From 7278054615d1fc15d398312d3c457de76a8da7c6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 30 七月 2025 14:42:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkDetlLog.java      |    4 +-
 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java |   11 +++++
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java    |    4 +-
 src/main/java/com/zy/asrs/entity/OrderDetl.java       |   16 +++++--
 src/main/java/com/zy/asrs/entity/WaitPakin.java       |    4 +-
 src/main/java/com/zy/asrs/entity/LocDetl.java         |    4 +-
 src/main/java/com/zy/asrs/entity/WrkDetl.java         |    4 +-
 src/main/java/com/zy/asrs/entity/OrderDetlPakin.java  |   16 +++++--
 8 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 755acdf..a055ca1 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -211,7 +211,7 @@
     private Integer frozen;
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -370,7 +370,7 @@
         if (!Cools.isEmpty(kcztMap)){
             return String.valueOf(kcztMap.getVname());
         }
-        return this.cstateid;
+        return String.valueOf(this.cstateid);
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index f673c5d..f7a2c91 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -7,10 +7,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.StoreTypeService;
+import com.zy.asrs.service.*;
 import com.zy.asrs.utils.MathUtils;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -360,7 +357,7 @@
     private String remark;
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public OrderDetl() {
     }
@@ -703,6 +700,15 @@
         return this.boxType1;
     }
 
+    public String getCstateid$() {
+        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+        if (!Cools.isEmpty(kcztMap)){
+            return String.valueOf(kcztMap.getVname());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 97041a2..578938a 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -7,10 +7,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasProcessProceduresService;
-import com.zy.asrs.service.BasQualityTestingService;
-import com.zy.asrs.service.OrderService;
-import com.zy.asrs.service.StoreTypeService;
+import com.zy.asrs.service.*;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -354,7 +351,7 @@
     private String boxType3 = "";
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public OrderDetlPakin() {}
 
@@ -576,6 +573,15 @@
         );
     }
 
+    public String getCstateid$() {
+        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+        if (!Cools.isEmpty(kcztMap)){
+            return String.valueOf(kcztMap.getVname());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 24bc5b6..48c2925 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -351,7 +351,7 @@
     private String boxType3 = "";
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public OrderDetlPakout() {}
 
@@ -582,6 +582,15 @@
         return null;
     }
 
+    public String getCstateid$() {
+        KcztMapService service = SpringUtils.getBean(KcztMapService.class);
+        KcztMap kcztMap = service.selectOne(new EntityWrapper<KcztMap>().eq("cstateid", this.cstateid));
+        if (!Cools.isEmpty(kcztMap)){
+            return String.valueOf(kcztMap.getVname());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
 
     public void sync(Object source) {
         Synchro.Copy(source, this);
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 750296d..219946b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -205,7 +205,7 @@
     private String tkFlag = "";
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -305,7 +305,7 @@
         if (!Cools.isEmpty(kcztMap)){
             return String.valueOf(kcztMap.getVname());
         }
-        return this.cstateid;
+        return String.valueOf(this.cstateid);
     }
 
     public void sync(Object source) {
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 91f4e6f..bc06976 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -204,7 +204,7 @@
     private String tkFlag = "";
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -303,7 +303,7 @@
         if (!Cools.isEmpty(kcztMap)){
             return String.valueOf(kcztMap.getVname());
         }
-        return this.cstateid;
+        return String.valueOf(this.cstateid);
     }
 
 }
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ad82221..9374cb7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -334,7 +334,7 @@
     private Double stockNum2;
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public String getIoTime$() {
         if (Cools.isEmpty(this.ioTime)) {
@@ -448,7 +448,7 @@
         if (!Cools.isEmpty(kcztMap)){
             return String.valueOf(kcztMap.getVname());
         }
-        return this.cstateid;
+        return String.valueOf(this.cstateid);
     }
 
     public void sync(Object source) {
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index bb05cc2..88e9c35 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -334,7 +334,7 @@
     private Double stockNum2;
 
     //搴撳瓨鐘舵��
-    private String cstateid;
+    private Integer cstateid;
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -440,7 +440,7 @@
         if (!Cools.isEmpty(kcztMap)){
             return String.valueOf(kcztMap.getVname());
         }
-        return this.cstateid;
+        return String.valueOf(this.cstateid);
     }
 
     public void sync(Object source) {

--
Gitblit v1.9.1