From 31b586dbc4dd87c88ac585f00071df32798e8d42 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 24 九月 2025 15:43:11 +0800
Subject: [PATCH] 缓冲库区修改
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 0e8c1a5..308d93b 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -576,10 +576,12 @@
*/
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> AgvStart(Task wrkMast) {
- Date now = new Date();
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
if (Objects.isNull(locCache)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ 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)) {
@@ -624,12 +626,17 @@
if (Objects.isNull(pakins) || pakins.isEmpty()) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- pakins.forEach(orderPakin -> {
- orderPakin.setSettle(4L);
- if (!orderPakinService.updateById(orderPakin)) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
- }
- });
+
+// pakins.forEach(orderPakin -> {
+// orderPakin.setSettle(4L);
+// if (!orderPakinService.updateById(orderPakin)) {
+// throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
+// }
+// List<OrderDetlPakin> detlPakins = orderDetlPakinService.selectList(new EntityWrapper<OrderDetlPakin>().eq("order_id", orderPakin.getId()));
+// if (Objects.isNull(detlPakins) || detlPakins.isEmpty()) {
+// throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+// }
+// });
return SUCCESS;
}
--
Gitblit v1.9.1