From 792de9fdb245b9b29ec6f2193d64886232f6d6c5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 09 一月 2025 12:17:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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..a6dfdc7 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;
@@ -295,6 +297,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 +390,7 @@
if (null == this.source){ return "鏈‘璁�"; }
switch (this.source){
case 1:
- return "纭";
+ return "宸茬‘璁�";
default:
return "鏈‘璁�";
}
@@ -393,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$(){
@@ -472,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