From 0f769b47d8d71bd419ddf1733b0b2f21c82e86b1 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 07 十月 2024 10:33:30 +0800
Subject: [PATCH] 跨巷道移库

---
 src/main/java/com/zy/asrs/task/GhjtScheduler.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/GhjtScheduler.java b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
index f3366d6..075bbe7 100644
--- a/src/main/java/com/zy/asrs/task/GhjtScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
@@ -1,7 +1,9 @@
 package com.zy.asrs.task;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.OrderDetl;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.mapper.OrderMapper;
 import com.zy.asrs.mapper.WrkMastMapper;
 import com.zy.asrs.task.handler.GhjtHandler;
@@ -35,6 +37,9 @@
     @Resource
     private ConfigMapper configMapper;
 
+    @Resource
+    private OrderDetlMapper orderDetlMapper;
+
     // 鑷姩澶囪揣(鏍规嵁鍑哄簱鍗曪紝鎶婅鍑虹殑璐ф彁鍓嶆斁鍒伴潬杩戝嚭搴撳彛浣嶇疆)
     // 瀹氭椂浠诲姟鑾峰彇寰呭璐ц鍗曟槑缁�->鑾峰彇鍫嗗灈鏈哄搴旂殑婧愬簱浣嶏紝鑾峰彇澶囪揣鍖哄簱浣�->鐢熸垚绉诲簱浠诲姟11->
     // 鎵ц绉诲簱浠诲姟12->鍏ュ簱瀹屾垚4->鏇存柊宸ヤ綔妗e畾鏃朵换鍔′腑鏇存柊璁㈠崟澶囪揣鐘舵�佸拰璁㈠崟鏄庣粏澶囪揣鐘舵��5->杞偍鍘嗗彶
@@ -59,7 +64,7 @@
     @Scheduled(cron = "0/2 * * * * ? ")
     public void ckrwPushGwcs() {
         // 鏌ヨ鐘舵�佷负13鐨勫伐浣滄。
-        List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().in("io_type", 101,103,107,110,3).eq("wrk_sts", 13));
+        List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().in("io_type", 101,103,107,110,3,12).eq("wrk_sts", 13));
         for (WrkMast wrkMast : wrkMasts) {
             try {
                 ghjtHandler.startCkrwPushGwcs(wrkMast);
@@ -69,6 +74,26 @@
         }
     }
 
+    // 鑷姩璺ㄥ贩閬撶Щ搴�
+    // 閰嶇疆寮�鍚�->鑾峰彇鍗曟嵁鏄庣粏->鑾峰彇婧愬簱浣嶇洰鏍囧簱浣�->鐢熸垚绉诲簱浠诲姟->鍙栨秷浠诲姟鍥炴粴鍗曟嵁->
+    // wcs鍑哄簱鍒板爢鍨涙満鍑哄簱鍙�->gwms缁檊wcs鎺ㄩ�佺洰鏍囩珯1->gwcs鍒拌揪鍫嗗灈鏈哄叆搴撳彛璇锋眰鍏ュ簱->鍫嗗灈鏈烘墽琛屽叆搴�->鍏ュ簱瀹屾垚->鏇存柊鍗曟嵁鐘舵��
+    // 11->12->13->1->2->3->4->5
+    @Scheduled(cron = "0/10 * * * * ?")
+    public synchronized void autoMoveLoc() {
+        // 鏌ヨ璺ㄥ贩閬撶Щ搴撻厤缃�
+        Config config = configMapper.selectConfigByCode("auto_move_loc");
+        if (config == null || config.getStatus() == 0) {
+            return;
+        }
+        // 鏌ヨ寰呯Щ搴撶殑鍗曟嵁鏄庣粏
+        List<OrderDetl> orderDetlList = orderDetlMapper.selectMoveLocDetl();
+        if (orderDetlList.isEmpty()) {
+            return;
+        }
+
+        ghjtHandler.autoMoveLoc(orderDetlList);
+    }
+
     // 绌洪棽鐞嗚揣
     @Scheduled(cron = "0/5 * * * * ? ")
     public void autoTallyGoods() {

--
Gitblit v1.9.1