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/LocDetl.java |   75 ++++++++++++++++++++++++++++++++-----
 1 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 356f4a4..728f2a0 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -18,6 +18,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -48,11 +49,11 @@
     private String maktx;
 
     @ApiModelProperty(value= "瑙勬牸")
-    @ExcelProperty("瑙勬牸")
+    //@ExcelProperty("瑙勬牸")
     private String specs;
 
     @ApiModelProperty(value= "璐у搧鐗瑰緛")
-    @ExcelProperty("璐у搧鐗瑰緛")
+    //@ExcelProperty("璐у搧鐗瑰緛")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -103,10 +104,11 @@
     private Double safeQty;
 
     @ApiModelProperty(value= "閲嶉噺")
-    private Double weight;
+    private BigDecimal weight;
 
     @ApiModelProperty(value= "闀垮害")
-    private Double man_length;
+    @TableField("man_length")
+    private Double manLength;
 
     @ApiModelProperty(value= "浣撶Н")
     private Double volume;
@@ -163,27 +165,78 @@
     private String memo;
 
     /**
+     * 闆嗚绠卞彿
+     */
+    @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= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+    @ExcelProperty("璐х墿棰戞")
+    @TableField("freq_type")
+    private Integer freqType;
+
+    /**
+     * 绔嬫柟鏁�
+     */
+    @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+    @ExcelProperty("绔嬫柟鏁�")
+    @TableField("cube_number")
+    private Double cubeNumber;
+
+    /**
      * 鎷ユ湁鑰�
      */
     @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
     private Integer owner;
 
     /**
-     * 澶囩敤1
+     * 澶囩敤1(PO)
      */
-    @ApiModelProperty(value= "澶囩敤1")
+    @ApiModelProperty(value= "澶囩敤1")//PO
+    @ExcelProperty("瀹㈡埛PO")
     private String standby1 = "1";
 
     /**
-     * 澶囩敤2
+     * 澶囩敤2(UPC)
      */
-    @ApiModelProperty(value= "澶囩敤2")
+    @ApiModelProperty(value= "澶囩敤2")//UPC
+    @ExcelProperty("鏉＄爜UPC")
     private String standby2 = "1";
 
     /**
-     * 澶囩敤3
+     * 澶囩敤3(SKU)
      */
-    @ApiModelProperty(value= "澶囩敤3")
+    @ApiModelProperty(value= "澶囩敤3")//SKU
+    @ExcelProperty("瀹㈡埛SKU")
     private String standby3 = "1";
 
     /**
@@ -191,6 +244,7 @@
      */
     @ApiModelProperty(value= "澶囩敤1")
     @TableField("box_type1")
+    @ExcelProperty("璐т富")
     private String boxType1 = "1";
 
     /**
@@ -205,6 +259,7 @@
      */
     @ApiModelProperty(value= "澶囩敤3")
     @TableField("box_type3")
+    @ExcelProperty("閲囪喘鍗曞彿")
     private String boxType3 = "1";
 
     /**

--
Gitblit v1.9.1