From 19c13db8d30d1c2aeb9250ed218c110e1290d05f Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 08 二月 2022 16:37:27 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/MatCode.java |  314 ++++++++++++++++-----------------------------------
 1 files changed, 99 insertions(+), 215 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 6f45a09..5f3ebf0 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -20,9 +20,9 @@
     private static final long serialVersionUID = 1L;
 
     /**
-     * 鐗╂枡缂栫爜
+     * 浜у搧浠e彿
      */
-    @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+    @ApiModelProperty(value= "浜у搧缂栫爜")
     @TableId(value = "mat_no", type = IdType.INPUT)
     @TableField("mat_no")
     private String matNo;
@@ -34,101 +34,86 @@
     private String barcode;
 
     /**
-     * 鐗╂枡鍚嶇О
+     * 浜у搧鍚嶇О
      */
-    @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+    @ApiModelProperty(value= "浜у搧鍚嶇О")
     @TableField("mat_name")
     private String matName;
 
     /**
-     * 鐗╂枡鍗曚綅
+     * 瑙勬牸
      */
-    @ApiModelProperty(value= "鍩烘湰鍗曚綅")
-    private String str1;
+    @ApiModelProperty(value= "瑙勬牸")
+    private String specs;
 
-    @ApiModelProperty(value= "鍟嗗搧绫诲埆")
-    private String str2;
+    /**
+     * 鍗曚綅
+     */
+    @ApiModelProperty(value= "鍗曚綅")
+    private String unit;
 
-    @ApiModelProperty(value= "瑙勬牸鍨嬪彿")
-    private String str3;
+    /**
+     * 灏哄
+     */
+    @ApiModelProperty(value= "灏哄")
+    private String size;
 
-    @ApiModelProperty(value= "鐘舵��")
-    private String str4;
+    /**
+     * 棰滆壊
+     */
+    @ApiModelProperty(value= "棰滆壊")
+    private String color;
 
-    @ApiModelProperty(value= "鍔╄鐮�")
-    private String str5;
-
-    @ApiModelProperty(value= "榛樿渚涘簲鍟�")
-    private String str6;
-
-    @ApiModelProperty(value= "榛樿浠撳簱")
-    private String str7;
-
-    @ApiModelProperty(value= "鍝佺墝")
-    private String str8;
-
-    @ApiModelProperty(value= "閲囪喘鍛�")
-    private String str9;
-
-    @ApiModelProperty(value= "浜у湴")
-    private String str10;
-
-    @ApiModelProperty(value= "搴忓垪鍙风鐞�")
-    private String str11;
-
-    @ApiModelProperty(value= "鎵规绠$悊")
-    private String str12;
-
-    @ApiModelProperty(value= "淇濊川鏈熷崟浣�")
-    private String str13;
-
-    @ApiModelProperty(value= "淇濊川鏈熺鐞�")
-    private String str14;
-
-    @ApiModelProperty(value= "淇濊川鏈�")
-    private String str15;
-
-    @ApiModelProperty(value= "鍙攢鍞�")
-    private String str16;
-
-    @ApiModelProperty(value= "鍙噰璐�")
-    private String str17;
-
-    @ApiModelProperty(value= "鍙负瀛愪欢")
-    private String str18;
-
-    @ApiModelProperty(value= "鍙负缁勪欢")
-    private String str19;
-
-    @ApiModelProperty(value= "杈呭姪灞炴�х鐞�")
-    private String str20;
-
-    @ApiModelProperty(value= "鎴愭湰璁$畻鏂规硶")
-    private String str21;
-
-    @ApiModelProperty(value= "閲囪喘鍗曚綅")
-    private String str22;
-
-    @ApiModelProperty(value= "閿�鍞崟浣�")
-    private String str23;
-
-    @ApiModelProperty(value= "棰勮澶╂暟")
-    private Double num1;
-
-    @ApiModelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
-    private Double num2;
-
-    @ApiModelProperty(value= "鏈�楂樺簱瀛樻暟閲�")
-    private Double num3;
-
-    @ApiModelProperty(value= "瀹夊叏搴撳瓨")
-    private Double num4;
-
-    @ApiModelProperty(value= "绋庣巼")
-    private Double num5;
+    /**
+     * 鍗曢噸
+     */
+    @ApiModelProperty(value= "鍗曢噸")
+    private Double weight;
 
     @ApiModelProperty(value= "")
-    private Double num6;
+    private String str1;
+
+    @ApiModelProperty(value= "")
+    private String str2;
+
+    @ApiModelProperty(value= "")
+    private String str3;
+
+    @ApiModelProperty(value= "")
+    private String str4;
+
+    @ApiModelProperty(value= "")
+    private String str5;
+
+    @ApiModelProperty(value= "")
+    private String str6;
+
+    @ApiModelProperty(value= "")
+    private String str7;
+
+    @ApiModelProperty(value= "")
+    private String str8;
+
+    @ApiModelProperty(value= "")
+    private String str9;
+
+    @ApiModelProperty(value= "")
+    private String str10;
+
+    @ApiModelProperty(value= "")
+    private Double num1;
+
+    @ApiModelProperty(value= "")
+    private Double num2;
+
+    @ApiModelProperty(value= "")
+    private Double num3;
+
+    @ApiModelProperty(value= "")
+    private Double num4;
+
+    @ApiModelProperty(value= "")
+    private Double num5;
 
     @ApiModelProperty(value= "")
     private Date date1;
@@ -166,9 +151,14 @@
 
     public MatCode() {}
 
-    public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
+    public MatCode(String barcode,String matName,String specs,String unit,String size,String color,Double weight,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,Double num1,Double num2,Double num3,Double num4,Double num5,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
         this.barcode = barcode;
         this.matName = matName;
+        this.specs = specs;
+        this.unit = unit;
+        this.size = size;
+        this.color = color;
+        this.weight = weight;
         this.str1 = str1;
         this.str2 = str2;
         this.str3 = str3;
@@ -179,25 +169,11 @@
         this.str8 = str8;
         this.str9 = str9;
         this.str10 = str10;
-        this.str11 = str11;
-        this.str12 = str12;
-        this.str13 = str13;
-        this.str14 = str14;
-        this.str15 = str15;
-        this.str16 = str16;
-        this.str17 = str17;
-        this.str18 = str18;
-        this.str19 = str19;
-        this.str20 = str20;
-        this.str21 = str21;
-        this.str22 = str22;
-        this.str23 = str23;
         this.num1 = num1;
         this.num2 = num2;
         this.num3 = num3;
         this.num4 = num4;
         this.num5 = num5;
-        this.num6 = num6;
         this.date1 = date1;
         this.appeUser = appeUser;
         this.appeTime = appeTime;
@@ -208,9 +184,9 @@
 
 //    MatCode matCode = new MatCode(
 //            null,    // 鏉$爜
-//            null,    // 鐗╂枡鍚嶇О
-//            null,    // 鐗╂枡鍗曚綅
-//            null,    // 鐗╂枡瑙勬牸
+//            null,    // 浜у搧鍚嶇О
+//            null,    // 鍩烘湰鍗曚綅
+//            null,    // 瑙勬牸鍨嬪彿
 //            null,    // 
 //            null,    // 
 //            null,    // 
@@ -261,6 +237,26 @@
     public void setBarcode(String barcode) {
         this.barcode = barcode;
     }
+
+    public String getSpecs() { return specs; }
+
+    public void setSpecs(String specs) { this.specs = specs; }
+
+    public String getUnit() { return unit; }
+
+    public void setUnit(String unit) { this.unit = unit; }
+
+    public String getSize() { return size; }
+
+    public void setSize(String size) { this.size = size; }
+
+    public String getColor() { return color; }
+
+    public void setColor(String color) { this.color = color; }
+
+    public Double getWeight() { return weight; }
+
+    public void setWeight(Double weight) { this.weight = weight; }
 
     public String getMatName() {
         return matName;
@@ -350,110 +346,6 @@
         this.str10 = str10;
     }
 
-    public String getStr11() {
-        return str11;
-    }
-
-    public void setStr11(String str11) {
-        this.str11 = str11;
-    }
-
-    public String getStr12() {
-        return str12;
-    }
-
-    public void setStr12(String str12) {
-        this.str12 = str12;
-    }
-
-    public String getStr13() {
-        return str13;
-    }
-
-    public void setStr13(String str13) {
-        this.str13 = str13;
-    }
-
-    public String getStr14() {
-        return str14;
-    }
-
-    public void setStr14(String str14) {
-        this.str14 = str14;
-    }
-
-    public String getStr15() {
-        return str15;
-    }
-
-    public void setStr15(String str15) {
-        this.str15 = str15;
-    }
-
-    public String getStr16() {
-        return str16;
-    }
-
-    public void setStr16(String str16) {
-        this.str16 = str16;
-    }
-
-    public String getStr17() {
-        return str17;
-    }
-
-    public void setStr17(String str17) {
-        this.str17 = str17;
-    }
-
-    public String getStr18() {
-        return str18;
-    }
-
-    public void setStr18(String str18) {
-        this.str18 = str18;
-    }
-
-    public String getStr19() {
-        return str19;
-    }
-
-    public void setStr19(String str19) {
-        this.str19 = str19;
-    }
-
-    public String getStr20() {
-        return str20;
-    }
-
-    public void setStr20(String str20) {
-        this.str20 = str20;
-    }
-
-    public String getStr21() {
-        return str21;
-    }
-
-    public void setStr21(String str21) {
-        this.str21 = str21;
-    }
-
-    public String getStr22() {
-        return str22;
-    }
-
-    public void setStr22(String str22) {
-        this.str22 = str22;
-    }
-
-    public String getStr23() {
-        return str23;
-    }
-
-    public void setStr23(String str23) {
-        this.str23 = str23;
-    }
-
     public Double getNum1() {
         return num1;
     }
@@ -492,14 +384,6 @@
 
     public void setNum5(Double num5) {
         this.num5 = num5;
-    }
-
-    public Double getNum6() {
-        return num6;
-    }
-
-    public void setNum6(Double num6) {
-        this.num6 = num6;
     }
 
     public Date getDate1() {

--
Gitblit v1.9.1