From 938d10604366db71cb73fddc2320fb573b7949f2 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 25 十一月 2022 10:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/hylyasrs' into hylyasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 3ebff2a..40b0221 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -802,6 +802,7 @@
if(wrkMast.getIoType() == 101 || wrkMast.getIoType() == 103) {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
+ //瀛楃涓蹭笉涓虹┖
if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
@@ -811,7 +812,7 @@
boolean flag = true;
List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no",wrkDetl.getOrderNo()));
for(OrderDetl orderDetl : orderDetls){
- if(orderDetl.getWorkQty() > 0){
+ if(orderDetl.getQty() > 0){
flag = false;
}
}
--
Gitblit v1.9.1