楚江erp：发货单录入实发数逻辑调整

@@ -28,6 +28,7 @@ import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.CustomerCredit;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
 import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
@@ -397,6 +398,42 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
+    public void updateStatus(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
+        // 获取所有订货单下未发货的规格数据
+        String status = "SHIPPED";
+        List<PurchaseOrderLine> orderLineList = purchaseOrderLineService.listByOrderIds(ids, false);
+        if (CollectionUtils.isNotEmpty(orderLineList)) {
+            // 按照订货单分组
+            Map<String, List<PurchaseOrderLine>> lineMap = new HashMap<>();
+            for (PurchaseOrderLine purchaseOrderLine : orderLineList) {
+                String orderId = purchaseOrderLine.getPurchaseOrderId();
+                List<PurchaseOrderLine> list = lineMap.computeIfAbsent(orderId, k -> new ArrayList<>());
+                list.add(purchaseOrderLine);
+            }
+            for (String orderId : ids) {
+                List<PurchaseOrderLine> orderLines = lineMap.get(orderId);
+                if (CollectionUtils.isNotEmpty(orderLines)) {
+                    status = "TRANSIT";
+                } else {
+                    status = "SHIPPED";
+                }
+                updateWrapper.clear();
+                updateWrapper.set(PurchaseOrderInfo::getStatus, status)
+                        .eq(PurchaseOrderInfo::getId, orderId);
+                getBaseMapper().update(updateWrapper);
+            }
+        } else {
+            updateWrapper.set(PurchaseOrderInfo::getStatus, status)
+                    .in(PurchaseOrderInfo::getId, ids);
+            getBaseMapper().update(updateWrapper);
+        }
+    }
+
+    @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void updateStatus(List<String> ids, String status) {
     public void updateStatus(List<String> ids, String status) {
         if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(status)) {
         if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(status)) {

@@ -339,6 +339,18 @@ public class PurchaseOrderLineServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     }
     }
 
 
     @Override
     @Override
+    public void dispatched(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return;
+        }
+        // 已发货
+        LambdaUpdateWrapper<PurchaseOrderLine> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderLine.class);
+        updateWrapper.set(PurchaseOrderLine::getShipment, Boolean.TRUE)
+                .in(PurchaseOrderLine::getId, ids);
+        getBaseMapper().update(updateWrapper);
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
     public void cleanCacheByKey(Serializable key) {
 
 
     }
     }

@@ -27,6 +27,7 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.handlers.MessageHandler;
 import com.lframework.xingyun.sc.handlers.MessageHandler;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
@@ -84,7 +85,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private MessageHandler messageHandler;
     private MessageHandler messageHandler;
     @Resource
     @Resource
     private MqProducerService mqProducerService;
     private MqProducerService mqProducerService;
-
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
 
 
 
 
     @Override
     @Override
@@ -328,8 +330,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             throw new DefaultClientException("发货单明细不存在！");
             throw new DefaultClientException("发货单明细不存在！");
         }
         }
         List<String> orderIds = new ArrayList<>();
         List<String> orderIds = new ArrayList<>();
-        List<String> partShipmentsOrderIds = new ArrayList<>();
-        List<String> shipmentsOrderIds = new ArrayList<>();
+        List<String> orderSpecIds = new ArrayList<>();
         List<ShipmentsPlanDetail> dataList = new ArrayList<>();
         List<ShipmentsPlanDetail> dataList = new ArrayList<>();
         for (ShipmentsPlanDetail info : shipmentsOrderDetailList) {
         for (ShipmentsPlanDetail info : shipmentsOrderDetailList) {
             ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
             ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
@@ -341,28 +342,24 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setNum(detailVo.getNum());
             detail.setNum(detailVo.getNum());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
-            // 判断发货数量
-            Double quantity = detailVo.getQuantity();
-            Double actualShipmentQuantity = detailVo.getActualShipmentQuantity();
-            if (actualShipmentQuantity >= quantity) {
-                // 发货完成
-                shipmentsOrderIds.add(info.getOrderId());
-            } else {
-                // 部分发货
-                partShipmentsOrderIds.add(info.getOrderId());
-            }
+
             dataList.add(detail);
             dataList.add(detail);
+
+            if (!orderSpecIds.contains(info.getOrderSpecId())) {
+                orderSpecIds.add(info.getOrderSpecId());
+            }
             if (!orderIds.contains(info.getOrderId())) {
             if (!orderIds.contains(info.getOrderId())) {
-                orderIds.add(detail.getOrderId());
+                orderIds.add(info.getOrderId());
             }
             }
         }
         }
         // 更新发货明细
         // 更新发货明细
         shipmentsPlanDetailService.updateBatchById(dataList);
         shipmentsPlanDetailService.updateBatchById(dataList);
         // 更新发货单状态
         // 更新发货单状态
         updateStatus(shipmentsOrderId, "SHIPMENTS");
         updateStatus(shipmentsOrderId, "SHIPMENTS");
+        // 更新订货单物料行发货状态
+        purchaseOrderLineService.dispatched(orderSpecIds);
         // 更新订货单状态
         // 更新订货单状态
-        purchaseOrderInfoService.updateStatus(shipmentsOrderIds, "SHIPPED");
-        purchaseOrderInfoService.updateStatus(partShipmentsOrderIds, "TRANSIT");
+        purchaseOrderInfoService.updateStatus(orderIds);
         // 消息通知
         // 消息通知
         String type = vo.getType();
         String type = vo.getType();
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
         List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);

@@ -76,6 +76,7 @@ public interface PurchaseOrderInfoService extends BaseMpService<PurchaseOrderInf
      * @param status 审核状态
      * @param status 审核状态
      */
      */
     void updateStatus(String id, String status);
     void updateStatus(String id, String status);
+    void updateStatus(List<String> ids);
     void updateStatus(List<String> ids, String status);
     void updateStatus(List<String> ids, String status);
 
 
     /**
     /**

@@ -131,4 +131,11 @@ public interface PurchaseOrderLineService extends BaseMpService<PurchaseOrderLin
      * @param ids    主键ID
      * @param ids    主键ID
      */
      */
     void updateShipments(List<String> ids);
     void updateShipments(List<String> ids);
+
+    /**
+     * 已发货
+     *
+     * @param ids   主键ID集合
+     */
+    void dispatched(List<String> ids);
 }
 }