From bd96ecd68841a7115231131bce5ba874914b89b5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 03 一月 2025 15:33:58 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9f51f3c..64d160d 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -4,8 +4,10 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
 import com.zy.asrs.service.OrderService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -55,10 +57,20 @@
     /**
      * 浣滀笟鏁伴噺
      *
-     *  1. 鍏ュ簱 : qty 馃憜
-     *  1. 鍑哄簱 : qty 馃憜
+     *  鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+     *  鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
      */
     @ApiModelProperty(value= "浣滀笟鏁伴噺")
+    @TableField("work_qty")
+    private Double workQty;
+
+    /**
+     * 瀹屾垚鏁伴噺
+     *
+     *  鍏ュ簱 : qty 馃憜
+     *  鍑哄簱 : qty 馃憜
+     */
+    @ApiModelProperty(value= "瀹屾垚鏁伴噺")
     private Double qty;
 
     /**
@@ -140,7 +152,7 @@
     private String origin;
 
     /**
-     * 鍘傚
+     * 鍘傚 銆併�佹睙閾滐細鏆傚瓨搴撲綅鍙�
      */
     @ApiModelProperty(value= "鍘傚")
     private String manu;
@@ -226,7 +238,7 @@
     private Integer deadWarn;
 
     /**
-     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗
+     * 鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  銆併�佹睙閾滐細鏄惁纭   1: 纭  2: 鏈‘璁�
      */
     @ApiModelProperty(value= "鍒惰喘 1: 鍒堕��  2: 閲囪喘  3: 澶栧崗  ")
     private Integer source;
@@ -284,6 +296,17 @@
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
+
+    @ApiModelProperty(value = "閫�搴撴爣璁�")
+    @TableField("tk_type")
+    private Integer tkType;
+
+    /**
+     * 鍗蜂俊鎭疘D
+     */
+    @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+    @TableField("roll_up")
+    private Long rollUp;
 
     public OrderDetl() {}
 
@@ -350,17 +373,26 @@
         }
     }
 
+//    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 getSource$(){
-        if (null == this.source){ return null; }
+        if (null == this.source){ return "鏈‘璁�"; }
         switch (this.source){
             case 1:
-                return "鍒堕��";
-            case 2:
-                return "閲囪喘";
-            case 3:
-                return "澶栧崗";
+                return "宸茬‘璁�";
             default:
-                return String.valueOf(this.source);
+                return "鏈‘璁�";
         }
     }
 
@@ -374,6 +406,14 @@
             default:
                 return String.valueOf(this.inspect);
         }
+    }
+
+    public String getTkType$(){
+        if (null == this.tkType) return "姝ｅ父";
+        if (this.tkType == 1) {
+            return "閫�搴�";
+        }
+        return "姝ｅ父";
     }
 
     public String getDanger$(){
@@ -432,10 +472,20 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
     }
 
-    public Double getEnableQty() {
-        if (null != this.anfme && this.qty != null) {
-            return this.anfme - this.qty;
+    public String getQty$(){
+        if (this.anfme.equals(this.qty)){
+            return "宸插畬鎴�";
         }
+        return "鏈畬鎴�";
+    }
+
+    public Double getEnableQty() {
+        if (null != this.anfme && this.workQty != null) {
+            return this.anfme - this.workQty;
+        }
+//        if (null != this.anfme && this.qty != null) {
+//            return this.anfme - this.qty;
+//        }
         return null;
     }
 
@@ -443,4 +493,13 @@
         Synchro.Copy(source, this);
     }
 
-}
+    public String getBrand$(){
+        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+        BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+        if (!Cools.isEmpty(basBoxType)){
+            return String.valueOf(basBoxType.getBoxSpecs());
+        }
+        return this.brand;
+    }
+
+}
\ No newline at end of file

--
Gitblit v1.9.1