非通宇 保税仓入口订单推送;

mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java

@@ -753,7 +753,8 @@ public class PickingOrderApplicationService {
             pickingMaterialDetailDO.setPickingOrderNumber(pickingOrder.getPickingOrderNumber());
             List<PickingMaterialDetailPO> materialDetailList = pickingMaterialDetailService.queryList(pickingMaterialDetailDO);
             List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailService.list(new QueryWrapper<OutMaterialDetail>().lambda()
-                    .eq(OutMaterialDetail::getOutOrderNumber, pickingOrder.getOrderNumber()));
+                    .eq(OutMaterialDetail::getOutOrderNumber, pickingOrder.getOrderNumber())
+                    .eq(OutMaterialDetail::getDelFlag, 1));
             if (outMaterialDetailList == null || outMaterialDetailList.isEmpty()) {
                 failCount++;
                 failMsg.append("id:").append(id).append("无物料明细;");

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -2306,7 +2306,9 @@ public class StockInOrderApplicationService {
             gwStockInOrder.setCorp_code(userNcCode);
 
 
-            List<InMaterialDetail> reservationInMaterialDetails = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>().eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber()));
+            List<InMaterialDetail> reservationInMaterialDetails = inMaterialDetailService.list(new LambdaQueryWrapper<InMaterialDetail>().
+                    eq(InMaterialDetail::getInOrderNumber, stockInOrder.getInOrderNumber())
+                    .eq(InMaterialDetail::getDelFlag, 1));
             List<GwInDetail> orderList = new LinkedList<>();
             for (InMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) {
                 GwInDetail gwInDetail = new GwInDetail();

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -116,7 +116,7 @@ public class StockOutOrderApplicationService {
     @Autowired
     private StockOutOrderMapper stockOutOrderMapper;
     private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData";
-    private static final String API_NAME = "save_order_i";
+    private static final String API_NAME = "save_order_e";
     private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
 
     /**
@@ -1528,6 +1528,7 @@ public class StockOutOrderApplicationService {
                     outMaterialDetailService.list(
                             new LambdaQueryWrapper<OutMaterialDetail>()
                                     .eq(OutMaterialDetail::getOutOrderNumber, stockOutOrder.getOutOrderNumber())
+                                    .eq(OutMaterialDetail::getDelFlag, 1)
                     );
 
             if (outMaterialDetails == null || outMaterialDetails.isEmpty()) {

mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java

@@ -127,7 +127,7 @@ public class StockShelfOrderApplicationService {
     @Autowired
     private IStockShelfOrderService stockShelfOrderService;
     private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData";
-    private static final String API_NAME = "save_order_i";
+    private static final String API_NAME = "save_qnBill_i";
     private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD";
 
 

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockInOrder/StockInOrderApi.java

@@ -199,5 +199,13 @@ public class StockInOrderApi extends BaseController {
         result.put("detailList", detailList == null ? Collections.emptyList() : detailList);
         return AjaxResult.success(result);
     }
+    @ApiOperation("通宇-进口订单推送")
+    @PostMapping("/batchPush")
+    public AjaxResult batchPush(@RequestBody List<Long> idList){
+        if(idList == null || idList.isEmpty()){
+            return AjaxResult.error("没有数据需要推送");
+        }
+        return stockInOrderApplicationService.batchPush(idList);
+    }
 
 }

mhd_wms/src/main/java/com/mhd/wms/interfaces/facadeApi/stockOutOrder/StockOutOrderApi.java

@@ -464,5 +464,12 @@ public class StockOutOrderApi extends BaseController {
         fillNoticePrintTitle(result, stockOutOrderDTO);
         return result;
     }
-
+    @ApiOperation("通宇-出口订单推送")
+    @PostMapping("/batchPush")
+    public AjaxResult batchPush(@RequestBody List<Long> idList){
+        if(idList == null || idList.isEmpty()){
+            return AjaxResult.error("没有数据需要推送");
+        }
+        return stockOutOrderApplicationService.batchPush(idList);
+    }
 }