From 934c2a1da9291cf6e125c622e38595a5b18b97a7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 27 十二月 2024 09:34:11 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index 86e13bd..c87f317 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -6,10 +6,14 @@
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.entity.param.FieldParam;
+import com.zy.asrs.wms.asrs.service.MatFieldService;
import com.zy.asrs.wms.asrs.service.MatService;
import com.zy.asrs.wms.asrs.service.OrderService;
+import com.zy.asrs.wms.asrs.service.WaitPakinService;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
@@ -98,7 +102,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -132,6 +135,12 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鍟嗗搧搴撳瓨绱㈠紩
+ */
+ @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
+ private String stockIndex;
public OrderDetl() {}
@@ -170,6 +179,17 @@
// null, // 淇敼浜哄憳
// null // 澶囨敞
// );
+
+ //鑾峰彇缁勬墭鏁伴噺
+ public Double getWaitQty(){
+ Double qty = 0D;
+ WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));
+ for (WaitPakin waitPakin : waitPakins) {
+ qty += waitPakin.getAnfme();
+ }
+ return qty;
+ }
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
@@ -320,5 +340,18 @@
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.getOrDefault(matField.getName(), ""));
+ list.add(param);
+ }
+ return list;
+ }
}
--
Gitblit v1.9.1