From 59cf6b97399bc8c9fe39926fa13aa39cbd827270 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 15:39:01 +0800
Subject: [PATCH] 出库提取界面加搜索条件，提取出来包装一个木箱明细全部出来
---
src/main/java/com/zy/asrs/task/GhjtScheduler.java | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 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..1f4d0a5 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,11 +37,14 @@
@Resource
private ConfigMapper configMapper;
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
+
// 鑷姩澶囪揣(鏍规嵁鍑哄簱鍗曪紝鎶婅鍑虹殑璐ф彁鍓嶆斁鍒伴潬杩戝嚭搴撳彛浣嶇疆)
// 瀹氭椂浠诲姟鑾峰彇寰呭璐ц鍗曟槑缁�->鑾峰彇鍫嗗灈鏈哄搴旂殑婧愬簱浣嶏紝鑾峰彇澶囪揣鍖哄簱浣�->鐢熸垚绉诲簱浠诲姟11->
// 鎵ц绉诲簱浠诲姟12->鍏ュ簱瀹屾垚4->鏇存柊宸ヤ綔妗ｅ畾鏃朵换鍔′腑鏇存柊璁㈠崟澶囪揣鐘舵�佸拰璁㈠崟鏄庣粏澶囪揣鐘舵��5->杞偍鍘嗗彶
@Scheduled(cron = "0/10 * * * * ?")
- public synchronized void autoStockUp() {
+ public void autoStockUp() {
// 鏌ヨ鑷姩澶囪揣閰嶇疆
Config config = configMapper.selectConfigByCode("auto_stock_up");
if (config == null || config.getStatus() == 0) {
@@ -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,109).eq("wrk_sts", 13));
for (WrkMast wrkMast : wrkMasts) {
try {
ghjtHandler.startCkrwPushGwcs(wrkMast);
@@ -69,22 +74,62 @@
}
}
+ // 鑷姩璺ㄥ贩閬撶Щ搴�
+ // 閰嶇疆寮�鍚�->鑾峰彇鍗曟嵁鏄庣粏->鑾峰彇婧愬簱浣嶇洰鏍囧簱浣�->鐢熸垚绉诲簱浠诲姟->鍙栨秷浠诲姟鍥炴粴鍗曟嵁->
+ // 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);
+ }
+
// 绌洪棽鐞嗚揣
- @Scheduled(cron = "0/5 * * * * ? ")
+ // 閰嶇疆寮�鍚�->鏌ヨ鍙敤妗佹灦->鑾峰彇鍒拌兘鐞嗚揣鐨勪袱涓湪绠�->鐢熸垚涓や釜鏈ㄧ鐨勭悊璐т换鍔″拰缁勭洏鐐圭殑鍏ュ簱浠诲姟
+ // 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;
}
- // 鍥涗釜鎹㈢洏鐐癸紝涓や釜缁勭洏鐐�
- // 鍏堟煡浠诲姟鐩爣绔欎负 3045/3044鍜�3041/3040鐨勬崲鐩樼粍 濡傛灉鏈変负绌虹殑缁勫垯鍙互鍑猴紝鏈変竴涓垨涓や釜閮戒笉鑳藉嚭
- // todo 闇�鏂板涓や釜鍏ュ簱璺緞 3046/3042
- // 瀵绘壘涓や釜鑳界粍鐩樼殑搴撲綅锛屽簱浣嶇姸鎬佷负F锛屾弧瓒崇粍鐩樻潯浠�
- // 鍑哄簱鎬庝箞鍑猴紝鎵嶈兘鎶婄粍濂界殑鐩樹竴娆″嚭鍑哄幓
- // gwcs鎬庝箞淇濊瘉涓や釜閮芥媶瀹屼簡鎵嶈姹傜粍鐩樺畬鎴�
+ // 鏍囪鍝竴濂楁鏋惰兘鐢�
+ 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