楚江ERP-录入实发数接口调整

@@ -394,7 +394,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     @Override
     @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.isNotEmpty(ids) || StringUtils.isBlank(status)) {
+        if (CollectionUtils.isEmpty(ids) || StringUtils.isBlank(status)) {
             return;
             return;
         }
         }
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);
         LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class);

@@ -270,14 +270,35 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public void dataReplenishInput(ShipmentsOrderVo vo) {
     public void dataReplenishInput(ShipmentsOrderVo vo) {
         String shipmentsOrderId = vo.getId();
         String shipmentsOrderId = vo.getId();
+        ShipmentsOrderInfo orderInfo = getBaseMapper().selectById(shipmentsOrderId);
+        if (orderInfo == null) {
+            throw new DefaultClientException("发货单不存在！");
+        }
         List<ShipmentsOrderDetailVo> detailList = vo.getDetailList();
         List<ShipmentsOrderDetailVo> detailList = vo.getDetailList();
         if (CollectionUtils.isEmpty(detailList)) {
         if (CollectionUtils.isEmpty(detailList)) {
             return;
             return;
         }
         }
-        List<ShipmentsPlanDetail> dataList = new ArrayList<>();
+        List<String> detailIds = new ArrayList<>();
+        Map<String, ShipmentsOrderDetailVo> detailVoMap = new HashMap<>();
         for (ShipmentsOrderDetailVo detailVo : detailList) {
         for (ShipmentsOrderDetailVo detailVo : detailList) {
+            String id = detailVo.getId();
+            detailIds.add(id);
+            detailVoMap.put(id, detailVo);
+        }
+        List<ShipmentsPlanDetail> shipmentsOrderDetailList = shipmentsPlanDetailService.listByIds(detailIds);
+        if (CollectionUtils.isEmpty(shipmentsOrderDetailList)) {
+            throw new DefaultClientException("发货单明细不存在！");
+        }
+        List<String> partShipmentsOrderIds = new ArrayList<>();
+        List<String> shipmentsOrderIds = new ArrayList<>();
+        List<ShipmentsPlanDetail> dataList = new ArrayList<>();
+        for (ShipmentsPlanDetail info : shipmentsOrderDetailList) {
             ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
             ShipmentsPlanDetail detail = new ShipmentsPlanDetail();
-            detail.setId(detailVo.getId());
+            detail.setId(info.getId());
+            ShipmentsOrderDetailVo detailVo = detailVoMap.get(info.getId());
+            if (detailVo == null) {
+                continue;
+            }
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setActualShipmentQuantity(detailVo.getActualShipmentQuantity());
             detail.setNum(detailVo.getNum());
             detail.setNum(detailVo.getNum());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
             detail.setYieldBatchNo(detailVo.getYieldBatchNo());
@@ -285,9 +306,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             Double quantity = detailVo.getQuantity();
             Double quantity = detailVo.getQuantity();
             Double actualShipmentQuantity = detailVo.getActualShipmentQuantity();
             Double actualShipmentQuantity = detailVo.getActualShipmentQuantity();
             if (actualShipmentQuantity >= quantity) {
             if (actualShipmentQuantity >= quantity) {
-                purchaseOrderInfoService.updateStatus(detailVo.getOrderId(), "SHIPPED");
+                // 发货完成
+                shipmentsOrderIds.add(info.getOrderId());
             } else {
             } else {
-                purchaseOrderInfoService.updateStatus(detailVo.getOrderId(), "TRANSIT");
+                // 部分发货
+                partShipmentsOrderIds.add(info.getOrderId());
             }
             }
             dataList.add(detail);
             dataList.add(detail);
         }
         }
@@ -295,6 +318,9 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         shipmentsPlanDetailService.updateBatchById(dataList);
         shipmentsPlanDetailService.updateBatchById(dataList);
         // 更新发货单状态
         // 更新发货单状态
         updateStatus(shipmentsOrderId, "SHIPMENTS");
         updateStatus(shipmentsOrderId, "SHIPMENTS");
+        // 更新订货单状态
+        purchaseOrderInfoService.updateStatus(shipmentsOrderIds, "SHIPPED");
+        purchaseOrderInfoService.updateStatus(partShipmentsOrderIds, "TRANSIT");
     }
     }
 
 
     @Override
     @Override

@@ -13,7 +13,6 @@
         <result column="dept_id" property="deptId"/>
         <result column="dept_id" property="deptId"/>
         <result column="delivery_type" property="deliveryType"/>
         <result column="delivery_type" property="deliveryType"/>
         <result column="destination" property="destination"/>
         <result column="destination" property="destination"/>
-        <result column="actual_shipment_quantity" property="actualShipmentQuantity"/>
         <result column="status" property="status"/>
         <result column="status" property="status"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
@@ -33,7 +32,6 @@
             tb.dept_id,
             tb.dept_id,
             tb.delivery_type,
             tb.delivery_type,
             tb.destination,
             tb.destination,
-            tb.actual_shipment_quantity,
             tb.status,
             tb.status,
             tb.create_by_id,
             tb.create_by_id,
             tb.update_by_id,
             tb.update_by_id,