From e549bc25fce8679682e7698c9ad725dfaf37d82c Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期一, 15 十二月 2025 16:52:28 +0800
Subject: [PATCH] #平板入
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 020c0d7..15d054a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -141,6 +141,8 @@
} else {
locDetl = new LocDetl();
locDetl.sync(wrkDetl);
+ locDetl.setAreaId(locMast.getAreaId());
+ locMast.setAreaName(locMast.getAreaName());
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -854,18 +856,21 @@
throw new CoolException(
"褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
}
- List<WaitPakin> apallet = waitPakinService
- .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- if (Objects.isNull(apallet)) {
+
+ List<TaskDetl> taskDetls = taskDetlService
+ .selectList(new EntityWrapper<TaskDetl>().eq("zpallet", wrkMast.getBarcode()));
+
+ if (Objects.isNull(taskDetls)) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
}
- apallet.forEach(pakin -> {
+ log.info(taskDetls.size() + "-------------------------------------------------------------------");
+ taskDetls.forEach(pakin -> {
LocDetl detl = new LocDetl();
BeanUtils.copyProperties(pakin, detl);
-
detl.setBarcode(pakin.getBarcode());
detl.setAnfme(pakin.getAnfme());
detl.setBrand(pakin.getBrand());
+ detl.setSuppCode(pakin.getSuppCode());
detl.setAppeTime(new Date());
detl.setSpecs(pakin.getSpecs());
detl.setColor(pakin.getColor());
@@ -877,6 +882,33 @@
detl.setBatch(pakin.getBatch());
if (!locDetlService.insert(detl)) {
throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+
+ // 鏇存柊璁㈠崟瀹屾垚鏁伴噺
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(),
+ pakin.getMatnr(), pakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
+ pakin.getStandby2(), pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
+ if (orderDetlPakin == null) {
+ orderDetlPakin = orderDetlPakinService.selectItem(pakin.getOrderNo(), pakin.getMatnr(),
+ pakin.getBatch(),
+ pakin.getBrand(), pakin.getStandby1(), pakin.getStandby2(),
+ pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3());
+ }
+ try {
+ if (!Cools.isEmpty(orderDetlPakin)) {
+ if (!orderDetlPakinService.increaseQtyByOrderNo(pakin.getOrderNo(),
+ pakin.getMatnr(),
+ orderDetlPakin.getBatch(), pakin.getBrand(), pakin.getStandby1(),
+ pakin.getStandby2(), pakin.getStandby3(),
+ pakin.getBoxType1(), pakin.getBoxType2(), pakin.getBoxType3(),
+ pakin.getAnfme())) {
+ throw new CoolException("AGV鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo()
+ + "],[locNo=" + wrkMast.getLocNo() + "]");
+ }
+ }
+ } catch (Exception ignore) {
}
});
@@ -894,14 +926,16 @@
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- for (WaitPakin pakin : apallet){
+ List<WaitPakin> apallets = waitPakinService
+ .selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
+ for (WaitPakin pakin : apallets){
WaitPakinLog waitPakinLog = new WaitPakinLog();
BeanUtils.copyProperties(pakin, waitPakinLog);
waitPakinLogService.insert(waitPakinLog);
waitPakinService.deleteById(pakin.getId());
}
- Set<Long> list = apallet.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
+ Set<Long> list = apallets.stream().map(WaitPakin::getOrderId).collect(Collectors.toSet());
List<OrderPakin> pakins = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("id", list));
if (Objects.isNull(pakins) || pakins.isEmpty()) {
// throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
@@ -917,7 +951,6 @@
+ wrkMast.getLocNo() + "]");
}
for (TaskDetl wrkDetl : wrkDetls53) {
-
LocDetl locDetl = locDetlService.selectItem(locCache.getLocNo(), wrkDetl.getMatnr(),
wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(),
wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(),
--
Gitblit v1.9.1