From c84738851edb0c852d11ebb9e7d6a24cb4cbdcc1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 09 十二月 2024 10:15:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java | 125 +++++++++++++++++++++++++++++++++++++++--
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 16 +++--
2 files changed, 128 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
index 86040e2..500bdd2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecute.java
@@ -264,14 +264,17 @@
if (Cools.isEmpty(this.wrkSts)){
return this.wrkSts+"锛氭湭鐭�";
}
-// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
-//// BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
-// BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
-// if (!Cools.isEmpty(basJarMastStatus)){
-// return String.valueOf(basJarMastStatus.getBoxSpecs());
-// }
if (Cools.isEmpty(this.ioType)){
return this.wrkSts.toString();
+ } else if (this.ioType == 100){
+ switch (this.wrkSts){
+ case 0:
+ return this.wrkSts+"銆佸垵濮�";
+ case 99:
+ return this.wrkSts+"銆佸厖鐢典腑";
+ case 100:
+ return this.wrkSts+"銆佸厖鐢靛畬鎴�";
+ }
} else {
switch (this.wrkSts){
case 1:
@@ -352,6 +355,7 @@
} catch (Exception e){
return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
}
+ return this.wrkSts+"锛氭湭鐭�";
}
//浠诲姟绫诲瀷 0: 鏈煡 1: 寮�杩涙枡闂� 2: 鍏宠繘鏂欓棬 3: 寮�鍑烘枡闂� 4: 鍏冲嚭鏂欓棬 5: 鍏ョ～鍖栫綈 6: 鍏ュ喎鍗存Ы 7: 绌挎杞﹁繘鍐峰嵈妲� B=>C 8: 绌挎杞︾寮�鍐峰嵈妲� C=>B 9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
index e9e7e0a..7838cd9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -260,19 +260,130 @@
}
}
+// public String getWrkSts$(){
+// try{
+// if (Cools.isEmpty(this.wrkSts)){
+// return this.wrkSts+"锛氭湭鐭�";
+// }
+//// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
+////// BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
+//// BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
+//// if (!Cools.isEmpty(basJarMastStatus)){
+//// return String.valueOf(basJarMastStatus.getBoxSpecs());
+//// }
+// if (true){
+// return this.wrkSts.toString();
+// }
+// } catch (Exception e){
+// return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
+// }
+// return this.wrkSts+"锛氭湭鐭�";
+// }
+
+ /**
+ * 宸ヤ綔鐘舵��
+ * 0:鍒濆 wrk_sts
+ * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬紑闂ㄤ腑銆�4锛氬紑闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 1銆�3
+ * 1锛歊GV灏忚溅閬胯銆�2锛氶伩璁╁畬鎴愩��3锛氬叧闂ㄤ腑銆�4锛氬叧闂ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 2銆�4
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歳gv鍙栬揣銆�4锛歳gv鍙栬揣瀹屾垚銆�5锛歋te绌挎鐗堝叆纭寲缃愩��6锛氬叆缃愬畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 5 STE A闈㈢┛姊溅
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6 STE B闈㈢┛姊溅
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 7 B=>C 銆�8 C=>B
+ * 1锛歋te绌挎鐗堝彇鏀捐揣涓��2锛氭斁璐у畬鎴愮瓑寰呬笅涓�姝ャ��3锛氳緭閫佺嚎浠诲姟涓嬪彂瀹屾垚銆�4锛氭洿鏂板畬鎴� //io_type = 9 STE 鏈杈撻�佺嚎
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
+ * 1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堢Щ鍔ㄤ腑銆�4锛氱Щ鍔ㄥ畬鎴愩��5锛氭洿鏂板畬鎴� //io_type = 10銆�11
+ */
public String getWrkSts$(){
try{
if (Cools.isEmpty(this.wrkSts)){
return this.wrkSts+"锛氭湭鐭�";
}
-// BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
-//// BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
-// BasJarMastStatus basJarMastStatus = service.selectOne(new EntityWrapper<BasJarMastStatus>().eq("box_type",this.wrkSts.toString()));
-// if (!Cools.isEmpty(basJarMastStatus)){
-// return String.valueOf(basJarMastStatus.getBoxSpecs());
-// }
- if (true){
+ if (Cools.isEmpty(this.ioType)){
return this.wrkSts.toString();
+ } else if (this.ioType == 100){
+ switch (this.wrkSts){
+ case 0:
+ return this.wrkSts+"銆佸垵濮�";
+ case 99:
+ return this.wrkSts+"銆佸厖鐢典腑";
+ case 100:
+ return this.wrkSts+"銆佸厖鐢靛畬鎴�";
+ }
+ } else {
+ switch (this.wrkSts){
+ case 1:
+ switch (this.ioType){
+ case 9:
+ return this.wrkSts+"銆丼te绌挎鐗堝彇鏀捐揣涓�";
+ default:
+ return this.wrkSts+"銆丷GV骞宠 杞︾Щ鍔�";
+ }
+ case 2:
+ switch (this.ioType){
+ case 9:
+ return this.wrkSts+"銆丼te绌挎鐗堟斁璐у畬鎴愮瓑寰呬笅涓�姝�";
+ default:
+ return this.wrkSts+"銆丷GV骞宠 杞﹀埌浣�";
+ }
+ case 3:
+ switch (this.ioType){
+ case 1:
+ case 3:
+ return this.wrkSts+"銆佺～鍖栫綈寮�闂ㄤ腑";
+ case 2:
+ case 4:
+ return this.wrkSts+"銆佺～鍖栫綈鍏抽棬涓�";
+ case 5:
+ return this.wrkSts+"銆丷GV骞宠 杞﹀彇璐�";
+ case 6:
+ return this.wrkSts+"銆丼te绌挎鐗堝彇璐�";
+ case 9:
+ return this.wrkSts+"銆佽緭閫佺嚎浠诲姟涓嬪彂瀹屾垚";
+ default:
+ return this.wrkSts+"銆丼te绌挎鐗堢Щ鍔ㄤ腑";
+ }
+ case 4:
+ switch (this.ioType){
+ case 1:
+ case 3:
+ return this.wrkSts+"銆佺～鍖栫綈寮�闂ㄥ畬鎴�";
+ case 2:
+ case 4:
+ return this.wrkSts+"銆佺～鍖栫綈鍏抽棬瀹屾垚";
+ case 5:
+ return this.wrkSts+"銆丷GV骞宠 杞﹀彇璐у畬鎴�";
+ case 6:
+ return this.wrkSts+"銆丼te绌挎鐗堝彇璐у畬鎴�";
+ case 9:
+ return this.wrkSts+"銆佹洿鏂板畬鎴�";
+ default:
+ return this.wrkSts+"銆丼te绌挎鐗堢Щ鍔ㄥ畬鎴�";
+ }
+ case 5:
+ switch (this.ioType){
+ case 5:
+ return this.wrkSts+"銆丼te绌挎鐗堝叆纭寲缃�";
+ case 6:
+ return this.wrkSts+"銆丼te绌挎鐗堟斁璐ц嚦鍐峰嵈姹�";
+ default:
+ return this.wrkSts+"銆佹洿鏂板畬鎴�";
+ }
+ case 6:
+ switch (this.ioType){
+ case 5:
+ return this.wrkSts+"銆丼te绌挎鐗堝叆纭寲缃愬畬鎴�";
+ case 6:
+ return this.wrkSts+"銆丼te绌挎鐗堟斁璐у畬鎴�";
+ default:
+ return this.wrkSts+"銆佹洿鏂板畬鎴�";
+ }
+ case 7:
+ switch (this.ioType){
+ default:
+ return this.wrkSts+"銆佹洿鏂板畬鎴�";
+ }
+ default:
+ return this.wrkSts.toString();
+ }
}
} catch (Exception e){
return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
--
Gitblit v1.9.1