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 |   85 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 31 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..4bda323 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,12 +1,9 @@
 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 com.zy.common.utils.Synchro;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,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;
 
@@ -70,12 +117,6 @@
 
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
-
-    @ApiModelProperty(value= "浜у湴")
-    private String origin;
-
-    @ApiModelProperty(value= "鍘傚")
-    private String manu;
 
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
@@ -160,19 +201,19 @@
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1 = "";
+    private String standby1 = "1";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2 = "";
+    private String standby2 = "1";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3 = "";
+    private String standby3 = "1";
 
     /**
      * 澶囩敤1
@@ -257,24 +298,6 @@
             return "";
         }
         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;
     }
 
     public void sync(Object source) {

--
Gitblit v1.9.1