From d907a822a940c7ec0fb7de0ca845472bda52229b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 03 二月 2026 14:33:12 +0800
Subject: [PATCH] #pda料箱组托和换码

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

diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 8292b5e..7823e36 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -24,15 +24,15 @@
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value= "搴撲綅鍙�")
+    @ApiModelProperty(value= "搴撲綅鍙�") //Bin Location
     @TableField("loc_no")
     private String locNo;
 
-    @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+    @ApiModelProperty(value= "鎵樼洏鏉＄爜")//Pallet No
     private String zpallet;
 
-    @ApiModelProperty(value= "鏁伴噺")
-    @ExcelProperty("鏁伴噺")
+    @ApiModelProperty(value= "鏁伴噺") //Quantity
+    @ExcelProperty("Quantity")
     private Double anfme;
 
     @ApiModelProperty(value= "鍟嗗搧缂栧彿")
@@ -43,8 +43,12 @@
     @ExcelProperty("鍟嗗搧鍚嶇О")
     private String maktx;
 
-    @ApiModelProperty(value= "鎵瑰彿")
-    @ExcelProperty("鎵瑰彿")
+    @ApiModelProperty(value= "瑙勬牸") //style
+    @ExcelProperty("style")
+    private String specs;
+
+    @ApiModelProperty(value= "鎵瑰彿")  //carton number  ctn
+    @ExcelProperty("carton number")
     private String batch;
 
     @ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -52,13 +56,10 @@
     @TableField("order_no")
     private String orderNo;
 
-    @ApiModelProperty(value= "瑙勬牸")
-    private String specs;
-
-    @ApiModelProperty(value= "鍨嬪彿")
+    @ApiModelProperty(value= "鍨嬪彿") //size
     private String model;
 
-    @ApiModelProperty(value= "棰滆壊")
+    @ApiModelProperty(value= "棰滆壊")  //color
     private String color;
 
     @ApiModelProperty(value= "鍝佺墝")
@@ -70,26 +71,26 @@
     @ApiModelProperty(value= "鍗曚环")
     private Double price;
 
-    @ApiModelProperty(value= "sku")
+    @ApiModelProperty(value= "buyer Po")  //buyer Po
     private String sku;
 
-    @ApiModelProperty(value= "鍗曚綅閲�")
+    @ApiModelProperty(value= "鍗曟嵁鏁伴噺")  //order qty
     private Double units;
 
-    @ApiModelProperty(value= "鏉＄爜")
+    @ApiModelProperty(value= "鏉＄爜") //carton Barcode
     private String barcode;
 
     @ApiModelProperty(value= "浜у湴")
     private String origin;
 
-    @ApiModelProperty(value= "鍘傚")
+    @ApiModelProperty(value= "container number") //container number
     private String manu;
 
     @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
     @TableField("manu_date")
     private String manuDate;
 
-    @ApiModelProperty(value= "鍝侀」鏁�")
+    @ApiModelProperty(value= "inspection document number")  //inspection document number
     @TableField("item_num")
     private String itemNum;
 
@@ -103,17 +104,17 @@
     @ApiModelProperty(value= "闀垮害")
     private Double length;
 
-    @ApiModelProperty(value= "浣撶Н")
+    @ApiModelProperty(value= "ratio") //ratio
     private Double volume;
 
-    @ApiModelProperty(value= "涓夋柟缂栫爜")
+    @ApiModelProperty(value= "鍗栧") //Buyer
     @TableField("three_code")
     private String threeCode;
 
-    @ApiModelProperty(value= "渚涘簲鍟�")
+    @ApiModelProperty(value= "閿�鍞崟鍙�")  //SO/OC  sales order
     private String supp;
 
-    @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+    @ApiModelProperty(value= "閲囪喘鍗曞彿")//POrder
     @TableField("supp_code")
     private String suppCode;
 
@@ -129,13 +130,13 @@
     @TableField("dead_warn")
     private Integer deadWarn;
 
-    @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
+    @ApiModelProperty(value= "鍖呰绫诲瀷solid/ratio ")  //Pack type
     private Integer source;
 
-    @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value= "妫�楠岀姸鎬� 1: success  0: fail  ")  //inspection status
     private Integer inspect;
 
-    @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄�  0: 鍚�  ")
+    @ApiModelProperty(value= "Pack/open ")  //carton status
     private Integer danger;
 
     @ApiModelProperty(value= "淇敼浜哄憳")
@@ -154,8 +155,11 @@
     @TableField("appe_time")
     private Date appeTime;
 
-    @ApiModelProperty(value= "澶囨敞")
+    @ApiModelProperty(value= "鍗栧鏉＄爜")  //Buyer label barcode
     private String memo;
+
+    @ApiModelProperty(value= "缁勫悎id")  //cartonId-POnumber-item Number
+    private String mixNumber;
 
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -232,7 +236,6 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
 
-
     public String getAppeUser$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.appeUser);
@@ -249,6 +252,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
     }
 
+    public long getStoreDate(){
+        long timeNow = new Date().getTime();
+        long timeCreate = (this.appeTime != null) ? this.appeTime.getTime() : 0L;
+
+        return (timeNow - timeCreate) /24/60/60/1000;
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1