From 4d300a00081d7b5916c41162075bdd79851a8fcc Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 七月 2024 15:05:19 +0800
Subject: [PATCH] 新增MES采购入库上报功能
---
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 81ed2a9..cc83782 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -63,7 +63,7 @@
.andNew().eq("io_type",108)
.andNew()
.eq("crn_no",2).or().eq("crn_no",3)
- .orderBy("appe_time",true)
+ .orderBy("io_pri",false).orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
return;
@@ -72,7 +72,7 @@
try{
autoMoveHandler.start2(agvWrkMast);
} catch (Exception e){
- log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
}
@@ -110,6 +110,7 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 22)
.andNew().eq("io_type",111)
+ .orderBy("io_pri",false)
.orderBy("appe_time",true)
);
if (agvWrkMastList.isEmpty()) {
@@ -119,7 +120,7 @@
try{
autoMoveHandler.start3(agvWrkMast);
} catch (Exception e){
- log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ //log.error("宸ヤ綔鍙�"+agvWrkMast.getWrkNo()+"璋冩嫧鍑哄簱,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
}
}
@@ -158,7 +159,8 @@
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>()
.eq("wrk_sts", 214)
.eq("loc_no","")
- .eq("io_type",113));
+ .eq("io_type",113)
+ .orderBy("io_pri",false));
if (agvWrkMastList.isEmpty()) {
return;
}
@@ -197,26 +199,45 @@
* 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿
* 姣忓眰鏈�澶� 鍦� 鍥炲簱鏁伴噺闄愬埗5鏉�
* 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱
+ * 2妤兼垨3妤肩珯鐐瑰彲鍏ヤ俊鍙峰叏閮ㄦ病鏈夛紝浠ｈ〃璧扮數姊嚜鍔ㄦ惉杩愭ā寮�
*/
-
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack4(){
- // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
- List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
- new EntityWrapper<AgvLocMast>()
- .ne("floor", 1)
- .eq("loc_sts","D")
- .eq("loc_type1",3));
- if (agvLocMasts.isEmpty()) {
- return;
- }
- for (AgvLocMast agvLocMast : agvLocMasts) {
- try{
- autoMoveHandler.autoEmptyBack4(agvLocMast);
- } catch (Exception e){
- log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+// if (determineFloorConnection(2)){
+ // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
+ List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(
+ new EntityWrapper<AgvLocMast>()
+ .ne("floor", 1)
+ .eq("loc_sts","D")
+ .eq("loc_type1",3));
+ if (agvLocMasts.isEmpty()) {
+ return;
}
+ for (AgvLocMast agvLocMast : agvLocMasts) {
+ try{
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e){
+ log.error("搴撲綅鍙�"+agvLocMast.getLocNo()+"绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細"+e.getMessage());
+ }
+ }
+// }
+ }
+
+ private boolean determineFloorConnection(Integer floor){
+ try{
+ List<AgvBasDevp> agvBasDevps = agvBasDevpService.selectList(new EntityWrapper<AgvBasDevp>().eq("floor", floor).like("dev_no", "DB_"));
+ if (!agvBasDevps.isEmpty()){
+ for (AgvBasDevp agvBasDevp:agvBasDevps){
+ if (agvBasDevp.getInEnable().equals("Y")){
+ return false;
+ }
+ }
+ return true;
+ }
+ }catch (Exception e){
+ log.error("鍒ゆ柇褰撳墠妤煎眰鎺ラ┏浣嶆槸鍚﹀叏閮ㄥ叧闂紝寮傚父"+e.getMessage());
}
+ return false;
}
/**
@@ -224,6 +245,7 @@
* 鑷姩锛� 鐢熸垚 109 鑷姩鍥炴祦
* 鎵嬪姩锛� 鐢熸垚 113 鎵嬪姩鍥炴祦
* 浼樺厛閫夋嫨鍏堝埌鎺ラ┏浣嶏紙鎺ラ┏浣嶅彲鍏ワ級 鍚庨�夋嫨鐩存帴鍥炲簱
+ *
*/
@Scheduled(cron = "0/2 * * * * ? ")
private void autoEmptyBack5(){
--
Gitblit v1.9.1