提交

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -56,6 +56,7 @@ import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
+import com.fjhx.wms.service.WmsService;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.fjhx.wms.service.stock.StockJournalService;
 import com.fjhx.wms.service.stock.StockService;
@@ -100,10 +101,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
     @Autowired
     private CustomerService customerService;
-
     @Autowired
     private JdOrderDetailsService jdOrderDetailsService;
-
     @Autowired
     private ProductInfoService productInfoService;
     @Autowired
@@ -114,7 +113,6 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     private StockWaitService stockWaitService;
     @Autowired
     private StockWaitDetailsService stockWaitDetailsService;
-
     @Autowired
     private AbnormalInfoService abnormalInfoService;
     @Autowired
@@ -129,7 +127,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     private CompanyInfoService companyInfoService;
     @Autowired
     private JdApiService jdApiService;
-
+    @Autowired
+    private WmsService wmsService;
 
     @Override
     public Page<JdOrderVo> getPage(JdOrderSelectDto dto) {
@@ -879,7 +878,7 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         return collect;
     }
 
-    @DSTransactional
+    //@DSTransactional
     @Override
     public void batchOutStock(MultipartFile file, Long warehouseId, JSONObject outInfo) {
         //读取数据
@@ -977,6 +976,9 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
 
             stockWaitService.addByWdly(stockWaitDto);
         }
+
+        ////并自动回告
+        //wmsService.jdTellBackOrer(stockWaitDto);
     }
 
     private List<JdBatchOutStockBo> getJdBatchOutStockBos(List<Map<Integer, String>> list) {