From f6f8bb8d5dfc7f663bdce8a0fbf5062a030de2f6 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 14 六月 2025 20:07:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 196874a..e18a416 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -61,7 +61,26 @@
if (anfme <= 0) {
return this.baseMapper.deleteItem(wrkNo, matnr, batch) > 0;
} else {
- return baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
+ boolean result = baseMapper.updateAnfme(anfme, wrkNo, matnr, batch) > 0;
+ if (!result) {
+ return false;
+ }
+
+ //鏇存柊杈呮枡
+ Mat mat = matService.selectByMatnr(matnr);
+ if (mat == null) {
+ return false;
+ }
+
+ //杞崲鍏崇郴
+ String origin = mat.getOrigin();
+ if (Cools.isEmpty(origin)) {
+ return true;
+ }
+ String[] split = origin.split("/");
+ //杈呭崟浣�
+ Double weight = (anfme / Double.parseDouble(split[1])) / Double.parseDouble(split[0]);
+ return baseMapper.updateWeight(weight, wrkNo, matnr, batch) > 0;
}
}
@@ -79,4 +98,9 @@
public List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr) {
return this.baseMapper.selectPakoutQuery(staNo, matnr);
}
+
+ @Override
+ public List<WrkDetl> selectAndLogByOrderNoGroupByMatnrOfSum(String orderNo) {
+ return this.baseMapper.selectAndLogByOrderNoGroupByMatnrOfSum(orderNo);
+ }
}
--
Gitblit v1.9.1