增加配置参数，支持只有整盘出库

肖超群
1 parent f14f6fca
Showing 3 changed files with 5 additions and 2 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -1373,6 +1373,8 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         int shipmentTaskRule = Integer.parseInt(value);
         if (shipmentTaskRule == QuantityConstant.RULE_TASK_PICK_SHIPMENT) {
             taskType = QuantityConstant.TASK_TYPE_SORTINGSHIPMENT;
+        } else if (shipmentTaskRule == QuantityConstant.RULE_TASK_WHOLE_SHIPMENT) {
+            taskType = QuantityConstant.TASK_TYPE_WHOLESHIPMENT;
         }
         if (forceTaskType != 0) {
             taskType = forceTaskType;
@@ -1844,6 +1844,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result completeWholeShipmentTaskClearInventory(InventoryHeader inventoryHeader, List<InventoryDetail> inventoryDetailList) {
         List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
         for (InventoryDetail inventoryDetail : inventoryDetailList) {
@@ -1854,7 +1855,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
             inventoryTransaction.setContainerCode(inventoryDetail.getContainerCode());
             inventoryTransaction.setZoneCode(inventoryDetail.getZoneCode());
             inventoryTransaction.setFromLocationCode(inventoryDetail.getLocationCode());
-            inventoryTransaction.setToLocationCode(inventoryDetail.getLocationCode());
             inventoryTransaction.setMaterialCode(inventoryDetail.getMaterialCode());
             inventoryTransaction.setMaterialName(inventoryDetail.getMaterialName());
             inventoryTransaction.setMaterialSpec(inventoryDetail.getMaterialSpec());
@@ -595,8 +595,9 @@ public class QuantityConstant {
     public static final int RULE_TASK_SET_LOCATION = 1;
     public static final int RULE_TASK_NOT_LOCATION = 0;
  
+    public static final int RULE_TASK_WHOLE_OR_PICK_SHIPMENT = 0;
     public static final int RULE_TASK_PICK_SHIPMENT = 1;
-    public static final int RULE_TASK_WHOLE_SHIPMENT = 0;
+    public static final int RULE_TASK_WHOLE_SHIPMENT = 2;
  
     public static final int RULE_ALLOW_EMPTY = 1;
     public static final int RULE_NOT_ALLOW_EMPTY = 0;