完善悬架库出库

肖超群
1 parent f97dee93
Showing 4 changed files with 269 additions and 9 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/IContainerService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/ITaskHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -19,6 +19,8 @@ public interface IContainerService extends IService&lt;Container&gt; {
  
     Container getContainerByCode(String containCode, String warehouseCode);
  
+    boolean removeContainerByCode(String containCode, String warehouseCode);
+
     Container getContainerByLocationCode(String locationCode, String warehouseCode);
  
     boolean updateStatus(String containerCode, String status, String warehouseCode);
@@ -92,6 +92,19 @@ public class ContainerServiceImpl extends ServiceImpl&lt;ContainerMapper, Container
     }
  
     @Override
+    public boolean removeContainerByCode(String containCode, String warehouseCode) {
+        if (StringUtils.isEmpty(containCode)) {
+            throw new JeecgBootException("容器编码为空");
+        }
+        if (StringUtils.havaLowerCase(containCode)) {
+            throw new JeecgBootException("容器不能有小字母" + containCode);
+        }
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper.eq(Container::getCode, containCode).eq(Container::getWarehouseCode, warehouseCode);
+        return containerService.remove(containerLambdaQueryWrapper);
+    }
+
+    @Override
     public Container getContainerByLocationCode(String locationCode, String warehouseCode) {
         if (StringUtils.isEmpty(locationCode)) {
             throw new JeecgBootException("库位编码为空");
@@ -66,11 +66,19 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
  
     /**
      * 通过目标库位编码，获取任务信息
-     * @param  toLocationCode
+     * @param  fromLocationCode
+     * @param  warehouseCode
+     * @return
+     */
+    TaskHeader getUnCompleteTransferTaskByFromLocationCode(String fromLocationCode, String warehouseCode);
+
+    /**
+     * 通过目标库位编码，获取任务信息
+     * @param  fromLocationCode
      * @param  warehouseCode
      * @return
      */
-    TaskHeader getUnCompleteTransferTaskByFromLocationCode(String toLocationCode, String warehouseCode);
+    TaskHeader getUnCompleteShipmentTaskByFromLocationCode(String fromLocationCode, String warehouseCode);
  
     /**
      * 通过库位编码，获取任务信息
@@ -302,6 +310,13 @@ public interface ITaskHeaderService extends IService&lt;TaskHeader&gt; {
     Result completeShipmentTask(TaskHeader taskHeader);
  
     /**
+     * 完成悬臂库出库
+     * @param  taskHeader
+     * @return
+     */
+    Result completeCantaleverShipmentTask(TaskHeader taskHeader);
+
+    /**
      * 完成整出出库,清空库存
      * @param  inventoryDetailList
      * @return
@@ -1025,6 +1025,16 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     @Override
+    public TaskHeader getUnCompleteShipmentTaskByFromLocationCode(String fromLocationCode, String warehouseCode) {
+        LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
+        taskHeaderLambdaQueryWrapper.eq(TaskHeader::getFromLocationCode, fromLocationCode).eq(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT).
+                eq(TaskHeader::getWarehouseCode, warehouseCode).lt(TaskHeader::getStatus,
+                        QuantityConstant.TASK_STATUS_COMPLETED);
+        TaskHeader taskHeader = taskHeaderService.getOne(taskHeaderLambdaQueryWrapper);
+        return taskHeader;
+    }
+
+    @Override
     public TaskHeader getUnCompleteTaskByLocationCode(String locationCode, String warehouseCode) {
         TaskHeader taskHeader = getUnCompleteTaskByFromLocationCode(locationCode, warehouseCode);
         if (taskHeader == null) {
@@ -1101,7 +1111,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 break;
             case QuantityConstant.TASK_TYPE_WHOLESHIPMENT:
             case QuantityConstant.TASK_TYPE_SORTINGSHIPMENT:
-                result = taskHeaderService.completeShipmentTask(taskHeader);
+                if (zoneCode.equals(QuantityConstant.ZONE_B)) {
+                    result = taskHeaderService.completeCantaleverShipmentTask(taskHeader);
+                } else {
+                    result = taskHeaderService.completeShipmentTask(taskHeader);
+                }
                 break;
             case QuantityConstant.TASK_TYPE_CYCLECOUNT:
                 result = taskHeaderService.completeCycleCountTask(taskHeader);
@@ -1648,7 +1662,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
         taskHeader.setTaskType(QuantityConstant.TASK_TYPE_TRANSFER);
         taskHeader.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_TRANSFER_POSITION);
         taskHeader.setZoneCode(zoneCode);
-        taskHeader.setContainerCode(fromLocation.getContainerCode());
+        taskHeader.setContainerCode(containerCode);
         taskHeader.setFromLocationCode(fromLocationCode);
         taskHeader.setToLocationCode(toLocationCode);
         taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
@@ -2376,6 +2390,219 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
  
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
+            msg = "#taskHeader == null ? '' : '任务类型：' + #taskHeader.getTaskType() + '，起始库位：' + #taskHeader.getFromLocationCode() + '，目标库位：' + #taskHeader.getToLocationCode() + '，容器编码：' + #taskHeader.getContainerCode()",
+            recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'出库任务完成'", extra = "#extraJsonString1",
+            msg = "'任务ID：' + #taskHeader.getId() + '，库位编码：' + #taskHeader.getFromLocationCode() + '，容器编码：' + #taskHeader.getContainerCode() + '，目标出入口：' + #taskHeader.getToPortCode()",
+            recordReturnValue = true)
+    @OperationLog(bizId = "''", bizType = "'出库单追踪'", tag = "'详情出库完成'", extra = "#extraJsonString2", msg = "''", recordReturnValue = true)
+    public Result completeCantaleverShipmentTask(TaskHeader taskHeader) {
+        if (taskHeader == null) {
+            return Result.error("完成出库任务未找到，执行中止");
+        }
+        log.info("开始完成出库任务,任务号：" + taskHeader.getId());
+        String warehouseCode = taskHeader.getWarehouseCode();
+        String fromLocationCode = taskHeader.getFromLocationCode();
+        String toLocationCode = taskHeader.getToLocationCode();
+        String containerCode = taskHeader.getContainerCode();
+        String zoneCode = taskHeader.getZoneCode();
+        int taskType = taskHeader.getTaskType();
+        List<TaskDetail> taskDetailList = taskDetailService.getTaskDetailListByTaskId(taskHeader.getId());
+        boolean success = false;
+        if (taskHeader.getStatus().equals(QuantityConstant.TASK_STATUS_COMPLETED)) {
+            return Result.ok("完成出库任务，(" + taskHeader.getId() + ")任务已经是完成的！");
+        }
+        // 如果任务详情为空，那么就是呼叫料盒，但是又没入库进去。
+        if (taskDetailList.isEmpty()) {
+            throw new JeecgBootException("完成出库任务失败，任务详情为空");
+        }
+        if (StringUtils.isEmpty(fromLocationCode)) {
+            return Result.error("完成出库任务" + taskHeader.getId() + "没有起始库位，执行中止");
+        }
+        if (StringUtils.isEmpty(toLocationCode) && (taskType == QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)) {
+            return Result.error("完成出库任务，任务" + taskHeader.getId() + "没有目的库位，执行中止");
+        }
+        InventoryHeader inventoryHeader = inventoryHeaderService.getInventoryHeaderByContainerCode(containerCode, warehouseCode);
+        if (inventoryHeader == null) {
+            return Result.error("完成出库任务，出库任务" + taskHeader.getId() + "没有找到库存头");
+        }
+        List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
+        List<Integer> shipmentIdList = new ArrayList<>();
+        List<ShipmentDetail> shipmentDetailList = new ArrayList<>();
+        List<ShipmentDetail> updateStatusShipmentDetailList = new ArrayList<>();
+        for (TaskDetail taskDetail : taskDetailList) {
+            ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getById(taskDetail.getShipmentContainerDetailId());
+            if (shipmentContainerDetail == null) {
+                throw new JeecgBootException("完成出库任务， 出库任务没有找到出库组盘详情" + taskDetail.getShipmentContainerDetailId());
+            }
+            ShipmentDetail shipmentDetail = shipmentDetailService.getById(taskDetail.getShipmentDetailId());
+            if (shipmentDetail == null) {
+                throw new JeecgBootException("完成出库任务， 出库任务没有找到出库详情" + taskDetail.getShipmentDetailId());
+            }
+            ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentDetail.getShipmentId());
+            if (shipmentHeader == null) {
+                throw new JeecgBootException("完成出库任务， 出库任务没有找到出库单" + shipmentDetail.getShipmentId());
+            }
+            taskDetail.setShipmentCode(shipmentDetail.getShipmentCode());
+            int shipmentDetailId = shipmentDetail.getId();
+            BigDecimal shipmentQty = shipmentDetail.getShipmentQty();
+            shipmentQty = shipmentQty.add(taskDetail.getQty());
+            int status = QuantityConstant.SHIPMENT_HEADER_COMPLETED;
+            if (shipmentDetail.getQty().compareTo(shipmentQty) == 0) {
+                status = QuantityConstant.SHIPMENT_HEADER_COMPLETED;
+            } else if (shipmentDetail.getQty().compareTo(shipmentQty) > 0) {
+                status = QuantityConstant.SHIPMENT_HEADER_OFF_SHELF;
+            } else if (shipmentDetail.getQty().compareTo(shipmentQty) < 0) {
+                throw new JeecgBootException("完成出库任务时， 出库单 单据数量不能小于出库数量");
+            }
+            shipmentDetailList.add(shipmentDetail);
+            ShipmentDetail updateStatusShipmentDetail = new ShipmentDetail();
+            updateStatusShipmentDetail.setId(shipmentDetailId);
+            updateStatusShipmentDetail.setStatus(status);
+            updateStatusShipmentDetail.setShipmentQty(shipmentQty);
+            updateStatusShipmentDetailList.add(updateStatusShipmentDetail);
+            success = shipmentDetailService.updateById(updateStatusShipmentDetail);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，更新出库详情失败");
+            }
+            InventoryDetail inventoryDetail = inventoryDetailService.getById(taskDetail.getFromInventoryDetailId());
+            if (inventoryDetail == null) {
+                throw new JeecgBootException("完成出库任务，出库任务没有找到库存详情" + taskDetail.getFromInventoryDetailId());
+            }
+            BigDecimal taskQty = BigDecimal.ZERO;
+            BigDecimal qty = inventoryDetail.getQty().subtract(taskDetail.getQty());
+            inventoryDetail.setTaskQty(taskQty);
+            inventoryDetail.setQty(qty);
+            inventoryDetail.setLocationCode(toLocationCode);
+            // 扣减后的库存不能小于0
+            if (inventoryDetail.getQty().compareTo(BigDecimal.ZERO) < 0) {
+                throw new JeecgBootException("完成出库任务，扣减库存大于wms库存");
+            }
+            if (inventoryDetail.getQty().compareTo(BigDecimal.ZERO) == 0) {
+                if (inventoryDetail.getTaskQty().compareTo(BigDecimal.ZERO) != 0) {
+                    throw new JeecgBootException("完成出库任务，已无库存量可以扣减");
+                }
+                success = inventoryDetailService.removeById(inventoryDetail.getId());
+                if (!success) {
+                    throw new JeecgBootException("完成出库任务，删除库存详情失败");
+                }
+            } else {
+                success = inventoryDetailService.updateQtyAndTaskQtyAndLocationCode(qty, taskQty, toLocationCode, inventoryDetail.getId());
+                if (!success) {
+                    throw new JeecgBootException("完成出库任务，更新库存详情失败");
+                }
+            }
+
+            InventoryTransaction inventoryTransaction = new InventoryTransaction();
+            inventoryTransaction.setType(QuantityConstant.INVENTORY_TRANSACTION_SHIPMENT);
+            inventoryTransaction.setWarehouseCode(warehouseCode);
+            inventoryTransaction.setCompanyCode(inventoryDetail.getCompanyCode());
+            inventoryTransaction.setContainerCode(containerCode);
+            inventoryTransaction.setZoneCode(zoneCode);
+            inventoryTransaction.setFromLocationCode(fromLocationCode);
+            inventoryTransaction.setToLocationCode(toLocationCode);
+            inventoryTransaction.setMaterialCode(inventoryDetail.getMaterialCode());
+            inventoryTransaction.setMaterialName(inventoryDetail.getMaterialName());
+            inventoryTransaction.setMaterialSpec(inventoryDetail.getMaterialSpec());
+            inventoryTransaction.setMaterialUnit(inventoryDetail.getMaterialUnit());
+            inventoryTransaction.setInventoryStatus(inventoryDetail.getInventoryStatus());
+            inventoryTransaction.setShipmentId(taskDetail.getShipmentId());
+            inventoryTransaction.setShipmentCode(shipmentHeader.getCode());
+            inventoryTransaction.setShipmentType(shipmentHeader.getType());
+            inventoryTransaction.setShipmentDetailId(taskDetail.getShipmentDetailId());
+            inventoryTransaction.setShipmentContainerDetailId(taskDetail.getShipmentContainerDetailId());
+            inventoryTransaction.setBatch(inventoryDetail.getBatch());
+            inventoryTransaction.setLot(inventoryDetail.getLot());
+            inventoryTransaction.setProject(inventoryDetail.getProject());
+            inventoryTransaction.setQty(taskDetail.getQty());
+            inventoryTransaction.setShipmentQty(taskDetail.getQty());
+            BigDecimal inventoryQty = inventoryDetailService.getInventorySumQty(inventoryDetail);
+            // 获得物料在这个托盘上的库存数
+            BigDecimal containerInventoryQty = inventoryDetailService.getContainerInventorySumQty(inventoryDetail);
+            inventoryTransaction.setInventoryQty(inventoryQty);
+            inventoryTransaction.setContainerInventoryQty(containerInventoryQty);
+            inventoryTransactionList.add(inventoryTransaction);
+            shipmentIdList.add(taskDetail.getShipmentId());
+        }
+        success = inventoryTransactionService.saveBatch(inventoryTransactionList);
+        if (!success) {
+            throw new JeecgBootException("完成出库任务，保存库存详情失败");
+        }
+        List<InventoryDetail> inventoryDetailList = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId());
+        if (inventoryDetailList.size() == 0) {
+            success = inventoryHeaderService.removeById(inventoryHeader.getId());
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，删除库存头失败");
+            }
+            success = containerService.updateLocationCodeAndStatus(containerCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，更新容器状态失败");
+            }
+            success = locationService.updateContainerCodeAndStatus(fromLocationCode, QuantityConstant.EMPTY_STRING, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务, 任务类型" + taskType + "完成任务时, 更新源库位失败");
+            }
+            success = containerService.removeContainerByCode(containerCode, warehouseCode);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，删除容器失败");
+            }
+        } else {
+            success = containerService.updateStatus(containerCode, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，更新容器状态失败");
+            }
+            success = locationService.updateStatus(fromLocationCode, QuantityConstant.STATUS_LOCATION_EMPTY, warehouseCode);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务, 任务类型" + taskType + "完成任务时, 更新源库位失败");
+            }
+            if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode)) {
+                throw new JeecgBootException("任务类型" + taskType + "完成任务时，更新托盘状态失败");
+            }
+
+        }
+        ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(taskHeader.getShipmentContainerHeaderId());
+        if (shipmentContainerHeader == null) {
+            throw new JeecgBootException("完成出库任务，获取出库组盘头失败");
+        }
+        shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
+        success = shipmentContainerHeaderService.updateStatusById(QuantityConstant.SHIPMENT_CONTAINER_FINISHED, shipmentContainerHeader.getId());
+        if (!success) {
+            throw new JeecgBootException("完成出库任务，更新出库组盘头失败");
+        }
+        inventoryDetailList = inventoryDetailService.getInventoryDetailListByInventoryHeaderId(inventoryHeader.getId());
+        if (inventoryDetailList.size() != 0) {
+            if (!taskHeaderService.combineInventoryDetail(containerCode, warehouseCode)) {
+                throw new JeecgBootException("合并入库库存失败");
+            }
+        }
+        shipmentIdList = shipmentIdList.stream().distinct().collect(Collectors.toList());
+        for (Integer shipmentId : shipmentIdList) {
+            success = shipmentHeaderService.updateShipmentHeaderStatus(shipmentId);
+            if (!success) {
+                throw new JeecgBootException("完成出库任务，更新出库单头失败");
+            }
+        }
+//        Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode,
+//                toLocationCode, warehouseCode);
+//        if (!result.isSuccess()) {
+//            throw new JeecgBootException(result.getMessage());
+//        }
+        success = taskHeaderService.updateStatusById(QuantityConstant.TASK_STATUS_COMPLETED, taskHeader.getId());
+        if (!success) {
+            throw new JeecgBootException("完成出库任务，保存任务头失败");
+        }
+        // 操作记录添加
+        shipmentDetailList = shipmentDetailList.stream().filter(t -> t.getStatus().equals(QuantityConstant.SHIPMENT_HEADER_COMPLETED)).collect(Collectors.toList());
+        LogRecordContext.putVariable("taskHeader", taskHeader);
+        LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(taskDetailList));
+        LogRecordContext.putVariable("extraJsonString2", JSON.toJSONString(shipmentDetailList));
+        log.info("完成出库任务,任务号：" + taskHeader.getId());
+        return Result.ok("完成出库任务");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result completeWholeShipmentTaskClearInventory(InventoryHeader inventoryHeader, List<InventoryDetail> inventoryDetailList) {
         List<InventoryTransaction> inventoryTransactionList = new ArrayList<>();
         for (InventoryDetail inventoryDetail : inventoryDetailList) {
@@ -3636,11 +3863,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
                 throw new JeecgBootException("完成移库任务时，更新起始库位失败");
             }
         } else {
-            if (!containerService.updateStatus(containerCode,  QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode)) {
-                throw new JeecgBootException("完成移库任务时，更新起始容器失败");
-            }
-            if (!locationService.updateStatus(fromLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode)) {
-                throw new JeecgBootException("完成移库任务时，更新起始库位失败");
+            TaskHeader unCompleteTask = taskHeaderService.getUnCompleteShipmentTaskByFromLocationCode(fromLocationCode, warehouseCode);
+            if (unCompleteTask == null) {
+                if (!containerService.updateStatus(containerCode,  QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode)) {
+                    throw new JeecgBootException("完成移库任务时，更新起始容器失败");
+                }
+                if (!locationService.updateStatus(fromLocationCode, QuantityConstant.STATUS_CONTAINER_EMPTY, warehouseCode)) {
+                    throw new JeecgBootException("完成移库任务时，更新起始库位失败");
+                }
             }
         }
         if (!containerService.updateLocationCode(toContainerCode, toLocationCode, warehouseCode)) {