一条单据明细可能有多条组盘多条任务,只有组盘明细全部执行完成后，才能改单据明细状态为拣货完成

易文鹏
1 parent 24a6dfae
Showing 2 changed files with 19 additions and 2 deletions
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
@@ -166,6 +166,7 @@ public class RyTask extends BaseController {
             runningTaskMap.put(taskKey, true);
             //出库回传
             List<ShipmentHeader> shipmentHeaderList = shipmentHeaderService.list(new LambdaQueryWrapper<ShipmentHeader>()
+                    .eq(ShipmentHeader::getFirstStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED)
                     .eq(ShipmentHeader::getLastStatus, QuantityConstant.SHIPMENT_HEADER_COMPLETED));
             for (ShipmentHeader shipmentHeader : shipmentHeaderList) {
                 //299：其他出库
@@ -67,6 +67,9 @@ public class ShipmentTaskService {
     private InventoryDetailService inventoryDetailService;
     @Resource
     private TaskHeaderService taskHeaderService;
+
+    @Resource
+    private ShipmentContainerHeaderService shipmentContainerHeaderService;
     @Resource
     private TaskDetailService taskDetailService;
     @Resource
@@ -403,10 +406,23 @@ public class ShipmentTaskService {
         HashSet<Integer> ids = new HashSet<>();
         for (TaskDetail taskDetail : taskDetailList) {
             ShipmentDetail shipmentDetail = shipmentDetailService.getById(taskDetail.getBillDetailId());
-
             if (StringUtils.isNotNull(shipmentDetail)) {
                 if (shipmentDetail.getQty().compareTo(shipmentDetail.getTaskQty()) == 0) {
-                    shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
+
+                    //一条单据明细可能有多条组盘多条任务
+                    List<ShipmentContainerDetail> list = shipmentContainerDetailService.list(new LambdaQueryWrapper<ShipmentContainerDetail>().eq(ShipmentContainerDetail::getShipmentDetailId, shipmentDetail.getId()));
+                    boolean flag = true;
+                    for (ShipmentContainerDetail shipmentContainerDetail : list) {
+                        if (shipmentContainerDetail.getStatus() != 20) {
+                            flag = false;
+                            break;
+                        }
+                    }
+                    if (flag) {
+                        shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_COMPLETED);
+                    } else {
+                        shipmentDetail.setStatus(QuantityConstant.SHIPMENT_HEADER_GROUPDISK);
+                    }
                     shipmentDetailService.updateById(shipmentDetail);
                 }
                 ids.add(shipmentDetail.getShipmentId());