From cca40ca8d275faa8b5cc9501ce4f09b81cfbd7fc Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 16:04:38 +0800
Subject: [PATCH] 123

---
 src/main/java/com/zy/nc/task/PlanOrderTask.java |   27 +++++++++++++++++----------
 1 files changed, 17 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..f874839 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,27 +46,29 @@
      */
     @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());
+                    wms.setWmsFlag(0);
                     nccSaleXsfhmxWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
             }
-        }
 
+//            if (wmsFlag.get(0).getNastnum().doubleValue() > 0) {
+//                returnT = planOrderHandler.start1(wmsFlag);
+//            } else {
+//                returnT = planOrderHandler.start1In(wmsFlag);
+//            }
+        }
     }
 
     /**
@@ -88,6 +90,7 @@
             if (!returnT.isSuccess()) {
                 for (NccScZkmxbWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccScZkmxbWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -105,7 +108,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;
             }
@@ -113,6 +116,7 @@
             if (!returnT.isSuccess()) {
                 for (NccScZkmxbWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccScZkmxbWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -137,6 +141,7 @@
             if (!returnT.isSuccess()) {
                 for (NccCgCgdhdWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccCgCgdhdWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -163,6 +168,7 @@
             if (!returnT.isSuccess()) {
                 for (NccSaleDbddWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccSaleDbddWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -186,6 +192,7 @@
             if (!returnT.isSuccess()) {
                 for (NccCkPddWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccCkPddWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());

--
Gitblit v1.9.1