From f42b0a62c914d9f3d897edf857eaddc0964e2a13 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:41:51 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index aa96844..0d2c243 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -9,18 +9,20 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasProcessProceduresService;
import com.zy.asrs.service.BasQualityTestingService;
+import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.beans.BeanUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
@Data
@TableName("man_order_detl")
@@ -353,6 +355,14 @@
@TableField("box_type3")
private String boxType3 = "1";
+ @ApiModelProperty("鐮存崯鏁�")
+ @TableField("adjust_qty")
+ private Double adjustQty;
+
+ @ApiModelProperty("宸紓鏁�")
+ @TableField("splus_qty")
+ private Double splusQty;
+
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 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) {
@@ -478,6 +488,17 @@
default:
return String.valueOf(this.source);
}
+ }
+
+ public String getTag$() {
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat order = service.selectOne(new EntityWrapper<Mat>()
+ .eq("supp_code", this.suppCode)
+ .eq("matnr", this.matnr));
+ if (Cools.isEmpty(order)){
+ return null;
+ }
+ return order.getTagId$();
}
public String getInspect$(){
@@ -628,7 +649,9 @@
}
public void sync(Object source) {
- Synchro.Copy(source, this);
+ if (!Objects.isNull(source)) {
+ BeanUtils.copyProperties(source, this);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.1