From 5f14e63a2400456055086632e027951086114648 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 06 十二月 2024 15:07:04 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
index 1b6f769..09768bb 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskDetl.java
@@ -6,12 +6,11 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.zy.asrs.common.utils.Synchro;
-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.TaskService;
+import com.zy.asrs.wms.asrs.entity.param.FieldParam;
+import com.zy.asrs.wms.asrs.service.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -158,6 +157,12 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 娉㈡ID
+ */
+ @ApiModelProperty(value= "娉㈡ID")
+ private Long waveId;
+
public TaskDetl() {}
public TaskDetl(Long taskId,String taskNo,Double anfme,String batch,String barcode,Long orderId,String orderNo,Long detlId,Long matId,Long hostId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
@@ -259,6 +264,15 @@
Mat mat = service.getById(this.matId);
if (!Cools.isEmpty(mat)){
return mat;
+ }
+ return null;
+ }
+
+ public Wave getWave$(){
+ WaveService service = SpringUtils.getBean(WaveService.class);
+ Wave wave = service.getById(this.waveId);
+ if (!Cools.isEmpty(wave)){
+ return wave;
}
return null;
}
@@ -385,5 +399,19 @@
dynamicFields.put(key, value);
}
+ //鑾峰彇绱㈠紩瀛楁
+ public List<FieldParam> getUniqueField() {
+ MatFieldService service = SpringUtils.getBean(MatFieldService.class);
+
+ List<FieldParam> list = new ArrayList<>();
+ for (MatField matField : service.list(new LambdaQueryWrapper<MatField>().eq(MatField::getUnique, 1))) {
+ FieldParam param = new FieldParam();
+ param.setName(matField.getName());
+ param.setValue(dynamicFields.get(matField.getName()));
+ list.add(param);
+ }
+ return list;
+ }
+
}
--
Gitblit v1.9.1