From c22266b4dfbe3f338d2dd0bb31b10df1b5c92fb5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 24 五月 2025 13:54:39 +0800
Subject: [PATCH] 13

---
 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 5e63857..5ebd329 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,6 +1,7 @@
 package com.zy.nc.task;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.nc.entity.*;
 import com.zy.nc.service.*;
@@ -36,8 +37,9 @@
 
     @Autowired
     private NccCkPddWmsService nccCkPddWmsService;
+
     @Autowired
-    private ConfigServiceImpl configService;
+    private StoreTypeService storeTypeService;
 
     /**
      * 鍙戣揣
@@ -48,7 +50,7 @@
     public void execute1() {
         List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh();
         for (String id : Ids) {
-            List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).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).eq("fstatusflag", 2));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }
@@ -71,12 +73,11 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute2_1() {
-        //Config wmsFlag1 = configService.selectConfigByCode("wms_flag");
-        List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+        List<String> ids = storeTypeService.listOwn();
         //String s = "涓�鏈熸垚鍝佸簱-鍐呰锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚幈鍥介檯澶栬锤(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-澶栬喘(绔嬩綋搴�)銆佷竴鏈熸垚鍝佸簱-绂忚揪/宸ュ巶澶栬锤(绔嬩綋搴�)銆佷竴鏈熻緟鏂欏簱-鍖呮潗(绔嬩綋搴�)";
         List<String> strings = nccScZkmxbWmsService.selectZkIn(ids);
         for (String string : strings) {
-            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1));
+            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;
             }
@@ -98,10 +99,10 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute2_2() {
-        List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+        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));
+            List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }
@@ -125,7 +126,7 @@
     public void execute3() {
         List<String> strings = nccCgCgdhdWmsService.selectCg();
         for (String string : strings) {
-            List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1));
+            List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }
@@ -148,10 +149,10 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute5() {
-        List<Integer> ids = Arrays.asList(6101, 6102, 6106, 6110);
+        List<String> ids = storeTypeService.listOwn();
         List<String> strings = nccSaleDbddWmsService.selectDbdd(ids);
         for (String string : strings) {
-            List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1));
+            List<NccSaleDbddWms> wmsFlag = nccSaleDbddWmsService.selectList(new EntityWrapper<NccSaleDbddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("dr", 0).eq("bdr", 0));
             if (wmsFlag == null || wmsFlag.isEmpty()) {
                 return;
             }

--
Gitblit v1.9.1