From dc84bb47fbc3ffc22a6ba36d30a2852432c2d01d Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 10 五月 2025 09:23:50 +0800
Subject: [PATCH] 读取第二数据源

---
 src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index 3f2c0c3..b45b738 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
 import com.zy.asrs.service.OpenService;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
@@ -40,7 +40,7 @@
         List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
         for (String id : Ids) {
             List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("cdeliveryid", id).ne("wms_flag", 1).eq("fstatusflag", 2));
-            OpenOrderPakinParam param = new OpenOrderPakinParam();
+            OpenOrderPakoutParam param = new OpenOrderPakoutParam();
             param.setOrderType("閿�鍞彂璐�");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
@@ -51,14 +51,15 @@
                     detlDto.setMatnr(nccSaleXsfhmxWms.getWlbm());
                     detlDto.setAnfme(nccSaleXsfhmxWms.getNastnum());
                     detlDto.setLineNumber(i);
-                    nccSaleXsfhmxWms.setWmsFlag(1);
                     orderDetails.add(detlDto);
                     log.info("NccSaleXsfhmxWms鏁版嵁:{}", JSONObject.toJSON(nccSaleXsfhmxWms));
                     i++;
                 }
+                nccSaleXsfhmxWms.setWmsFlag(1);
             }
+            param.setOrderNo(id);
             param.setOrderDetails(orderDetails);
-            openService.pakinOrderCreate(param);
+            openService.pakoutOrderCreate(param);
             nccSaleXsfhmxWmsService.updateBatchById(wmsFlag);
         }
         return SUCCESS;
@@ -72,12 +73,12 @@
     public ReturnT<String> start2() {
         List<String> strings = nccScZkmxbWmsService.selectZk();
         for (String string : strings) {
-            OpenOrderPakinParam param = new OpenOrderPakinParam();
+            OpenOrderPakoutParam param = new OpenOrderPakoutParam();
             param.setOrderType("杞簱");
             DetlDto detlDto;
             List<DetlDto> orderDetails = new ArrayList<>();
             long i = 1;
-            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("cdeliveryid", string).ne("wms_flag", 1));
+            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
             for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) {
                 log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms));
                 if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) {
@@ -86,13 +87,14 @@
                     detlDto.setAnfme(nccScZkmxbWms.getYingzzsl());
                     detlDto.setBatch(nccScZkmxbWms.getVbatchcode());
                     detlDto.setLineNumber(i);
-                    nccScZkmxbWms.setWmsFlag(1);
                     orderDetails.add(detlDto);
                     i++;
                 }
+                nccScZkmxbWms.setWmsFlag(1);
             }
+            param.setOrderNo(string);
             param.setOrderDetails(orderDetails);
-            openService.pakinOrderCreate(param);
+            openService.pakoutOrderCreate(param);
             nccScZkmxbWmsService.updateBatchById(wmsFlag);
         }
         return SUCCESS;

--
Gitblit v1.9.1