From 90aea4830974e3687222aa266952923d59aa088f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 19 十二月 2025 17:19:52 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 1f8e762..1f869e2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -6,6 +6,8 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.enums.LocAreaType;
import com.zy.asrs.enums.LocStsType;
+import com.zy.asrs.enums.TaskIOType;
+import com.zy.asrs.enums.TaskStatusType;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.*;
import com.zy.asrs.task.AbstractHandler;
@@ -355,7 +357,6 @@
}
// 淇敼搴撳瓨鏄庣粏鏁伴噺锛屽鏃犲簱瀛橈紝鏇炬柊澧�
for (WrkDetl wrkDetl : wrkDetls54) {
-
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(),
wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(),
wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(),
@@ -423,6 +424,24 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撲綅鐘舵�佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo="
+ wrkMast.getLocNo() + "]");
+ }
+ }
+
+ String agvSta = null;
+ if (wrkMast.getIoType() == TaskIOType.MERGE_IN.type) {
+ agvSta = wrkMast.getPauseMk();
+ }
+ // . 鍒犻櫎缂撳瓨绔欑偣鏄庣粏
+ if (!Objects.isNull(agvSta)) {
+ // 淇敼鐩爣绔欑偣淇℃伅
+ BasStation station = basStationService.selectOne(new EntityWrapper<BasStation>().eq("dev_no", agvSta));
+ if (Objects.isNull(station)) {
+ throw new CoolException("绔欑偣涓嶅瓨鍦�!!");
+ }
+ basStationDetlService.delete(new EntityWrapper<BasStationDetl>().eq("dev_no", station.getDevNo()));
+ station.setLocSts(LocStsType.LOC_STS_TYPE_D.type);
+ if (!basStationService.updateById(station)) {
+ throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
}
break;
@@ -709,10 +728,10 @@
@Transactional(rollbackFor = Exception.class)
public ReturnT<String> AgvStart(Task task) {
// 4.鍏ュ簱瀹屾垚
- if (task.getWrkSts() == 4) {
+ if (task.getWrkSts().equals(TaskStatusType.AGV_TASK_FINISHED_IN.type)) {
return agvDoIn(task);
// 14.鍑哄簱瀹屾垚
- } else if (task.getWrkSts() == 14) {
+ } else if (task.getWrkSts().equals(TaskStatusType.AGV_TASK_FINISHED_OUT.type)) {
return agvDoOut(task);
}
return SUCCESS;
@@ -721,7 +740,7 @@
/**
* @author Ryan
* @date 2025/9/25
- * @description: AGV鍑哄簱浠诲姟
+ * @description: AGV鍑哄簱浠�
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
@@ -747,6 +766,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("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
@@ -809,9 +829,7 @@
throw new CoolException("褰撳墠搴撲綅鐘舵��" + locMast.getLocSts() + ", 鏃犳硶鎵ц鍑哄簱鎿嶄綔锛侊紒");
}
-
-
- task.setWrkSts(15L);
+ task.setWrkSts(TaskStatusType.AGV_INVENTORY_UPDATED_OUT.type);
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -847,7 +865,7 @@
if (!basStationService.updateById(devNo)) {
throw new CoolException("绔欑偣淇℃伅淇敼澶辫触锛侊紒");
}
- task.setWrkSts(15L);
+ task.setWrkSts(TaskStatusType.AGV_INVENTORY_UPDATED_OUT.type);
if (!taskService.updateById(task)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -860,6 +878,19 @@
@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("");
+ basStationService.updateById(station);
+ }
+ }
+
if(wrkMast.getIoType().equals(1)){
if (Objects.isNull(locCache)) {
throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
@@ -932,7 +963,7 @@
if (!locCacheService.updateById(locCache)) {
throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒");
}
- wrkMast.setWrkSts(5L);
+ wrkMast.setWrkSts(TaskStatusType.AGV_INVENTORY_UPDATED_IN.type);
wrkMast.setModiTime(new Date());
if (!taskService.updateById(wrkMast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -1027,7 +1058,7 @@
}
// 淇敼宸ヤ綔涓绘。鐘舵��
- wrkMast.setWrkSts(5L);
+ wrkMast.setWrkSts(TaskStatusType.AGV_INVENTORY_UPDATED_IN.type);
wrkMast.setModiTime(now);
if (!taskService.updateById(wrkMast)) {
// exceptionHandle("鏇存柊鍏ュ簱瀹屾垚鐘舵�佸け璐�;[workNo={0}]", wrkMast.getWrkNo());
--
Gitblit v1.9.1