From e38cf917b19b91bf6c8f07c70fb7bb391e1e80c0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 13:10:44 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   74 +++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e7e66b5..e8c1229 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -186,7 +186,8 @@
      * 闀垮害
      */
     @ApiModelProperty(value= "闀垮害")
-    private Double length;
+    @TableField("man_length")
+    private Double manLength;
 
     /**
      * 浣撶Н
@@ -309,9 +310,27 @@
     @TableField("line_number")
     private Integer lineNumber;
 
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    private String standby1;
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    private String standby2;
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    private String standby3;
+
     public OrderDetl() {}
 
-    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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) {
+    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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 manLength, 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) {
         this.orderId = orderId;
         this.orderNo = orderNo;
         this.anfme = anfme;
@@ -334,7 +353,7 @@
         this.itemNum = itemNum;
         this.safeQty = safeQty;
         this.weight = weight;
-        this.length = length;
+        this.manLength = manLength;
         this.volume = volume;
         this.threeCode = threeCode;
         this.supp = supp;
@@ -352,6 +371,54 @@
         this.updateTime = updateTime;
         this.memo = memo;
     }
+
+    public OrderDetl(OrderDetl orderDetl) {
+        this.orderId = orderDetl.getOrderId();
+        this.orderNo = orderDetl.getOrderNo();
+        this.anfme = orderDetl.getAnfme();
+        this.qty = orderDetl.getQty();
+        this.matnr = orderDetl.getMatnr();
+        this.maktx = orderDetl.getMaktx();
+        this.batch = orderDetl.getBatch();
+        this.specs = orderDetl.getSpecs();
+        this.model = orderDetl.getModel();
+        this.color = orderDetl.getColor();
+        this.brand = orderDetl.getBrand();
+        this.unit = orderDetl.getUnit();
+        this.price = orderDetl.getPrice();
+        this.sku = orderDetl.getSku();
+        this.units = orderDetl.getUnits();
+        this.barcode = orderDetl.getBarcode();
+        this.origin = orderDetl.getOrigin();
+        this.manu = orderDetl.getManu();
+        this.manuDate = orderDetl.getManuDate();
+        this.itemNum = orderDetl.getItemNum();
+        this.safeQty = orderDetl.getSafeQty();
+        this.weight = orderDetl.getWeight();
+        this.manLength = orderDetl.getManLength();
+        this.volume = orderDetl.getVolume();
+        this.threeCode = orderDetl.getThreeCode();
+        this.supp = orderDetl.getSupp();
+        this.suppCode = orderDetl.getSuppCode();
+        this.beBatch = orderDetl.getBeBatch();
+        this.deadTime = orderDetl.getDeadTime();
+        this.deadWarn = orderDetl.getDeadWarn();
+        this.source = orderDetl.getSource();
+        this.inspect = orderDetl.getInspect();
+        this.danger = orderDetl.getDanger();
+        this.status = orderDetl.getStatus();
+        this.createBy = orderDetl.getCreateBy();
+        this.createTime = orderDetl.getCreateTime();
+        this.updateBy = orderDetl.getUpdateBy();
+        this.updateTime = orderDetl.getUpdateTime();
+        this.memo = orderDetl.getMemo();
+        this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
+        this.lineNumber = orderDetl.getLineNumber();
+        this.standby1 = orderDetl.getStandby1();
+        this.standby2 = orderDetl.getStandby2();
+        this.standby3 = orderDetl.getStandby3();
+    }
+
 
     public String getOrderId$(){
         OrderService service = SpringUtils.getBean(OrderService.class);
@@ -474,6 +541,7 @@
     }
 
     public String getPakinPakoutStatus$(){
+        if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
         switch (this.pakinPakoutStatus){
             case 1:
                 return "Y";

--
Gitblit v1.9.1