From 9052fef232f56eb878d7cf8360a09a11e6a0fe2f Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 06 六月 2025 10:48:54 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/LocDetl.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 0556824..4ac4219 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -43,17 +43,18 @@
     @ExcelProperty("鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "鎵瑰彿")
-    @ExcelProperty("鎵瑰彿")
+    @ApiModelProperty(value= "瑙勬牸")
+    @ExcelProperty("瑙勬牸")
+    private String specs;
+
+    @ApiModelProperty(value= "璐у搧鐗瑰緛")
+    @ExcelProperty("璐у搧鐗瑰緛")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
     @ExcelProperty("鍗曟嵁缂栧彿")
     @TableField("order_no")
     private String orderNo;
-
-    @ApiModelProperty(value= "瑙勬牸")
-    private String specs;
 
     @ApiModelProperty(value= "鍨嬪彿")
     private String model;
@@ -157,6 +158,50 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    @TableField("pro_type")
+    private String  proType;
+    /**
+     * 璁㈠崟鍙�
+     */
+    @TableField("out_order_no")
+    private String outOrderNo;
+
+
+    /**
+     * 鐐夊彿\瀹㈡埛鍥惧彿
+     */
+    @TableField("lu_hao")
+    private String luHao;
+
+    /**
+     * 宸ュ崟鍙�
+     */
+    @TableField("pg_no")
+    private String sPgNO;
+
+    @TableField("i_no")
+    private String i_no;
+
+    private String temp1;
+
+
+    private String temp2;
+
+    private String temp3;
+
+
+    @TableField("i_no")
+    private Integer iNo;
+
+    @TableField("packing")
+    private String packing;
+
+    @TableField("ware_id")
+    private String wareId;
+
+    @TableField("ware_name")
+    private String wareName;
+
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);
@@ -248,6 +293,16 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public Long getStoreDate() {
+        if (this.appeTime == null) {
+            return null;  // 鎴栬�呰繑鍥� -1L銆�0L锛岀湅浣犵殑涓氬姟閫昏緫
+        }
+        long timeNow = System.currentTimeMillis();
+        long timeCreate = this.appeTime.getTime();
+        return (timeNow - timeCreate) / (24 * 60 * 60 * 1000);
+    }
+
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1