From 3b0cab2402876426acbc0814394ff940fd2ce83d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 20:22:16 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据

---
 src/main/java/com/zy/asrs/entity/WaitPakinLog.java |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 108 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 34cade8..a318f2b 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -1,8 +1,13 @@
 package com.zy.asrs.entity;
 
+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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -32,12 +37,44 @@
     @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "搴忓垪鐮�")
+    @ApiModelProperty(value= "鎵瑰彿")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
+
+    /**
+     * 闆嗚绠卞彿
+     */
+    @ApiModelProperty(value= "闆嗚绠卞彿")
+    @ExcelProperty("闆嗚绠卞彿")
+    @TableField("container_no")
+    private String containerNo;
+
+    /**
+     * TEU
+     */
+    @ApiModelProperty(value= "TEU")
+    @ExcelProperty("TEU")
+    @TableField("teu")
+    private Integer teu;
+
+    /**
+     * 杞︾墝鍙�
+     */
+    @ApiModelProperty(value= "杞︾墝鍙�")
+    @ExcelProperty("杞︾墝鍙�")
+    @TableField("plate_no")
+    private String plateNo;
+
+    /**
+     * 杞︽鍙�
+     */
+    @ApiModelProperty(value= "杞︽鍙�")
+    @ExcelProperty("杞︽鍙�")
+    @TableField("train_no")
+    private String trainNo;
 
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
@@ -69,6 +106,18 @@
     @ApiModelProperty(value= "浜у湴")
     private String origin;
 
+    @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+    @TableField("freq_type")
+    private Integer freqType;
+
+    /**
+     * 绔嬫柟鏁�
+     */
+    @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+    @ExcelProperty("绔嬫柟鏁�")
+    @TableField("cube_number")
+    private Double cubeNumber;
+
     @ApiModelProperty(value= "鍘傚")
     private String manu;
 
@@ -88,7 +137,7 @@
     private Double weight;
 
     @ApiModelProperty(value= "闀垮害")
-    private Double length;
+    private Double man_length;
 
     @ApiModelProperty(value= "浣撶Н")
     private Double volume;
@@ -150,6 +199,45 @@
 
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    private String standby1 = "1";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    private String standby2 = "1";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    private String standby3 = "1";
+
+    /**
+     * 澶囩敤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";
 
     public String getBeBatch$(){
         if (null == this.beBatch){ return null; }
@@ -215,4 +303,22 @@
         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 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