From 7317c0c6f3e88ff9476c16e473391e8b8cb2c3ee Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 15 四月 2025 16:53:02 +0800
Subject: [PATCH] 修复主页控制台进入拣货单管理异常

---
 src/main/java/com/zy/asrs/entity/ManLocDetl.java |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index f738f2f..e0b60b0 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -9,6 +9,7 @@
 import com.core.common.SpringUtils;
 import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.NodeService;
+import com.zy.common.utils.Synchro;
 import com.zy.system.entity.Host;
 import com.zy.system.entity.User;
 import com.zy.system.service.HostService;
@@ -30,6 +31,7 @@
      * 鎵�灞為」鐩�
      */
     @ApiModelProperty(value= "鎵�灞為」鐩�")
+    @TableId(value = "host_id", type = IdType.AUTO)
     @TableField("host_id")
     private Long hostId;
 
@@ -37,7 +39,6 @@
      * 璐т綅缂栧彿
      */
     @ApiModelProperty(value= "璐т綅缂栧彿")
-    @TableId(value = "loc_no", type = IdType.INPUT)
     @TableField("loc_no")
     private String locNo;
 
@@ -148,7 +149,7 @@
      * 鏁伴噺
      */
     @ApiModelProperty(value= "鏁伴噺")
-    private Integer count;
+    private Double count;
 
 
     /**
@@ -198,6 +199,13 @@
     private Date modiTime;
 
     /**
+     * 娣诲姞鏃堕棿
+     */
+    @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+    @TableField("produce_time")
+    private Date produceTime;
+
+    /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
@@ -215,44 +223,20 @@
     @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
     private Integer payment;
 
-    /**
-     * uuid鏃堕棿鎴�
-     */
-    @ApiModelProperty(value= "uuid")
-    @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
-    @TableField("uuid")
-    private String uuid;
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("real_anfme")
+    private Double realAnfme;
 
-    public ManLocDetl() {}
+    @ApiModelProperty(value= "璁㈠崟鍙�")
+    @TableField("order_no")
+    private String orderNo;
 
-    public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo,int owner ,int payment,String uuid) {
-        this.hostId = hostId;
-        this.nodeId = nodeId;
-        this.zpallet = zpallet;
-        this.anfme = anfme;
-        this.maktx = maktx;
-        this.name = name;
-        this.specs = specs;
-        this.model = model;
-        this.batch = batch;
-        this.unit = unit;
-        this.barcode = barcode;
-        this.docId = docId;
-        this.docNum = docNum;
-        this.custName = custName;
-        this.itemNum = itemNum;
-        this.count = count;
-        this.weight = weight;
-        this.status = status;
-        this.createBy = createBy;
-        this.createTime = createTime;
-        this.updateBy = updateBy;
-        this.modiTime = modiTime;
-        this.memo = memo;
-        this.owner = owner;
-        this.payment = payment;
-        this.uuid = uuid;
-    }
+    @TableField("stock_freeze")
+    @ApiModelProperty(value= "搴撳瓨鍐荤粨{1:姝ｅ父,0:鍐荤粨}")
+    private Integer stockFreeze;
+
+
+
 
 //    LocDetl locDetl = new LocDetl(
 //            null,    // 璐т綅缂栧彿[闈炵┖]
@@ -352,6 +336,13 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
     }
 
+    public String getProduceTimeTime$(){
+        if (Cools.isEmpty(this.produceTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.produceTime);
+    }
+
     public String getUpdateBy$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.selectById(this.updateBy);
@@ -367,6 +358,15 @@
         }
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
+    public String getStockFreeze$() {
+        if (Cools.isEmpty(this.stockFreeze)){
+            return "";
+        }
+        return this.stockFreeze == 1 ? "姝ｅ父" : "鍐荤粨";
+    }
+    public void sync(Object source) {
+        Synchro.Copy(source, this);
+    }
 
 
 

--
Gitblit v1.9.1