From ac4341ea6b66ae02427d39d35f41d42d78b2eb2e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 14 二月 2025 10:08:32 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 06b1630..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
@@ -102,7 +102,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -136,6 +135,12 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鍟嗗搧搴撳瓨绱㈠紩
+ */
+ @ApiModelProperty(value= "鍟嗗搧搴撳瓨绱㈠紩")
+ private String stockIndex;
public OrderDetl() {}
@@ -179,7 +184,7 @@
public Double getWaitQty(){
Double qty = 0D;
WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
- List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));
for (WaitPakin waitPakin : waitPakins) {
qty += waitPakin.getAnfme();
}
@@ -343,7 +348,7 @@
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()));
+ param.setValue(dynamicFields.getOrDefault(matField.getName(), ""));
list.add(param);
}
return list;
--
Gitblit v1.9.1