Merge remote-tracking branch 'origin/master'

liweidong
李涛 1 month ago
commit d65595ae3e
  1. 42
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StAllotRecordController.java
  2. 17
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StBuyOrderController.java
  3. 42
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StClassRequestController.java
  4. 17
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StComboxController.java
  5. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StErpWarehouseTransferController.java
  6. 13
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireRecordController.java
  7. 9
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StExpireSubmissionController.java
  8. 15
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGlassCakeOutController.java
  9. 12
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsClassController.java
  10. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsController.java
  11. 8
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGoodsExtController.java
  12. 12
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StLendController.java
  13. 9
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldApplyForController.java
  14. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StMoldBaseController.java
  15. 13
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherOutRecordController.java
  16. 17
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StOtherReceiptRecordController.java
  17. 31
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRealtimeStockController.java
  18. 33
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StRequisitionController.java
  19. 10
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StReturnRecordController.java
  20. 9
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStockInoutRecordController.java
  21. 14
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorageLocationController.java
  22. 15
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java
  23. 11
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StTeamRequestController.java
  24. 13
      blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StWmsRequestController.java
  25. 13
      blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StRealtimeStockMapper.xml
  26. 39
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StBuyOrderServiceImpl.java
  27. 36
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StClassRequestServiceImpl.java
  28. 25
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StErpWarehouseTransferServiceImpl.java
  29. 35
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java
  30. 2
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherReceiptRecordServiceImpl.java
  31. 39
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRealtimeStockServiceImpl.java
  32. 5
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StRequisitionServiceImpl.java
  33. 34
      blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StWmsRequestServiceImpl.java

@ -1,37 +1,37 @@
package org.springblade.wms.controller;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StAllotRecordExcel;
import org.springblade.wms.pojo.entity.StAllotRecord;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StAllotRecordVO;
import org.springblade.wms.excel.StAllotRecordExcel;
import org.springblade.wms.wrapper.StAllotRecordWrapper;
import org.springblade.wms.service.IStAllotRecordService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.wms.wrapper.StAllotRecordWrapper;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile;
import java.util.Map;
/**
* @version 1.0
@ -55,6 +55,7 @@ public class StAllotRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("库位调拨记录表 详情")
@Operation(summary = "详情", description = "传入stAllotRecord")
public R<StAllotRecordVO> detail(StAllotRecord stAllotRecord) {
StAllotRecord detail = stAllotRecordService.getOne(Condition.getQueryWrapper(stAllotRecord));
@ -66,6 +67,7 @@ public class StAllotRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("库位调拨记录表 自定义分页")
@Operation(summary = "分页", description = "传入stAllotRecord")
public R<IPage<StAllotRecordVO>> page(StAllotRecordVO stAllotRecord, Query query) {
// 1. 若前端无筛选,强制 curStatus = NEW_BUILT
@ -88,6 +90,7 @@ public class StAllotRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 3)
@ApiLog("库位调拨记录表 新增")
@Operation(summary = "新增", description = "传入stAllotRecord")
public R save(@Valid @RequestBody StAllotRecord stAllotRecord) {
return R.status(stAllotRecordService.add(stAllotRecord));
@ -98,6 +101,7 @@ public class StAllotRecordController extends BladeController {
*/
@PostMapping("/batchAdd")
@ApiOperationSupport(order = 4)
@ApiLog("库位调拨记录表 批量新增")
@Operation(summary = "新增", description = "传入stAllotRecord")
public R save(@Valid @RequestBody List<StAllotRecord> stAllotRecordList) {
return R.status(stAllotRecordService.batchAdd(stAllotRecordList));
@ -108,6 +112,7 @@ public class StAllotRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("库位调拨记录表 修改")
@Operation(summary = "修改", description = "传入stAllotRecord")
public R update(@Valid @RequestBody StAllotRecord stAllotRecord) {
return R.status(stAllotRecordService.updateById(stAllotRecord));
@ -118,6 +123,7 @@ public class StAllotRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("库位调拨记录表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stAllotRecord")
public R submit(@Valid @RequestBody StAllotRecord stAllotRecord) {
return R.status(stAllotRecordService.saveOrUpdate(stAllotRecord));
@ -128,6 +134,7 @@ public class StAllotRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("库位调拨记录表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stAllotRecordService.deleteLogic(Func.toLongList(ids)));
@ -173,6 +180,7 @@ public class StAllotRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stAllotRecord")
@ApiOperationSupport(order = 10)
@ApiLog("库位调拨记录表 导出数据")
@Operation(summary = "导出数据", description = "传入stAllotRecord")
public void exportStAllotRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stAllotRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StAllotRecord> queryWrapper = Condition.getQueryWrapper(stAllotRecord, StAllotRecord.class);

@ -12,6 +12,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -53,6 +54,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("采购申请单 详情")
@Operation(summary = "详情", description = "传入stBuyOrder")
public R<StBuyOrderVO> detail(StBuyOrder stBuyOrder) {
StBuyOrder detail = stBuyOrderService.getOne(Condition.getQueryWrapper(stBuyOrder));
@ -63,6 +65,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("采购申请单 分页")
@Operation(summary = "分页", description = "传入stBuyOrder")
public R<IPage<StBuyOrderVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stBuyOrder,
@ -86,6 +89,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("采购申请单 自定义分页")
@Operation(summary = "分页", description = "传入stBuyOrder")
public R<IPage<StBuyOrderVO>> page(StBuyOrderVO stBuyOrder, Query query) {
@ -115,6 +119,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/pageBuyTrack")
@ApiOperationSupport(order = 4)
@ApiLog("采购跟踪 自定义分页")
@Operation(summary = "分页", description = "传入stBuyOrder")
public R<IPage<StBuyOrderVO>> pageBuyTrack(StBuyOrderVO stBuyOrder, Query query) {
@ -130,6 +135,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/pageStoreRequest")
@ApiOperationSupport(order = 5)
@ApiLog("仓库提请 自定义分页")
@Operation(summary = "分页", description = "传入stBuyOrder")
public R<IPage<StBuyOrderVO>> pageStoreRequest(StBuyOrderVO stBuyOrder, Query query) {
// 前端不传排序规则时,默认按 boCode 升序排序
@ -152,6 +158,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/queryCode")
@ApiOperationSupport(order = 6)
@ApiLog("查询新单号")
@Operation(summary = "查询新单号", description = "获取采购申请单下一个单号")
public R<String> queryCode() {
return R.data(stBuyOrderService.nextCode());
@ -162,6 +169,7 @@ public class StBuyOrderController extends BladeController {
*/
@GetMapping("/queryForAdd")
@ApiOperationSupport(order = 7)
@ApiLog("为新增或修改采购申请单准备数据")
@Operation(summary = "为新增或修改采购申请单准备数据", description = "传入boId")
public R<StBuyOrder> queryForAdd(@RequestParam(required = false) Long boId) {
StBuyOrder vo = stBuyOrderService.queryForAdd(boId, AuthUtil.getUser());
@ -173,6 +181,7 @@ public class StBuyOrderController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 8)
@ApiLog("采购申请单 新增")
@Operation(summary = "新增", description = "传入stBuyOrder")
public R save(@Valid @RequestBody StBuyOrder stBuyOrder) {
return R.status(stBuyOrderService.save(stBuyOrder));
@ -183,6 +192,7 @@ public class StBuyOrderController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 9)
@ApiLog("采购申请单 修改")
@Operation(summary = "修改", description = "传入stBuyOrder")
public R update(@Valid @RequestBody StBuyOrder stBuyOrder) {
return R.status(stBuyOrderService.updateById(stBuyOrder));
@ -193,6 +203,7 @@ public class StBuyOrderController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 10)
@ApiLog("采购申请单 新增或修改")
@Operation(summary = "新增或修改", description = "传入stBuyOrder")
public R<Boolean> submit(@Valid @RequestBody StBuyOrderDTO stBuyOrderDTO) {
stBuyOrderService.saveOrEdit(stBuyOrderDTO, AuthUtil.getUser());
@ -204,6 +215,7 @@ public class StBuyOrderController extends BladeController {
*/
@PostMapping("/renderBuyOrder")
@ApiOperationSupport(order = 11)
@ApiLog("提交采购申请单")
@Operation(summary = "提交采购订单", description = "传入采购订单列表")
public R<Boolean> renderBuyOrder(@Valid @RequestBody List<StBuyOrder> list) {
stBuyOrderService.purOtherRest(list, AuthUtil.getUserId());
@ -215,16 +227,18 @@ public class StBuyOrderController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 12)
@ApiLog("采购申请单 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stBuyOrderService.deleteLogic(Func.toLongList(ids)));
}
/**
* 采购申请单审批
* 采购申请单 审批
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 13)
@ApiLog("采购申请单 审批")
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) {
stBuyOrderService.approvalOrder(id, approvalResult, AuthUtil.getUser());
@ -237,6 +251,7 @@ public class StBuyOrderController extends BladeController {
@IsAdmin
@GetMapping("/export-stBuyOrder")
@ApiOperationSupport(order = 14)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stBuyOrder")
public void exportStBuyOrder(@Parameter(hidden = true) @RequestParam Map<String, Object> stBuyOrder, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StBuyOrder> queryWrapper = Condition.getQueryWrapper(stBuyOrder, StBuyOrder.class);

@ -1,36 +1,36 @@
package org.springblade.wms.controller;
import cn.hutool.core.util.StrUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.IsAdmin;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.excel.StClassRequestExcel;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.wms.pojo.vo.StClassRequestVO;
import org.springblade.wms.excel.StClassRequestExcel;
import org.springblade.wms.wrapper.StClassRequestWrapper;
import org.springblade.wms.service.IStClassRequestService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.wms.wrapper.StClassRequestWrapper;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.Map;
import java.util.List;
import jakarta.servlet.http.HttpServletResponse;
import java.util.Map;
/**
* @version 1.0
@ -54,6 +54,7 @@ public class StClassRequestController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("班组提请表 详情")
@Operation(summary = "详情", description = "传入stClassRequest")
public R<StClassRequestVO> detail(StClassRequest stClassRequest) {
StClassRequest detail = stClassRequestService.getOne(Condition.getQueryWrapper(stClassRequest));
@ -64,6 +65,7 @@ public class StClassRequestController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("班组提请表 分页")
@Operation(summary = "分页", description = "传入stClassRequest")
public R<IPage<StClassRequestVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stClassRequest, Query query) {
@ -90,6 +92,7 @@ public class StClassRequestController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("班组提请表 自定义分页")
@Operation(summary = "分页", description = "传入stClassRequest")
public R<IPage<StClassRequestVO>> page(StClassRequestVO stClassRequest, Query query) {
/* 1. 数据权限:当前用户工厂 */
@ -114,6 +117,7 @@ public class StClassRequestController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("班组提请表 新增")
@Operation(summary = "新增", description = "传入stClassRequest")
public R save(@Valid @RequestBody StClassRequest stClassRequest) {
return R.status(stClassRequestService.save(stClassRequest));
@ -124,6 +128,7 @@ public class StClassRequestController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("班组提请表 修改")
@Operation(summary = "修改", description = "传入stClassRequest")
public R update(@Valid @RequestBody StClassRequest stClassRequest) {
return R.status(stClassRequestService.updateById(stClassRequest));
@ -134,6 +139,7 @@ public class StClassRequestController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("班组提请表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stClassRequest 列表")
public R<Boolean> submit(
@Valid @RequestBody List<StClassRequest> list,
@ -147,6 +153,7 @@ public class StClassRequestController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("班组提请表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stClassRequestService.deleteLogic(Func.toLongList(ids)));
@ -157,6 +164,7 @@ public class StClassRequestController extends BladeController {
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 8)
@ApiLog("班组提请表 审批")
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder( @RequestParam Long id, @RequestParam Short approvalResult) {
stClassRequestService.approvalRequest(id, approvalResult, AuthUtil.getUser());
@ -168,6 +176,7 @@ public class StClassRequestController extends BladeController {
*/
@GetMapping("/queryCode")
@ApiOperationSupport(order = 9)
@ApiLog("班组提请表 查询新单号")
@Operation(summary = "查询新单号", description = "获取下一个单据号")
public R<String> queryCode() {
return R.data(stClassRequestService.nextCode(null));
@ -179,6 +188,7 @@ public class StClassRequestController extends BladeController {
@IsAdmin
@GetMapping("/export-stClassRequest")
@ApiOperationSupport(order = 10)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stClassRequest")
public void exportStClassRequest(@Parameter(hidden = true) @RequestParam Map<String, Object> stClassRequest, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StClassRequest> queryWrapper = Condition.getQueryWrapper(stClassRequest, StClassRequest.class);

@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import lombok.AllArgsConstructor;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -62,6 +63,7 @@ public class StComboxController {
@GetMapping("/goodsOut")
@ApiOperationSupport(order = 1)
@ApiLog("物料信息(带批次号)")
@Operation(summary = "物料信息(扫码/筛选)", description = "传入filterValue、shId、goodsId")
public R<IPage<StRealtimeStockVO>> goodsOut(StRealtimeStockVO stRealtimeStock, Query query) {
// 1. 数据权限:获取当前登录用户的工厂部门ID
@ -100,7 +102,8 @@ public class StComboxController {
return R.data(pages);
}
@GetMapping("/goodsAll")
@ApiOperationSupport(order = 10)
@ApiOperationSupport(order = 2)
@ApiLog("物料信息")
@Operation(summary = "物料信息", description = "模糊查询+实时库存单价")
public R<IPage<StGoodsVO>> goodsAll(@RequestParam(required = false) String filterValue,
@RequestParam(required = false) Long shId,
@ -146,6 +149,7 @@ public class StComboxController {
*/
@GetMapping("/findAllGoods")
@ApiOperationSupport(order = 3)
@ApiLog("查询所有物料信息")
@Operation(summary = "查询所有物料信息", description = "传入coGoods")
public R<IPage<StGoodsVO>> findAllGoods(StGoodsVO stGoods, Query query) {
if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) {
@ -159,18 +163,20 @@ public class StComboxController {
* 查询所有库位号信息
*/
@GetMapping("/stStorageLocationAll")
@ApiOperationSupport(order = 3)
@ApiOperationSupport(order = 4)
@ApiLog("查询所有库位号信息")
@Operation(summary = "库位号信息", description = "传入coStorageLocation")
public R<IPage<StStorageLocationVO>> stStorageLocationAll(StStorageLocationVO stStorageLocation, Query query) {
if (StrUtil.isBlank(query.getAscs()) && StrUtil.isBlank(query.getDescs())) {
query.setAscs("storageLocationCode"); // 默认按货位号编码排序,可根据实际字段调整
query.setAscs("location"); // 默认按货位号编码排序,可根据实际字段调整
}
IPage<StStorageLocationVO> pages = stStorageLocationService.selectStStorageLocationAllPage(Condition.getPage(query), stStorageLocation);
return R.data(pages);
}
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiOperationSupport(order = 5)
@ApiLog("查询所有库房信息")
@Operation(summary = "库房组件", description = "传入coStorehouse")
public R<IPage<StStorehouseVO>> page(StStorehouseVO stStorehouse, Query query) {
// 1. 获取当前登录用户信息
@ -190,7 +196,8 @@ public class StComboxController {
}
@GetMapping("/outboundGoods")
@ApiOperationSupport(order = 3)
@ApiOperationSupport(order = 6)
@ApiLog("班组提请可选物料")
@Operation(summary = "班组提请可选物料", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> outboundGoods(StRealtimeStockVO stRealtimeStock, Query query) {
// 1. 获取当前登录用户

@ -12,6 +12,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -58,6 +59,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("ERP库转移记录表 详情")
@Operation(summary = "详情", description = "传入stErpWarehouseTransfer")
public R<StErpWarehouseTransferVO> detail(StErpWarehouseTransfer stErpWarehouseTransfer) {
StErpWarehouseTransfer detail = stErpWarehouseTransferService.getOne(Condition.getQueryWrapper(stErpWarehouseTransfer));
@ -68,6 +70,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("ERP库转移记录表 分页")
@Operation(summary = "分页", description = "传入stErpWarehouseTransfer")
public R<IPage<StErpWarehouseTransferVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stErpWarehouseTransfer, Query query) {
@ -92,6 +95,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("ERP库转移记录表 自定义分页")
@Operation(summary = "分页", description = "传入stErpWarehouseTransfer")
public R<IPage<StErpWarehouseTransferVO>> page(StErpWarehouseTransferVO stErpWarehouseTransfer, Query query) {
// BladeUser user = AuthUtil.getUser();
@ -129,6 +133,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("ERP库转移记录表 新增")
@Operation(summary = "新增", description = "传入stErpWarehouseTransfer")
public R save(@Valid @RequestBody StErpWarehouseTransfer stErpWarehouseTransfer) {
return R.status(stErpWarehouseTransferService.save(stErpWarehouseTransfer));
@ -139,6 +144,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("ERP库转移记录表 修改")
@Operation(summary = "修改", description = "传入stErpWarehouseTransfer")
public R update(@Valid @RequestBody StErpWarehouseTransfer stErpWarehouseTransfer) {
return R.status(stErpWarehouseTransferService.updateById(stErpWarehouseTransfer));
@ -149,6 +155,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@PostMapping("/transferReceipt")
@ApiOperationSupport(order = 6)
@ApiLog("ERP库转移记录表 转移入库")
@Operation(summary = "库转移入库", description = "传入shId、cslId、ewtId、putQuantity")
public R<Boolean> transferReceipt(
@Parameter(description = "库房ID", required = true) @RequestParam Long shId,
@ -164,6 +171,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@GetMapping("/transferReceiptBatch")
@ApiOperationSupport(order = 7)
@ApiLog("ERP库转移记录表 批量入库")
@Operation(summary = "批量库转移入库", description = "自动推送待入库数据")
public R<Boolean> transferReceiptBatch() {
stErpWarehouseTransferService.transferReceiptBatch(AuthUtil.getUser());
@ -175,6 +183,7 @@ public class StErpWarehouseTransferController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("ERP库转移记录表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stErpWarehouseTransferService.deleteLogic(Func.toLongList(ids)));
@ -186,6 +195,7 @@ public class StErpWarehouseTransferController extends BladeController {
@IsAdmin
@GetMapping("/export-stErpWarehouseTransfer")
@ApiOperationSupport(order = 9)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stErpWarehouseTransfer")
public void exportStErpWarehouseTransfer(@Parameter(hidden = true) @RequestParam Map<String, Object> stErpWarehouseTransfer, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StErpWarehouseTransfer> queryWrapper = Condition.getQueryWrapper(stErpWarehouseTransfer, StErpWarehouseTransfer.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -55,6 +56,7 @@ public class StExpireRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("到期维护记录表 详情")
@Operation(summary = "详情", description = "传入stExpireRecord")
public R<StExpireRecordVO> detail(StExpireRecord stExpireRecord) {
StExpireRecord detail = stExpireRecordService.getOne(Condition.getQueryWrapper(stExpireRecord));
@ -66,6 +68,7 @@ public class StExpireRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("到期维护记录表 分页")
@Operation(summary = "分页", description = "传入stExpireRecord")
public R<IPage<StExpireRecordVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireRecord, Query query) {
IPage<StExpireRecord> pages = stExpireRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(stExpireRecord, StExpireRecord.class));
@ -77,6 +80,7 @@ public class StExpireRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("到期维护记录表 自定义分页")
@Operation(summary = "分页", description = "传入stExpireRecord")
public R<IPage<StExpireRecordVO>> page(StExpireRecordVO stExpireRecord, Query query) {
IPage<StExpireRecordVO> pages = stExpireRecordService.selectStExpireRecordPage(Condition.getPage(query), stExpireRecord);
@ -88,6 +92,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("到期维护记录表 新增")
@Operation(summary = "新增", description = "传入stExpireRecord")
public R save(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.save(stExpireRecord));
@ -98,6 +103,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("到期维护记录表 修改")
@Operation(summary = "修改", description = "传入stExpireRecord")
public R update(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.updateById(stExpireRecord));
@ -108,6 +114,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("到期维护记录表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stExpireRecord")
public R submit(@Valid @RequestBody StExpireRecord stExpireRecord) {
return R.status(stExpireRecordService.saveOrUpdate(stExpireRecord));
@ -118,6 +125,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("到期维护记录表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stExpireRecordService.deleteLogic(Func.toLongList(ids)));
@ -128,6 +136,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/editStopUse")
@ApiOperationSupport(order = 8)
@ApiLog("设置数据合格与限用")
@Operation(summary = "设置合格与限用", description = "传入rlsId、stopUse、memo")
public R<Boolean> editStopUse(@RequestParam Long rlsId,
@RequestParam Boolean stopUse, @RequestParam(required = false) String memo) {
@ -140,6 +149,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/expireHandle")
@ApiOperationSupport(order = 9)
@ApiLog("修改到期日期")
@Operation(summary = "修改到期日期", description = "传入rlsIdArr、dueDate")
public R<Boolean> expireHandle(@RequestParam List<Long> rlsIdArr,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") String dueDate) {
@ -152,6 +162,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/invalidatedOut")
@ApiOperationSupport(order = 10)
@ApiLog("报废出库")
@Operation(summary = "报废出库", description = "传入rlsId、memo、bfCode")
public R<Boolean> invalidatedOut(@RequestParam Long rlsId,
@RequestParam(required = false) Double outQty,
@ -169,6 +180,7 @@ public class StExpireRecordController extends BladeController {
*/
@PostMapping("/invalidatedOut/batch")
@ApiOperationSupport(order = 11)
@ApiLog("批量报废出库")
@Operation(summary = "批量报废出库", description = "传入批量明细items,支持单条指定出库数量")
public R<Boolean> batchInvalidatedOut(@RequestBody @Valid StExpireRecordDTO dto) {
stExpireRecordService.batchInvalidatedOut(dto, AuthUtil.getUser());
@ -181,6 +193,7 @@ public class StExpireRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stExpireRecord")
@ApiOperationSupport(order = 12)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stExpireRecord")
public void exportStExpireRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StExpireRecord> queryWrapper = Condition.getQueryWrapper(stExpireRecord, StExpireRecord.class);

@ -12,6 +12,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -56,6 +57,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("到期送检表 详情")
@Operation(summary = "详情", description = "传入stExpireSubmission")
public R<StExpireSubmissionVO> detail(StExpireSubmission stExpireSubmission) {
StExpireSubmission detail = stExpireSubmissionService.getOne(Condition.getQueryWrapper(stExpireSubmission));
@ -67,6 +69,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("到期送检表 分页")
@Operation(summary = "分页", description = "传入stExpireSubmission")
public R<IPage<StExpireSubmissionVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireSubmission, Query query) {
IPage<StExpireSubmission> pages = stExpireSubmissionService.page(Condition.getPage(query), Condition.getQueryWrapper(stExpireSubmission, StExpireSubmission.class));
@ -86,6 +89,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 4)
@ApiLog("到期送检表 自定义分页")
@Operation(summary = "分页", description = "传入stExpireSubmission")
public R<IPage<StExpireSubmissionVO>> page(StExpireSubmissionVO stExpireSubmission, Query query) {
IPage<StExpireSubmissionVO> pages = stExpireSubmissionService.selectStExpireSubmissionPage(Condition.getPage(query), stExpireSubmission);
@ -97,6 +101,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@ApiLog("到期送检表 新增")
@Operation(summary = "新增", description = "传入stExpireSubmission")
public R save(@Valid @RequestBody StExpireSubmission stExpireSubmission) {
return R.status(stExpireSubmissionService.save(stExpireSubmission));
@ -107,6 +112,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@ApiLog("到期送检表 修改")
@Operation(summary = "修改", description = "传入stExpireSubmission")
public R update(@Valid @RequestBody StExpireSubmission stExpireSubmission) {
return R.status(stExpireSubmissionService.updateById(stExpireSubmission));
@ -117,6 +123,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@ApiLog("到期送检表 新增或修改送检")
@Operation(summary = "新增或修改", description = "传入stExpireSubmission列表")
public R<Boolean> submit(@Valid @RequestBody List<StExpireSubmission> list) {
if (CollUtil.isEmpty(list)) {
@ -131,6 +138,7 @@ public class StExpireSubmissionController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("到期送检表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stExpireSubmissionService.deleteLogic(Func.toLongList(ids)));
@ -143,6 +151,7 @@ public class StExpireSubmissionController extends BladeController {
@IsAdmin
@GetMapping("/export-stExpireSubmission")
@ApiOperationSupport(order = 9)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stExpireSubmission")
public void exportStExpireSubmission(@Parameter(hidden = true) @RequestParam Map<String, Object> stExpireSubmission, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StExpireSubmission> queryWrapper = Condition.getQueryWrapper(stExpireSubmission, StExpireSubmission.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -55,6 +56,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("玻璃饼出库 详情")
@Operation(summary = "详情", description = "传入stGlassCakeOut")
public R<StGlassCakeOutVO> detail(StGlassCakeOut stGlassCakeOut) {
StGlassCakeOut detail = stGlassCakeOutService.getOne(Condition.getQueryWrapper(stGlassCakeOut));
@ -66,6 +68,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("玻璃饼出库 分页")
@Operation(summary = "分页", description = "传入stGlassCakeOut")
public R<IPage<StGlassCakeOutVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stGlassCakeOut, Query query) {
IPage<StGlassCakeOut> pages = stGlassCakeOutService.page(Condition.getPage(query), Condition.getQueryWrapper(stGlassCakeOut, StGlassCakeOut.class));
@ -77,6 +80,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("玻璃饼出库 自定义分页")
@Operation(summary = "分页", description = "传入stGlassCakeOut")
public R<IPage<StGlassCakeOutVO>> page(StGlassCakeOutVO stGlassCakeOut, Query query) {
IPage<StGlassCakeOutVO> pages = stGlassCakeOutService.selectStGlassCakeOutPage(Condition.getPage(query), stGlassCakeOut);
@ -88,6 +92,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("玻璃饼出库 新增")
@Operation(summary = "新增", description = "传入stGlassCakeOut")
public R save(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.save(stGlassCakeOut));
@ -98,6 +103,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("玻璃饼出库 修改")
@Operation(summary = "修改", description = "传入stGlassCakeOut")
public R update(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.updateById(stGlassCakeOut));
@ -108,6 +114,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("玻璃饼出库 新增或修改")
@Operation(summary = "新增或修改", description = "传入stGlassCakeOut")
public R submit(@Valid @RequestBody StGlassCakeOut stGlassCakeOut) {
return R.status(stGlassCakeOutService.saveOrUpdate(stGlassCakeOut));
@ -118,6 +125,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("玻璃饼出库 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGlassCakeOutService.deleteLogic(Func.toLongList(ids)));
@ -128,6 +136,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/generateCode")
@ApiOperationSupport(order = 8)
@ApiLog("玻璃饼出库 生成出库单号")
@Operation(summary = "生成玻璃饼出库单号", description = "获取新单据号并返回空账单对象")
public R<StStockInoutRecordVO> generateCode() {
// 1. 生成单号
@ -146,6 +155,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/generateOrder")
@ApiOperationSupport(order = 9)
@ApiLog("生成玻璃饼预出库单")
@Operation(summary = "生成玻璃饼预出库单", description = "按物料编号+印字+粉重等条件查库存,库存充足生成预出库单,不足返回指定提示")
public R<List<StGlassCakeOut>> generatePreOutOrder(
@Parameter(description = "玻璃饼预出库信息", required = true)
@ -159,6 +169,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/batchGenerateOrder")
@ApiOperationSupport(order = 10)
@ApiLog("批量生成玻璃饼预出库单")
@Operation(summary = "批量生成玻璃饼预出库单", description = "批量传入玻璃饼信息,逐条校验库存,成功生成预出库单,失败收集提示信息(一条失败不影响其他)")
public R<Map<String, Object>> batchGeneratePreOutOrder(
@Parameter(description = "玻璃饼预出库信息集合", required = true)
@ -173,6 +184,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@GetMapping("/scanCard")
@ApiOperationSupport(order = 11)
@ApiLog("扫码查询/新增待出库数据")
@Operation(summary = "扫码处理玻璃饼出库", description = "传入流程卡号,查询/新增待出库数据")
public R<List<StGlassCakeOut>> scanCard(
@Parameter(description = "流程卡号(扫码内容)", required = true) @RequestParam String cardNo) {
@ -184,6 +196,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/submitOutStock")
@ApiOperationSupport(order = 12)
@ApiLog("编辑出库数量后 提交确认出库")
@Operation(summary = "玻璃饼出库-提交确认出库", description = "填写出库数量后提交,写入出入库记录并扣减库存,变更为已出库状态")
public R<StGlassCakeOut> submitOutStock(@RequestBody StGlassCakeOut stGlassCakeOut) {
BladeUser user = AuthUtil.getUser();
@ -196,6 +209,7 @@ public class StGlassCakeOutController extends BladeController {
*/
@PostMapping("/batchSubmitOutStock")
@ApiOperationSupport(order = 13)
@ApiLog("编辑出库数量后 批量出库")
@Operation(summary = "玻璃饼出库-提交确认出库", description = "填写出库数量后提交,写入出入库记录并扣减库存,变更为已出库状态")
public R<List<StGlassCakeOut>> batchSubmitOutStock(@RequestBody List<StGlassCakeOut> paramList) {
BladeUser user = AuthUtil.getUser();
@ -209,6 +223,7 @@ public class StGlassCakeOutController extends BladeController {
@IsAdmin
@GetMapping("/export-stGlassCakeOut")
@ApiOperationSupport(order = 14)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stGlassCakeOut")
public void exportStGlassCakeOut(@Parameter(hidden = true) @RequestParam Map<String, Object> stGlassCakeOut, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGlassCakeOut> queryWrapper = Condition.getQueryWrapper(stGlassCakeOut, StGlassCakeOut.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -51,6 +52,7 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("物料类别表 详情")
@Operation(summary = "详情", description = "传入stGoodsClass")
public R<StGoodsClassVO> detail(StGoodsClass stGoodsClass) {
StGoodsClass detail = stGoodsClassService.getOne(Condition.getQueryWrapper(stGoodsClass));
@ -62,6 +64,7 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("物料类别表 分页")
@Operation(summary = "分页", description = "传入stGoodsClass")
public R<IPage<StGoodsClassVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsClass, Query query) {
QueryWrapper<StGoodsClass> wrapper = Condition.getQueryWrapper(stGoodsClass, StGoodsClass.class);
@ -75,6 +78,7 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("物料类别表 自定义分页")
@Operation(summary = "分页", description = "传入stGoodsClass")
public R<IPage<StGoodsClassVO>> page(StGoodsClassVO stGoodsClass, Query query) {
stGoodsClass.setIsDeleted(0);
@ -87,6 +91,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("物料类别表 新增")
@Operation(summary = "新增", description = "传入stGoodsClass")
public R save(@Valid @RequestBody StGoodsClass stGoodsClass) {
return R.status(stGoodsClassService.save(stGoodsClass));
@ -97,6 +102,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("物料类别表 修改")
@Operation(summary = "修改", description = "传入stGoodsClass")
public R update(@Valid @RequestBody StGoodsClass stGoodsClass) {
return R.status(stGoodsClassService.updateById(stGoodsClass));
@ -107,6 +113,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("物料类别表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stGoodsClass")
public R submit(@Valid @RequestBody StGoodsClass stGoodsClass) {
// 1. 名称重复校验
@ -126,6 +133,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("物料类别表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGoodsClassService.deleteLogic(Func.toLongList(ids)));
@ -136,6 +144,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/checkName")
@ApiOperationSupport(order = 8)
@ApiLog("验证物料类别名称是否重复")
@Operation(summary = "验证物料类别名称是否重复", description = "传入id和gcName")
public R<Boolean> checkName(@Valid @RequestBody StGoodsClass stGoodsClass) {
Boolean result = stGoodsClassService.checkName(stGoodsClass.getId(), stGoodsClass.getGcName());
@ -147,6 +156,7 @@ public class StGoodsClassController extends BladeController {
*/
@PostMapping("/checkCode")
@ApiOperationSupport(order = 9)
@ApiLog("验证物料类别编码是否重复")
@Operation(summary = "验证物料类别编码是否重复", description = "传入id和gcCode")
public R<Boolean> checkCode(@Valid @RequestBody StGoodsClass stGoodsClass) {
Boolean result = stGoodsClassService.checkCode(stGoodsClass.getId(), stGoodsClass.getGcCode());
@ -158,6 +168,7 @@ public class StGoodsClassController extends BladeController {
*/
@GetMapping("/findGoodsClass")
@ApiOperationSupport(order = 10)
@ApiLog("查询物料类别列表(不分页)")
@Operation(summary = "查询物料类别列表(不分页)", description = "支持按类别编码/名称模糊搜索,默认查询所有未删除的类别")
public R<List<StGoodsClass>> findGoodsClass(
@Parameter(description = "模糊搜索值(类别编码/名称)", required = false)
@ -172,6 +183,7 @@ public class StGoodsClassController extends BladeController {
@IsAdmin
@GetMapping("/export-stGoodsClass")
@ApiOperationSupport(order = 11)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stGoodsClass")
public void exportStGoodsClass(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsClass, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoodsClass> queryWrapper = Condition.getQueryWrapper(stGoodsClass, StGoodsClass.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -51,6 +52,7 @@ public class StGoodsController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("物料信息表 详情")
@Operation(summary = "详情", description = "传入stGoods")
public R<StGoodsVO> detail(StGoods stGoods) {
StGoods detail = stGoodsService.getOne(Condition.getQueryWrapper(stGoods));
@ -61,6 +63,7 @@ public class StGoodsController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("物料信息表 分页")
@Operation(summary = "分页", description = "传入stGoods")
public R<IPage<StGoodsVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoods, Query query) {
QueryWrapper<StGoods> wrapper = Condition.getQueryWrapper(stGoods, StGoods.class);
@ -74,6 +77,7 @@ public class StGoodsController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("物料信息表 自定义分页")
@Operation(summary = "分页", description = "传入stGoods")
public R<IPage<StGoodsVO>> page(StGoodsVO stGoods, Query query) {
stGoods.setIsDeleted(0);
@ -86,6 +90,7 @@ public class StGoodsController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("物料信息表 新增")
@Operation(summary = "新增", description = "传入stGoods")
public R save(@Valid @RequestBody String goodsCode) throws Exception{
stGoodsService.saveGoods(goodsCode);
@ -97,6 +102,7 @@ public class StGoodsController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("物料信息表 修改")
@Operation(summary = "修改", description = "传入stGoods")
public R update(@Valid @RequestBody StGoods stGoods) {
return R.status(stGoodsService.updateById(stGoods));
@ -107,6 +113,7 @@ public class StGoodsController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("物料信息表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stGoods")
public R submit(@Valid @RequestBody StGoods stGoods) {
return R.status(stGoodsService.saveOrUpdate(stGoods));
@ -117,6 +124,7 @@ public class StGoodsController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("物料信息表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGoodsService.deleteLogic(Func.toLongList(ids)));
@ -127,6 +135,7 @@ public class StGoodsController extends BladeController {
*/
@PostMapping("/setUsed")
@ApiOperationSupport(order = 8)
@ApiLog("设置物料状态")
@Operation(summary = "设置物料状态", description = "传入goodsId(物料ID)和used(状态:true=启用,false=禁用)")
public R setUsed(@Validated @RequestBody StGoods stGoods) throws Exception {
stGoodsService.changeUsed(stGoods.getId(), stGoods.getUsed());
@ -138,6 +147,7 @@ public class StGoodsController extends BladeController {
*/
@GetMapping("/getGoodsByGoodsCode")
@ApiOperationSupport(order = 9)
@ApiLog("根据物料编码查询物料")
@Operation(summary = "根据物料编码查询物料", description = "传入物料编码goodsCode(路径参数)")
public R getGoodsByGoodsCode(
@Validated
@ -153,6 +163,7 @@ public class StGoodsController extends BladeController {
@IsAdmin
@GetMapping("/export-stGoods")
@ApiOperationSupport(order = 10)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stGoods")
public void exportStGoods(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoods, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoods> queryWrapper = Condition.getQueryWrapper(stGoods, StGoods.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -50,6 +51,7 @@ public class StGoodsExtController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("物料状态表 详情")
@Operation(summary = "详情", description = "传入stGoodsExt")
public R<StGoodsExtVO> detail(StGoodsExt stGoodsExt) {
StGoodsExt detail = stGoodsExtService.getOne(Condition.getQueryWrapper(stGoodsExt));
@ -61,6 +63,7 @@ public class StGoodsExtController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("物料状态表 自定义分页")
@Operation(summary = "分页", description = "传入stGoodsExt")
public R<IPage<StGoodsExtVO>> page(StGoodsExtVO stGoodsExt, Query query) {
IPage<StGoodsExtVO> pages = stGoodsExtService.selectStGoodsExtPage(Condition.getPage(query), stGoodsExt);
@ -72,6 +75,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 3)
@ApiLog("物料状态表 新增")
@Operation(summary = "新增", description = "传入stGoodsExt")
public R save(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.save(stGoodsExt));
@ -82,6 +86,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 4)
@ApiLog("物料状态表 修改")
@Operation(summary = "修改", description = "传入stGoodsExt")
public R update(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.updateById(stGoodsExt));
@ -92,6 +97,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 5)
@ApiLog("物料状态表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stGoodsExt")
public R submit(@Valid @RequestBody StGoodsExt stGoodsExt) {
return R.status(stGoodsExtService.saveOrUpdate(stGoodsExt));
@ -102,6 +108,7 @@ public class StGoodsExtController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@ApiLog("物料状态表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stGoodsExtService.deleteLogic(Func.toLongList(ids)));
@ -114,6 +121,7 @@ public class StGoodsExtController extends BladeController {
@IsAdmin
@GetMapping("/export-stGoodsExt")
@ApiOperationSupport(order = 7)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stGoodsExt")
public void exportStGoodsExt(@Parameter(hidden = true) @RequestParam Map<String, Object> stGoodsExt, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StGoodsExt> queryWrapper = Condition.getQueryWrapper(stGoodsExt, StGoodsExt.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -61,6 +62,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("物料借用 详情")
@Operation(summary = "详情", description = "传入stLend")
public R<StLendVO> detail(StLend stLend) {
StLend detail = stLendService.getOne(Condition.getQueryWrapper(stLend));
@ -72,6 +74,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("物料借用 分页")
@Operation(summary = "分页", description = "传入stLend")
public R<IPage<StLendVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stLend, Query query) {
@ -92,6 +95,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("物料借用 自定义分页")
@Operation(summary = "分页", description = "传入stLend")
public R<IPage<StLendVO>> page(StLendVO stLend, Query query) {
IPage<StLendVO> pages = stLendService.selectStLendPage(Condition.getPage(query), stLend);
@ -103,6 +107,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("物料借用 新增")
@Operation(summary = "新增", description = "传入stLend")
public R save(@Valid @RequestBody StLend stLend) {
return R.status(stLendService.save(stLend));
@ -113,6 +118,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("物料借用 修改")
@Operation(summary = "修改", description = "传入stLend")
public R update(@Valid @RequestBody StLend stLend) {
return R.status(stLendService.updateById(stLend));
@ -123,6 +129,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/submitBatch")
@ApiOperationSupport(order = 6)
@ApiLog("物料借用 新增或修改")
@Operation(summary = "批量新增或修改", description = "传入List<StLend>批量处理")
public R submitBatch(@Validated @RequestBody List<StLend> stLendList) throws Exception {
return R.status(stLendService.saveOrEditBatch(stLendList, AuthUtil.getUser()));
@ -133,6 +140,7 @@ public class StLendController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("物料借用 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stLendService.deleteLogic(Func.toLongList(ids)));
@ -143,6 +151,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/queryCode")
@ApiOperationSupport(order = 8)
@ApiLog("物料借用 查询新单号")
@Operation(summary = "查询新单号", description = "获取借出单下一个单号")
public R<String> queryCode() {
return R.data(stLendService.nextCode());
@ -153,6 +162,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/generateDataByBarCode/{barCode}")
@ApiOperationSupport(order = 9)
@ApiLog("物料借用 扫码借出")
@Operation(summary = "根据条码号生成借出数据", description = "传入条码号或物料编码")
public R<StLendVO> generateDataByBarCode(@PathVariable String barCode) {
StRealtimeStock stock = stRealtimeStockService.getByBarCode(barCode);
@ -194,6 +204,7 @@ public class StLendController extends BladeController {
*/
@GetMapping("/generateRtnDataByBarCode")
@ApiOperationSupport(order = 10)
@ApiLog("物料借用 扫码归还")
@Operation(summary = "根据条码号生成归还数据", description = "传入条码号或物料编码")
public R<List<StLend>> generateRtnDataByBarCode(@RequestParam("barCode") String barCode) {
return R.data(stLendService.generateRtnDataByBarCode(barCode));
@ -205,6 +216,7 @@ public class StLendController extends BladeController {
@IsAdmin
@GetMapping("/export-stLend")
@ApiOperationSupport(order = 11)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stLend")
public void exportStLend(@Parameter(hidden = true) @RequestParam Map<String, Object> stLend, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StLend> queryWrapper = Condition.getQueryWrapper(stLend, StLend.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -52,6 +53,7 @@ public class StMoldApplyForController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("工装计划申请表 详情")
@Operation(summary = "详情", description = "传入stMoldApplyFor")
public R<StMoldApplyForVO> detail(StMoldApplyFor stMoldApplyFor) {
StMoldApplyFor detail = stMoldApplyForService.getOne(Condition.getQueryWrapper(stMoldApplyFor));
@ -63,6 +65,7 @@ public class StMoldApplyForController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("工装计划申请表 分页")
@Operation(summary = "分页", description = "传入stMoldApplyFor")
public R<IPage<StMoldApplyForVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldApplyFor, Query query) {
@ -79,6 +82,7 @@ public class StMoldApplyForController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("工装计划申请表 自定义分页")
@Operation(summary = "分页", description = "传入stMoldApplyFor")
public R<IPage<StMoldApplyForVO>> page(StMoldApplyForVO stMoldApplyFor, Query query) {
stMoldApplyFor.setMafType(StMoldApplyFor.MAF_STATUS_HAVE);
@ -93,6 +97,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("工装计划申请表 新增")
@Operation(summary = "新增", description = "传入stMoldApplyFor")
public R save(@Valid @RequestBody StMoldApplyFor stMoldApplyFor) {
return R.status(stMoldApplyForService.save(stMoldApplyFor));
@ -103,6 +108,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("工装计划申请表 修改")
@Operation(summary = "修改", description = "传入stMoldApplyFor")
public R update(@Valid @RequestBody StMoldApplyFor stMoldApplyFor) {
return R.status(stMoldApplyForService.updateById(stMoldApplyFor));
@ -113,6 +119,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("工装计划申请表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stMoldApplyForSubmitDTO")
public R<Boolean> submit(@Valid @RequestBody StMoldApplyForDTO dto) {
stMoldApplyForService.addOrEditProcess(dto.getList(), dto.getDeleteIds(), AuthUtil.getUser());
@ -124,6 +131,7 @@ public class StMoldApplyForController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("工装计划申请表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stMoldApplyForService.deleteLogic(Func.toLongList(ids)));
@ -136,6 +144,7 @@ public class StMoldApplyForController extends BladeController {
@IsAdmin
@GetMapping("/export-stMoldApplyFor")
@ApiOperationSupport(order = 8)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stMoldApplyFor")
public void exportStMoldApplyFor(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldApplyFor, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StMoldApplyFor> queryWrapper = Condition.getQueryWrapper(stMoldApplyFor, StMoldApplyFor.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -51,6 +52,7 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("模具关系表 详情")
@Operation(summary = "详情", description = "传入stMoldBase")
public R<StMoldBaseVO> detail(StMoldBase stMoldBase) {
StMoldBase detail = stMoldBaseService.getOne(Condition.getQueryWrapper(stMoldBase));
@ -62,6 +64,7 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("模具关系表 详情")
@Operation(summary = "分页", description = "传入stMoldBase")
public R<IPage<StMoldBaseVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldBase, Query query) {
IPage<StMoldBase> pages = stMoldBaseService.page(Condition.getPage(query), Condition.getQueryWrapper(stMoldBase, StMoldBase.class));
@ -73,6 +76,7 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("模具关系表 自定义分页")
@Operation(summary = "分页", description = "传入stMoldBase")
public R<IPage<StMoldBaseVO>> page(StMoldBaseVO stMoldBase, Query query) {
IPage<StMoldBaseVO> pages = stMoldBaseService.selectStMoldBasePage(Condition.getPage(query), stMoldBase);
@ -84,6 +88,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("模具关系表 新增")
@Operation(summary = "新增", description = "传入stMoldBase")
public R save(@Valid @RequestBody StMoldBase stMoldBase) {
return R.status(stMoldBaseService.save(stMoldBase));
@ -94,6 +99,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("模具关系表 修改")
@Operation(summary = "修改", description = "传入stMoldBase")
public R update(@Valid @RequestBody StMoldBase stMoldBase) {
return R.status(stMoldBaseService.updateById(stMoldBase));
@ -104,6 +110,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("模具关系表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stMoldBase")
public R submit(@Valid @RequestBody StMoldBaseDTO dto) {
return R.status(stMoldBaseService.addOrEdit(dto.getList(), dto.getDeleteIds()));
@ -114,6 +121,7 @@ public class StMoldBaseController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("模具关系表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stMoldBaseService.deleteLogic(Func.toLongList(ids)));
@ -124,6 +132,7 @@ public class StMoldBaseController extends BladeController {
*/
@GetMapping("/getByGoodsId")
@ApiOperationSupport(order = 8)
@ApiLog("根据父级物料查询所有子级")
@Operation(summary = "根据父级物料查询所有子级", description = "传入goodsId")
public R<List<StMoldBase>> getByGoodsId(
@Parameter(description = "父级物料ID", required = true) @RequestParam Long goodsId) {
@ -137,6 +146,7 @@ public class StMoldBaseController extends BladeController {
@IsAdmin
@GetMapping("/export-stMoldBase")
@ApiOperationSupport(order = 9)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stMoldBase")
public void exportStMoldBase(@Parameter(hidden = true) @RequestParam Map<String, Object> stMoldBase, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StMoldBase> queryWrapper = Condition.getQueryWrapper(stMoldBase, StMoldBase.class);

@ -12,6 +12,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -65,6 +66,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("其他出库表 详情")
@Operation(summary = "详情", description = "传入stOtherOutRecord")
public R<StOtherOutRecordVO> detail(StOtherOutRecordVO stOtherOutRecord) {
// StOtherOutRecord detail = stOtherOutRecordService.getOne(Condition.getQueryWrapper(stOtherOutRecord));
@ -81,6 +83,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("其他出库表 分页")
@Operation(summary = "分页", description = "传入stOtherOutRecord")
public R<IPage<StOtherOutRecordVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherOutRecord, Query query) {
@ -107,6 +110,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("其他出库表 自定义分页")
@Operation(summary = "分页", description = "传入stOtherOutRecord")
public R<IPage<StOtherOutRecordVO>> page(StOtherOutRecordVO stOtherOutRecord, Query query) {
/* 1. 数据权限:当前用户工厂 */
@ -132,6 +136,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("其他出库表 新增")
@Operation(summary = "新增", description = "传入stOtherOutRecord")
public R save(@Valid @RequestBody StOtherOutRecord stOtherOutRecord) {
return R.status(stOtherOutRecordService.save(stOtherOutRecord));
@ -142,6 +147,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("其他出库表 修改")
@Operation(summary = "修改", description = "传入stOtherOutRecord")
public R update(@Valid @RequestBody StOtherOutRecord stOtherOutRecord) {
return R.status(stOtherOutRecordService.updateById(stOtherOutRecord));
@ -152,6 +158,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("其他出库表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stOtherOutRecord 与逐条明细")
public R<Boolean> submit(@Valid @RequestBody StOtherOutRecordDTO dto) {
stOtherOutRecordService.addOtherOutRecord(
@ -166,6 +173,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/scanSubmit")
@ApiOperationSupport(order = 7)
@ApiLog("其他出库表 扫码出库")
@Operation(summary = "扫码出库", description = "通过物料编码(条形码)生成其他出库数据")
public R scanSubmit(@RequestParam String barCode) {
StRealtimeStock stock = stRealtimeStockService.getByBarCode(barCode);
@ -185,6 +193,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 8)
@ApiLog("其他出库表 审批")
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder(@RequestParam Long id, @RequestParam Short approvalResult) {
stOtherOutRecordService.approvalRequest(id, approvalResult, AuthUtil.getUser());
@ -196,6 +205,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 9)
@ApiLog("其他出库表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stOtherOutRecordService.deleteLogic(Func.toLongList(ids)));
@ -206,6 +216,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/generateCode")
@ApiOperationSupport(order = 10)
@ApiLog("其他出库表 生成其他出库单")
@Operation(summary = "生成其他出库单号", description = "获取新单据号并返回空账单对象")
public R<StStockInoutRecordVO> generateCode() {
// 1. 生成单号
@ -224,6 +235,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/queryByGoodsIdShId")
@ApiOperationSupport(order = 11)
@ApiLog("其他出库表 根据条件查询库存")
@Operation(summary = "根据物料编号和仓库号批号查询", description = "传入goodsId、shId")
public R<IPage<StRealtimeStockVO>> queryByGoodsIdShId(
@Parameter(description = "仓库ID", required = true) @RequestParam Long shId,
@ -240,6 +252,7 @@ public class StOtherOutRecordController extends BladeController {
*/
@GetMapping("/export-stOtherOutRecord")
@ApiOperationSupport(order = 12)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stOtherOutRecord")
public void exportStOtherOutRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherOutRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherOutRecord> queryWrapper = Condition.getQueryWrapper(stOtherOutRecord, StOtherOutRecord.class);

@ -14,6 +14,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -68,6 +69,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("其他入库表 详情")
@Operation(summary = "详情", description = "传入stOtherReceiptRecord")
public R<StOtherReceiptRecordVO> detail(StOtherReceiptRecord stOtherReceiptRecord) {
StOtherReceiptRecord detail = stOtherReceiptRecordService.getOne(Condition.getQueryWrapper(stOtherReceiptRecord));
@ -79,6 +81,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("其他入库表 分页")
@Operation(summary = "分页", description = "传入stStockInoutRecord")
public R<IPage<StStockInoutRecordVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stStockInoutRecord, Query query) {
@ -106,6 +109,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("其他入库表 自定义分页")
@Operation(summary = "分页", description = "传入stOtherReceiptRecord")
public R<IPage<StOtherReceiptRecordVO>> page(StOtherReceiptRecordVO stOtherReceiptRecord, Query query) {
// 1. 数据权限
@ -132,6 +136,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("其他入库表 新增")
@Operation(summary = "新增", description = "传入stOtherReceiptRecord")
public R save(@Valid @RequestBody StOtherReceiptRecord stOtherReceiptRecord) {
return R.status(stOtherReceiptRecordService.save(stOtherReceiptRecord));
@ -142,16 +147,18 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("其他入库表 修改")
@Operation(summary = "修改", description = "传入stOtherReceiptRecord")
public R update(@Valid @RequestBody StOtherReceiptRecord stOtherReceiptRecord) {
return R.status(stOtherReceiptRecordService.updateById(stOtherReceiptRecord));
}
/**
* 生成单条批次号接口
* 生成单条批次号
*/
@GetMapping("/generateSinglePiNo")
@ApiOperationSupport(order = 6)
@ApiLog("生成单条批次号")
@Operation(summary = "生成单条批次号", description = "生成规则:Q+yyyyMMdd+4位补0自增序号,无入参,直接返回唯一批次号")
public R<String> generateSinglePiNo() {
String datePrefix = cn.hutool.core.date.DateUtil.format(new Date(), "yyyyMMdd");
@ -168,6 +175,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@ApiLog("其他入库表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stOtherReceiptRecord")
public R<Boolean> submit(@Valid @RequestBody StOtherReceiptRecord stOtherReceiptRecord) {
stOtherReceiptRecordService.otherWarehousing(stOtherReceiptRecord, AuthUtil.getUser());
@ -179,6 +187,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("其他入库表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stOtherReceiptRecordService.deleteLogic(Func.toLongList(ids)));
@ -189,6 +198,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/findPriceByParams")
@ApiOperationSupport(order = 9)
@ApiLog("物料id和质量编码获取单价")
@Operation(summary = "根据物料id和质量编码获取单价", description = "传入goodsId、checkNo")
public R<Double> findPriceByParams(@RequestParam Long goodsId, @RequestParam String checkNo) {
return R.data(stRealtimeStockService.findPriceByParams(goodsId, checkNo));
@ -199,6 +209,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/generateCode")
@ApiOperationSupport(order = 10)
@ApiLog("其他入库表 生成单号")
@Operation(summary = "生成其他入库单号", description = "获取新单据号并返回空账单对象")
public R<StStockInoutRecordVO> generateCode() {
String sirCode = stStockInoutRecordService.generateCode();
@ -213,6 +224,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/getGlassCakeByWoCode")
@ApiOperationSupport(order = 11)
@ApiLog("物料id和车间订单号获取玻璃饼信息")
@Operation(summary = "根据物料id和车间订单号获取玻璃饼信息", description = "传入goodsId、woCode")
public R<List<StOtherReceiptRecordVO>> getGlassCakeByWoCode(@RequestParam String woCode) {
return R.data(stOtherReceiptRecordService.getGlassCakeByWoCode(woCode));
@ -237,6 +249,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@GetMapping("/downloadExcelTemplate")
@ApiOperationSupport(order = 13)
@ApiLog("导出数据模版")
@Operation(summary = "导出数据模版", description = "传入stOtherReceiptRecord")
public void downloadExcelTemplate(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);
@ -253,6 +266,7 @@ public class StOtherReceiptRecordController extends BladeController {
*/
@PostMapping("/import-stOtherReceiptRecord")
@ApiOperationSupport(order = 14)
@ApiLog("导入数据")
@Transactional(rollbackFor = Exception.class)
public R<Boolean> writeNotice(@RequestPart MultipartFile file) {
// 基础校验:文件非空
@ -385,6 +399,7 @@ public class StOtherReceiptRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stOtherReceiptRecord")
@ApiOperationSupport(order = 15)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stOtherReceiptRecord")
public void exportStOtherReceiptRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stOtherReceiptRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StOtherReceiptRecord> queryWrapper = Condition.getQueryWrapper(stOtherReceiptRecord, StOtherReceiptRecord.class);

@ -16,6 +16,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -48,13 +49,6 @@ import static org.springblade.core.excel.util.ExcelUtil.export;
* @create 2025-12-15 15:04
**/
/**
* 仓库实时结余表 控制器
*
* @author BladeX
* @since 2025-12-15
*/
@RestController
@AllArgsConstructor
@RequestMapping("/stRealtimeStock")
@ -69,6 +63,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("仓库实时结余表 详情")
@Operation(summary = "详情", description = "传入stRealtimeStock")
public R<StRealtimeStockVO> detail(StRealtimeStock stRealtimeStock) {
StRealtimeStock detail = stRealtimeStockService.getOne(Condition.getQueryWrapper(stRealtimeStock));
@ -80,6 +75,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("仓库实时结余表 分页")
@Operation(summary = "分页", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stRealtimeStock, Query query) {
IPage<StRealtimeStock> pages = stRealtimeStockService.page(Condition.getPage(query), Condition.getQueryWrapper(stRealtimeStock, StRealtimeStock.class));
@ -91,6 +87,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("仓库实时结余表 自定义分页")
@Operation(summary = "分页", description = "传入stRealtimeStock")
public R<IPage<StRealtimeStockVO>> page(StRealtimeStockVO stRealtimeStock, Query query) {
IPage<StRealtimeStockVO> pages = stRealtimeStockService.selectStRealtimeStockPage(Condition.getPage(query), stRealtimeStock);
@ -102,6 +99,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/pageToolsData")
@ApiOperationSupport(order = 4)
@ApiLog("量具库存表 详情")
@Operation(summary = "分页加载量具库存数据", description = "传入stRealtimeStock,默认过滤量具类型仓库,按sumNum排序")
public R<IPage<StRealtimeStockVO>> pageToolsData(StRealtimeStockVO stRealtimeStock, Query query) {
@ -118,6 +116,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@ApiLog("仓库实时结余表 新增")
@Operation(summary = "新增", description = "传入stRealtimeStock")
public R save(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.save(stRealtimeStock));
@ -128,6 +127,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@ApiLog("仓库实时结余表 修改")
@Operation(summary = "修改", description = "传入stRealtimeStock")
public R update(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.updateById(stRealtimeStock));
@ -138,6 +138,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@ApiLog("仓库实时结余表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stRealtimeStock")
public R submit(@Valid @RequestBody StRealtimeStock stRealtimeStock) {
return R.status(stRealtimeStockService.saveOrUpdate(stRealtimeStock));
@ -148,6 +149,7 @@ public class StRealtimeStockController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("仓库实时结余表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stRealtimeStockService.deleteLogic(Func.toLongList(ids)));
@ -158,6 +160,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/findBySlIdAndGoodsCode")
@ApiOperationSupport(order = 9)
@ApiLog("根据库位物料编码查询批次号")
@Operation(summary = "根据库位物料编码查询", description = "传入shId与goodsCode")
public R<List<String>> findBySlIdAndGoodsCode(
@Parameter(description = "库位ID", required = true) @RequestParam Long slId,
@ -171,6 +174,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/findByPiNoAndGoodsCode")
@ApiOperationSupport(order = 10)
@ApiLog("根据库位物料编码和批次号查询库存")
@Operation(summary = "根据库位物料编码和批次号查询库存", description = "传入piNo与goodsCode")
public R<List<StRealtimeStockVO>> findByPiNoAndGoodsCode(
@Parameter(description = "库位ID", required = true) @RequestParam String piNo,
@ -183,6 +187,7 @@ public class StRealtimeStockController extends BladeController {
*/
@GetMapping("/findStorehouseByGoodsCode")
@ApiOperationSupport(order = 11)
@ApiLog("根据物料编码查询库房")
@Operation(summary = "根据物料编码查询库房", description = "传入shId与goodsCode")
public R<List<StStorehouseVO>> findStorehouseByGoodsCode(
@Parameter(description = "物料编码", required = true) @RequestParam String goodsCode) {
@ -193,7 +198,8 @@ public class StRealtimeStockController extends BladeController {
* 获取表头条形码
*/
@GetMapping("/getBarCode")
@ApiOperationSupport(order = 10)
@ApiOperationSupport(order = 12)
@ApiLog("获取表头条形码")
@Operation(summary = "获取表头条形码", description = "传入Id")
public R<Map<String, Object>> getBarCode(@Parameter(description = "ID", required = true)
@RequestParam Long rlsId) {
@ -204,7 +210,7 @@ public class StRealtimeStockController extends BladeController {
* 仓库实时结余表 打印标签
*/
@PostMapping("/printWoLabel")
@ApiOperationSupport(order = 12)
@ApiOperationSupport(order = 13)
@Operation(summary = "打印标签", description = "传入rlsIdList(主键集合)、quantity(打印数量)、exportType(导出类型)")
public void printLabel(
@Parameter(hidden = true) @RequestBody JSONObject data,
@ -230,7 +236,7 @@ public class StRealtimeStockController extends BladeController {
* 仓库实时结余表 打印
*/
@PostMapping("/print")
@ApiOperationSupport(order = 13)
@ApiOperationSupport(order = 14)
@Operation(summary = "打印流程卡", description = "传入idArr(主键集合)、exportType(导出类型)、reportId(报表ID)")
public void print(
@Parameter(description = "打印参数(idArr:主键集合, exportType:导出类型, reportId:报表ID)", required = true)
@ -269,7 +275,7 @@ public class StRealtimeStockController extends BladeController {
value = {"/listprintData"},
method = {RequestMethod.POST}
)
@ApiOperationSupport(order = 14)
@ApiOperationSupport(order = 15)
@Operation(summary = "获取打印数据列表", description = "传入idArr(主键集合)获取打印数据")
public R<List<PrintStoresList>> listprintData(
@Parameter(description = "请求参数(idArr:主键集合)", required = true)
@ -294,7 +300,8 @@ public class StRealtimeStockController extends BladeController {
*/
@IsAdmin
@GetMapping("/export-stRealtimeStock")
@ApiOperationSupport(order = 15)
@ApiOperationSupport(order = 16)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stRealtimeStock")
public void exportStRealtimeStock(@Parameter(hidden = true) @RequestParam Map<String, Object> stRealtimeStock, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StRealtimeStock> queryWrapper = Condition.getQueryWrapper(stRealtimeStock, StRealtimeStock.class);

@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -54,6 +55,7 @@ public class StRequisitionController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("领料单打印 详情")
@Operation(summary = "详情", description = "传入stRequisition")
public R<StRequisitionVO> detail(StRequisition stRequisition) {
StRequisition detail = stRequisitionService.getOne(Condition.getQueryWrapper(stRequisition));
@ -65,6 +67,7 @@ public class StRequisitionController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("领料单打印 分页")
@Operation(summary = "分页", description = "传入stRequisition")
public R<IPage<StRequisitionVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stRequisition, Query query) {
IPage<StRequisition> pages = stRequisitionService.page(Condition.getPage(query), Condition.getQueryWrapper(stRequisition, StRequisition.class));
@ -76,6 +79,7 @@ public class StRequisitionController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("领料单打印 自定义分页")
@Operation(summary = "加载采购物料领料单列表", description = "传入stRequisition")
public R<IPage<StRequisitionVO>> page(StRequisitionVO stRequisition, Query query) {
// 复刻原逻辑:默认排序(无排序字段时,按enrtydate降序)
@ -92,6 +96,7 @@ public class StRequisitionController extends BladeController {
*/
@GetMapping("/pageWaitPush")
@ApiOperationSupport(order = 4)
@ApiLog("物料入库 自定义分页")
@Operation(summary = "分页", description = "传入stRequisition")
public R<IPage<StRequisitionVO>> pageWaitPush(StRequisitionVO stRequisition, Query query) {
// 1. 默认排序:enrtydate DESC
@ -115,6 +120,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 5)
@ApiLog("领料单打印 新增")
@Operation(summary = "新增", description = "传入stRequisition")
public R save(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.save(stRequisition));
@ -125,6 +131,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 6)
@ApiLog("领料单打印 修改")
@Operation(summary = "修改", description = "传入stRequisition")
public R update(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.updateById(stRequisition));
@ -135,6 +142,7 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 7)
@ApiLog("领料单打印 新增或修改")
@Operation(summary = "新增或修改", description = "传入stRequisition")
public R submit(@Valid @RequestBody StRequisition stRequisition) {
return R.status(stRequisitionService.saveOrUpdate(stRequisition));
@ -145,16 +153,32 @@ public class StRequisitionController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("领料单打印 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stRequisitionService.deleteLogic(Func.toLongList(ids)));
}
/**
* 领料单修改状态
*/
@PostMapping("/updateStatus")
@ApiOperationSupport(order = 9)
@ApiLog("领料单修改状态")
@Operation(summary = "修改状态", description = "传入id和状态值,修改领料单状态")
public R updateStatus(
@Parameter(description = "主键", required = true) @RequestParam Long srId,
@Parameter(description = "状态值", required = true) @RequestParam Short curStatus) {
stRequisitionService.updateStatus(srId, curStatus);
return R.success();
}
/**
* 领料单物料入库
*/
@PostMapping("/pushWarehose")
@ApiOperationSupport(order = 9)
@ApiOperationSupport(order = 10)
@ApiLog("领料单物料入库")
@Operation(summary = "领料单物料入库", description = "传入入库列表")
public R<Boolean> pushWarehose(@RequestBody List<StRequisitionDTO> list) {
if (CollUtil.isEmpty(list)) {
@ -169,7 +193,7 @@ public class StRequisitionController extends BladeController {
*/
@IsAdmin
@GetMapping("/export-stRequisition")
@ApiOperationSupport(order = 10)
@ApiOperationSupport(order = 11)
@Operation(summary = "导出/打印领料单数据", description = "传入idList、exportType,支持基础打印")
public void exportStRequisition(
@Parameter(description = "领料单ID列表(逗号分隔)") @RequestParam(required = true) String idList,
@ -186,7 +210,7 @@ public class StRequisitionController extends BladeController {
*/
@IsAdmin
@GetMapping("/export-stRequisition-detail") // 明细打印专属接口
@ApiOperationSupport(order = 11)
@ApiOperationSupport(order = 12)
@Operation(summary = "导出/打印领料单明细数据", description = "传入idList、exportType,支持明细打印")
public void exportStRequisitionDetail(
@Parameter(description = "领料单ID列表(逗号分隔)") @RequestParam(required = true) String idList,
@ -202,7 +226,8 @@ public class StRequisitionController extends BladeController {
* 获取表头条形码
*/
@GetMapping("/getBarCode")
@ApiOperationSupport(order = 10)
@ApiOperationSupport(order = 13)
@ApiLog("获取表头条形码")
@Operation(summary = "获取表头条形码", description = "传入Id")
public R<Map<String, Object>> getBarCode(@Parameter(description = "ID", required = true)
@RequestParam Long srId) {

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -51,6 +52,7 @@ public class StReturnRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("归还记录 详情")
@Operation(summary = "详情", description = "传入stReturnRecord")
public R<StReturnRecordVO> detail(StReturnRecord stReturnRecord) {
StReturnRecord detail = stReturnRecordService.getOne(Condition.getQueryWrapper(stReturnRecord));
@ -62,6 +64,7 @@ public class StReturnRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("归还记录 分页")
@Operation(summary = "分页", description = "传入stReturnRecord")
public R<IPage<StReturnRecordVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stReturnRecord, Query query) {
IPage<StReturnRecord> pages = stReturnRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(stReturnRecord, StReturnRecord.class));
@ -73,6 +76,7 @@ public class StReturnRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("归还记录 自定义分页")
@Operation(summary = "分页", description = "传入stReturnRecord")
public R<IPage<StReturnRecordVO>> page(StReturnRecordVO stReturnRecord, Query query) {
IPage<StReturnRecordVO> pages = stReturnRecordService.selectStReturnRecordPage(Condition.getPage(query), stReturnRecord);
@ -84,6 +88,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("归还记录 新增")
@Operation(summary = "新增", description = "传入stReturnRecord")
public R save(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.save(stReturnRecord));
@ -94,6 +99,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("归还记录 修改")
@Operation(summary = "修改", description = "传入stReturnRecord")
public R update(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.updateById(stReturnRecord));
@ -104,6 +110,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("归还记录 新增或修改")
@Operation(summary = "新增或修改", description = "传入stReturnRecord")
public R submit(@Valid @RequestBody StReturnRecord stReturnRecord) {
return R.status(stReturnRecordService.saveOrUpdate(stReturnRecord));
@ -114,6 +121,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/sendBackBatch")
@ApiOperationSupport(order = 7)
@ApiLog("归还记录 批量归还")
@Operation(summary = "批量归还", description = "传入stReturnRecord")
public R sendBackBatch(@RequestBody List<StReturnRecord> stReturnRecordList) throws Exception {
return R.status(stReturnRecordService.sendBackBatch(stReturnRecordList, AuthUtil.getUser()));
@ -124,6 +132,7 @@ public class StReturnRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("归还记录 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stReturnRecordService.deleteLogic(Func.toLongList(ids)));
@ -136,6 +145,7 @@ public class StReturnRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stReturnRecord")
@ApiOperationSupport(order = 9)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stReturnRecord")
public void exportStReturnRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stReturnRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StReturnRecord> queryWrapper = Condition.getQueryWrapper(stReturnRecord, StReturnRecord.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -52,6 +53,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("出入库记录表 详情")
@Operation(summary = "详情", description = "传入stStockInoutRecord")
public R<StStockInoutRecordVO> detail(StStockInoutRecord stStockInoutRecord) {
StStockInoutRecord detail = stStockInoutRecordService.getOne(Condition.getQueryWrapper(stStockInoutRecord));
@ -62,6 +64,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("出入库记录表 分页")
@Operation(summary = "分页", description = "传入stStockInoutRecord")
public R<IPage<StStockInoutRecordVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stStockInoutRecord, Query query) {
@ -97,6 +100,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("出入库记录表 自定义分页")
@Operation(summary = "分页", description = "传入stStockInoutRecord")
public R<IPage<StStockInoutRecordVO>> page(StStockInoutRecordVO stStockInoutRecord, Query query) {
IPage<StStockInoutRecordVO> pages = stStockInoutRecordService.selectStStockInoutRecordPage(Condition.getPage(query), stStockInoutRecord);
@ -108,6 +112,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("出入库记录表 新增")
@Operation(summary = "新增", description = "传入stStockInoutRecord")
public R save(@Valid @RequestBody StStockInoutRecord stStockInoutRecord) {
return R.status(stStockInoutRecordService.save(stStockInoutRecord));
@ -118,6 +123,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("出入库记录表 修改")
@Operation(summary = "修改", description = "传入stStockInoutRecord")
public R update(@Valid @RequestBody StStockInoutRecord stStockInoutRecord) {
return R.status(stStockInoutRecordService.updateById(stStockInoutRecord));
@ -128,6 +134,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("出入库记录表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stStockInoutRecord")
public R submit(@Valid @RequestBody StStockInoutRecord stStockInoutRecord) {
return R.status(stStockInoutRecordService.saveOrUpdate(stStockInoutRecord));
@ -138,6 +145,7 @@ public class StStockInoutRecordController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("出入库记录表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stStockInoutRecordService.deleteLogic(Func.toLongList(ids)));
@ -150,6 +158,7 @@ public class StStockInoutRecordController extends BladeController {
@IsAdmin
@GetMapping("/export-stStockInoutRecord")
@ApiOperationSupport(order = 8)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stStockInoutRecord")
public void exportStStockInoutRecord(@Parameter(hidden = true) @RequestParam Map<String, Object> stStockInoutRecord, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StStockInoutRecord> queryWrapper = Condition.getQueryWrapper(stStockInoutRecord, StStockInoutRecord.class);

@ -11,6 +11,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -55,6 +56,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("库位维护表 详情")
@Operation(summary = "详情", description = "传入stStorageLocation")
public R<StStorageLocationVO> detail(StStorageLocation stStorageLocation) {
StStorageLocation detail = stStorageLocationService.getOne(Condition.getQueryWrapper(stStorageLocation));
@ -66,6 +68,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("库位维护表 分页")
@Operation(summary = "分页", description = "传入stStorageLocation")
public R<IPage<StStorageLocationVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorageLocation, Query query) {
QueryWrapper<StStorageLocation> wrapper = Condition.getQueryWrapper(stStorageLocation, StStorageLocation.class);
@ -86,6 +89,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("库位维护表 自定义分页")
@Operation(summary = "分页", description = "传入stStorageLocation")
public R<IPage<StStorageLocationVO>> page(StStorageLocationVO stStorageLocation, Query query) {
// 1. 软删除
@ -106,6 +110,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("库位维护表 新增")
@Operation(summary = "新增", description = "传入stStorageLocation")
public R save(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.save(stStorageLocation));
@ -116,6 +121,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("库位维护表 修改")
@Operation(summary = "修改", description = "传入stStorageLocation")
public R update(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.updateById(stStorageLocation));
@ -126,6 +132,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("库位维护表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stStorageLocation")
public R submit(@Valid @RequestBody StStorageLocation stStorageLocation) {
return R.status(stStorageLocationService.saveOrUpdate(stStorageLocation));
@ -136,6 +143,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/batchAddOrEdit")
@ApiOperationSupport(order = 7)
@ApiLog("批量新增/编辑")
@Operation(summary = "批量新增或修改", description = "传入coStorageLocation列表")
public R batchAddOrEdit(@Valid @RequestBody List<StStorageLocation> stStorageLocations) {
return R.status(stStorageLocationService.batchAddOrEdit(stStorageLocations));
@ -146,6 +154,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@ApiLog("库位维护表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
List<Long> idList = Func.toLongList(ids);
@ -175,6 +184,7 @@ public class StStorageLocationController extends BladeController {
*/
@PostMapping("/checkLocation")
@ApiOperationSupport(order = 9)
@ApiLog("验证库位号是否重复")
@Operation(summary = "验证库位号是否重复", description = "传入id和shName")
public R<Boolean> checkLocation(@Valid @RequestBody StStorageLocation stStorageLocation) {
Boolean result = stStorageLocationService.checkLocation(stStorageLocation.getId(), stStorageLocation.getLocation(), stStorageLocation.getShId());
@ -186,6 +196,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/findByShId")
@ApiOperationSupport(order = 10)
@ApiLog("根据库号查库位号")
@Operation(summary = "根据库号查库位号", description = "传入shId")
public R<List<StStorageLocation>> findByShId(@Parameter(description = "库房ID", required = true) @RequestParam Long shId) {
return R.data(stStorageLocationService.findByShId(shId));
@ -196,6 +207,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/findByGoodsCode")
@ApiOperationSupport(order = 11)
@ApiLog("根据物料编号查库位号")
@Operation(summary = "根据物料编号查库位号", description = "传入goodsCode")
public R<StStorageLocation> findByGoodsCode(@Parameter(description = "物料编号", required = true) @RequestParam String goodsCode) {
return R.data(stStorageLocationService.findByGoodsCode(goodsCode));
@ -206,6 +218,7 @@ public class StStorageLocationController extends BladeController {
*/
@GetMapping("/findByShIdAndGoodsId")
@ApiOperationSupport(order = 12)
@ApiLog("根据库号+物料编码查询库位号")
@Operation(summary = "根据库号物料编码查询库位号", description = "传入shId与goodsCode")
public R<List<StStorageLocationVO>> findByShIdAndGoodsId(
@Parameter(description = "库号ID", required = true) @RequestParam Long shId,
@ -220,6 +233,7 @@ public class StStorageLocationController extends BladeController {
@IsAdmin
@GetMapping("/export-stStorageLocation")
@ApiOperationSupport(order = 13)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stStorageLocation")
public void exportStStorageLocation(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorageLocation, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StStorageLocation> queryWrapper = Condition.getQueryWrapper(stStorageLocation, StStorageLocation.class);

@ -12,6 +12,7 @@ import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -64,6 +65,7 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("库房维护表 详情")
@Operation(summary = "详情", description = "传入stStorehouse")
public R<StStorehouseVO> detail(StStorehouse stStorehouse) {
StStorehouse detail = stStorehouseService.getOne(Condition.getQueryWrapper(stStorehouse));
@ -75,6 +77,7 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("库房维护表 分页")
@Operation(summary = "分页", description = "传入stStorehouse")
public R<IPage<StStorehouseVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorehouse, Query query) {
QueryWrapper<StStorehouse> wrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class);
@ -98,6 +101,7 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("库房维护表 自定义分页")
@Operation(summary = "分页", description = "传入stStorehouse")
public R<IPage<StStorehouseVO>> page(StStorehouseVO stStorehouse, Query query) {
// 1. 软删除过滤
@ -123,6 +127,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("库房维护表 新增")
@Operation(summary = "新增", description = "传入stStorehouse")
public R save(@Valid @RequestBody StStorehouse stStorehouse) {
return R.status(stStorehouseService.save(stStorehouse));
@ -133,6 +138,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("库房维护表 修改")
@Operation(summary = "修改", description = "传入stStorehouse")
public R update(@Valid @RequestBody StStorehouse stStorehouse) {
return R.status(stStorehouseService.updateById(stStorehouse));
@ -143,6 +149,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("库房维护表 新增或修改")
@Operation(summary = "新增或修改", description = "传入stStorehouse")
public R submit(@Valid @RequestBody StStorehouse stStorehouse) {
// 1. 库房名称重复校验
@ -161,6 +168,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 7)
@ApiLog("库房维护表 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
List<Long> idList = Func.toLongList(ids);
@ -192,6 +200,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/checkName")
@ApiOperationSupport(order = 8)
@ApiLog("验证库房名称是否重复")
@Operation(summary = "验证库房名称是否重复", description = "传入id和shName")
public R<Boolean> checkName(@Valid @RequestBody StStorehouse stStorehouse) {
Boolean result = stStorehouseService.checkName(stStorehouse.getId(), stStorehouse.getShName());
@ -203,6 +212,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/checkCode")
@ApiOperationSupport(order = 9)
@ApiLog("验证库房编码是否重复")
@Operation(summary = "验证库房编码是否重复", description = "传入id和shCode")
public R<Boolean> checkCode(@Valid @RequestBody StStorehouse stStorehouse) {
Boolean result = stStorehouseService.checkCode(stStorehouse.getId(), stStorehouse.getShCode());
@ -221,6 +231,7 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/storehouseUserRight/{shId}")
@ApiOperationSupport(order = 10)
@ApiLog("库房人员权限数据")
@Operation(summary = "库房人员权限数据", description = "查询库房人员权限数据")
public R storehouseUserRight(@PathVariable Long shId) {
return R.data(stUserRightService.assembleaUserRight(shId, StUserRight.UR_TYPE_STOREHOUSE));
@ -231,6 +242,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/saveUserRight")
@ApiOperationSupport(order = 11)
@ApiLog("保存库房人员权限")
@Operation(summary = "保存库房人员权限", description = "传入shId与userId列表")
public R<Boolean> saveUserRight(@RequestParam Long shId,
@RequestParam List<Long> userIdList) {
@ -246,6 +258,7 @@ public class StStorehouseController extends BladeController {
*/
@GetMapping("/findStorehouseByUser/{userId}")
@ApiOperationSupport(order = 12)
@ApiLog("人员库房权限数据")
@Operation(summary = "人员库房权限数据", description = "查询人员库房权限数据")
public R findStorehouseByUser(@PathVariable Long userId) {
return R.data(stStorehouseService.assembleaStorehouse(userId, StUserRight.UR_TYPE_STOREHOUSE));
@ -256,6 +269,7 @@ public class StStorehouseController extends BladeController {
*/
@PostMapping("/saveStorehouseRight/{userId}")
@ApiOperationSupport(order = 13)
@ApiLog("保存人员库房权限")
@Operation(summary = "保存人员库房权限", description = "传入shId列表")
public R<Boolean> saveStorehouseRight(@RequestBody List<Long> shIdList, @PathVariable Long userId) {
stUserRightService.saveStorehouseRight(shIdList, userId);
@ -268,6 +282,7 @@ public class StStorehouseController extends BladeController {
@IsAdmin
@GetMapping("/export-stStorehouse")
@ApiOperationSupport(order = 14)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stStorehouse")
public void exportStStorehouse(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorehouse, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StStorehouse> queryWrapper = Condition.getQueryWrapper(stStorehouse, StStorehouse.class);

@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@ -18,7 +19,6 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.wms.pojo.dto.ClassOutboundDTO;
import org.springblade.wms.pojo.entity.StClassRequest;
import org.springblade.wms.pojo.entity.StRealtimeStock;
import org.springblade.wms.pojo.vo.StClassRequestVO;
import org.springblade.wms.service.IStClassRequestService;
import org.springblade.wms.wrapper.StClassRequestWrapper;
@ -49,6 +49,7 @@ public class StTeamRequestController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 1)
@ApiLog("班组提请领料出库 分页")
@Operation(summary = "分页", description = "传入stClassRequest")
public R<IPage<StClassRequestVO>> list(
@Parameter(hidden = true) @RequestParam Map<String, Object> stClassRequest, Query query) {
@ -74,6 +75,7 @@ public class StTeamRequestController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 2)
@ApiLog("班组提请领料出库 自定义分页")
@Operation(summary = "分页", description = "传入stClassRequest")
public R<IPage<StClassRequestVO>> page(StClassRequestVO stClassRequest, Query query) {
/* 1. 固定条件:已发布 */
@ -92,16 +94,18 @@ public class StTeamRequestController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 3)
@ApiLog("班组提请领料出库 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stClassRequestService.deleteLogic(Func.toLongList(ids)));
}
/**
* 班组提请修改
* 班组提请 修改
*/
@PostMapping("/classRequestOutbound")
@ApiOperationSupport(order = 4)
@ApiLog("班组提请领料出库 修改")
@Operation(summary = "班组提请修改", description = "传入出库列表")
public R<Void> classRequestOutbound(@Valid @RequestBody List<ClassOutboundDTO> list) {
if (CollUtil.isEmpty(list)) {
@ -123,6 +127,7 @@ public class StTeamRequestController {
*/
@PostMapping("/batchOut")
@ApiOperationSupport(order = 5)
@ApiLog("班组提请领料出库")
@Operation(summary = "批量班组提请领料出库", description = "传入 crId 集合")
public R<Void> batchOut(@RequestBody List<ClassOutboundDTO> list) {
if (CollUtil.isEmpty(list)) {
@ -137,6 +142,7 @@ public class StTeamRequestController {
*/
@PostMapping("/scanSubmit")
@ApiOperationSupport(order = 6)
@ApiLog("班组提请领料出库 扫码出库")
@Operation(summary = "扫码出库", description = "通过物料编码(条形码)生成其他出库数据")
public R scanSubmit( @RequestParam String crCode) {
StClassRequest stClassRequest = stClassRequestService.getByCrCode(crCode);
@ -153,6 +159,7 @@ public class StTeamRequestController {
*/
@PostMapping("/complete")
@ApiOperationSupport(order = 7)
@ApiLog("班组提请领料出库 关闭订单")
@Operation(summary = "关闭订单", description = "传入ID")
public R<Boolean> complete(@RequestParam Long id) {
if (Func.isNull(id)) {

@ -12,6 +12,7 @@ import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@ -52,6 +53,7 @@ public class StWmsRequestController extends BladeController {
*/
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiLog("仓库提请记录 详情")
@Operation(summary = "详情", description = "传入stWmsRequest")
public R<StWmsRequestVO> detail(StWmsRequest stWmsRequest) {
StWmsRequest detail = stWmsRequestService.getOne(Condition.getQueryWrapper(stWmsRequest));
@ -63,6 +65,7 @@ public class StWmsRequestController extends BladeController {
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiLog("仓库提请记录 分页")
@Operation(summary = "分页", description = "传入stWmsRequest")
public R<IPage<StWmsRequestVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> stWmsRequest, Query query) {
IPage<StWmsRequest> pages = stWmsRequestService.page(Condition.getPage(query), Condition.getQueryWrapper(stWmsRequest, StWmsRequest.class));
@ -74,6 +77,7 @@ public class StWmsRequestController extends BladeController {
*/
@GetMapping("/page")
@ApiOperationSupport(order = 3)
@ApiLog("仓库提请记录 自定义分页")
@Operation(summary = "分页", description = "传入stWmsRequest")
public R<IPage<StWmsRequestVO>> page(StWmsRequestVO stWmsRequest, Query query) {
BladeUser user = AuthUtil.getUser();
@ -91,6 +95,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiLog("仓库提请记录 新增")
@Operation(summary = "新增", description = "传入stWmsRequest")
public R save(@Valid @RequestBody StWmsRequest stWmsRequest) {
return R.status(stWmsRequestService.save(stWmsRequest));
@ -101,16 +106,18 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/update")
@ApiOperationSupport(order = 5)
@ApiLog("仓库提请记录 修改")
@Operation(summary = "修改", description = "传入stWmsRequest")
public R update(@Valid @RequestBody StWmsRequest stWmsRequest) {
return R.status(stWmsRequestService.updateById(stWmsRequest));
}
/**
* 仓库提请提交保存并直接提交
* 仓库提请提交
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiLog("仓库提请提交")
@Operation(summary = "提交仓库提请", description = "传入RbWmsRequest")
public R submit(@Valid @RequestBody StWmsRequest stWmsRequest) {
stWmsRequestService.saveOrEdit(stWmsRequest, AuthUtil.getUser());
@ -122,6 +129,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/submit/batch")
@ApiOperationSupport(order = 7)
@ApiLog("批量提交仓库提请")
@Operation(summary = "批量提交仓库提请", description = "传入List<StWmsRequest>")
public R batchSubmit(@Valid @RequestBody List<StWmsRequest> stWmsRequestList) {
if (stWmsRequestList == null || stWmsRequestList.isEmpty()) {
@ -136,6 +144,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/approval/operate")
@ApiOperationSupport(order = 8)
@ApiLog("仓库提请审批(通过后自动提交)")
@Operation(summary = "审批", description = "传入ids")
public R<String> approvalOrder(@RequestParam Long id, @RequestParam Short approvalResult) {
stWmsRequestService.approvalRequest(id, approvalResult, AuthUtil.getUser());
@ -147,6 +156,7 @@ public class StWmsRequestController extends BladeController {
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 9)
@ApiLog("仓库提请记录 删除")
@Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(stWmsRequestService.deleteLogic(Func.toLongList(ids)));
@ -158,6 +168,7 @@ public class StWmsRequestController extends BladeController {
@IsAdmin
@GetMapping("/export-stWmsRequest")
@ApiOperationSupport(order = 10)
@ApiLog("导出数据")
@Operation(summary = "导出数据", description = "传入stWmsRequest")
public void exportStWmsRequest(@Parameter(hidden = true) @RequestParam Map<String, Object> stWmsRequest, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<StWmsRequest> queryWrapper = Condition.getQueryWrapper(stWmsRequest, StWmsRequest.class);

@ -64,6 +64,7 @@
r.balance_money ,
r.scrap_cycle,
r.goods_status,
r.create_time,
sh.sh_code,
sl.location,
-- 物料表:物料编号、名称、单位、型号、规格
@ -89,7 +90,7 @@
-- 左关联部门表:根据分厂ID/部门ID关联,过滤已删除
LEFT JOIN BLADE_DEPT dept ON r.dept_id = dept.id AND dept.is_deleted = 0
-- 左关联库存出入库明细表:取该库存最新的入库记录(入库类型)
LEFT JOIN ST_STOCK_INOUT_RECORD in_rec ON in_rec.is_deleted = 0 AND in_rec.in_out_type = 0
LEFT JOIN ST_STOCK_INOUT_RECORD in_rec ON in_rec.rls_id = r.id AND in_rec.is_deleted = 0
-- 左关联用户表:取保管员姓名(假设库位表sl.keeper_id关联用户ID)
LEFT JOIN BLADE_USER u ON in_rec.keeper = u.id AND u.is_deleted = 0
-- 主表过滤条件
@ -136,11 +137,13 @@
AND r.goods_status = #{stRealtimeStock.GoodsStatus}
</if>
<!-- 11. 入库时间范围查询(Oracle TO_DATE格式化,含结束时间当天23:59:59) -->
<if test="stRealtimeStock.startInOutDate != null">
AND in_rec.in_out_date &gt;= TO_DATE(#{stRealtimeStock.startInOutDate}, 'yyyy-mm-dd')
<if test="stRealtimeStock.startInOutDate != null and stRealtimeStock.startInOutDate.trim() != ''">
<!-- TRUNC截断时分秒,只保留日期:2026-01-23 13:40:08 → 2026-01-23 00:00:00 -->
AND TRUNC(r.create_time) &gt;= TO_DATE(#{stRealtimeStock.startInOutDate}, 'yyyy-mm-dd')
</if>
<if test="stRealtimeStock.endInOutDate != null">
AND in_rec.in_out_date &lt;= TO_DATE(#{stRealtimeStock.endInOutDate}, 'yyyy-mm-dd') + 1 - 1/86400
<if test="stRealtimeStock.endInOutDate != null and stRealtimeStock.endInOutDate.trim() != ''">
<!-- 同样截断,结束时间无需复杂公式,直接比较日期即可 -->
AND TRUNC(r.create_time) &lt;= TO_DATE(#{stRealtimeStock.endInOutDate}, 'yyyy-mm-dd')
</if>
<!-- 12. 是否印字精确查询 -->
<if test="stRealtimeStock.printMark != null">

@ -11,8 +11,14 @@ import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
import org.springblade.system.cache.SysCache;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.Dept;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StBuyOrderExcel;
import org.springblade.wms.mapper.StBuyOrderMapper;
import org.springblade.wms.pojo.dto.ErpStPurOtherDTO;
@ -43,6 +49,12 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
private IStGoodsService stGoodsService;
@Resource
private StHttpRequestService stHttpRequestService;
@Resource
private IMesApprovalRecordClient mesApprovalRecordClient;
@Resource
private IUserClient userClient;
@Resource
private ISysClient sysClient;
@Override
public IPage<StBuyOrderVO> selectStBuyOrderPage(IPage<StBuyOrderVO> page, StBuyOrderVO stBuyOrder) {
@ -152,12 +164,28 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
} else {
// 新增
buyOrder.setCreateUser(user.getUserId()); // 原 PfUserInfo → BladeUser
buyOrder.setCreateUser(user.getUserId());
buyOrder.setCreateTime(new Date()); // 原 new Date()
buyOrder.setBoStatus(StBuyOrder.BOSTATUS_NEW);
buyOrder.setApprovalStatus(StBuyOrder.APPROVAL_STATUS_CHECKING);
baseMapper.insert(buyOrder);
MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity();
approvalRecord.setBizId(buyOrder.getId());
approvalRecord.setBizType("额外提请审批");
approvalRecord.setContent("额外提请审批");
R<User> ruser = userClient.userInfoById(buyOrder.getDeclareMan());
User user1 = ruser.getData();
approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId()));
R<String> roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId());
String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("保管员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
// 启动流程(原逻辑完全保留)
// PfFlowRecServiceImpl.saveStartFlow(buyOrder.getFlowCode(), buyOrder.getBoId(), user);
@ -191,6 +219,15 @@ public class StBuyOrderServiceImpl extends BaseServiceImpl<StBuyOrderMapper, StB
// 3. 更新审批状态
buyOrder.setApprovalStatus(approvalResult);
baseMapper.updateById(buyOrder);
MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity();
updateRecord.setBizId(orderId);
updateRecord.setBizType("额外提请审批");
updateRecord.setOpinion("");
updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId()));
updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
} else {
throw new RuntimeException("仅保管员可执行审批操作!");
}

@ -15,6 +15,12 @@ import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StClassRequestExcel;
import org.springblade.wms.mapper.StClassRequestMapper;
import org.springblade.wms.pojo.dto.ClassOutboundDTO;
@ -46,6 +52,12 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
IStStockInoutRecordService stStockInoutRecordService;
@Resource
IStOtherOutRecordService stOtherOutRecordService;
@Resource
IMesApprovalRecordClient mesApprovalRecordClient;
@Resource
IUserClient userClient;
@Resource
ISysClient sysClient;
@Override
public IPage<StClassRequestVO> selectStClassRequestPage(IPage<StClassRequestVO> page, StClassRequestVO stClassRequest) {
@ -83,6 +95,22 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
// 特殊物料:进入审批流程,状态设为【审批中】
ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_CHECKING);
ccr.setCurStatus(StClassRequest.CURSTATUS_NEW); // 待审批
MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity();
approvalRecord.setBizId(ccr.getId());
approvalRecord.setBizType("班组提请审批");
approvalRecord.setContent("班组提请审批");
R<User> ruser = userClient.userInfoById(ccr.getCrMan());
User user1 = ruser.getData();
approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId()));
R<String> roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId());
String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("热表-工艺员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
} else {
// 普通物料:无需审批,状态设为【无需审批】+ 直接发布
ccr.setApprovalStatus(StClassRequest.APPROVAL_STATUS_NONE);
@ -160,6 +188,14 @@ public class StClassRequestServiceImpl extends BaseServiceImpl<StClassRequestMap
? StClassRequest.CURSTATUS_RELEASED : StClassRequest.CURSTATUS_NEW);
this.updateById(ccr);
MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity();
updateRecord.setBizId(id);
updateRecord.setBizType("班组提请审批");
updateRecord.setOpinion("");
updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId()));
updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
}else {
throw new RuntimeException("仅工艺员可执行审批操作!");
}

@ -2,7 +2,6 @@ package org.springblade.wms.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -11,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.wms.excel.StErpWarehouseTransferExcel;
import org.springblade.wms.mapper.StErpWarehouseTransferMapper;
import org.springblade.wms.pojo.entity.*;
@ -24,7 +22,6 @@ import java.math.BigDecimal;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* @version 1.0
@ -63,6 +60,12 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
throw new ServiceException("入库数量必须大于 0");
}
Double totalPutQuantity =
BigDecimal.valueOf(transfer.getPutQuantity()).add(BigDecimal.valueOf(putQuantity)).doubleValue();
if (totalPutQuantity > transfer.getOutQuantity()) {
throw new ServiceException("入库数量不能大于出库数量");
}
/* 1. 主账单(无 ID 则新增)*/
StStockInoutRecord inout = new StStockInoutRecord();
inout.setSirCode(stStockInoutRecordService.generateCode());
@ -76,14 +79,14 @@ public class StErpWarehouseTransferServiceImpl extends BaseServiceImpl<StErpWare
stStockInoutRecordService.save(inout);
/* 2. 单条序号(原逻辑)*/
String datePrefix = DateUtil.format(new Date(), "yyyyMMdd");
String maxPiNo = stStockInoutRecordService.getMaxPiNo("T");
int n = Optional.ofNullable(maxPiNo)
.map(p -> Integer.parseInt(p.substring(9)))
.orElse(0);
String piNo = Optional.ofNullable(transfer.getPrtWoCode())
.orElse("T" + datePrefix + StrUtil.padPre(String.valueOf(++n), 4, '0'));
inout.setPiNo(piNo);
// String datePrefix = DateUtil.format(new Date(), "yyyyMMdd");
// String maxPiNo = stStockInoutRecordService.getMaxPiNo("T");
// int n = Optional.ofNullable(maxPiNo)
// .map(p -> Integer.parseInt(p.substring(9)))
// .orElse(0);
// String piNo = Optional.ofNullable(transfer.getPrtWoCode())
// .orElse("T" + datePrefix + StrUtil.padPre(String.valueOf(++n), 4, '0'));
inout.setPiNo(transfer.getBatchCode());
/* 3. 单条数量/价格(原逻辑)*/
inout.setQuantity(putQuantity); // 本次入库数量

@ -11,6 +11,11 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springblade.wms.excel.StOtherOutRecordExcel;
import org.springblade.wms.mapper.StOtherOutRecordMapper;
import org.springblade.wms.pojo.dto.StOtherOutRecordDTO;
@ -44,6 +49,12 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
IStStockInoutRecordService stStockInoutRecordService;
@Resource
IStRealtimeStockService stRealtimeStockService;
@Resource
IMesApprovalRecordClient mesApprovalRecordClient;
@Resource
IUserClient userClient;
@Resource
ISysClient sysClient;
@Override
public StOtherOutRecordVO getDetail(Long id) {
@ -67,6 +78,22 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
// 3. 先保存出库单基础记录(获取ID)
this.save(stOtherOutRecord);
MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity();
approvalRecord.setBizId(stOtherOutRecord.getId());
approvalRecord.setBizType("报废审批");
approvalRecord.setContent("报废审批");
R<User> ruser = userClient.userInfoById(stOtherOutRecord.getCreateUser());
User user1 = ruser.getData();
approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId()));
R<String> roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId());
String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("热表-工艺员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
}
@Override
@ -87,6 +114,14 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl<StOtherOutRecor
stOtherOutRecord.setApprovalStatus(approvalResult);
this.updateById(stOtherOutRecord);
MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity();
updateRecord.setBizId(id);
updateRecord.setBizType("报废审批");
updateRecord.setOpinion("");
updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId()));
updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
this.addOtherOutRecord(stOtherOutRecord, approver);
}else {
throw new RuntimeException("仅工艺员可审批!");

@ -112,6 +112,8 @@ public class StOtherReceiptRecordServiceImpl extends BaseServiceImpl<StOtherRece
detail.setInOutDate(new Date());
// detail.setId(inout.getId());
// detail.setSirMoney(detail.getUnitPrice() * detail.getQuantity());
detail.setUnitPrice(detail.getUnitPrice());
detail.setSirMoney(detail.getSirMoney());
detail.setDeptId(user.getDeptId());
detail.setCreateUser(user.getUserId());
detail.setCreateTime(new Date());

@ -14,6 +14,9 @@ import org.springblade.common.exception.BusinessException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.desk.common.feign.IMesNotifyMessageClient;
import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
import org.springblade.wms.excel.StRealtimeStockExcel;
import org.springblade.wms.mapper.*;
import org.springblade.wms.pojo.entity.*;
@ -63,6 +66,8 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
private IStGoodsClassService stGoodsClassService;
@Resource
private StGlassCakeOutMapper stGlassCakeOutMapper;
@Resource
private IMesNotifyMessageClient mesNotifyMessageClient;
@Override
@ -237,7 +242,7 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
// 核心业务逻辑
Double quantity = inout.getQuantity();
Double balanceMoney = inout.getSirMoney() == null ? 0.0 : inout.getSirMoney();
Double balanceMoney = inout.getUnitPrice() == null ? 0.0 : inout.getUnitPrice();
if (inout.getInOutSource() < StStockInoutRecord.INOUT_SOURCE_QUOTA_OUT) {
@ -535,6 +540,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
// 打印预警日志(保留原有日志格式,也可升级为warn级别更贴合预警语义)
log.info(warnMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(warnMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
// 4.1 获取物料类别名称
// String goodsCategoryName = null;
// if (stGoods.getGcId() != null) {
@ -641,6 +650,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 名称:%s(类别:%s)触发【物料出库】补制!出库数量:%.2f,开始生成模具补制单",
stGoods.getGoodsCode(), stGoods.getGoodsName(), goodsCategoryName, outQuantity);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
// 执行模具类物料出库补制
// generateMoldOutReissueOrder(goodsId, outQuantity);
@ -648,6 +661,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 名称:%s(类别:%s)触发【物料出库】补制!出库数量:%.2f,开始生成玻璃饼补制单",
stGoods.getGoodsCode(), stGoods.getGoodsName(), goodsCategoryName, outQuantity);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
// 执行玻璃饼类物料出库补制
// generateGlassPieOutReissueOrder(goodsId, outQuantity);
@ -655,6 +672,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 类别为%s,暂未配置【物料出库】补制逻辑,跳过补制",
stGoods.getGoodsCode(), goodsCategoryName);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
}
return reissueMsg;
}
@ -673,6 +694,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 类别为%s,当前库存:%.2f ≥ 最低库存:%.2f,无需触发【最低库存】补制",
goodsCode, goodsCategoryName, currentStock, minStock);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
return reissueMsg;
}
@ -681,6 +706,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 名称:%s(类别:%s)触发【最低库存】补制!当前库存:%.2f,最低库存:%.2f,开始生成模具采购计划",
goodsCode, stGoods.getGoodsName(), goodsCategoryName, currentStock, minStock);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
// 执行模具类最低库存补制
// generateMoldMinStockPurchasePlan(goodsId, currentStock, minStock);
@ -688,6 +717,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 名称:%s(类别:%s)触发【最低库存】补制!当前库存:%.2f,最低库存:%.2f,开始生成玻璃饼生产订单",
goodsCode, stGoods.getGoodsName(), goodsCategoryName, currentStock, minStock);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
// 执行玻璃饼类最低库存补制
// generateGlassPieMinStockProductionOrder(goodsId, currentStock, minStock);
@ -695,6 +728,10 @@ public class StRealtimeStockServiceImpl extends BaseServiceImpl<StRealtimeStockM
reissueMsg = String.format("物料编码:%s 类别为%s,当前库存:%.2f < 最低库存:%.2f,但暂未配置【最低库存】补制逻辑,跳过补制",
goodsCode, goodsCategoryName, currentStock, minStock);
log.info(reissueMsg);
MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
notifyMessage.setContent(reissueMsg);
notifyMessage.setReceiveUserId(AuthUtil.getUserId());
mesNotifyMessageClient.save(notifyMessage);
}
return reissueMsg;
}

@ -213,6 +213,11 @@ public class StRequisitionServiceImpl extends BaseServiceImpl<StRequisitionMappe
// 生成出库单号条形码(尺寸:宽300,高80,可根据打印需求调整)
resultMap.put("invadjCodeBar", generateBarcodeAsBase64(invadjCodeValue, 200, 50));
String buyCodeValue = StringUtils.isNotBlank(stRequisition.getBuyCode()) ? stRequisition.getBuyCode() : "/";
resultMap.put("buyCode", buyCodeValue);
// 生成出库单号条形码(尺寸:宽300,高80,可根据打印需求调整)
resultMap.put("buyCodeBar", generateBarcodeAsBase64(buyCodeValue, 200, 50));
// 4. 组装返回数据(与原有方法结构统一)
// list.add(map);
// data.put("data", list);

@ -11,6 +11,9 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.desk.common.feign.IMesApprovalRecordClient;
import org.springblade.desk.common.pojo.entity.MesApprovalRecordEntity;
import org.springblade.system.feign.ISysClient;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springblade.system.feign.IUserClient;
@ -43,7 +46,12 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
@Resource
IStBuyOrderService stBuyOrderService;
@Resource
IMesApprovalRecordClient mesApprovalRecordClient;
@Resource
IUserClient userClient;
@Resource
ISysClient sysClient;
@Override
public IPage<StWmsRequestVO> selectStWmsRequestPage(IPage<StWmsRequestVO> page, StWmsRequestVO stWmsRequest) {
return page.setRecords(baseMapper.selectStWmsRequestPage(page, stWmsRequest));
@ -82,10 +90,26 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
this.updateById(old);
} else {
stWmsRequest.setReqCode(this.nextCode(1));
stWmsRequest.setCreateUser(user.getUserId()); // 原 createMan
stWmsRequest.setCreateUser(user.getUserId());
stWmsRequest.setCreateTime(new Date());
stWmsRequest.setApprovalStatus(StWmsRequest.APPROVAL_STATUS_CHECKING);
this.save(stWmsRequest);
MesApprovalRecordEntity approvalRecord = new MesApprovalRecordEntity();
approvalRecord.setBizId(stWmsRequest.getId());
approvalRecord.setBizType("仓库提请审批");
approvalRecord.setContent("仓库提请审批");
R<User> ruser = userClient.userInfoById(stWmsRequest.getCreateUser());
User user1 = ruser.getData();
approvalRecord.setCurrentRoleId(Long.valueOf(user1.getRoleId()));
R<String> roleName = sysClient.getRoleName(approvalRecord.getCurrentRoleId());
String roleNameData = roleName.getData();
approvalRecord.setCurrentRoleName(roleNameData);
approvalRecord.setNextRoleName("保管员");
R<String> roleIdResp = sysClient.getRoleIds(null, approvalRecord.getNextRoleName());
String roleId = roleIdResp.getData();
approvalRecord.setNextRoleId(Long.valueOf(roleId));
mesApprovalRecordClient.save(approvalRecord);
}
/* 更新采购订单已提请数量(原逻辑) */
@ -120,6 +144,14 @@ public class StWmsRequestServiceImpl extends BaseServiceImpl<StWmsRequestMapper,
wmsRequest.setApprovalStatus(approvalResult);
baseMapper.updateById(wmsRequest);
MesApprovalRecordEntity updateRecord = new MesApprovalRecordEntity();
updateRecord.setBizId(id);
updateRecord.setBizType("仓库提请审批");
updateRecord.setOpinion("");
updateRecord.setNextRoleId(Long.valueOf(approver.getRoleId()));
updateRecord.setStatus(Integer.valueOf(approvalResult));
mesApprovalRecordClient.update(updateRecord);
bo.setDrawQuantity(afterQty);
bo.setSurDrawQty(bo.getBuyQty() - afterQty);
stBuyOrderService.updateById(bo);

Loading…
Cancel
Save