From d9eeceed86c1ce43c73dda00a108595a078a8f3d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 29 五月 2025 18:44:53 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/WrkMastExecute.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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..b12e7b4 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
@@ -360,31 +364,31 @@
if (null == this.ioType){ return "鏈煡"; }
switch (this.ioType){
case 0:
- return "鏈煡";
+ return "0.鏈煡";
case 1:
- return "寮�杩涙枡闂�";
+ return "1.寮�杩涙枡闂�";
case 2:
- return "鍏宠繘鏂欓棬";
+ return "2.鍏宠繘鏂欓棬";
case 3:
- return "寮�鍑烘枡闂�";
+ return "3.寮�鍑烘枡闂�";
case 4:
- return "鍏冲嚭鏂欓棬";
+ return "4.鍏冲嚭鏂欓棬";
case 5:
- return "鍏ョ～鍖栫綈";
+ return "5.鍏ョ～鍖栫綈";
case 6:
- return "鍏ュ喎鍗存Ы";
+ return "6.鍏ュ喎鍗存Ы";
case 7:
- return "B=>C";
+ return "7.B=>C";
case 8:
- return "C=>B";
+ return "8.C=>B";
case 9:
- return "鍑哄喎鍗存Ы";
+ return "9.鍑哄喎鍗存Ы";
case 10:
- return "A=>B";
+ return "10.A=>B";
case 11:
- return "B=>A";
+ return "11.B=>A";
case 100:
- return "鍏呯數浠诲姟";
+ return "100.鍏呯數浠诲姟";
default:
return String.valueOf(this.ioType);
}
--
Gitblit v1.9.1