From 48cf45216c825ef7379986b7cf98b136768bcb4e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 25 十一月 2025 16:46:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 3d4baa0..ede4780 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -582,9 +582,9 @@
if (param.getBarcode().length() != 8) {
throw new CoolException("鏉＄爜闀垮害涓嶆槸8浣�===>>" + param.getBarcode());
}
-// if (param.getCombMats().size() > 1) {
-// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
-// }
+ if (param.getCombMats().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()));
@@ -659,6 +659,17 @@
}
if (order.getSettle() > 2) {
throw new CoolException("鍗曟嵁缂栧彿宸蹭綔涓氬畬鎴�");
+ }
+
+ List<WaitPakin> waitPakinList = waitPakinService.selectList(new EntityWrapper<WaitPakin>()
+ .eq("matnr", elem.getMatnr())
+ .eq("batch", elem.getBatch())
+ .eq("order_no", elem.getOrderNo())
+ .eq("anfme", elem.getAnfme())
+ .eq("standby1", elem.getStandby1())
+ );
+ if (!waitPakinList.isEmpty()) {
+ throw new CoolException("璇ヨ鍗曠墿鏂欏凡缁忕粍鎵橈紒");
}
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
@@ -1303,6 +1314,12 @@
@Override
public void toAllOut(PalletToAllOutParam param, Long userId) {
+ String barcodeSize = param.getBarcode().substring(0, 2);
+ String newBarcodeSize = param.getNewBarcode().substring(0, 2);
+ if (!barcodeSize.equals(newBarcodeSize)) {
+ throw new CoolException("鎵樼洏灏哄涓嶄竴鑷�");
+ }
+
WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
if (wrkMast == null) {
throw new CoolException("宸ヤ綔妗ｄ笉瀛樺湪");
@@ -1316,7 +1333,7 @@
throw new CoolException("宸ヤ綔鐘舵�佹湭澶勪簬宸插嚭搴�");
}
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getLocNo()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));
if (locMast == null) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
@@ -1330,20 +1347,12 @@
wrkMast.setModiUser(userId);
wrkMastService.updateById(wrkMast);
- WrkDetl wrkDetl = new WrkDetl();
- wrkDetl.setZpallet(param.getNewBarcode());
- wrkDetl.setModiTime(new Date());
- wrkDetl.setModiUser(userId);
- wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
+ wrkDetlService.updateBarcode(wrkMast.getWrkNo(), param.getNewBarcode());
locMast.setBarcode(param.getNewBarcode());
locMast.setModiTime(new Date());
locMastService.updateById(locMast);
- LocDetl locDetl = new LocDetl();
- locDetl.setZpallet(param.getNewBarcode());
- locDetl.setModiTime(new Date());
- locDetl.setModiUser(userId);
- locDetlService.update(locDetl, new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ locDetlService.updateBarcode(locMast.getLocNo(), param.getNewBarcode());
}
}
--
Gitblit v1.9.1