From 304d785396e666534ec15a3ad1ad8e41da6ffad2 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 15:44:24 +0800
Subject: [PATCH] 关闭与erp的对接

---
 src/main/java/com/zy/nc/task/PlanOrderTask.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 2ed9808..7ebebd2 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,18 +46,14 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute1() {
-        List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
+        List<String> ids = storeTypeService.listOwn();
+        List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(ids);
         for (String id : Ids) {
-            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0).eq("fstatusflag", 2));
+            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }
-            ReturnT<String> returnT;
-            if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
-                returnT = planOrderHandler.start1(wmsFlag);
-            } else {
-                returnT = planOrderHandler.start1In(wmsFlag);
-            }
+            ReturnT<String> returnT = planOrderHandler.start1(wmsFlag);
             if (!returnT.isSuccess()) {
                 for (NccSaleXsfhmxWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
@@ -65,8 +61,13 @@
                 }
                 log.error(returnT.getMsg());
             }
-        }
 
+//            if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
+//                returnT = planOrderHandler.start1(wmsFlag);
+//            } else {
+//                returnT = planOrderHandler.start1In(wmsFlag);
+//            }
+        }
     }
 
     /**
@@ -105,7 +106,7 @@
         List<String> ids = storeTypeService.listOwn();
         List<String> strings = nccScZkmxbWmsService.selectZkOut(ids);
         for (String string : strings) {
-            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
+            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }

--
Gitblit v1.9.1