From 8bc35cc4f75cfb435577e34763002f69def6a1a2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期六, 07 二月 2026 16:53:18 +0800
Subject: [PATCH] 调试
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 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 25a3c13..2561c9b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -94,10 +94,17 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
+ int countLocMast = locMastService.selectCount(new EntityWrapper<LocMast>().eq("barcode", param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countwait > 0) {
throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
}
-
+ if (wrkMast != null && wrkMast.getWrkSts() != 15){
+ throw new CoolException("宸ヤ綔妗ｈ繕鏈畬鎴�,鎵樼洏杩樻湭鍑哄簱" + param.getBarcode());
+ }
+ if (countLocMast > 0){
+ throw new CoolException("鎵樼洏鏈嚭搴�");
+ }
Date now = new Date();
// 鏃犲崟缁勬墭
@@ -656,6 +663,7 @@
adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
adjDetl.setBarcode( param.getBarcode()); // 鎵樼洏鐮�
adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //骞舵澘瀵瑰簲鐨勫伐浣滃彿
+ adjDetl.setMemo("骞舵澘");
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -721,6 +729,15 @@
List<CombParam.CombMat> combMats = combParam.getCombMats();
String recordRecordLog = "鎵樼洏鐮�" + combParam.getBarcode() + "鐩樼偣璁板綍锛�";
+ AdjDetl adjDetl = new AdjDetl();
+ adjDetl.setAppeTime(new Date());
+ adjDetl.setAppeUser(userId);
+ adjDetl.setModiTime(new Date());
+ adjDetl.setModiUser(userId);
+ adjDetl.setLocNo(wrkMast.getSourceLocNo()); // 搴撲綅
+ adjDetl.setBarcode(combParam.getBarcode()); // 鎵樼洏鐮�
+ adjDetl.setWorkNo(wrkMast.getWrkNo().toString()); //鐩樼偣瀵瑰簲鐨勫伐浣滃彿
+ adjDetl.setMemo("鐩樼偣");
for (CombParam.CombMat wrkDetl : combMats) {
WrkDetl wrkDetlOld = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
@@ -728,6 +745,10 @@
.eq("matnr", wrkDetl.getMatnr())
// .eq("batch",Cools.isEmpty(wrkDetl.getBatch())?"":wrkDetl.getBatch())
);
+
+ adjDetl.setMatnr(wrkDetl.getMatnr());
+ adjDetl.setBatch(wrkDetl.getBatch());
+ adjDetl.setAdjQty(wrkDetl.getAnfme()); //鍙樻洿鏁伴噺
if (Cools.isEmpty(wrkDetlOld)) {
WrkDetl detl = new WrkDetl();
@@ -739,17 +760,25 @@
detl.setModiUser(userId); // 淇敼浜哄憳
detl.setAppeUser(userId); // 娣诲姞浜哄憳
wrkDetlService.insert(detl); // 鎻掑叆宸ヤ綔鏄庣粏
+
+ adjDetl.setOriQty(0.0); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
+
recordRecordLog = recordRecordLog + "\n" + "鏂板涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetl.getAnfme();
}
// 鏇存柊鏁伴噺
else if (!wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
wrkDetlService.updateInventoryAnfme(wrkDetl.getAnfme(), wrkMast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ adjDetl.setOriQty(wrkDetlOld.getAnfme()); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
recordRecordLog = recordRecordLog + "\n" + "鏇存柊涓�鏉℃槑缁�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鍘熸暟閲忥細" + wrkDetlOld.getAnfme() + "\t鏇存柊鏁伴噺锛�" + wrkDetl.getAnfme();
}
// 鏁伴噺淇濇寔涓嶅彉
else if (wrkDetlOld.getAnfme().equals(wrkDetl.getAnfme())) {
+ adjDetl.setOriQty(wrkDetlOld.getAnfme()); // 鍘熸暟閲�
+ adjDetlService.insert(adjDetl);
recordRecordLog = recordRecordLog + "\n" + "涓�鏉℃槑缁嗕繚鎸佷笉鍙�:" + "\t鍟嗗搧缂栧彿锛�" + wrkDetl.getMatnr() + "\t鎵瑰彿锛�" + wrkDetl.getBatch() + "\t鏁伴噺锛�" + wrkDetlOld.getAnfme();
continue;
}
--
Gitblit v1.9.1