From 127e75e16fba5aa42b1d368a07ea334445881112 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期六, 22 十一月 2025 16:57:03 +0800
Subject: [PATCH] #盘点完成
---
src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
index 1380b77..43ff929 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
@@ -61,9 +61,15 @@
}
List<LocDto> locDtos = new ArrayList<>();
for (CheckOrderDetl checkOrderDetl : checkOrderDetls) {
+ if (!checkOrderDetl.getStatus().equals(1)){
+ continue;
+ }
LocDto locDto = new LocDto(checkOrderDetl.getLocNo(), checkOrderDetl.getMatnr(), checkOrderDetl.getMaktx(), checkOrderDetl.getBatch(), checkOrderDetl.getOrderNo(),
checkOrderDetl.getAnfme().doubleValue());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", checkOrderDetl.getLocNo()));
+ if (!locMast.getLocSts().equals("F")){
+ continue;
+ }
LocDetl locDetl = locDetlService.selectById(checkOrderDetl.getLocDetlId());
locDto.setFrozen(locDetl.getFrozen());
locDto.setFrozenLoc(locMast.getFrozen());
@@ -96,11 +102,7 @@
if(Cools.isEmpty(wrkDetl.getOrderNo())){
throw new CoolException("鏄庣粏鏁版嵁鏈夎锛屾棤璁㈠崟鍙锋暟鎹�");
}
- CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
- .eq("loc_no", wrkMast.getSourceLocNo())
- .eq("matnr", wrkDetl.getMatnr())
- .eq("batch", wrkDetl.getBatch())
- .eq("order_no", wrkDetl.getOrderNo()));
+ CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectById(wrkDetl.getOrderId());
if(Cools.isEmpty(checkOrderDetl)){
throw new CoolException("鏄庣粏鏁版嵁鏈夎锛屾湭鎵惧埌鐩樼偣鍗曟暟鎹�");
}
--
Gitblit v1.9.1