From ec92a309b68b1e7029196d9d0ea0ac7e2badb5a7 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 03 八月 2025 09:32:12 +0800
Subject: [PATCH] 设置入空桶库输送线缓存任务数

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   64 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 58d036c..2c3590c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,8 +4,11 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 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.LocMastService;
 import com.zy.asrs.service.LocOwnerService;
 import com.zy.common.utils.Synchro;
@@ -45,11 +48,10 @@
     private String maktx;
 
     @ApiModelProperty(value= "瑙勬牸")
-    @ExcelProperty("瑙勬牸")
     private String specs;
 
     @ApiModelProperty(value= "璐у搧鐗瑰緛")
-    @ExcelProperty("璐у搧鐗瑰緛")
+    @ExcelProperty("鎵瑰彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -58,6 +60,7 @@
     private String orderNo;
 
     @ApiModelProperty(value= "鍨嬪彿")
+    @ExcelProperty("妗跺瀷")
     private String model;
 
     @ApiModelProperty(value= "棰滆壊")
@@ -89,6 +92,7 @@
 
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
+    @ExcelProperty("鐢熶骇鏃ユ湡")
     private String manuDate;
 
     @ApiModelProperty(value= "鍝侀」鏁�")
@@ -100,12 +104,17 @@
     private Double safeQty;
 
     @ApiModelProperty(value= "閲嶉噺")
+    @ExcelProperty("鍑�閲�")
     private Double weight;
 
     @ApiModelProperty(value= "闀垮害")
-    private Double man_length;
+    @TableField("man_length")
+    @ExcelProperty("姣涢噸")
+    private Double manLength;
 
     @ApiModelProperty(value= "浣撶Н")
+    @TableField("volume")
+    @ExcelProperty("缃愯閲�")
     private Double volume;
 
     @ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -169,19 +178,40 @@
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1;
+    private String standby1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2;
+    private String standby2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3;
+    private String standby3 = "";
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    @TableField("box_type1")
+    private String boxType1 = "1";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    @TableField("box_type2")
+    private String boxType2 = "1";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    @TableField("box_type3")
+    private String boxType3 = "1";
 
     /**
      * 鏄惁鍐荤粨
@@ -302,15 +332,33 @@
     }
 
     public String getFrozen$() {
-        if (null == this.frozen){ return null; }
+        if (null == this.frozen){ return "鏈喕缁�"; }
         switch (this.frozen){
             case 0:
                 return "鏈喕缁�";
             case 1:
                 return "宸插喕缁�";
             default:
-                return null;
+                return "鏈喕缁�";
         }
     }
 
+    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 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;
+    }
+
 }

--
Gitblit v1.9.1