完成呼叫出库料盒的开发

肖超群
1 parent 2bceaed2
Showing 3 changed files with 95 additions and 43 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/IShipmentCombinationService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -17,6 +17,8 @@ public interface IShipmentCombinationService {
  
     List<InventoryDetail> getInventorys(ShipmentDetail shipmentDetail);
  
+    List<InventoryDetail> getAllInventorys(ShipmentDetail shipmentDetail);
+
     Result autoCombination(String shipmentCode, String warehouseCode);
  
     Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber);
@@ -5,8 +5,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
  
-import javax.annotation.Resource;
-
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.wms.config.container.entity.Container;
@@ -16,7 +14,6 @@ import org.jeecg.modules.wms.config.location.service.ILocationService;
 import org.jeecg.modules.wms.config.material.entity.Material;
 import org.jeecg.modules.wms.config.material.service.IMaterialService;
 import org.jeecg.modules.wms.config.parameterConfiguration.service.IParameterConfigurationService;
-import org.jeecg.modules.wms.framework.service.IHuahengMultiHandlerService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.entity.InventoryDetail;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryDetailService;
 import org.jeecg.modules.wms.inventory.inventoryHeader.service.IInventoryHeaderService;
@@ -124,6 +121,33 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
  
     @Override
     @Transactional(rollbackFor = JeecgBootException.class)
+    public List<InventoryDetail> getAllInventorys(ShipmentDetail shipmentDetail) {
+        String warehouseCode = shipmentDetail.getWarehouseCode();
+        String companyCode = shipmentDetail.getCompanyCode();
+        String materialCode = shipmentDetail.getMaterialCode();
+        String inventoryStatus = shipmentDetail.getInventoryStatus();
+        if (StringUtils.isEmpty(warehouseCode)) {
+            throw new JeecgBootException("寻找库存详情时,出库详情没有仓库编码");
+        }
+        if (StringUtils.isEmpty(companyCode)) {
+            throw new JeecgBootException("寻找库存详情时,出库详情没有货主编码");
+        }
+        if (StringUtils.isEmpty(materialCode)) {
+            throw new JeecgBootException("寻找库存详情时, 出库详情没有物料编码");
+        }
+        if (StringUtils.isEmpty(inventoryStatus)) {
+            throw new JeecgBootException("寻找库存详情时, 出库详情没有物料品质");
+        }
+        LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+        inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getWarehouseCode, warehouseCode).eq(InventoryDetail::getCompanyCode, companyCode)
+            .eq(InventoryDetail::getMaterialCode, materialCode).eq(InventoryDetail::getInventoryStatus, inventoryStatus)
+            .eq(InventoryDetail::getEnable, QuantityConstant.INVENTORY_DETAIL_STATUS_ENABLE);
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+        return inventoryDetailList;
+    }
+
+    @Override
+    @Transactional(rollbackFor = JeecgBootException.class)
     public Result autoCombination(String shipmentCode, String warehouseCode) {
         log.info("开始自动配盘,单号" + shipmentCode);
         LambdaQueryWrapper<ShipmentHeader> shipmentHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
@@ -266,12 +290,20 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         if (container == null) {
             return Result.error("配盘时, 没有找到容器, 编码" + containerCode);
         }
-        if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
-            return Result.error("配盘时, 容器已经锁定，不能再组盘");
+        int callBox = QuantityConstant.NOT_CALL_BOX;
+        TaskHeader callBoxTask = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
+        if (callBoxTask != null) {
+            callBox = callBoxTask.getCallBox();
+        }
+        // 如果不是呼叫料盒，那么要判断容器状态
+        if (callBox == QuantityConstant.NOT_CALL_BOX) {
+            if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+                return Result.error("配盘时, 容器已经锁定，不能再配盘");
+            }
         }
         ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getUnCompleteReceiptContainerByCode(containerCode, warehouseCode);
         if (receiptContainerHeader != null) {
-            return Result.error("配盘时, 容器有入库组盘不能再组盘，容器编码" + containerCode);
+            return Result.error("配盘时, 容器有入库组盘不能再配盘，容器编码" + containerCode);
         }
         BigDecimal shipmentDetailQty = shipmentDetail.getQty();
         BigDecimal shipmentDetailTaskQty = shipmentDetail.getTaskQty();
@@ -454,6 +486,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         condition = "#taskDetailList.size() > 0", recordReturnValue = true)
     public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) {
         Integer preTaskNo = 0;
+        boolean success = false;
         if (shipmentContainerHeader == null) {
             return Result.error("生成出库任务时, 出库组盘头" + "未找到,操作中止");
         }
@@ -514,35 +547,51 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
         if (shipmentTaskRule == QuantityConstant.RULE_TASK_PICK_SHIPMENT) {
             taskType = QuantityConstant.TASK_TYPE_SORTINGSHIPMENT;
         }
-        // 锁定容器、库位
-        Result result = taskHeaderService.createTaskLockContainerAndLocation(taskType, containerCode, fromLocationCode, toLocationCode, warehouseCode);
-        if (!result.isSuccess()) {
-            throw new JeecgBootException(result.getMessage());
-        }
-        TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
-        String zoneCode = taskLockEntity.getZoneCode();
-        TaskHeader taskHeader = new TaskHeader();
-        taskHeader.setPreTaskNo(preTaskNo);
-        taskHeader.setTaskType(taskType);
-        taskHeader.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
-        taskHeader.setZoneCode(zoneCode);
-        taskHeader.setShipmentOrder(shipmentOrder);
-        taskHeader.setSequence(sequence);
-        taskHeader.setSequenceNumber(sequenceNumber);
-        taskHeader.setWarehouseCode(warehouseCode);
-        taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
-        taskHeader.setContainerCode(containerCode);
-        taskHeader.setToPortCode(shipmentContainerHeader.getToPort());
-        taskHeader.setFromLocationCode(fromLocationCode);
-        if (taskType == QuantityConstant.TASK_TYPE_SORTINGSHIPMENT) {
-            taskHeader.setToLocationCode(toLocationCode);
-        }
-        taskHeader.setShipmentContainerHeaderId(shipmentContainerHeader.getId());
-        boolean success = taskHeaderService.save(taskHeader);
-        if (!success) {
-            throw new JeecgBootException("生成出库任务时, 创建任务失败");
+        int taskHeaderId = 0;
+        TaskHeader taskHeader = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
+        if (taskHeader == null) {
+            // 锁定容器、库位
+            Result result = taskHeaderService.createTaskLockContainerAndLocation(taskType, containerCode, fromLocationCode, toLocationCode, warehouseCode);
+            if (!result.isSuccess()) {
+                throw new JeecgBootException(result.getMessage());
+            }
+            TaskLockEntity taskLockEntity = (TaskLockEntity)result.getResult();
+            String zoneCode = taskLockEntity.getZoneCode();
+            taskHeader = new TaskHeader();
+            taskHeader.setPreTaskNo(preTaskNo);
+            taskHeader.setTaskType(taskType);
+            taskHeader.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_SHIPMENT);
+            taskHeader.setZoneCode(zoneCode);
+            taskHeader.setShipmentOrder(shipmentOrder);
+            taskHeader.setSequence(sequence);
+            taskHeader.setSequenceNumber(sequenceNumber);
+            taskHeader.setWarehouseCode(warehouseCode);
+            taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
+            taskHeader.setContainerCode(containerCode);
+            taskHeader.setToPortCode(shipmentContainerHeader.getToPort());
+            taskHeader.setFromLocationCode(fromLocationCode);
+            if (taskType == QuantityConstant.TASK_TYPE_SORTINGSHIPMENT) {
+                taskHeader.setToLocationCode(toLocationCode);
+            }
+            taskHeader.setShipmentContainerHeaderId(shipmentContainerHeader.getId());
+            success = taskHeaderService.save(taskHeader);
+            if (!success) {
+                throw new JeecgBootException("生成出库任务时, 创建任务失败");
+            }
+            taskHeaderId = taskHeader.getId();
+        } else {
+            taskHeaderId = taskHeader.getId();
+            if (taskHeader.getCallBox() == QuantityConstant.NOT_CALL_BOX) {
+                throw new JeecgBootException("生成出库任务时, 没有呼叫料盒标记");
+            }
+            TaskHeader taskHeader1 = new TaskHeader();
+            taskHeader1.setId(taskHeaderId);
+            taskHeader1.setShipmentContainerHeaderId(shipmentContainerHeader.getId());
+            success = taskHeaderService.updateById(taskHeader1);
+            if (!success) {
+                throw new JeecgBootException("生成出库任务时, 任务更新失败");
+            }
         }
-        int taskHeaderId = taskHeader.getId();
         List<TaskDetail> taskDetailList = new ArrayList<>();
         for (ShipmentContainerDetail shipmentContainerDetail : shipmentContainerDetailList) {
             TaskDetail taskDetail = new TaskDetail();
@@ -602,7 +651,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             return Result.error("找不到出库单详情");
         }
         String warehouseCode = shipmentDetail.getWarehouseCode();
-        List<InventoryDetail> inventoryDetailList = shipmentCombinationService.getInventorys(shipmentDetail);
+        List<InventoryDetail> inventoryDetailList = shipmentCombinationService.getAllInventorys(shipmentDetail);
         if (inventoryDetailList.size() == 0) {
             return Result.error("该物料没有库存或没有符合出库规则的库存");
         }
@@ -613,8 +662,15 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
             if (container == null) {
                 return Result.error("没有找到容器，容器编码" + containerCode);
             }
-            if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
-                removeInventoryList.add(inventoryDetail);
+            int callBox = QuantityConstant.NOT_CALL_BOX;
+            TaskHeader callBoxTask = taskHeaderService.getUnCompleteTaskByContainerCode(containerCode, warehouseCode);
+            if (callBoxTask != null) {
+                callBox = callBoxTask.getCallBox();
+            }
+            if (callBox == QuantityConstant.NOT_CALL_BOX) {
+                if (container.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+                    removeInventoryList.add(inventoryDetail);
+                }
             }
         }
         List<ReceiptContainerHeader> unCompleteCombineList = receiptContainerHeaderService.getUnCompleteCombineList();
@@ -485,12 +485,6 @@ public class QuantityConstant {
  
     public static final String EMPTY_ROADWAY_DEFAULT = "emptyRoadWayDefault";
  
-    public static final String ZONE_RECEIPT_MANY_CONTAINER = "A"; // 空托盘组缓存区
-    public static final String ZONE_RECEIPT_CACHE = "B"; // 钢托盘入库缓存区
-    public static final String ZONE_LK = "L"; // 立体库区
-    public static final String ZONE_WOOD_CONTAINER_CACHE = "C"; // 木托盘缓存区
-    public static final String ZONE_STOCK_UP = "D"; // 备货区
-
     public static final int DOUBLE_FORK = 1;
     public static final int SINGLE_FORK = 0;