From fc80e4040d6bf39b8657f94df1f957732bae26fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 22:02:31 +0800
Subject: [PATCH] 电视机入库出库显示耗时、托数功能修改： 1.入库耗时改成当前订单第一托入库任务创建时间到后续入库的创建时间相减转换成分钟 2.出库耗时改成当前订订单任务创建时间减去到达出库口的耗时时间 3.入库托数改成当前入库订单号累计入库数量

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 7a90242..5b004df 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,7 +104,7 @@
     private Double safeQty;
 
     @ApiModelProperty(value= "閲嶉噺")
-    private Double weight;
+    private BigDecimal weight;
 
     @ApiModelProperty(value= "闀垮害")
     @TableField("man_length")
@@ -163,6 +164,57 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @ApiModelProperty(value= "鍏ュ簱鎶撴媿鐓х墖")
+    private String pic;
+
+    /**
+     * 闆嗚绠卞彿
+     */
+    @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;
+
     /**
      * 鎷ユ湁鑰�
      */

--
Gitblit v1.9.1