From a869e7291b6016b297bc00b30a2e83f8ed3983ea Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期一, 14 二月 2022 08:28:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/PltBarcode.java | 79 ++++++++++++++++++++++++++++++++++-----
1 files changed, 68 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 4481171..90b47bd 100644
--- a/src/main/java/com/zy/asrs/entity/PltBarcode.java
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -9,6 +9,7 @@
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -16,6 +17,7 @@
import java.util.Date;
@TableName("asr_plt_barcode")
+@Data
public class PltBarcode implements Serializable {
private static final long serialVersionUID = 1L;
@@ -71,6 +73,13 @@
private Double qty;
/**
+ * 鎬绘暟閲�
+ */
+ @ApiModelProperty(value= "鎬绘暟閲�")
+ @TableField("all_qty")
+ private Double allQty;
+
+ /**
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
@@ -106,15 +115,36 @@
*/
@ApiModelProperty(value= "鍗曢噸")
private Double weight;
-
+ /**
+ * 鎬婚噸
+ */
+ @ApiModelProperty(value= "鎬婚噸閲�")
+ @TableField("all_weight")
+ private double allWeight;
+ /**
+ * 鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�
+ */
+ @ApiModelProperty(value="鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�")
+ private Integer source;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "鎵瑰彿")
+ private String supplier;
+ /**
+ * 渚涘簲鍟�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟�")
+ @TableField("batch_number")
+ private String batchNumber;
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
- @ApiModelProperty(value= "鎵瑰彿")
- private String supplier;
+// @ApiModelProperty(value= "鎵瑰彿")
+// private String supplier;
/**
* ERP杩炵嚎 0: 闈炶繛绾� 1: ERP杩炵嚎
@@ -170,7 +200,7 @@
public PltBarcode() {}
- public PltBarcode(String barcode,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public PltBarcode(String barcode,double allQty,Integer source,String supplier,String batchNumber,double allWeight,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
this.barcode = barcode;
this.billNo = billNo;
this.seqNo = seqNo;
@@ -192,6 +222,11 @@
this.modiTime = modiTime;
this.appeUser = appeUser;
this.appeTime = appeTime;
+ this.allQty=allQty;
+ this.allWeight=allWeight;
+ this.source=source;
+ this.supplier=supplier;
+ this.batchNumber=batchNumber;
}
// PltBarcode pltBarcode = new PltBarcode(
@@ -226,6 +261,14 @@
this.barcode = barcode;
}
+ public double getAllWeight(){return allWeight;}
+
+ public void setAllWeight(double allweight){this.allWeight=allweight;}
+
+ public double getAllQty(){return allQty;}
+
+ public void setAllQty(double allqty){this.allQty=allqty;}
+
public String getBillNo() {
return billNo;
}
@@ -244,6 +287,20 @@
public Integer getBillType() {
return billType;
+ }
+
+ 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 getBillType$(){
@@ -340,13 +397,13 @@
this.weight = weight;
}
- public String getSupplier() {
- return supplier;
- }
-
- public void setSupplier(String supplier) {
- this.supplier = supplier;
- }
+// public String getSupplier() {
+// return supplier;
+// }
+//
+// public void setSupplier(String supplier) {
+// this.supplier = supplier;
+// }
public String getMemo() {
return memo;
--
Gitblit v1.9.1