楚江erp：发货单上传签单接口bug修复

@@ -43,6 +43,7 @@ import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
@@ -457,7 +458,39 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             return;
             return;
         }
         }
         List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
         List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
-        purchaseOrderInfoService.updateStatus(orderIds, "DELIVERED");
+        // 获取订货单规格数据
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(orderIds, true);
+        if (CollectionUtils.isEmpty(orderLineList)) {
+            return;
+        }
+        // 按照订货单分组
+        Map<String, List<PurchaseOrderLine>> orderLineMap = new HashMap<>();
+        for (PurchaseOrderLine orderLine : orderLineList) {
+            String orderId = orderLine.getPurchaseOrderId();
+            List<PurchaseOrderLine> list = orderLineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+            list.add(orderLine);
+        }
+        List<String> needDeliveryOrderIds = new ArrayList<>();
+        for (String orderId : orderIds) {
+            List<PurchaseOrderLine> lineList = orderLineMap.get(orderId);
+            if (CollectionUtils.isEmpty(lineList)) {
+                log.info("========================== 订货单 {} 不存在规格数据！", orderId);
+                continue;
+            }
+            boolean needDelivery = true;
+            for (PurchaseOrderLine line : lineList) {
+                Boolean shipment = line.getShipment();
+                if (!BooleanUtils.isTrue(shipment)) {
+                    needDelivery = false;
+                    break;
+                }
+            }
+            if (needDelivery) {
+                needDeliveryOrderIds.add(orderId);
+            }
+        }
+
+        purchaseOrderInfoService.updateStatus(needDeliveryOrderIds, "DELIVERED");
     }
     }
 
 
     @Override
     @Override