From 05466547c913ad2cd29944e5444dd387ce64b25f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 18 十二月 2025 16:07:48 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 23 ++++++++++++++++-------
1 files changed, 16 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 43f85c0..adf0ee2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -427,10 +427,9 @@
}
String agvSta = null;
- if (wrkMast.getIoType() == TaskIOType.MERGE_OUT.type) {
+ if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
agvSta = wrkMast.getPauseMk();
}
-
// . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
if (!Objects.isNull(agvSta)) {
// 淇敼鐩爣绔欑偣淇℃伅
@@ -444,9 +443,6 @@
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
}
-
-
-
break;
// 鐩樼偣鍏ュ簱
case 57:
@@ -769,6 +765,7 @@
throw new CoolException("绔欑偣锛�" + task.getSourceStaNo() + ", 涓嶅瓨鍦紒锛�");
}
devNo.setLocSts(LocStsType.LOC_STS_TYPE_F.type);
+ devNo.setBarcode(task.getBarcode());
devNo.setModiTime(new Date());
if (!basStationService.updateById(devNo)) {
throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
@@ -831,8 +828,6 @@
throw new CoolException("褰撳墠搴撲綅鐘舵��" + locMast.getLocSts() + ", 鏃犳硶鎵ц鍑哄簱鎿嶄綔锛侊紒");
}
-
-
task.setWrkSts(15L);
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -882,6 +877,20 @@
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> agvDoIn(Task wrkMast) {
LocCache locCache = locCacheService.selectOne(new EntityWrapper<LocCache>().eq("loc_no", wrkMast.getLocNo()));
+
+ if (!Objects.isNull(wrkMast.getSourceStaNo())) {
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>()
+ .eq("dev_no", wrkMast.getSourceStaNo()));
+ if (!Objects.isNull(station)) {
+ List<String> list = Arrays.asList(LocStsType.LOC_STS_TYPE_O.type, LocStsType.LOC_STS_TYPE_D.type);
+ if (!list.contains(station.getLocSts())) {
+ station.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
+ }
+ station.setBarcode(null);
+ basStationService.updateById(station);
+ }
+ }
+
if(wrkMast.getIoType().equals(1)){
if (Objects.isNull(locCache)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
--
Gitblit v1.9.1