From 6b87333a6b55af23c28e730ba1b3ce1647cdc736 Mon Sep 17 00:00:00 2001
From: zf <27208084@qq.com>
Date: Tue, 10 Jan 2023 14:26:23 +0800
Subject: [PATCH] 增加组盘后直接生成任务接口receivingAndCreateTask
---
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java | 16 +++++++++++++++-
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java | 5 ++++-
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java | 18 ++++++++++++++++++
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
index b6ca77a..f89dc57 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
@@ -13,6 +13,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.jeecg.utils.StringUtils;
import org.springframework.web.bind.annotation.*;
@@ -74,11 +75,24 @@ public class ReceiveController {
* @return
*/
@AutoLog("入库单-收货")
- @ApiOperation(value="入库单-收货", notes="入库单-收货")
+ @ApiOperation(value="入库单-收货", notes="入库单-收货组盘")
@PostMapping("/receiving")
@ResponseBody
public Result receiving(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
return receiveService.receiving(receiveList, warehouseCode);
}
+
+ /**
+ * 收货
+ * @return
+ */
+ @AutoLog("入库单-收货-生成任务")
+ @ApiOperation(value="入库单-收货-生成任务", notes="收货组盘后，自动生成任务")
+ @PostMapping("/receivingAndCreateTask")
+ @ResponseBody
+ public Result<TaskHeader> receivingAndCreateTask(@RequestBody List<Receive> receiveList, HttpServletRequest req) {
+ String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
+ return receiveService.receivingAndCreateTask(receiveList, warehouseCode);
+ }
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java
index 531905e..d446ad8 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@@ -13,5 +14,7 @@ import java.util.List;
*/
public interface IReceiveService extends IService<Receive> {
- public Result receiving(List<Receive> receiveList, String warehouseCode);
+ Result receiving(List<Receive> receiveList, String warehouseCode);
+
+ Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode);
}
diff --git a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
index 952da4e..83128ef 100644
--- a/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
+++ b/jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -23,6 +23,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService
import org.jeecg.modules.wms.receipt.receiving.domain.Receive;
import org.jeecg.modules.wms.receipt.receiving.mapper.ReceiveMapper;
import org.jeecg.modules.wms.receipt.receiving.service.IReceiveService;
+import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
import org.springframework.stereotype.Service;
@@ -54,6 +55,23 @@ public class ReceiveServiceImpl extends ServiceImpl<ReceiveMapper, Receive> imp
@Resource
private IReceiptHeaderService receiptHeaderService;
+
+ /**
+ * 组盘后自动生成任务，返回任务实体
+ * @param receiveList
+ * @param warehouseCode
+ * @return
+ */
+ @Override
+ @Transactional(rollbackFor = ServiceException.class)
+ public Result<TaskHeader> receivingAndCreateTask(List<Receive> receiveList, String warehouseCode) {
+ Result<ReceiptContainerHeader> result = receiving(receiveList, warehouseCode);
+ if(result.isSuccess()){
+ return receiptContainerHeaderService.createReceiptTask(result.getResult(), warehouseCode);
+ } else {
+ return Result.error(result.getMessage());
+ }
+ }
/**
* 1.判断容器是否存在,并且不能被锁定
* 2.收货数量必须大于0
--
libgit2 0.22.2