From a167c1ba9816896114debe769b8247a72f3a1a99 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 23 九月 2025 12:33:33 +0800
Subject: [PATCH] 缓冲区功能调整
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 f9b67b0..ea7db5a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -59,7 +59,6 @@
return SUCCESS;
}
- @Transactional(rollbackFor = Exception.class)
public ReturnT<String> doIn(WrkMast wrkMast) {
if (wrkMast.getTaskType().equals("agv")) {
Date now = new Date();
@@ -67,12 +66,11 @@
if (Objects.isNull(locCache)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
}
- List<WaitPakin> apallet = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("apallet", wrkMast.getBarcode()));
+ List<WaitPakin> apallet = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
if (Objects.isNull(apallet)) {
throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
}
- List<LocDetl> detls = new ArrayList<>();
apallet.forEach(pakin -> {
LocDetl detl = new LocDetl();
BeanUtils.copyProperties(pakin, detl);
@@ -88,19 +86,25 @@
.setAreaName(locCache.getAreaName())
.setUnit(pakin.getUnit())
.setBatch(pakin.getBatch());
- detls.add(detl);
- });
- if (!locDetlService.insertBatch(detls)) {
- throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
+ if (!locDetlService.insert(detl)) {
+ throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
locCache.setModiTime(new Date());
-
+ locCache.setBarcode("");
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
if (!locCacheService.updateById(locCache)) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
}
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(new Date());
+ if (!wrkMastService.updateById(wrkMast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
} else {
Date now = new Date();
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
--
Gitblit v1.9.1