From 408f70e524beb80f555dcd2285cbddb979dbcf35 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 14:12:38 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index ce546a1..99eb489 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
 import com.zy.asrs.service.NodeService;
 import com.zy.system.entity.Host;
 import com.zy.system.entity.User;
@@ -29,6 +30,7 @@
      * 鎵�灞為」鐩�
      */
     @ApiModelProperty(value= "鎵�灞為」鐩�")
+    @TableId(value = "host_id", type = IdType.AUTO)
     @TableField("host_id")
     private Long hostId;
 
@@ -36,7 +38,6 @@
      * 璐т綅缂栧彿
      */
     @ApiModelProperty(value= "璐т綅缂栧彿")
-    @TableId(value = "loc_no", type = IdType.INPUT)
     @TableField("loc_no")
     private String locNo;
 
@@ -193,8 +194,8 @@
      * 淇敼鏃堕棿
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
-    @TableField("update_time")
-    private Date updateTime;
+    @TableField("modi_time")
+    private Date modiTime;
 
     /**
      * 澶囨敞
@@ -202,33 +203,28 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
-    public ManLocDetl() {}
+    /**
+     * 鎷ユ湁鑰�
+     */
+    @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠   ")
+    private Integer owner;
 
-    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 updateTime,String memo) {
-        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.updateTime = updateTime;
-        this.memo = memo;
-    }
+    /**
+     * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+     */
+    @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+    private Integer payment;
+
+    @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @TableField("real_anfme")
+    private Date realAnfme;
+
+    @ApiModelProperty(value= "璁㈠崟鍙�")
+    @TableField("order_no")
+    private String orderNo;
+
+
+
 
 //    LocDetl locDetl = new LocDetl(
 //            null,    // 璐т綅缂栧彿[闈炵┖]
@@ -256,6 +252,27 @@
 //            null,    // 淇敼鏃堕棿
 //            null    // 澶囨敞
 //    );
+
+    public String getOwner$(){
+        LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+        LocOwner locOwner = service.selectById(this.owner);
+        if (!Cools.isEmpty(locOwner)){
+            return String.valueOf(locOwner.getOwner());
+        }
+        return null;
+    }
+
+    public String getPayment$(){
+        if (null == this.payment){ return null; }
+        switch (this.payment){
+            case 1:
+                return "浠撳偍";
+            case 0:
+                return "浠ｉ噰";
+            default:
+                return String.valueOf(this.payment);
+        }
+    }
 
     public String getHostId$(){
         HostService service = SpringUtils.getBean(HostService.class);
@@ -316,10 +333,13 @@
         return null;
     }
 
-    public String getUpdateTime$(){
-        if (Cools.isEmpty(this.updateTime)){
+    public String getModiTime$(){
+        if (Cools.isEmpty(this.modiTime)){
             return "";
         }
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
     }
+
+
+
 }

--
Gitblit v1.9.1