no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/material/manage/WebsitPartsSalesOrderLogic.java

@@ -569,7 +569,7 @@ public class WebsitPartsSalesOrderLogic {
             // 如果是快递并且销售类型为“服务人员”的单，需要增加师傅在途库存
             // 增加师傅在途库存
             List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean,
-                    PartsRefTypeEnum.SALES.getKey(), null, PartsAttrEnum.WAY.getKey());
+                    PartsRefTypeEnum.SALES.getRemark(), null, PartsAttrEnum.WAY.getKey());
 
             materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
         }
@@ -585,14 +585,14 @@ public class WebsitPartsSalesOrderLogic {
                 && BuyPeopleEnum.WORKER.getKey().equals(partsSalesOrderBean.getBuyPeople())) {
             // 如果是快递并且销售类型为“服务人员”的单，需要减师傅在途库存
             // 减师傅在途库存
-            List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean, PartsRefTypeEnum.SALES.getKey(),
+            List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean, PartsRefTypeEnum.SALES.getRemark(),
                     PartsAttrEnum.WAY.getKey(), null);
             materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
         }
     }
 
     @Transactional
-    public void confirmDelivery(String id, String logisticsNo) {
+    public void confirmDelivery(String id, String logisticsNo) throws Exception {
         AdminUserCom adminUser = commonLogic.getAdminUser();
         WebsitPartsSalesBean partsSalesOrderBean = this.loadSalesOrderById(id);
         if(Objects.isNull(partsSalesOrderBean)) {
@@ -618,11 +618,11 @@ public class WebsitPartsSalesOrderLogic {
 
             if (BuyPeopleEnum.WORKER.getKey().equals(partsSalesOrderBean.getBuyPeople())) {
                 // 增加师傅库存
-//                List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean, PartsRefTypeEnum.SALES.toString(),
-//                        Objects.nonNull(partsSalesOrderBean.getWorkerConfirmDate()) ? PartsStockPartsAttrEnum.WAY.toString() : null,
-//                        PartsStockPartsAttrEnum.NEW.toString());
+                List<WorkerStockDTO> workerStockDTOList = this.getWorkerStock(partsSalesOrderBean, PartsRefTypeEnum.SALES.getRemark(),
+                        Objects.nonNull(partsSalesOrderBean.getWorkerConfirmDate()) ? PartsAttrEnum.WAY.toString() : null,
+                        PartsAttrEnum.NEW.getKey());
 
-//                partsStockLogic.handleWorkerStock(workerStockDTOList);
+                materialGoodsStockLogic.handleWorkerStock(workerStockDTOList);
             }
             // 更新销售单明细信息
             this.updateSalesItem(partsSalesOrderBean);