From 0ad8974666f184a90b63f4cde84b7ad7514547dc Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 二月 2025 17:11:16 +0800
Subject: [PATCH] #修改 接口界面功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java |   37 +++++++++++++++++++++++++------------
 1 files changed, 25 insertions(+), 12 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..2792c1d 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
@@ -1,6 +1,7 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -11,10 +12,7 @@
 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;
@@ -24,9 +22,11 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_matnr")
+@ApiModel(value = "Matnr", description = "鐗╂枡鎵�鏈夊熀纭�灞炴��")
 public class Matnr implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -144,7 +144,7 @@
      * 鏄惁鏍囩绠＄悊(*) 0:  鍚�   1:  鏄�  
      */
     @ApiModelProperty(value= "鏄惁鏍囩绠＄悊(*) 0:  鍚�   1:  鏄�  ")
-    private Short isLabelMange;
+    private Short flagLabelMange;
 
     /**
      * 瀹夊叏搴撳瓨
@@ -177,10 +177,16 @@
     private Integer validity;
 
     /**
+     * 鏉″舰鐮�
+     */
+    @ApiModelProperty(value = "鏉″舰鐮�")
+    private String barcode;
+
+    /**
      * 鏁堟湡棰勮闃堝��
      */
     @ApiModelProperty(value= "鏁堟湡棰勮闃堝��")
-    private Integer validityWarr;
+    private Integer validityWarn;
 
     /**
      * 鏄惁鍏嶆
@@ -239,9 +245,16 @@
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
 
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty(value= "鍒嗙被鍒楄〃")
+    @TableField(exist = false)
+    private List<Matnr> children;
+
     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 +272,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 +368,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