From 36e6c98d9e34fd8e90ae803e7de2eef0a4d0741b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 二月 2025 16:45:57 +0800
Subject: [PATCH] #新增 1. 添加仓库信息 2. 添加库区信息表

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 20e800b..943da6d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -144,7 +144,7 @@
      * 鏄惁鏍囩绠$悊(*) 0:  鍚�   1:  鏄�  
      */
     @ApiModelProperty(value= "鏄惁鏍囩绠$悊(*) 0:  鍚�   1:  鏄�  ")
-    private Short isLabelMange;
+    private Short flagLabelMange;
 
     /**
      * 瀹夊叏搴撳瓨
@@ -177,10 +177,15 @@
     private Integer validity;
 
     /**
+     * 鏉″舰鐮�
+     */
+    private String barcode;
+
+    /**
      * 鏁堟湡棰勮闃堝��
      */
     @ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
-    private Integer validityWarr;
+    private Integer validityWarn;
 
     /**
      * 鏄惁鍏嶆
@@ -241,7 +246,7 @@
 
     public Matnr() {}
 
-    public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short isLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarr,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public Matnr(String name,String code,Long shipperId,Long groupId,Long batchRegularId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purchaseUnit,String stockUnit,Short stockLeval,Short flagLabelMange,Double safetyQty,Double minQty,Double maxQty,Integer stagnate,Integer validity,Integer validityWarn,Short flagCheck,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.name = name;
         this.code = code;
         this.shipperId = shipperId;
@@ -259,13 +264,13 @@
         this.purchaseUnit = purchaseUnit;
         this.stockUnit = stockUnit;
         this.stockLeval = stockLeval;
-        this.isLabelMange = isLabelMange;
+        this.flagLabelMange = flagLabelMange;
         this.safetyQty = safetyQty;
         this.minQty = minQty;
         this.maxQty = maxQty;
         this.stagnate = stagnate;
         this.validity = validity;
-        this.validityWarr = validityWarr;
+        this.validityWarn = validityWarn;
         this.flagCheck = flagCheck;
         this.status = status;
         this.deleted = deleted;
@@ -355,14 +360,14 @@
     }
 
     public String getIsLabelMange$(){
-        if (null == this.isLabelMange){ return null; }
-        switch (this.isLabelMange){
+        if (null == this.flagLabelMange){ return null; }
+        switch (this.flagLabelMange){
             case 0:
                 return " 鍚�";
             case  1:
                 return " 鏄�";
             default:
-                return String.valueOf(this.isLabelMange);
+                return String.valueOf(this.flagLabelMange);
         }
     }
 

--
Gitblit v1.9.1