Merge branch 'develop' of http://172.16.29.40:8010/wms/wms4 into develop

李泰瑜
2 parents 416dc073 6b87333a
Showing 4 changed files with 41 additions and 6 deletions
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/controller/ReceiveController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/IReceiveService.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiving/service/impl/ReceiveServiceImpl.java
@@ -93,7 +93,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
  
 	@Override
 	@Transactional(rollbackFor = ServiceException.class)
-	public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
+	public Result<TaskHeader> createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) {
 		if (!receiptContainerHeader.getWarehouseCode().equals(warehouseCode)) {
 			return Result.error("id:" + receiptContainerHeader.getId() + "的入库组盘不能在" + warehouseCode + "仓库操作");
 		}
@@ -212,7 +212,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
 				throw new ServiceException("更新入库单明细失败");
 			}
 		}
-		return Result.OK("生成入库任务成功");
+		return Result.OK("生成入库任务成功", taskHeader);
 	}
  
 	@Override
@@ -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);
+    }
 }
@@ -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);
 }
@@ -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&lt;ReceiveMapper, Receive&gt;  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
@@ -65,7 +83,7 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt;  imp
      */
     @Override
     @Transactional(rollbackFor = ServiceException.class)
-    public Result receiving(List<Receive> receiveList, String warehouseCode) {
+    public Result<ReceiptContainerHeader> receiving(List<Receive> receiveList, String warehouseCode) {
         boolean result = false;
         if(receiveList == null || receiveList.size() == 0) {
             return Result.error("收货信息为空");
@@ -210,6 +228,6 @@ public class ReceiveServiceImpl extends ServiceImpl&lt;ReceiveMapper, Receive&gt;  imp
             }
         }
  
-        return Result.OK("收货成功");
+        return Result.OK("收货成功", receiptContainerHeader);
     }
 }