出库加入并发控制

肖超群
1 parent 0404b57d
Showing 6 changed files with 21 additions and 5 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mes/servuce/impl/MesServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/IHuahengMultiHandlerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/entity/InventoryHeader.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/entity/ReceiptDetail.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/controller/ShipmentCombinationController.java
@@ -223,7 +223,7 @@ public class MesServiceImpl implements IMesService {
             if (!success) {
                 throw new JeecgBootException("MES下发出库信息，更新出库组盘头失败");
             }
-            Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
+            Result result = huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
             if (!result.isSuccess()) {
                 throw new JeecgBootException(result.getMessage());
             }
@@ -3,6 +3,7 @@ package org.jeecg.modules.wms.framework.service;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
+import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
 import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
  
@@ -22,4 +23,6 @@ public interface IHuahengMultiHandlerService {
     Result cancelCombine(Integer id);
  
     Result autoCombination(String shipmentCode, String warehouseCode);
+
+    Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber);
 }
@@ -13,6 +13,7 @@ import org.jeecg.modules.wms.receipt.receiptContainerHeader.entity.ReceiptContai
 import org.jeecg.modules.wms.receipt.receiptContainerHeader.service.IReceiptContainerHeaderService;
 import org.jeecg.modules.wms.shipment.shipmentCombination.entity.CombinationModel;
 import org.jeecg.modules.wms.shipment.shipmentCombination.service.IShipmentCombinationService;
+import org.jeecg.modules.wms.shipment.shipmentContainerHeader.entity.ShipmentContainerHeader;
 import org.jeecg.modules.wms.shipment.shipmentContainerHeader.service.IShipmentContainerHeaderService;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.CombinationParam;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
@@ -129,4 +130,16 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem
         return result;
     }
  
+    @Override
+    public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
+        Result result = handleMultiProcess("createShipmentTask", new MultiProcessListener() {
+            @Override
+            public Result<?> doProcess() {
+                Result result = shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode, shipmentOrder, sequence, sequenceNumber);
+                return result;
+            }
+        });
+        return result;
+    }
+
 }
@@ -99,8 +99,8 @@ public class InventoryHeader implements Serializable {
     private Date updateTime;
  
     public void setTotalQty(BigDecimal totalQty) {
-        if (totalQty.compareTo(BigDecimal.ZERO) <= 0) {
-            throw new JeecgBootException("总数量必须大于0");
+        if (totalQty.compareTo(BigDecimal.ZERO) < 0) {
+            throw new JeecgBootException("总数量必须大于等于0");
         }
         this.totalQty = totalQty;
     }
@@ -134,7 +134,7 @@ public class ReceiptDetail implements Serializable {
     }
  
     public void setTaskQty(BigDecimal taskQty) {
-        if (qty.compareTo(BigDecimal.ZERO) < 0) {
+        if (taskQty.compareTo(BigDecimal.ZERO) < 0) {
             throw new JeecgBootException("已收数量必须大于等于0");
         }
         this.taskQty = taskQty;
@@ -112,7 +112,7 @@ public class ShipmentCombinationController {
     @ResponseBody
     public Result createShipmentTask(@RequestBody ShipmentContainerHeader shipmentContainerHeader, HttpServletRequest req) {
         String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        return shipmentCombinationService.createShipmentTask(shipmentContainerHeader, warehouseCode, 0, 0, 0);
+        return huahengMultiHandlerService.createShipmentTask(shipmentContainerHeader, warehouseCode, 0, 0, 0);
     }
  
     /**