yh

ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java

@@ -337,11 +337,13 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         } else {
             savePurchaseOrderInfo(purchaseOrderInfo, opOrder, skuIdAndOpOrderChildMap);
         }
+
+        dsPurchaseOrderOutStorageAndUpdateRemark(purchaseOrderInfo, opOrder, purchaseOrder);
     }
 
     private void dsPurchaseOrderOutStorageAndUpdateRemark(PurchaseOrderRequestDTO purchaseOrderInfo, OpOrder opOrder, PurchaseOrder purchaseOrder) {
         if (checkPurchaseOrderStatusCanOutStorage(purchaseOrderInfo, opOrder)) {
-
+            dsPurchaseAutoOutStorage(opOrder, purchaseOrder);
         }
         if (checkNeedBuildPurchaseOrderRemark(purchaseOrderInfo, purchaseOrder)) {
             buildAndUpdateNewPurchaseOrderRemark(opOrder);
@@ -351,9 +353,9 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
     private void dsPurchaseAutoOutStorage(OpOrder opOrder, PurchaseOrder purchaseOrder) {
         DsPurchaseSetting dsPurchaseSetting = dsPurchaseSettingService.getShopSetting(opOrder.getShopId());
         if (opOrder.getOrderStatus().equals(OrderConst.ORDER_STATUS_WAIT_SELLER_SEND_GOODS)) {
-
+            dsOrderOutStorage(opOrder, purchaseOrder, dsPurchaseSetting);
         } else if (opOrder.getOrderStatus().equals(OrderConst.ORDER_STATUS_WAIT_BUYER_CONFIRM_GOODS) || opOrder.getOrderStatus().equals(OrderConst.ORDER_STATUS_PART_DELIVERY)) {
-
+            dsOrderOutStorageOrUpdateOutStorageLogistics(opOrder, purchaseOrder, dsPurchaseSetting);
         } else {
             throw new RuntimeException("订单状态未达到发货条件");
         }
@@ -361,8 +363,10 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
 
     private void dsOrderOutStorage(OpOrder opOrder, PurchaseOrder purchaseOrder, DsPurchaseSetting dsPurchaseSetting) {
         Long nearExpShipTime = checkDsPurchaseAutoOutStorage(opOrder, purchaseOrder, dsPurchaseSetting);
+    }
 
-
+    private void dsOrderOutStorageOrUpdateOutStorageLogistics(OpOrder opOrder, PurchaseOrder purchaseOrder, DsPurchaseSetting dsPurchaseSetting) {
+        Long nearExpShipTime = checkDsPurchaseAutoOutStorage(opOrder, purchaseOrder, dsPurchaseSetting);
     }
 
     private Long checkDsPurchaseAutoOutStorage(OpOrder opOrder, PurchaseOrder purchaseOrder, DsPurchaseSetting dsPurchaseSetting) {