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/WaitPakin.java |  100 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..4bda323 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,5 +1,6 @@
 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.core.common.Cools;
@@ -40,6 +41,56 @@
     @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 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;
+
     @ApiModelProperty(value= "瑙勬牸")
     private String specs;
 
@@ -50,7 +101,7 @@
     private String color;
 
     @ApiModelProperty(value= "鍝佺墝")
-    private String brand;
+    private String brand = "";
 
     @ApiModelProperty(value= "鍗曚綅")
     private String unit;
@@ -66,12 +117,6 @@
 
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
-
-    @ApiModelProperty(value= "浜у湴")
-    private String origin;
-
-    @ApiModelProperty(value= "鍘傚")
-    private String manu;
 
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
@@ -89,7 +134,7 @@
     private Double weight;
 
     @ApiModelProperty(value= "闀垮害")
-    private Double length;
+    private Double man_length;
 
     @ApiModelProperty(value= "浣撶Н")
     private Double volume;
@@ -152,6 +197,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; }
         switch (this.beBatch){

--
Gitblit v1.9.1