From 47b4326b6167d520d57d33d71a2cd02ef3e926f2 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期二, 26 三月 2024 13:23:42 +0800
Subject: [PATCH] #XGHYSRJTXC 优化
---
src/main/java/com/zy/asrs/utils/RouteUtils.java | 92 ++++++++++++++++++++++++------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 41 ++++++++++++-
src/main/resources/mapper/WrkMastMapper.xml | 2
3 files changed, 111 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 48242e4..184421c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3693,9 +3693,17 @@
continue;
}
BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
- if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y")){
+ if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
}
+ if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
+ if (!basDevp.getEmptyMk().equals("Y")){
+ continue;
+ }
+ }
+ Date date = new Date();
+ log.info(date+"鍙栨斁浠诲姟涓嬪彂锛氬皬杞﹀伐浣滄。锛�"+wrkMastSta);
+ log.info(date+"鍙栨斁浠诲姟涓嬪彂锛氱洰鏍囩珯鐘舵�侊細"+basDevp);
boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta);
if (sign){
boolean signMap = rgvMapUpdate(basRgvMap, wrkMastSta.getStaStart(), wrkMastSta.getStaEnd());
@@ -3763,9 +3771,17 @@
boolean sign = false;
if ( wrkMastSta.getStaEnd()!=0){//鏀�
BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
- if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y")){
+ if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
}
+ if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
+ if (!basDevp.getEmptyMk().equals("Y")){
+ continue;
+ }
+ }
+ Date date = new Date();
+ log.info(date+"鎷嗙洏浠诲姟涓嬪彂锛氬皬杞﹀伐浣滄。锛�"+wrkMastSta);
+ log.info(date+"鎷嗙洏浠诲姟涓嬪彂锛氱洰鏍囩珯鐘舵�侊細"+basDevp);
sign = rgvPutEmpty(rgvProtocol.getRgvNo(),wrkMastSta);//鎷嗙洏
}else {
continue;
@@ -3837,9 +3853,17 @@
boolean sign = false;
if ( wrkMastSta.getStaEnd()!=0){//婊℃斁
BasDevp basDevp = basDevpService.selectById(wrkMastSta.getStaEnd());
- if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y")){
+ if (!basDevp.getAutoing().equals("Y") || basDevp.getLoading().equals("Y") || basDevp.getWrkNo()!=0){
continue;
}
+ if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
+ if (!basDevp.getEmptyMk().equals("Y")){
+ continue;
+ }
+ }
+ Date date = new Date();
+ log.info(date+"婊℃斁浠诲姟涓嬪彂锛氬皬杞﹀伐浣滄。锛�"+wrkMastSta);
+ log.info(date+"婊℃斁浠诲姟涓嬪彂锛氱洰鏍囩珯鐘舵�侊細"+basDevp);
sign = rgvPutEmptyFull(rgvProtocol.getRgvNo(),wrkMastSta);
}else {
continue;
@@ -3911,6 +3935,14 @@
if (!basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y")){
continue;
}
+ if (basDevp.getDevNo()>=118 && basDevp.getDevNo()<=123){
+ if (basDevp.getEmptyMk().equals("Y")){
+ continue;
+ }
+ }
+ Date date = new Date();
+ log.info(date+"鍙犵洏浠诲姟涓嬪彂锛氬皬杞﹀伐浣滄。锛�"+wrkMastSta);
+ log.info(date+"鍙犵洏浠诲姟涓嬪彂锛氱洰鏍囩珯鐘舵�侊細"+basDevp);
sign = rgvTakeEmpty(rgvProtocol.getRgvNo(),wrkMastSta);//鍙犵洏
}else {
continue;
@@ -3989,6 +4021,9 @@
if (!basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y")){
continue;
}
+ Date date = new Date();
+ log.info(date+"婊″彇浠诲姟涓嬪彂锛氬皬杞﹀伐浣滄。锛�"+wrkMastSta);
+ log.info(date+"婊″彇浠诲姟涓嬪彂锛氱洰鏍囩珯鐘舵�侊細"+basDevp);
sign = rgvTakeEmptyFull(rgvProtocol.getRgvNo(),wrkMastSta);
}else {
continue;
diff --git a/src/main/java/com/zy/asrs/utils/RouteUtils.java b/src/main/java/com/zy/asrs/utils/RouteUtils.java
index 1d633f3..8f42bc4 100644
--- a/src/main/java/com/zy/asrs/utils/RouteUtils.java
+++ b/src/main/java/com/zy/asrs/utils/RouteUtils.java
@@ -32,7 +32,7 @@
}};
public static final List<Integer> MERGE_STA_NO_SIX = new ArrayList<Integer>() {{
-
+ add(108);add(119);add(110);add(120);
}};
public static final List<Integer> MERGE_STA_NO_SEVEN = new ArrayList<Integer>() {{
@@ -44,7 +44,7 @@
}};
public static final List<Integer> MERGE_STA_NO_NINE = new ArrayList<Integer>() {{
-// add(108);add(119);add(110);add(120);
+
}};
// 姝ｅ簭
@@ -69,30 +69,82 @@
return msgBuilder.toString();
}
}
+// /*
+// * 鑾峰彇骞叉秹鏈�杩滅珯鐐�
+// * */
+// public static Integer RouteIndexFarMas(int rgvNo,Integer staNo){
+// List<Integer> staFall = new ArrayList<>();
+// if (MERGE_STA_NO_SIX.contains(staNo)){
+// staFall = MERGE_STA_NO_SIX;
+// }else if (MERGE_STA_NO_One.contains(staNo)){
+// staFall = MERGE_STA_NO_One;
+// }else if (MERGE_STA_NO_TWO.contains(staNo)){
+// staFall = MERGE_STA_NO_TWO;
+// }else if (MERGE_STA_NO_THREE.contains(staNo)){
+// staFall = MERGE_STA_NO_THREE;
+// }else if (MERGE_STA_NO_FOUR.contains(staNo)){
+// staFall = MERGE_STA_NO_FOUR;
+// }else if (MERGE_STA_NO_FIVE.contains(staNo)){
+// staFall = MERGE_STA_NO_FIVE;
+// }else {
+// return staNo;
+// }
+//
+// int indexNo = 0;
+// if (rgvNo==1){
+// indexNo=staFall.size()-1;
+// }
+// return staFall.get(indexNo);
+// }
+
/*
* 鑾峰彇骞叉秹鏈�杩滅珯鐐�
* */
public static Integer RouteIndexFarMas(int rgvNo,Integer staNo){
- List<Integer> staFall = new ArrayList<>();
- if (MERGE_STA_NO_One.contains(staNo)){
- staFall = MERGE_STA_NO_One;
- }else if (MERGE_STA_NO_TWO.contains(staNo)){
- staFall = MERGE_STA_NO_TWO;
- }else if (MERGE_STA_NO_THREE.contains(staNo)){
- staFall = MERGE_STA_NO_THREE;
- }else if (MERGE_STA_NO_FOUR.contains(staNo)){
- staFall = MERGE_STA_NO_FOUR;
- }else if (MERGE_STA_NO_FIVE.contains(staNo)){
- staFall = MERGE_STA_NO_FIVE;
- }else {
- return staNo;
- }
-
- int indexNo = 0;
if (rgvNo==1){
- indexNo=staFall.size()-1;
+ switch (staNo){
+ case 101:
+ case 102: return 102;
+ case 104:
+ case 122: return 118;
+ case 105: return 119;
+ case 107:
+ case 118: return 120;
+ case 108:
+ case 119: return 111;
+ case 110:
+ case 120: return 113;
+ case 111:
+ case 121: return 113;
+ case 113: return 114;
+ case 123:
+ case 114: return 1142;
+ default:
+ return 116;
+ }
+ }else {
+ switch (staNo){
+ case 117:
+ case 116: return 123;
+ case 1142:
+ case 114: return 113;
+ case 123:
+ case 113: return 111;
+ case 121:
+ case 111: return 108;
+ case 120:
+ case 110: return 107;
+ case 119:
+ case 108: return 107;
+ case 118:
+ case 107: return 105;
+ case 105:
+ case 122:
+ case 104: return 104;
+ default:
+ return 102;
+ }
}
- return staFall.get(indexNo);
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 0c2e333..2e8cee7 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -115,7 +115,7 @@
</select>
<select id="selectPakInStep5" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo}
+ select top 1 * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts = 14 and io_type>100 and sheet_no!=#{sheetNo} and sheet_no!= '0'
</select>
<select id="selectPickStep" resultMap="BaseResultMap">
--
Gitblit v1.9.1