From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/entity/Mat.java | 390 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 310 insertions(+), 80 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index ecd9b5f..6900551 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -12,6 +12,7 @@
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
@@ -20,8 +21,6 @@
@Data
@TableName("man_mat")
public class Mat implements Serializable {
-
- private static final long serialVersionUID = 1L;
@TableField(exist = false)
private Double stock;
@@ -33,6 +32,8 @@
public void setStock(Double stock) {
this.stock = stock;
}
+
+ private static final long serialVersionUID = 1L;
/**
* ID
@@ -48,13 +49,6 @@
private String uuid;
/**
- * 鎵�灞炲尯鍩�
- */
- @ApiModelProperty(value= "鎵�灞炲尯鍩�")
- @TableField("node_id")
- private Long nodeId;
-
- /**
* 鎵�灞炲綊绫�
*/
@ApiModelProperty(value= "鎵�灞炲綊绫�")
@@ -62,109 +56,218 @@
private Long tagId;
/**
- * 鍟嗗搧缂栧彿
+ * 鐗╂枡鍙�
*/
- @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡鍙�")
private String matnr;
+
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ExcelProperty(value = "鐗╂枡鍚嶇О")
private String maktx;
/**
- * 鍚嶇О
+ * 绉诲姩绫诲瀷
*/
- @ApiModelProperty(value= "鍚嶇О")
+ @ApiModelProperty(value= "绉诲姩绫诲瀷")
+ //@ExcelProperty(value = "绉诲姩绫诲瀷")
private String name;
/**
* 瑙勬牸
*/
- @ExcelProperty(index = 4, value = "瑙勬牸")
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty(value = "瑙勬牸鍨嬪彿")
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ExcelProperty(index = 5, value = "鍨嬪彿")
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
+ @ExcelProperty(value = "閫氱敤鍨嬪彿")
private String model;
/**
- * 鎵瑰彿
+ * 棰滆壊
*/
- @ExcelProperty(index = 6, value = "鎵瑰彿")
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value= "棰滆壊")
+ @ExcelProperty(value = "瀛樿揣鍒嗙被鍚嶇О")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ @ExcelProperty(value = "瀛樿揣鍒嗙被缂栫爜")
+ private String brand;
/**
* 鍗曚綅
*/
- @ExcelProperty(index = 7, value = "鍗曚綅")
@ApiModelProperty(value= "鍗曚綅")
+ @ExcelProperty(value = "璁￠噺鍗曚綅")
private String unit;
/**
- * SKC
+ * 鍗曚环
*/
- @ExcelProperty(index = 8, value = "SKC")
- @ApiModelProperty(value= "SKC")
+ @ApiModelProperty(value= "鍗曚环")
+ @ExcelProperty(value = "杩涢」绋�")
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ //@ExcelProperty(value = "sku")
+ private String sku;
+
+ /**
+ * 鍖呮暟
+ */
+ @ApiModelProperty(value= "鍖呮暟")
+ @ExcelProperty(value = "閿�椤圭◣")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ //@ExcelProperty(value = "鏉＄爜")
private String barcode;
/**
- * 鍗曟嵁绫诲瀷
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲瀷")
- @TableField("doc_id")
- private Long docId;
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ //@ExcelProperty(value = "鐗╂枡鐘舵��")
+ private String origin;
/**
- * 鍗曟嵁缂栧彿
+ * 鍘傚
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
- @TableField("doc_num")
- private String docNum;
+ @ApiModelProperty(value= "鍘傚")
+ //@ExcelProperty(value = "鍘傚")
+ private String manu;
/**
- * 瀹㈡埛鍚嶇О
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
- @TableField("cust_name")
- private String custName;
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ //@ExcelProperty(value = "鍗曟嵁鏃堕棿")
+ @TableField("manu_date")
+ private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
+ //@ExcelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
- private Integer itemNum;
+ private String itemNum;
/**
- * 搴撳瓨浣欓噺
+ * 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "搴撳瓨浣欓噺")
- private Integer count;
-
- /**
- * 鍗曚环
- */
- @ExcelProperty(index = 9, value = "鍗曚环")
- @ApiModelProperty(value= "鍗曚环")
- private Double price;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ExcelProperty(value = "瀹夊叏搴撳瓨閲�")
+ @TableField("safe_qty")
+ private Double safeQty;
/**
* 閲嶉噺
*/
- @ExcelProperty(index = 10, value = "閲嶉噺")
@ApiModelProperty(value= "閲嶉噺")
+ //@ExcelProperty(value = "閲嶉噺")
private Double weight;
- @ApiModelProperty(value= "")
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ //@ExcelProperty(value = "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ //@ExcelProperty(value = "浣撶Н")
+ private Double volume;
+
+ /**
+ * 涓夋柟缂栫爜
+ */
+ @ApiModelProperty(value= "涓夋柟缂栫爜")
+ //@ExcelProperty(value = "涓夋柟缂栫爜")
+ @TableField("three_code")
+ private String threeCode;
+
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟�")
+ @ExcelProperty(value = "寤烘。浜�")
+ private String supp;
+
+ /**
+ * 渚涘簲鍟嗙紪鐮�
+ */
+ @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ //@ExcelProperty(value = "渚涘簲鍟嗙紪鐮�")
+ @TableField("supp_code")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @TableField("be_batch")
+ @ExcelProperty(value = "鐗╂枡棰戠巼")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ @TableField("dead_time")
+ //@ExcelProperty(value = "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ @TableField("dead_warn")
+ //@ExcelProperty(value = "棰勮澶╂暟")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
@@ -179,6 +282,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -193,62 +297,129 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ExcelProperty(index = 11, value = "澶囨敞")
@ApiModelProperty(value= "澶囨敞")
+ @ExcelProperty(value = "澶囨敞")
private String memo;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
+ //鍚姩鏃ユ湡
+ @TableField("ds_date")
+ @ExcelProperty(value = "鍚敤鏃ユ湡")
+ private Date dsDate;
+
+ //寤烘。鏃ユ湡
+ @TableField("d_inv_create_datetime")
+ @ExcelProperty(value = "寤烘。鏃ユ湡")
+ private Date dInvCreateDatetime;
+
+ /**
+ * 鐗╂枡鍙�
+ */
+ @ApiModelProperty(value= "鏃х墿鏂欏彿")
+ @ExcelProperty(value = "鏃х墿鏂欏彿")
+ private String matnr2;
public Mat() {}
- public Mat(String uuid,Long nodeId,Long tagId,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Double storeMax, Double storeMin, Integer storeMaxDate) {
this.uuid = uuid;
- this.nodeId = nodeId;
this.tagId = tagId;
this.matnr = matnr;
this.maktx = maktx;
this.name = name;
this.specs = specs;
this.model = model;
- this.batch = batch;
+ this.color = color;
+ this.brand = brand;
this.unit = unit;
+ this.price = price;
+ this.sku = sku;
+ this.units = units;
this.barcode = barcode;
- this.docId = docId;
- this.docNum = docNum;
- this.custName = custName;
+ this.origin = origin;
+ this.manu = manu;
+ this.manuDate = manuDate;
this.itemNum = itemNum;
- this.count = count;
+ this.safeQty = safeQty;
this.weight = weight;
+ this.length = length;
+ this.volume = volume;
+ this.threeCode = threeCode;
+ this.supp = supp;
+ this.suppCode = suppCode;
+ this.beBatch = beBatch;
+ this.deadTime = deadTime;
+ this.deadWarn = deadWarn;
+ this.source = source;
+ this.inspect = inspect;
+ this.danger = danger;
this.status = status;
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.storeMax = storeMax;
+ this.storeMin = storeMin;
+ this.storeMaxDate = storeMaxDate;
}
// Mat mat = new Mat(
// null, // 缂栧彿
-// null, // 鎵�灞炲尯鍩�
// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍚嶇О
+// null, // 鐗╂枡鍙�
+// null, // 鐗╂枡鍙�
+// null, // 绉诲姩绫诲瀷
// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵瑰彿
+// null, // 鎵规
+// null, // 棰滆壊
+// null, // 鍝佺墝
// null, // 鍗曚綅
-// null, // SKC
-// null, // 鍗曟嵁绫诲瀷
-// null, // 鍗曟嵁缂栧彿
-// null, // 瀹㈡埛鍚嶇О
+// null, // 鍗曚环
+// null, // sku
+// null, // 鍖呮暟
+// null, // 鏉＄爜
+// null, // 鐗╂枡鐘舵��
+// null, // 鍘傚
+// null, // 鍗曟嵁鏃堕棿
// null, // 鍝侀」鏁�
-// null, // 搴撳瓨浣欓噺
+// null, // 瀹夊叏搴撳瓨閲�
// null, // 閲嶉噺
-// null, //
+// null, // 闀垮害
+// null, // 浣撶Н
+// null, // 涓夋柟缂栫爜
+// null, // 渚涘簲鍟�
+// null, // 渚涘簲鍟嗙紪鐮�
+// null, // 鏄惁鎵规
+// null, // 淇濊川鏈�
+// null, // 棰勮澶╂暟
+// null, // 鍒惰喘
+// null, // 瑕佹眰妫�楠�
+// null, // 鍗遍櫓鍝�
+// null, // 鐘舵�乕闈炵┖]
// null, // 娣诲姞浜哄憳
// null, // 娣诲姞鏃堕棿
// null, // 淇敼浜哄憳
@@ -265,11 +436,73 @@
return null;
}
+ public String getBeBatch$(){
+ if (null == this.beBatch){ return null; }
+ switch (this.beBatch){
+ case 1:
+ return "楂�";
+ case 0:
+ return "浣�";
+ default:
+ return "浣�";
+ }
+ }
+
+ public String getSource$(){
+ if (null == this.source){ return null; }
+ switch (this.source){
+ case 1:
+ return "鍒堕��";
+ case 2:
+ return "閲囪喘";
+ case 3:
+ return "澶栧崗";
+ default:
+ return String.valueOf(this.source);
+ }
+ }
+
+ public String getInspect$(){
+ if (null == this.inspect){ return null; }
+ switch (this.inspect){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.inspect);
+ }
+ }
+
+ public String getDanger$(){
+ if (null == this.danger){ return null; }
+ switch (this.danger){
+ case 1:
+ return "鏄�";
+ case 0:
+ return "鍚�";
+ default:
+ return String.valueOf(this.danger);
+ }
+ }
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -281,15 +514,11 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public Long getUpdateBy() {
- return updateBy;
- }
-
public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
+ return String.valueOf(user.getUsername());
}
return null;
}
@@ -301,4 +530,5 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
+
}
--
Gitblit v1.9.1