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

---
 src/main/java/com/zy/nc/task/PlanOrderTask.java |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 5ebd329..f874839 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -6,13 +6,11 @@
 import com.zy.nc.entity.*;
 import com.zy.nc.service.*;
 import com.zy.nc.task.handler.PlanOrderHandler;
-import com.zy.system.service.impl.ConfigServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
 import java.util.List;
 
 @Slf4j
@@ -48,9 +46,10 @@
      */
     @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;
             }
@@ -58,12 +57,18 @@
             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);
+//            }
+        }
     }
 
     /**
@@ -85,6 +90,7 @@
             if (!returnT.isSuccess()) {
                 for (NccScZkmxbWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccScZkmxbWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -102,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;
             }
@@ -110,6 +116,7 @@
             if (!returnT.isSuccess()) {
                 for (NccScZkmxbWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccScZkmxbWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -134,6 +141,7 @@
             if (!returnT.isSuccess()) {
                 for (NccCgCgdhdWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccCgCgdhdWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -160,6 +168,7 @@
             if (!returnT.isSuccess()) {
                 for (NccSaleDbddWms wms : wmsFlag) {
                     wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
                     nccSaleDbddWmsService.updateById(wms);
                 }
                 log.error(returnT.getMsg());
@@ -178,11 +187,12 @@
     public void execute4() {
         List<String> strings = nccCkPddWmsService.selectPdd();
         for (String string : strings) {
-            List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("hdr", 0).eq("bdr", 0));
+            List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1).eq("FBILLFLAG", 4).eq("hdr", 0).eq("bdr", 0));
             ReturnT<String> returnT = planOrderHandler.start4(wmsFlag);
             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