From 65953b12f9d667c54049c34050d39bf90556585c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 二月 2025 17:08:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.97.1.152:5880/r/wms-master into dev

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 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 2792c1d..7e6e58b 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
@@ -66,7 +66,7 @@
      * 瑙勫垯浠ｇ爜
      */
     @ApiModelProperty(value= "瑙勫垯浠ｇ爜")
-    private Long batchRegularId;
+    private Long rglarId;
 
     /**
      * ERP缂栫爜
@@ -126,7 +126,7 @@
      * 閲囪喘鍗曚綅
      */
     @ApiModelProperty(value= "閲囪喘鍗曚綅")
-    private String purchaseUnit;
+    private String purUnit;
 
     /**
      * 搴撲綅鍗曚綅
@@ -138,7 +138,7 @@
      * 鍑哄叆搴撲紭鍏堢骇鍒� 0:  A    1:  B    2: C  
      */
     @ApiModelProperty(value= "鍑哄叆搴撲紭鍏堢骇鍒� 0:  A    1:  B    2: C  ")
-    private Short stockLeval;
+    private Short stockLevel;
 
     /**
      * 鏄惁鏍囩绠＄悊(*) 0:  鍚�   1:  鏄�  
@@ -150,7 +150,7 @@
      * 瀹夊叏搴撳瓨
      */
     @ApiModelProperty(value= "瀹夊叏搴撳瓨")
-    private Double safetyQty;
+    private Double safeQty;
 
     /**
      * 鏈�灏忓簱瀛橀璀﹀��
@@ -168,13 +168,13 @@
      * 鍋滄粸澶╂暟
      */
     @ApiModelProperty(value= "鍋滄粸澶╂暟")
-    private Integer stagnate;
+    private Integer stagn;
 
     /**
      * 淇濊川鏈熷ぉ鏁�
      */
     @ApiModelProperty(value= "淇濊川鏈熷ぉ鏁�")
-    private Integer validity;
+    private Integer valid;
 
     /**
      * 鏉″舰鐮�
@@ -186,7 +186,7 @@
      * 鏁堟湡棰勮闃堝��
      */
     @ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
-    private Integer validityWarn;
+    private Integer validWarn;
 
     /**
      * 鏄惁鍏嶆
@@ -254,12 +254,12 @@
 
     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 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) {
+    public Matnr(String name,String code,Long shipperId,Long groupId,Long rglarId,String erpCode,String spec,String model,Double weight,String color,String size,String describle,Integer nromNum,String unit,String purUnit,String stockUnit,Short stockLevel,Short flagLabelMange,Double safeQty,Double minQty,Double maxQty,Integer stagn,Integer valid,Integer validWarn,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;
         this.groupId = groupId;
-        this.batchRegularId = batchRegularId;
+        this.rglarId = rglarId;
         this.erpCode = erpCode;
         this.spec = spec;
         this.model = model;
@@ -269,16 +269,16 @@
         this.describle = describle;
         this.nromNum = nromNum;
         this.unit = unit;
-        this.purchaseUnit = purchaseUnit;
+        this.purUnit = purUnit;
         this.stockUnit = stockUnit;
-        this.stockLeval = stockLeval;
+        this.stockLevel = stockLevel;
         this.flagLabelMange = flagLabelMange;
-        this.safetyQty = safetyQty;
+        this.safeQty = safeQty;
         this.minQty = minQty;
         this.maxQty = maxQty;
-        this.stagnate = stagnate;
-        this.validity = validity;
-        this.validityWarn = validityWarn;
+        this.stagn = stagn;
+        this.valid = valid;
+        this.validWarn = validWarn;
         this.flagCheck = flagCheck;
         this.status = status;
         this.deleted = deleted;
@@ -344,9 +344,9 @@
         return null;
     }
 
-    public String getBatchRegularId$(){
+    public String getRglarId(){
         BatchRegularService service = SpringUtils.getBean(BatchRegularService.class);
-        BatchRegular batchRegular = service.getById(this.batchRegularId);
+        BatchRegular batchRegular = service.getById(this.rglarId);
         if (!Cools.isEmpty(batchRegular)){
             return String.valueOf(batchRegular.getCode());
         }
@@ -354,8 +354,8 @@
     }
 
     public String getStockLeval$(){
-        if (null == this.stockLeval){ return null; }
-        switch (this.stockLeval){
+        if (null == this.stockLevel){ return null; }
+        switch (this.stockLevel){
             case 0:
                 return " A";
             case   1:
@@ -363,7 +363,7 @@
             case   2:
                 return "C";
             default:
-                return String.valueOf(this.stockLeval);
+                return String.valueOf(this.stockLevel);
         }
     }
 

--
Gitblit v1.9.1