From 07c572bea979dbd3ee46ec24083cb1bdcc014e3a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 05 七月 2024 13:56:50 +0800
Subject: [PATCH] 一期找库位方法修改

---
 src/main/java/com/zy/asrs/entity/PltBarcode.java |   98 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 96 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/PltBarcode.java b/src/main/java/com/zy/asrs/entity/PltBarcode.java
index 8d72c87..a02bdf6 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,12 +115,35 @@
      */
     @ApiModelProperty(value= "鍗曢噸")
     private Double weight;
-
+    /**
+     * 鎬婚噸
+     */
+    @ApiModelProperty(value= "鎬婚噸閲�")
+    @TableField("all_weight")
+    private Double allWeight;
+    /**
+     * 鏉ユ簮
+     */
+    @ApiModelProperty(value="鏉ユ簮")
+    private String source;
+    /**
+     * 鎵瑰彿
+     */
+    @ApiModelProperty(value = "鎵瑰彿")
+    private String supplier;
+    /**
+     * 渚涘簲鍟�
+     */
+    @ApiModelProperty(value = "渚涘簲鍟�")
+    private String vendor;
     /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+//    @ApiModelProperty(value= "鎵瑰彿")
+//    private String supplier;
 
     /**
      * ERP杩炵嚎 0: 闈炶繛绾�  1: ERP杩炵嚎  
@@ -165,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,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;
@@ -189,6 +261,12 @@
         this.modiTime = modiTime;
         this.appeUser = appeUser;
         this.appeTime = appeTime;
+        this.allQty=allQty;
+        this.allWeight=allWeight;
+        this.source=source;
+        this.supplier=supplier;
+        this.vendor=vendor;
+        this.qtyBox=qtyBox;
     }
 
 //    PltBarcode pltBarcode = new PltBarcode(
@@ -222,6 +300,14 @@
     public void setBarcode(String barcode) {
         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;
@@ -337,6 +423,14 @@
         this.weight = weight;
     }
 
+//    public String getSupplier() {
+//        return supplier;
+//    }
+//
+//    public void setSupplier(String supplier) {
+//        this.supplier = supplier;
+//    }
+
     public String getMemo() {
         return memo;
     }

--
Gitblit v1.9.1