From 94e3cc94d83f5ec1bb64e48360a15d057f3643d9 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 12 十二月 2025 15:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jsxswms' into jsxswms
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 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 4102aba..ad95a82 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -766,11 +766,6 @@
}
- List<BasStationDetl> detls = basStationDetlService.selectList(new EntityWrapper<BasStationDetl>().eq("dev_no", devNo.getDevNo()));
- if (!Objects.isNull(detls) || !detls.isEmpty()) {
- basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", devNo.getDevNo()));
- }
-
BasStationDetl stationDetl = new BasStationDetl();
BeanUtils.copyProperties(wrkDetl, stationDetl);
stationDetl.setDevNo(devNo.getDevNo())
@@ -859,15 +854,17 @@
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());
@@ -899,14 +896,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("鍗曟嵁涓嶅瓨鍦紒锛�");
--
Gitblit v1.9.1