From da8a535959c72cf61cf904f3dffaa1d0bd33b79f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 七月 2025 10:43:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/nc/task/PlanOrderTask.java |  171 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 159 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 30b8b99..43cace7 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -1,11 +1,17 @@
 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.*;
 import com.zy.nc.task.handler.PlanOrderHandler;
 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.List;
 
 @Slf4j
 @Component
@@ -15,6 +21,24 @@
     private PlanOrderHandler planOrderHandler;
 
 
+    @Autowired
+    private NccSaleXsfhmxWmsService nccSaleXsfhmxWmsService;
+
+    @Autowired
+    private NccScZkmxbWmsService nccScZkmxbWmsService;
+
+    @Autowired
+    private NccCgCgdhdWmsService nccCgCgdhdWmsService;
+
+    @Autowired
+    private NccSaleDbddWmsService nccSaleDbddWmsService;
+
+    @Autowired
+    private NccCkPddWmsService nccCkPddWmsService;
+
+    @Autowired
+    private StoreTypeService storeTypeService;
+
     /**
      * 鍙戣揣
      *
@@ -22,9 +46,28 @@
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute1() {
-        ReturnT<String> returnT = planOrderHandler.start1();
-        if (!returnT.isSuccess()) {
-            log.error(returnT.getMsg());
+        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));
+            if (wmsFlag == null || wmsFlag.isEmpty()) {
+                return;
+            }
+            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);
+//            }
         }
     }
 
@@ -34,23 +77,127 @@
      * @return
      */
     @Scheduled(cron = "0/3 * * * * ? ")
-    public void execute2() {
-        ReturnT<String> returnT = planOrderHandler.start2();
-        if (!returnT.isSuccess()) {
-            log.error(returnT.getMsg());
+    public void execute2_1() {
+        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).eq("dr", 0).eq("bdr", 0));
+            if (wmsFlag == null || wmsFlag.isEmpty()) {
+                return;
+            }
+            ReturnT<String> returnT = planOrderHandler.start2In(wmsFlag);
+            if (!returnT.isSuccess()) {
+                for (NccScZkmxbWms wms : wmsFlag) {
+                    wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
+                    nccScZkmxbWmsService.updateById(wms);
+                }
+                log.error(returnT.getMsg());
+            }
         }
     }
+
     /**
-     * 杞簱
+     * 杞簱-鍑哄簱
+     * 涓嶅悓姝ワ紝杞簱鍑哄簱鐢盬MS鐩存帴鍙戣捣
+     *
+     * @return
+     */
+//    @Scheduled(cron = "0/3 * * * * ? ")
+    public void execute2_2() {
+        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("dr", 0).eq("bdr", 0));
+            if (wmsFlag == null || wmsFlag.isEmpty()) {
+                return;
+            }
+            ReturnT<String> returnT = planOrderHandler.start2Out(wmsFlag);
+            if (!returnT.isSuccess()) {
+                for (NccScZkmxbWms wms : wmsFlag) {
+                    wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
+                    nccScZkmxbWmsService.updateById(wms);
+                }
+                log.error(returnT.getMsg());
+            }
+        }
+    }
+
+    /**
+     * 閲囪喘鍒拌揣鍗�
      *
      * @return
      */
     @Scheduled(cron = "0/3 * * * * ? ")
     public void execute3() {
-//        ReturnT<String> returnT = planOrderHandler.start2();
-//        if (!returnT.isSuccess()) {
-//            log.error(returnT.getMsg());
-//        }
+        List<String> strings = nccCgCgdhdWmsService.selectCg();
+        for (String string : strings) {
+            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;
+            }
+            ReturnT<String> returnT = planOrderHandler.start3(wmsFlag);
+            if (!returnT.isSuccess()) {
+                for (NccCgCgdhdWms wms : wmsFlag) {
+                    wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
+                    nccCgCgdhdWmsService.updateById(wms);
+                }
+                log.error(returnT.getMsg());
+            }
+        }
+
     }
 
+    /**
+     * 璋冩嫧鍑哄簱
+     *
+     * @return
+     */
+    @Scheduled(cron = "0/3 * * * * ? ")
+    public void execute5() {
+        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).eq("dr", 0).eq("bdr", 0));
+            if (wmsFlag == null || wmsFlag.isEmpty()) {
+                return;
+            }
+            ReturnT<String> returnT = planOrderHandler.start5(wmsFlag);
+            if (!returnT.isSuccess()) {
+                for (NccSaleDbddWms wms : wmsFlag) {
+                    wms.setWmsMemo(returnT.getMsg());
+                    wms.setWmsFlag(0);
+                    nccSaleDbddWmsService.updateById(wms);
+                }
+                log.error(returnT.getMsg());
+            }
+        }
+
+    }
+
+
+    /**
+     * 鐩樼偣鍗�
+     *
+     * @return
+     */
+//    @Scheduled(cron = "0/3 * * * * ? ")
+//    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("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