From 00a6376e31fea643df9394a90aaf71b8369fd01f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 16:37:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 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 8105a00..e18a416 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -24,11 +24,10 @@
@Override
@Transactional
- public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId) {
+ public void createWorkDetail(Integer workNo, List<DetlDto> detlDtos, String barcode, Long userId, Date now) {
if (detlDtos.isEmpty()){
return;
}
- Date now = new Date();
for (DetlDto dto : detlDtos) {
Mat mat = matService.selectByMatnr(dto.getMatnr());
if (Cools.isEmpty(mat)){
@@ -62,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;
}
}
@@ -70,4 +88,19 @@
public List<WrkDetl> selectAndLogByOrderNo(String orderNo) {
return this.baseMapper.selectAndLogByOrderNo(orderNo);
}
+
+ @Override
+ public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
+ return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
+ }
+
+ @Override
+ 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