From c8d0e05c547a849da6d7eab25ce1478f304455e9 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 30 一月 2026 13:48:35 +0800
Subject: [PATCH] 注释掉多余的
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 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 ede4780..ca19bc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -277,6 +277,7 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
wrkMast.setCrnNo(staDesc.getCrnNo());
+ wrkMast.setMk(locMast.getMk());
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + param.getLocNo());
}
@@ -413,6 +414,7 @@
wrkMast.setModiTime(now);
wrkMast.setAppeUser(userId);
wrkMast.setModiUser(userId);
+ wrkMast.setMk(locMast.getMk());
wrkMastService.insert(wrkMast);
Mat mat = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", combMat.getMatnr()));
@@ -582,9 +584,20 @@
if (param.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
- if (param.getCombMats().size() > 1) {
+// if (param.getCombMats().size() > 1) {
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+// }
+ HashMap<String, Object> containMatnrMap = new HashMap<>();
+ for (CombParam.CombMat mat : param.getCombMats()) {
+ if(!containMatnrMap.containsKey(mat.getMatnr())) {
+ containMatnrMap.put(mat.getMatnr(), 1);
+ }
+ }
+
+ if (containMatnrMap.size() > 1) {
throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
}
+
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
@@ -1211,6 +1224,7 @@
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
wrkMast.setBarcode(locMast.getBarcode());
+ wrkMast.setMk(locMast.getMk());
if (!wrkMastService.insert(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細" + locDetl.getLocNo());
}
--
Gitblit v1.9.1