From 3af3b194265d37e40c8d141155bdc872781d8729 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:11 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 618b165..9fb57e2 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
@@ -68,6 +68,7 @@
}
LocDto locDto = new LocDto(checkOrderDetl.getLocNo(), checkOrderDetl.getMatnr(), checkOrderDetl.getMaktx(), checkOrderDetl.getBatch(), checkOrderDetl.getOrderNo(),
checkOrderDetl.getAnfme().doubleValue());
+ locDto.setSuppCode(checkOrderDetl.getSuppCode());
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", checkOrderDetl.getLocNo()));
if (!locMast.getLocSts().equals("F")){
continue;
@@ -139,7 +140,7 @@
.eq("loc_no", locMast.getLocNo())
.eq("matnr", checkOrderDetl.getMatnr())
.eq(!Cools.isEmpty(checkOrderDetl.getBatch()),"batch", checkOrderDetl.getBatch())
- .eq("supp_code", checkOrderDetl.getSuppCode())
+ .eq(!Cools.isEmpty(checkOrderDetl.getSuppCode()),"supp_code", checkOrderDetl.getSuppCode())
);
if (!Cools.isEmpty(locDetl)){
throw new CoolException("褰撳墠搴撲綅鏈夌浉鍚屽簱瀛樹俊鎭�");
@@ -171,6 +172,8 @@
locDetl1.setAppeTime(now);
locDetl1.setModiUser(userId);
locDetl1.setModiTime(now);
+ locDetl1.setAreaId(locMast.getAreaId());
+ locDetl1.setAreaName(locMast.getAreaName());
locDetlService.insert(locDetl1);
}else if (!Cools.isEmpty(checkOrderDetl.getId())){
checkOrderDetl.setDiffQty(checkOrderDetl.getWorkQty().subtract(checkOrderDetl.getAnfme()));
@@ -207,6 +210,9 @@
}
List<CheckOrderDetl> selectList = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
for (CheckOrderDetl checkOrderDetl : selectList) {
+ if (checkOrderDetl.getDiffQty().compareTo(BigDecimal.ZERO) == 0){
+ continue;
+ }
LocDetl locDetl = locDetlService.selectById(checkOrderDetl.getLocDetlId());
if (Cools.isEmpty(locDetl)) {
--
Gitblit v1.9.1