From a4dcb36d4c24a8b0505e4e331df6af582b27654a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 12 十月 2024 08:21:17 +0800
Subject: [PATCH] 入库寻找库位时不要放到备货区
---
src/main/java/com/zy/asrs/task/GhjtScheduler.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/GhjtScheduler.java b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
index f145c11..075bbe7 100644
--- a/src/main/java/com/zy/asrs/task/GhjtScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
@@ -1,8 +1,9 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.Order;
+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;
@@ -36,27 +37,34 @@
@Resource
private ConfigMapper configMapper;
- // 澶囪揣(鏍规嵁鍑哄簱鍗曪紝鎶婅鍑虹殑璐ф彁鍓嶆斁鍒伴潬杩戝嚭搴撳彛浣嶇疆)
-// @Scheduled(cron = "0/4 * * * * ? ")
- public void stockUp() {
- // 鏌ヨ寰呭嚭搴撹鍗�
- List<Order> orderList = orderMapper.selectList(new EntityWrapper<Order>().eq("settle", 1));
-// ghjtHandler.stockUp();
- List<Order> orders = orderMapper.selectComplete();
- for (Order order : orders) {
- try {
-// ghjtHandler.OutBoundCompleteReport(order);
- } catch (Exception e) {
- log.error("鍑哄簱璁㈠崟瀹屾垚鍒欎笂鎶ES澶辫触锛屽紓甯镐俊鎭細" + e);
- }
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
+ // 鑷姩澶囪揣(鏍规嵁鍑哄簱鍗曪紝鎶婅鍑虹殑璐ф彁鍓嶆斁鍒伴潬杩戝嚭搴撳彛浣嶇疆)
+ // 瀹氭椂浠诲姟鑾峰彇寰呭璐ц鍗曟槑缁�->鑾峰彇鍫嗗灈鏈哄搴旂殑婧愬簱浣嶏紝鑾峰彇澶囪揣鍖哄簱浣�->鐢熸垚绉诲簱浠诲姟11->
+ // 鎵ц绉诲簱浠诲姟12->鍏ュ簱瀹屾垚4->鏇存柊宸ヤ綔妗ｅ畾鏃朵换鍔′腑鏇存柊璁㈠崟澶囪揣鐘舵�佸拰璁㈠崟鏄庣粏澶囪揣鐘舵��5->杞偍鍘嗗彶
+ @Scheduled(cron = "0/10 * * * * ?")
+ public synchronized void autoStockUp() {
+ // 鏌ヨ鑷姩澶囪揣閰嶇疆
+ Config config = configMapper.selectConfigByCode("auto_stock_up");
+ if (config == null || config.getStatus() == 0) {
+ return;
}
+ // 鏌ヨ鍑哄簱鐢宠鍗曚腑娌℃湁澶囪揣鐨勮鍗曟槑缁嗙殑鍖呰缁勫彿
+ List<String> list = orderMapper.selectStockUpOrderDetl();
+ if (list.isEmpty()) {
+ return;
+ }
+
+ ghjtHandler.autoStockUpHandler(list, Integer.parseInt(config.getValue()));
+
}
// 涓嬪彂鍑哄簱浠诲姟缁橤WCS(浠庡嚭搴撶爜澶村埌鍑哄簱鍙�)
@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);
@@ -66,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