From d60e84cbedb554555578f071de95c4a8049183db Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java |  151 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 131 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
index e9e7e0a..953418a 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();
@@ -286,31 +397,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