From aa2d0845d83b95135d0c86a2cc62f66947ecd6f9 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 13:39:13 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   68 ++++++++++++++++++++++++++++++++-
 1 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a5bf524..4773df0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,7 +2,13 @@
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableName;
+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.KcztMapService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -175,21 +181,31 @@
      */
     @ApiModelProperty(value= "澶囩敤1")
     @TableField("box_type1")
-    private String boxType1 = "1";
+    private String boxType1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
     @TableField("box_type2")
-    private String boxType2 = "1";
+    private String boxType2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
     @TableField("box_type3")
-    private String boxType3 = "1";
+    private String boxType3 = "";
+
+    /**
+     * 閫�搴撴爣璁�
+     */
+    @ApiModelProperty(value= "閫�搴撴爣璁�")
+    @TableField("tk_flag")
+    private String tkFlag = "";
+
+    //搴撳瓨鐘舵��
+    private String cstateid;
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -255,6 +271,52 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public String getBoxType1$(){
+        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(processProcedures)){
+            return String.valueOf(processProcedures.getBoxSpecs());
+        }
+        return this.boxType1;
+    }
+
+    public String getStandby1$() {
+        StoreTypeService service = SpringUtils.getBean(StoreTypeService.class);
+        StoreType storeType = service.selectById(this.standby1);
+        if (!Cools.isEmpty(storeType)) {
+            return String.valueOf(storeType.getStoreName());
+        }
+        return null;
+    }
+
+
+    public String getBoxType2$(){
+        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(basQualityTesting)){
+            return String.valueOf(basQualityTesting.getBoxSpecs());
+        }
+        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 String getCstateidVcode() {
+        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.getVcode());
+        }
+        return String.valueOf(this.cstateid);
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1