From a5de20d0041431b7f5e92a49315082ff2140d447 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 13 七月 2025 10:48:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/nc/task/PlanOrderTask.java |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index dd0f29b..3d7868f 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,12 +46,19 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute1() {
-        List<String> ids = storeTypeService.listOwn();
-        List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(ids);
+        List<String> warehouseIds = storeTypeService.listOwn();
+        List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(warehouseIds);
         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));
+            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>()
+                    .eq("vbillcode", id)
+                    .ne("wms_flag", 1)
+                    .eq("fstatusflag", 2)
+                    .eq("hdr", 0)
+                    .eq("bdr", 0)
+                    .in("fhckbm",warehouseIds)
+            );
             if (wmsFlag == null || wmsFlag.isEmpty()) {
-                return;
+                continue;
             }
             ReturnT<String> returnT = planOrderHandler.start1(wmsFlag);
             if (!returnT.isSuccess()) {
@@ -99,11 +106,12 @@
     }
 
     /**
-     * 杞簱
+     * 杞簱-鍑哄簱
+     * 涓嶅悓姝ワ紝杞簱鍑哄簱鐢盬MS鐩存帴鍙戣捣
      *
      * @return
      */
-    @Scheduled(cron = "0/3 * * * * ? ")
+//    @Scheduled(cron = "0/3 * * * * ? ")
     public void execute2_2() {
         List<String> ids = storeTypeService.listOwn();
         List<String> strings = nccScZkmxbWmsService.selectZkOut(ids);

--
Gitblit v1.9.1