From a3776853fa6ff1c4a9805615a79852d54f700e3f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期六, 20 七月 2024 09:21:04 +0800
Subject: [PATCH] 增加库位明细导出功能,曾加物料、单据、库存全局搜索功能

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index 22321a7..9eabd34 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -30,7 +30,7 @@
 import java.util.Date;
 
 @Data
-@TableName("wms_loc_mast")
+@TableName("common_loc_mast")
 public class LocMast implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -164,9 +164,15 @@
     @ApiModelProperty(value= "鎺堟潈鍟嗘埛")
     private Long hostId;
 
+    @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+    private String pic;
+
+    @ApiModelProperty(value= "璐т富")
+    private String owner;
+
     public LocMast() {}
 
-    public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId) {
+    public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, String owner) {
         this.locNo = locNo;
         this.whsType = whsType;
         this.locSts = locSts;
@@ -190,6 +196,7 @@
         this.barcode = barcode;
         this.memo = memo;
         this.hostId = hostId;
+        this.owner = owner;
     }
 
 //    LocMast locMast = new LocMast(
@@ -227,6 +234,7 @@
         return null;
     }
 
+
     public String getLocSts$(){
         BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
         BasLocSts basLocSts = service.getById(this.locSts);

--
Gitblit v1.9.1