From b91211bcb11e4bbe2e827de0510d90d65c25e965 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 11 二月 2022 09:15:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/MatCode.java | 303 +++++++++++++++-----------------------------------
1 files changed, 91 insertions(+), 212 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index bfa7e5d..b8992d6 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -9,20 +9,22 @@
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+@Data
@TableName("bas_mat_code")
public class MatCode implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * 鐗╂枡缂栫爜
+ * 浜у搧浠ｅ彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "浜у搧缂栫爜")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -30,39 +32,81 @@
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value= "鏉″舰鐮�")
private String barcode;
/**
- * 鐗╂枡鍚嶇О
+ * 浜у搧鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
@TableField("mat_name")
private String matName;
/**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value= "瑙勬牸")
+ private String specs;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value= "鍗曚綅")
+ private String unit;
+
+ /**
+ * 灏哄
+ */
+ @ApiModelProperty(value= "灏哄")
+ private String size;
+
+ /**
+ * 棰滆壊
+ */
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍗曢噸
+ */
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
+
+ /**
* 鐗╂枡鍗曚綅
*/
- @ApiModelProperty(value= "鐗╂枡鍗曚綅")
+ @ApiModelProperty(value= "")
private String str1;
/**
* 鐗╂枡瑙勬牸
*/
- @ApiModelProperty(value= "鐗╂枡瑙勬牸")
+ @ApiModelProperty(value= "")
private String str2;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
@ApiModelProperty(value= "")
private String str3;
+ /**
+ * 椤圭洰淇℃伅
+ */
@ApiModelProperty(value= "")
private String str4;
-
+ /**
+ * 绫诲埆{1:鍘熸潗鏂�,2:鎴愬搧,3:鍗婃垚鍝亇
+ */
@ApiModelProperty(value= "")
private String str5;
+ /**
+ * 鏁伴噺
+ */
@ApiModelProperty(value= "")
- private String str6;
+ private Double str6;
@ApiModelProperty(value= "")
private String str7;
@@ -75,45 +119,6 @@
@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;
@@ -129,9 +134,6 @@
@ApiModelProperty(value= "")
private Double num5;
-
- @ApiModelProperty(value= "")
- private Double num6;
@ApiModelProperty(value= "")
private Date date1;
@@ -169,51 +171,27 @@
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) {
- this.barcode = barcode;
- this.matName = matName;
- this.str1 = str1;
- this.str2 = str2;
- this.str3 = str3;
- this.str4 = str4;
- this.str5 = str5;
- this.str6 = str6;
- this.str7 = str7;
- 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;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.status = status;
- }
+ public String getStr5$(){
+ if (Cools.isEmpty(this.str5) ){
+ return "";
+ }
+ if (this.str5.equals("1")){
+ return "鍘熸潗鏂�";
+ }
+ if (this.str5.equals("2")){
+ return "鎴愬搧";
+ }
+ if (this.str5.equals("3")){
+ return "鍗婃垚鍝�";
+ }
+ return "";
+ }
// MatCode matCode = new MatCode(
// null, // 鏉＄爜
-// null, // 鐗╂枡鍚嶇О
-// null, // 鐗╂枡鍗曚綅
-// null, // 鐗╂枡瑙勬牸
+// null, // 浜у搧鍚嶇О
+// null, // 鍩烘湰鍗曚綅
+// null, // 瑙勬牸鍨嬪彿
// null, //
// null, //
// null, //
@@ -265,6 +243,26 @@
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;
}
@@ -313,13 +311,6 @@
this.str5 = str5;
}
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
public String getStr7() {
return str7;
@@ -351,110 +342,6 @@
public void setStr10(String str10) {
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() {
@@ -495,14 +382,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