From 7c9a31347308abab5a6ee39046690ccc08c5f7c4 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 16:05:39 +0800
Subject: [PATCH] #界面

---
 src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java |   45 +++++++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
index e1db7be..d184963 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastExecuteLog.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.entity;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.baomidou.mybatisplus.annotations.TableField;
@@ -260,33 +261,53 @@
     }
 
     public String getWrkSts$(){
-        BasJarMastStatusService service = SpringUtils.getBean(BasJarMastStatusService.class);
-        BasJarMastStatus basJarMastStatus = service.selectById(this.wrkSts);
-        if (!Cools.isEmpty(basJarMastStatus)){
-            return String.valueOf(basJarMastStatus.getId());
+        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());
+            }
+        } catch (Exception e){
+            return this.wrkSts+"锛氭湭鐭�==>寮傚父锛�"+e.getMessage();
         }
-        return null;
+        return this.wrkSts+"锛氭湭鐭�";
     }
 
+    //浠诲姟绫诲瀷 0: 鏈煡  1: 寮�杩涙枡闂�  2: 鍏宠繘鏂欓棬  3: 寮�鍑烘枡闂�  4: 鍏冲嚭鏂欓棬  5: 鍏ョ~鍖栫綈  6: 鍏ュ喎鍗存Ы  7: 绌挎杞﹁繘鍐峰嵈妲�  B=>C  8: 绌挎杞︾寮�鍐峰嵈妲� C=>B  9: 鍑哄喎鍗存Ы 10锛欰=>B 11:B=>A
+
     public String getIoType$(){
-        if (null == this.ioType){ return null; }
+        if (null == this.ioType){ return "鏈煡"; }
         switch (this.ioType){
             case 0:
                 return "鏈煡";
             case 1:
-                return "寮�闂�";
+                return "寮�杩涙枡闂�";
             case 2:
-                return "鍏抽棬";
+                return "鍏宠繘鏂欓棬";
             case 3:
-                return "鍏ョ~鍖栫綈";
+                return "寮�鍑烘枡闂�";
             case 4:
-                return "鍏ュ喎鍗存Ы";
+                return "鍏冲嚭鏂欓棬";
             case 5:
-                return "绌挎杞﹁繘鍐峰嵈妲�";
+                return "鍏ョ~鍖栫綈";
             case 6:
-                return "绌挎杞︾寮�鍐峰嵈妲�";
+                return "鍏ュ喎鍗存Ы";
             case 7:
+                return "B=>C";
+            case 8:
+                return "C=>B";
+            case 9:
                 return "鍑哄喎鍗存Ы";
+            case 10:
+                return "A=>B";
+            case 11:
+                return "B=>A";
+            case 100:
+                return "鍏呯數浠诲姟";
             default:
                 return String.valueOf(this.ioType);
         }

--
Gitblit v1.9.1