wms / wms4_andelichi · Commits

Commit 6b87333a6b55af23c28e730ba1b3ce1647cdc736

Authored by 周峰
1 parent 0837c57c
develop ... AzureAD

增加组盘后直接生成任务接口receivingAndCreateTask

Inline Side-by-side
Showing 3 changed files with 37 additions and 2 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
  View file @6b87333
... ... @@ -13,6 +13,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
13 13 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
14 14 import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
15 15 import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
  16 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
16 17 import org.jeecg.utils.StringUtils;
17 18 import org.springframework.web.bind.annotation.*;
18 19  
... ... @@ -74,11 +75,24 @@ public class ReceiveController {
74 75 * @return
75 76 */
76 77 @AutoLog("入库单-收货")
77   - @ApiOperation(value="入库单-收货", notes="入库单-收货")
  78 + @ApiOperation(value="入库单-收货", notes="入库单-收货组盘")
78 79 @PostMapping("/receiving")
79 80 @ResponseBody
80 81 public Result receiving(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
81 82 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
82 83 return receiveService.receiving(receiveList, warehouseCode);
83 84 }
  85 +
  86 + /**
  87 + * 收货
  88 + * @return
  89 + */
  90 + @AutoLog("入库单-收货-生成任务")
  91 + @ApiOperation(value="入库单-收货-生成任务", notes="收货组盘后，自动生成任务")
  92 + @PostMapping("/receivingAndCreateTask")
  93 + @ResponseBody
  94 + public Result<TaskHeader> receivingAndCreateTask(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
  95 + String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
  96 + return receiveService.receivingAndCreateTask(receiveList, warehouseCode);
  97 + }
84 98 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java
  View file @6b87333
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
4 4 import org.jeecg.common.api.vo.Result;
5 5 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
6 6 import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
  7 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
7 8 import org.springframework.web.bind.annotation.RequestBody;
8 9  
9 10 import java.util.List;
... ... @@ -13,5 +14,7 @@ import java.util.List;
13 14 */
14 15 public interface IReceiveService extends IService<Receive> {
15 16  
16   - public Result receiving(List<Receive> receiveList, String warehouseCode);
  17 + Result receiving(List<Receive> receiveList, String warehouseCode);
  18 +
  19 + Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode);
17 20 }
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
  View file @6b87333
... ... @@ -23,6 +23,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService
23 23 import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
24 24 import org.jeecg.modules.wms.receipt.receiving.mapper.ReceiveMapper;
25 25 import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
  26 +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
26 27 import org.jeecg.utils.StringUtils;
27 28 import org.jeecg.utils.constant.QuantityConstant;
28 29 import org.springframework.stereotype.Service;
... ... @@ -54,6 +55,23 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt; imp
54 55 @Resource
55 56 private IReceiptHeaderService receiptHeaderService;
56 57  
  58 +
  59 + /**
  60 + * 组盘后自动生成任务，返回任务实体
  61 + * @param receiveList
  62 + * @param warehouseCode
  63 + * @return
  64 + */
  65 + @Override
  66 + @Transactional(rollbackFor = ServiceException.class)
  67 + public Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode) {
  68 + Result<ReceiptContainerHeader> result = receiving(receiveList, warehouseCode);
  69 + if(result.isSuccess()){
  70 + return receiptContainerHeaderService.createReceiptTask(result.getResult(), warehouseCode);
  71 + } else {
  72 + return Result.error(result.getMessage());
  73 + }
  74 + }
57 75 /**
58 76 * 1.判断容器是否存在,并且不能被锁定
59 77 * 2.收货数量必须大于0
... ...