From 3a17d3917e467fe37454e757edcedd962b907b45 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 06 二月 2023 08:43:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 58b9e02..6b77db2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -99,6 +99,7 @@
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
// int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode())
// .last(" wrk_no IN ( SELECT wrk_no FROM asr_wrk_mast WHERE wrk_sts != 15 )"));
+ if (wrkMast != null && wrkMast.getWrkSts()==18) countWrk = 0;
if (countLoc > 0 || countWrk > 0) {
throw new CoolException("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
@@ -207,7 +208,7 @@
}
@Override
@Transactional
- public void adjustNew(MobileAdjustParam param, Long userId) {
+ public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
if (Cools.isEmpty(wrkMast)){
throw new CoolException("鎵樼洏鐮�:"+param.getBarcode()+" 鏃犳湁鏁堝伐浣滄。");
@@ -257,7 +258,9 @@
adjDetl.setOriQty(0.0);
adjDetlService.insert(adjDetl);
checkRecord.setAnfme(0.0);
- checkRecordService.insert(checkRecord);
+ if (!re) {
+ checkRecordService.insert(checkRecord);
+ }
}else if (wrkDetlOld.getAnfme()!=wrkDetl.getAnfme()){
wrkDetlService.updateAnfme(wrkDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
recordRecordLog=recordRecordLog+"\n"+"鏇存柊涓�鏉℃槑缁�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鍘熸暟閲忥細"+wrkDetlOld.getAnfme()+"\t鏂版暟閲忥細"+wrkDetl.getAnfme();
@@ -265,7 +268,9 @@
adjDetlService.insert(adjDetl);
checkRecord.setAnfme(wrkDetlOld.getAnfme());
- checkRecordService.insert(checkRecord);
+ if (!re) {
+ checkRecordService.insert(checkRecord);
+ }
}else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
recordRecordLog=recordRecordLog+"\n"+"涓�鏉℃槑缁嗕繚鎸佷笉鍙�:"+"\t鍟嗗搧缂栧彿锛�"+wrkDetl.getMatnr()+"\t鎵瑰彿锛�"+wrkDetl.getBatch()+"\t鏁伴噺锛�"+wrkDetlOld.getAnfme();
continue;
--
Gitblit v1.9.1