From 053e6028bd20e599aea103401137816c6296a9ef Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 20 九月 2024 09:26:49 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 35 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java
index 1c4799f..3e6c2c9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveDetl.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.zy.asrs.wms.asrs.entity.param.FieldParam;
+import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.asrs.service.OrderDetlService;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.asrs.service.WaveService;
@@ -29,7 +32,6 @@
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
@Data
@TableName("man_wave_detl")
@@ -57,16 +59,40 @@
private String waveNo;
/**
- * 璁㈠崟ID
+ * 鍟嗗搧ID
*/
- @ApiModelProperty(value= "璁㈠崟ID")
- private Long orderId;
+ @ApiModelProperty(value= "鍟嗗搧ID")
+ private Long matId;
/**
- * 璁㈠崟鍙�
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "璁㈠崟鍙�")
- private String orderNo;
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ private String matnr;
+
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鍟嗗搧搴撳瓨绱㈠紩
+ */
+ @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
+ private String stockIndex;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value= "鏁伴噺")
+ private Double anfme;
+
+ /**
+ * 宸ヤ綔鏁伴噺
+ */
+ @ApiModelProperty(value= "宸ヤ綔鏁伴噺")
+ private Double workQty;
/**
* 鎵�灞炴満鏋�
@@ -118,13 +144,22 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 绱㈠紩瀛楁
+ */
+ @ApiModelProperty(value= "绱㈠紩瀛楁")
+ private String fieldParams;
+
public WaveDetl() {}
- public WaveDetl(Long waveId,String waveNo,Long orderId,String orderNo,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public WaveDetl(Long waveId, String waveNo, String matnr, String batch, String stockIndex, Double anfme, Double workQty, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo) {
this.waveId = waveId;
this.waveNo = waveNo;
- this.orderId = orderId;
- this.orderNo = orderNo;
+ this.matnr = matnr;
+ this.batch = batch;
+ this.stockIndex = stockIndex;
+ this.anfme = anfme;
+ this.workQty = workQty;
this.hostId = hostId;
this.status = status;
this.deleted = deleted;
@@ -135,7 +170,7 @@
this.memo = memo;
}
-// WaveDetl waveDetl = new WaveDetl(
+ // WaveDetl waveDetl = new WaveDetl(
// null, // 娉㈡ID
// null, // 娉㈡鍙�
// null, // 璁㈠崟ID
@@ -159,29 +194,11 @@
return null;
}
- public String getOrderId$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.getById(this.orderId);
- if (!Cools.isEmpty(order)){
- return String.valueOf(order.getId());
- }
- return null;
- }
-
- public Order getOrder$(){
- OrderService service = SpringUtils.getBean(OrderService.class);
- Order order = service.getById(this.orderId);
- if (!Cools.isEmpty(order)){
- return order;
- }
- return null;
- }
-
- public List<OrderDetl> getOrderDetl$(){
- OrderDetlService service = SpringUtils.getBean(OrderDetlService.class);
- List<OrderDetl> orderDetls = service.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, this.orderId));
- if (!orderDetls.isEmpty()){
- return service.parseDetl(orderDetls);
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getById(this.matId);
+ if (!Cools.isEmpty(mat)){
+ return mat;
}
return null;
}
@@ -256,4 +273,18 @@
public void sync(Object source) {
Synchro.Copy(source, this);
}
+
+ //鍔ㄦ�佹墿灞曞瓧娈�
+ public transient Map<String, Object> dynamicFields = new HashMap<>();
+
+ @JsonAnyGetter
+ public Map<String,Object> getDynamicFields() {
+ return dynamicFields;
+ }
+
+ public void setDynamicFields(List<FieldParam> list) {
+ for (FieldParam param : list) {
+ dynamicFields.put(param.getName(), param.getValue());
+ }
+ }
}
--
Gitblit v1.9.1