From 223cba9fa496be3174c047e122cbb85d6fa7764d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 09:56:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 5 ++++-
1 files changed, 4 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 d497908..bcf2089 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
@@ -98,6 +98,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
+ @ApiModelProperty(value = "鎷ｈ揣鐘舵�侊細0 鏈嫞璐� 1 瀹屾垚鎷ｈ揣 2 锛岄儴鍒嗘嫞璐�")
+ private Integer pickStatus;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -184,7 +187,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).eq(WaitPakin::getIoStatus, 0));
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));
for (WaitPakin waitPakin : waitPakins) {
qty += waitPakin.getAnfme();
}
--
Gitblit v1.9.1