From da8a535959c72cf61cf904f3dffaa1d0bd33b79f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 11 七月 2025 10:43:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WaitPakin.java |   24 +++++++++++++++++++++---
 1 files changed, 21 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 e1bfb4c..16a8879 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -7,6 +7,7 @@
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.BasProcessProceduresService;
 import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.StoreTypeService;
 import com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -179,21 +180,28 @@
      */
     @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 = "";
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -268,6 +276,16 @@
         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));

--
Gitblit v1.9.1