From e64b1d5ec0b3ca0c42048903f4ab5f9d588349e8 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 19 六月 2025 08:37:51 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java |   42 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index a816f62..c1f3787 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,18 +3,17 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.asrs.common.utils.Synchro;
 import com.zy.asrs.common.wms.service.DocTypeService;
 import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.MatService;
 import com.zy.asrs.common.wms.service.OrderService;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,6 +26,7 @@
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("wms_loc_detl")
@@ -42,12 +42,14 @@
      * 搴撲綅鍙�
      */
     @ApiModelProperty(value= "搴撲綅鍙�")
+    @TableField("loc_no")
     private String locNo;
 
     /**
      * 鎵樼洏鏉＄爜
      */
     @ApiModelProperty(value= "鎵樼洏鏉＄爜")
+    @TableField("zpallet")
     private String zpallet;
 
     /**
@@ -72,6 +74,7 @@
     private String batch;
 
     @ApiModelProperty(value= "")
+    @TableField("order_no")
     private String orderNo;
 
     /**
@@ -117,12 +120,15 @@
     private String manu;
 
     @ApiModelProperty(value= "")
+    @TableField("manu_date")
     private String manuDate;
 
     @ApiModelProperty(value= "")
+    @TableField("item_num")
     private String itemNum;
 
     @ApiModelProperty(value= "")
+    @TableField("safe_qty")
     private Double safeQty;
 
     @ApiModelProperty(value= "")
@@ -135,21 +141,26 @@
     private Double volume;
 
     @ApiModelProperty(value= "")
+    @TableField("three_code")
     private String threeCode;
 
     @ApiModelProperty(value= "")
     private String supp;
 
     @ApiModelProperty(value= "")
+    @TableField("supp_code")
     private String suppCode;
 
     @ApiModelProperty(value= "")
+    @TableField("be_batch")
     private Integer beBatch;
 
     @ApiModelProperty(value= "")
+    @TableField("dead_time")
     private String deadTime;
 
     @ApiModelProperty(value= "")
+    @TableField("dead_warn")
     private Integer deadWarn;
 
     @ApiModelProperty(value= "")
@@ -165,6 +176,7 @@
      * 淇敼浜哄憳
      */
     @ApiModelProperty(value= "淇敼浜哄憳")
+    @TableField("modi_user")
     private Long modiUser;
 
     /**
@@ -172,12 +184,14 @@
      */
     @ApiModelProperty(value= "淇敼鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("modi_time")
     private Date modiTime;
 
     /**
      * 鍒涘缓鑰�
      */
     @ApiModelProperty(value= "鍒涘缓鑰�")
+    @TableField("appe_user")
     private Long appeUser;
 
     /**
@@ -185,6 +199,7 @@
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @TableField("appe_time")
     private Date appeTime;
 
     /**
@@ -197,9 +212,11 @@
      * 鎺堟潈鍟嗘埛
      */
     @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+    @TableField("host_id")
     private Long hostId;
 
     @ApiModelProperty(value= "璐т富")
+    @TableField("owner")
     private String owner;
 
     public LocDetl() {}
@@ -289,6 +306,23 @@
 //            null    // 鎺堟潈鍟嗘埛
 //    );
 
+    public Mat getMat$(){
+        MatService service = SpringUtils.getBean(MatService.class);
+        Mat mat = null;
+        if (hostId!=null){
+             mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr).eq(Mat::getHostId,hostId));
+        }else {
+            List<Mat> list = service.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+            if (!list.isEmpty()){
+                mat =list.get(0);
+            }
+        }
+        if (!Cools.isEmpty(mat)){
+            return mat;
+        }
+        return null;
+    }
+
     public String getLocNo$(){
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.getById(this.locNo);

--
Gitblit v1.9.1