From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 六月 2025 13:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms
---
src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
index 2f6e818..e5f382a 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
@@ -48,17 +48,29 @@
/**
* 鑷姩鍑烘弧鎵�
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
private void execute(){
Config config = configService.selectConfigByCode("AutomaticOutboundShipment");
if(config.getStatus()==0){
return;
}
-
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no",200));
+ if(!Cools.isEmpty(wrkMast1)){
+ return;
+ }
BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 200));
if (Cools.isEmpty(basDevp.getLoading())||basDevp.getLoading().equals("N")) {
//鎵惧埌鍏ュ簱鏈�鏃╃殑
- LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time"));
+ List<LocDetl> locDetlss = locDetlService.selectList(new EntityWrapper<LocDetl>().orderBy("appe_time"));
+ LocMast locMastIoTime=new LocMast();
+ for (LocDetl locDetl : locDetlss) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
+ if(!Cools.isEmpty(locMast)&&locMast.getLocSts().equals("F")){
+ locMastIoTime=locMast;
+ break;
+ }
+ }
+// LocMast locMastIoTime=locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").orderBy("io_time"));
//鏈�鏃╁叆搴撶殑鍙兘涓嶆槸鏈�闈犺繎鍑哄簱鍙ｇ殑锛屾墍浠ラ渶瑕佸啀鍘绘壘杩欏眰鏈�闈犺繎鍑哄簱鍙ｇ殑璐�
LocMast locMast =locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("lev1",locMastIoTime.getLev1()).orderBy("bay1",false));
--
Gitblit v1.9.1