From 756fa60cebfb82ba824e87d080d44fc9ec34ecc8 Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期二, 02 九月 2025 14:01:09 +0800
Subject: [PATCH] 订单出库显示明细是否完成修复
---
src/main/java/com/zy/asrs/task/GhjtScheduler.java | 103 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 89 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/GhjtScheduler.java b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
index 65209f8..b16f487 100644
--- a/src/main/java/com/zy/asrs/task/GhjtScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GhjtScheduler.java
@@ -1,12 +1,16 @@
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;
+import com.zy.system.entity.Config;
+import com.zy.system.mapper.ConfigMapper;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -30,11 +34,37 @@
@Resource
private OrderMapper orderMapper;
+ @Resource
+ private ConfigMapper configMapper;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
+ // 鑷姩澶囪揣(鏍规嵁鍑哄簱鍗曪紝鎶婅鍑虹殑璐ф彁鍓嶆斁鍒伴潬杩戝嚭搴撳彛浣嶇疆)
+ // 瀹氭椂浠诲姟鑾峰彇寰呭璐ц鍗曟槑缁�->鑾峰彇鍫嗗灈鏈哄搴旂殑婧愬簱浣嶏紝鑾峰彇澶囪揣鍖哄簱浣�->鐢熸垚绉诲簱浠诲姟11->
+ // 鎵ц绉诲簱浠诲姟12->鍏ュ簱瀹屾垚4->鏇存柊宸ヤ綔妗ｅ畾鏃朵换鍔′腑鏇存柊璁㈠崟澶囪揣鐘舵�佸拰璁㈠崟鏄庣粏澶囪揣鐘舵��5->杞偍鍘嗗彶
+ @Scheduled(cron = "0/10 * * * * ?")
+ public 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() {
+ @Scheduled(cron = "0/3 * * * * ? ")
+ public synchronized void ckrwPushGwcs() {
// 鏌ヨ鐘舵�佷负13鐨勫伐浣滄。
- List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().eq("io_type", 101).eq("wrk_sts", 13));
+ List<WrkMast> wrkMasts = wrkMastMapper.selectList(new EntityWrapper<WrkMast>().in("io_type", 101,103,107,110,3,12,109).eq("wrk_sts", 13));
for (WrkMast wrkMast : wrkMasts) {
try {
ghjtHandler.startCkrwPushGwcs(wrkMast);
@@ -44,17 +74,62 @@
}
}
- // 鍑哄簱璁㈠崟瀹屾垚鍒欎笂鎶ES
-// @Scheduled(cron = "0/4 * * * * ? ")
- public void OutBoundCompleteReport() {
- // 鏌ヨ鍑哄簱璁㈠崟鐘舵�佷负4.宸插畬鎴�
- List<Order> orders = orderMapper.selectComplete();
- for (Order order : orders) {
- try {
- ghjtHandler.OutBoundCompleteReport(order);
- } catch (Exception e) {
- log.error("鍑哄簱璁㈠崟瀹屾垚鍒欎笂鎶ES澶辫触锛屽紓甯镐俊鎭細" + e);
+ // 鑷姩璺ㄥ贩閬撶Щ搴�
+ // 閰嶇疆寮�鍚�->鑾峰彇鍗曟嵁鏄庣粏->鑾峰彇婧愬簱浣嶇洰鏍囧簱浣�->鐢熸垚绉诲簱浠诲姟->鍙栨秷浠诲姟鍥炴粴鍗曟嵁->
+ // wcs鍑哄簱鍒板爢鍨涙満鍑哄簱鍙�->gwms缁檊wcs鎺ㄩ�佺洰鏍囩珯1->gwcs鍒拌揪鍫嗗灈鏈哄叆搴撳彛璇锋眰鍏ュ簱->鍫嗗灈鏈烘墽琛屽叆搴�->鍏ュ簱瀹屾垚->鏇存柊鍗曟嵁鐘舵��
+ // 11->12->13->1->2->3->4->5
+ @Scheduled(cron = "0/10 * * * * ?")
+ public 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);
+ }
+
+ // 绌洪棽鐞嗚揣
+ // 閰嶇疆寮�鍚�->鏌ヨ鍙敤妗佹灦->鑾峰彇鍒拌兘鐞嗚揣鐨勪袱涓湪绠�->鐢熸垚涓や釜鏈ㄧ鐨勭悊璐т换鍔″拰缁勭洏鐐圭殑鍏ュ簱浠诲姟
+ // wcs鍑哄簱鍒板爢鍨涙満鍑哄簱鍙�->鎺ㄩ�佺粰gwms鍘绘鏋跺懡浠�->鍒拌揪鐞嗚揣妗佹灦璇锋眰zms鎷嗗灈瑙勫垯->杩斿洖鎷嗗灈瑙勫垯gwcs鎵ц鎷嗗灈->鎷嗗灈瀹屾垚璇锋眰zwms->杩斿洖鍘诲彔鐩�/鍥炲簱/缁勭洏鐐瑰叆搴撳懡浠�->gwcs鍒拌揪鍏ュ簱鍙ｈ姹傚叆搴�->鍫嗗灈鏈烘墽琛屽叆搴�
+ // 11->12->13->2->42->52->2->3->4->5 // 鍥炲簱
+ // ->15 // 鍘诲彔鐩�
+ // ->1->2->3->4->5 // 缁勭洏鐐瑰叆搴�
+ @Scheduled(cron = "0/10 * * * * ? ")
+ public void autoTallyGoods() {
+
+ // 绯荤粺閰嶇疆鐣岄潰鍚敤
+ Config config = configMapper.selectConfigByCode("auto_tally_goods");
+ if (config == null || config.getStatus() == 0) {
+ return;
+ }
+
+ // 鏍囪鍝竴濂楁鏋惰兘鐢�
+ int flag = 0;
+
+ // 鍒嗗埆鏌ヨ涓ゅ妗佹灦鏄惁瀛樺湪浠诲姟
+ Integer count = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().eq("source_sta_no", 3046).or().in("sta_no", 3045, 3044));
+ if (count == 0) {
+ flag = 1;
+ } else {
+ count = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>().in("source_sta_no", 3042).or().in("sta_no", 3041, 3040));
+ if (count == 0) {
+ flag = 2;
}
}
+
+ // 娌℃湁鎵惧埌鍙敤妗佹灦锛屾鏋堕兘閮藉瓨鍦ㄤ换鍔�
+ if (flag == 0) {
+ return;
+ }
+
+ // 鎸囧畾妗佹灦鐢熸垚鐞嗚揣浠诲姟
+ ghjtHandler.autoTallyGoods(flag);
}
+
}
--
Gitblit v1.9.1