From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/entity/PltBarcode.java | 78 ++++++++++++++++++++++++++-------------
1 files changed, 52 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 90b47bd..a02bdf6 100644
--- a/src/main/java/com/zy/asrs/entity/PltBarcode.java
+++ b/src/main/java/com/zy/asrs/entity/PltBarcode.java
@@ -120,14 +120,14 @@
*/
@ApiModelProperty(value= "鎬婚噸閲�")
@TableField("all_weight")
- private double allWeight;
+ private Double allWeight;
/**
- * 鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�
+ * 鏉ユ簮
*/
- @ApiModelProperty(value="鏉ユ簮锛�1銆佸鍗� 2銆佽嚜鍒� 3銆佸渚�")
- private Integer source;
+ @ApiModelProperty(value="鏉ユ簮")
+ private String source;
/**
- * 渚涘簲鍟�
+ * 鎵瑰彿
*/
@ApiModelProperty(value = "鎵瑰彿")
private String supplier;
@@ -135,8 +135,7 @@
* 渚涘簲鍟�
*/
@ApiModelProperty(value = "渚涘簲鍟�")
- @TableField("batch_number")
- private String batchNumber;
+ private String vendor;
/**
* 澶囨敞
*/
@@ -198,9 +197,49 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date appeTime;
+ /**
+ * 鍗曠鏁伴噺
+ */
+ @ApiModelProperty(value = "鍗曠鏁伴噺")
+ @TableField("qty_box")
+ private Double qtyBox;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
+ private String str3;
+
+ /**
+ * 椤圭洰淇℃伅
+ */
+ @ApiModelProperty(value= "椤圭洰淇℃伅")
+ private String str4;
+ /**
+ * 绫诲埆
+ */
+ @ApiModelProperty(value= "绫诲埆")
+ private String str5;
+
+ 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 "";
+ }
+
public PltBarcode() {}
- 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) {
+ public PltBarcode(String barcode,Double allQty,Double qtyBox,String source,String supplier,String vendor,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;
@@ -226,7 +265,8 @@
this.allWeight=allWeight;
this.source=source;
this.supplier=supplier;
- this.batchNumber=batchNumber;
+ this.vendor=vendor;
+ this.qtyBox=qtyBox;
}
// PltBarcode pltBarcode = new PltBarcode(
@@ -263,11 +303,11 @@
public double getAllWeight(){return allWeight;}
- public void setAllWeight(double allweight){this.allWeight=allweight;}
+ public void setAllWeight(Double allweight){this.allWeight=allweight;}
- public double getAllQty(){return allQty;}
+ public Double getAllQty(){return allQty;}
- public void setAllQty(double allqty){this.allQty=allqty;}
+ public void setAllQty(Double allqty){this.allQty=allqty;}
public String getBillNo() {
return billNo;
@@ -287,20 +327,6 @@
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$(){
--
Gitblit v1.9.1