From fcdfbff0b969b8a5934cbaf1e8a46218dd903dd7 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 03 一月 2025 07:58:29 +0800
Subject: [PATCH] 优化自动出库
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 8 ++++----
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java | 13 +++++++++++--
4 files changed, 17 insertions(+), 8 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..81bb8f3 100644
--- a/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
+++ b/src/main/java/com/zy/asrs/task/AutomaticOutboundShipment.java
@@ -48,7 +48,7 @@
/**
* 鑷姩鍑烘弧鎵�
*/
- @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/5 * * * * ? ")
private void execute(){
Config config = configService.selectConfigByCode("AutomaticOutboundShipment");
if(config.getStatus()==0){
@@ -58,7 +58,16 @@
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));
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 52ddfb1..b55dbde 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -77,7 +77,7 @@
return FAIL.setMsg("绌烘澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
- basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
+ basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",100));
break;
// 鍏ㄦ澘鍏ュ簱
case 1:
@@ -148,7 +148,7 @@
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
}
- basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
+ basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",200));
break;
// 鎷ｆ枡鍏ュ簱
case 53:
@@ -300,7 +300,7 @@
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast.setLocSts(locSts);
locMast.setBarcode(wrkMast.getBarcode());
- locMast.setIoTime(now);
+// locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
// exceptionHandle("搴撲綅绉昏浆 ===>> 淇敼鐩爣搴撲綅鐘舵�佸け璐ワ紱[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -314,7 +314,7 @@
if(!Cools.isEmpty(basDevp)){
basDevp.setLoading("N");
basDevp.setModiTime(now);
- basDevpService.update(basDevp,new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceLocNo()));
+ basDevpService.update(basDevp,new EntityWrapper<BasDevp>().eq("dev_no",wrkMast.getSourceStaNo()));
}
// 淇敼宸ヤ綔涓绘。鐘舵��
wrkMast.setWrkSts(5L);
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 90e8841..88c7bf5 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -40,7 +40,7 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
)
return cols;
}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 68f73d3..33dd79a 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -117,7 +117,7 @@
];
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'})
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿'})
return cols;
}
--
Gitblit v1.9.1