From 3d100caf5453681293eb0c50f8b01e41e74735b1 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期一, 12 一月 2026 18:53:20 +0800
Subject: [PATCH] 缓存库位id优化
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 213 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 152 insertions(+), 61 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..0ab2769 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,8 +6,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocStsType;
import com.zy.asrs.service.*;
-import com.zy.asrs.service.impl.LocCacheServiceImpl;
-import com.zy.asrs.service.impl.OrderPakinServiceImpl;
+import com.zy.asrs.service.impl.BasStationServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import lombok.extern.slf4j.Slf4j;
@@ -17,7 +16,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import java.util.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -50,6 +52,13 @@
private OrderPakinService orderPakinService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private TaskDetlService taskDetlService;
+ @Autowired
+ private BasStationServiceImpl basStationService;
+
+ @Autowired
+ private LocCacheDetlService locCacheDetlService;
public ReturnT<String> start(WrkMast wrkMast) {
// 4.鍏ュ簱瀹屾垚
@@ -119,7 +128,8 @@
}
} else {
locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
+ BeanUtils.copyProperties(wrkDetl, locDetl);
+// locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -180,7 +190,6 @@
}
// 閬嶅巻宸ヤ綔鏄庣粏锛屾洿鏂板簱瀛樻槑缁嗗拰鍏ュ簱閫氱煡妗�
for (WrkDetl wrkDetl : wrkDetls8) {
-
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand()
, wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
if (null != locDetl) {
@@ -191,7 +200,8 @@
}
} else {
locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
+ BeanUtils.copyProperties(wrkDetl, locDetl);
+// locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -297,7 +307,8 @@
}
} else {
locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
+ BeanUtils.copyProperties(wrkDetl, locDetl);
+// locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
@@ -471,18 +482,16 @@
if (!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
orderDetlPakout.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(),
wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3(), wrkDetl.getAnfme())) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
-// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
}
} catch (Exception ignore) {
+
}
}
// 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
@@ -493,7 +502,6 @@
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}
@@ -575,61 +583,144 @@
* @version 1.0
*/
@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("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ public ReturnT<String> AgvStart(Task task) {
+ // 4.鍏ュ簱瀹屾垚
+ if (task.getWrkSts() == 4) {
+ return agvDoIn(task);
+ // 14.鍑哄簱瀹屾垚
+ } else if (task.getWrkSts() == 14) {
+ return agvDoOut(task);
}
- List<WaitPakin> apallet = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()));
- if (Objects.isNull(apallet)) {
- throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
- }
- apallet.forEach(pakin -> {
- LocDetl detl = new LocDetl();
- BeanUtils.copyProperties(pakin, detl);
- detl.setBarcode(pakin.getBarcode())
- .setAnfme(pakin.getAnfme())
- .setBrand(pakin.getBrand())
- .setAppeTime(new Date())
- .setSpecs(pakin.getSpecs())
- .setColor(pakin.getColor())
- .setLocId(locCache.getId())
- .setLocNo(locCache.getLocNo())
- .setAreaId(locCache.getAreaId())
- .setAreaName(locCache.getAreaName())
- .setUnit(pakin.getUnit())
- .setBatch(pakin.getBatch());
- if (!locDetlService.insert(detl)) {
- throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
- }
- });
+ return SUCCESS;
+ }
- 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("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+
+ /**
+ * @author Ryan
+ * @date 2025/9/25
+ * @description: AGV鍑哄簱浠诲姟
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public ReturnT<String> agvDoOut(Task task) {
+ if (task.getIoType().equals(101)) {
+ Date now = new Date();
+ LocCache locMast = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", task.getSourceLocNo()));
+ if (Objects.isNull(locMast)) {
+ throw new RuntimeException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉鑳戒负绌猴紒锛�");
+ }
+ List<TaskDetl> wrkDetls101 = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ if (wrkDetls101.isEmpty()) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+ if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", task.getSourceLocNo()))) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ // 淇敼婧愬簱浣嶇姸鎬� R ===>> O
+ if (locMast.getLocSts().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ locMast.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locMast.setBarcode("");
+ locMast.setModiTime(now);
+ locMast.setIoTime(now);
+ if (!locCacheService.updateById(locMast)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + task.getWrkNo() + "],[locNo=" + task.getSourceLocNo() + "]");
+ }
+ } else {
+ throw new CoolException("褰撳墠搴撲綅鐘舵��" + locMast.getLocSts() + ", 鏃犳硶鎵ц鍑哄簱鎿嶄綔锛侊紒");
+ }
+ task.setWrkSts(15L);
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ } else if(task.getIoType().equals(53) || task.getIoType().equals(54) || task.getIoType().equals(57)){
+ LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", task.getSourceLocNo()));
+ if (Objects.isNull(locCache)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ if (!locCache.getLocSts().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷负锛�" + LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc + "锛屼笉鏄嚭搴撻绾︾姸鎬�");
+ }
+
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ locCache.setModiTime(new Date());
+ locCache.setBarcode(null);
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
+ if (!locCacheService.updateById(locCache)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ }
+
+ boolean deleted = locCacheDetlService.delete(new EntityWrapper<LocCacheDetl>().eq("loc_id", locCache.getId()));
+
+ if (!deleted){
+ throw new CoolException("搴撲綅鏄庣粏鍒犻櫎澶辫触锛�");
+ }
+
+ task.setWrkSts(15L);
+ task.setModiTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
- wrkMast.setWrkSts(5L);
- wrkMast.setModiTime(new Date());
- if (!taskService.updateById(wrkMast)) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ return SUCCESS;
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
+ public ReturnT<String> agvDoIn(Task wrkMast) {
+ if (wrkMast.getIoType().equals(1)) {
+ 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<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("task_id", wrkMast.getId()));
+ if (Objects.isNull(taskDetls)) {
+ throw new CoolException("鏁版嵁閿欒锛氱粍鎵樻暟鎹笉瀛樺湪锛侊紒");
+ }
+ taskDetls.forEach(pakin -> {
+ LocCacheDetl detl = new LocCacheDetl();
+ BeanUtils.copyProperties(pakin, detl);
+ detl.setBarcode(pakin.getBarcode())
+ .setLocId(locCache.getId())
+ .setAnfme(pakin.getAnfme())
+ .setBrand(pakin.getBrand())
+ .setAppeTime(new Date())
+ .setSpecs(pakin.getSpecs())
+ .setColor(pakin.getColor())
+ .setLocNo(locCache.getLocNo())
+ .setAreaId(locCache.getAreaId())
+ .setAreaName(locCache.getAreaName())
+ .setUnit(pakin.getUnit())
+ .setBatch(pakin.getBatch());
+ if (!locCacheDetlService.insert(detl)) {
+ throw new CoolException("搴撲綅鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ });
+
+ locCache.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ locCache.setModiTime(new Date());
+ locCache.setBarcode(wrkMast.getBarcode());
+ locCache.setModiTime(new Date());
+ locCache.setIoTime(new Date());
+ if (!locCacheService.updateById(locCache)) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
+ }
+ wrkMast.setWrkSts(5L);
+ wrkMast.setModiTime(new Date());
+ if (!taskService.updateById(wrkMast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }else {
+ throw new CoolException("鏁版嵁閿欒锛歩oType涓嶅瓨鍦紒锛�");
}
- Set<Long> list = apallet.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("鍗曟嵁涓嶅瓨鍦紒锛�");
- }
- pakins.forEach(orderPakin -> {
- orderPakin.setSettle(4L);
- if (!orderPakinService.updateById(orderPakin)) {
- throw new CoolException("鍗曟嵁淇敼澶辫触锛侊紒");
- }
- });
return SUCCESS;
}
--
Gitblit v1.9.1