From 4db544a99fc9d3f033b020718ac1ac973dec4a0e Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期四, 17 七月 2025 18:46:55 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/entity/OrderDetl.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 18b1894..b1574a8 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;
@@ -17,6 +19,7 @@
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 @Data
 @TableName("man_order_detl")
@@ -295,6 +298,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() {}
 
     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) {
@@ -377,7 +391,7 @@
         if (null == this.source){ return "鏈‘璁�"; }
         switch (this.source){
             case 1:
-                return "纭";
+                return "宸茬‘璁�";
             default:
                 return "鏈‘璁�";
         }
@@ -395,13 +409,23 @@
         }
     }
 
+    public String getTkType$(){
+        if (null == this.tkType) return "姝ｅ父";
+        if (this.tkType == 1) {
+            return "閫�搴�";
+        }
+        return "姝ｅ父";
+    }
+
     public String getDanger$(){
         if (null == this.danger){ return null; }
         switch (this.danger){
             case 1:
-                return "鏄�";
+                return "鍚堟牸";
+            case 2:
+                return "涓嶅悎鏍�";
             case 0:
-                return "鍚�";
+                return "寰呭垽";
             default:
                 return String.valueOf(this.danger);
         }
@@ -452,7 +476,7 @@
     }
 
     public String getQty$(){
-        if (getAnfme().equals(getQty())){
+        if (this.anfme.equals(this.qty)){
             return "宸插畬鎴�";
         }
         return "鏈畬鎴�";
@@ -472,4 +496,13 @@
         Synchro.Copy(source, this);
     }
 
+    public String getBrand$(){
+        BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(new EntityWrapper<BasBoxType>().eq("box_type", this.brand).orderBy("id", true));
+        for (BasBoxType basBoxType:basBoxTypes){
+            return String.valueOf(basBoxType.getBoxSpecs());
+        }
+        return this.brand;
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1