From 2df63e034920c7069905e9173618ca149e0aa15b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 26 十二月 2025 15:25:35 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
index 248ee81..9666287 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/TaskServiceImpl.java
@@ -98,7 +98,7 @@
if (null == task) {
return Boolean.FALSE;
}
- this.maintainLocSts(task, Boolean.TRUE);
+ this.maintainLocAndStaHandler(task, Boolean.TRUE);
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setUpdateTime(new Date());
@@ -117,7 +117,7 @@
if (null == task) {
return Boolean.FALSE;
}
- this.maintainLocSts(task, Boolean.FALSE);
+ this.maintainLocAndStaHandler(task, Boolean.FALSE);
task.setTaskSts(TaskStsType.CANCEL.val());
task.setUpdateTime(new Date());
@@ -300,7 +300,7 @@
@Transactional
- public void maintainLocSts(Task task, Boolean complete) {
+ public void maintainLocAndStaHandler(Task task, Boolean complete) {
Loc oriLoc = null; Loc destLoc = null;
Sta oriSta = null; Sta destSta = null;
Date now = new Date();
@@ -331,18 +331,18 @@
}
destSta = staService.getById(task.getDestSta());
- destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
- destSta.setUpdateTime(now);
- if (!staService.updateById(destSta)) {
- throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(destSta, task, 1, StaReserveType.IN);
+ } else {
+ staReserveService.cancelStaReserve(destSta, task, 1, StaReserveType.IN);
}
break;
case STA_TO_LOC:
oriSta = staService.getById(task.getOriSta());
- oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
- oriSta.setUpdateTime(now);
- if (!staService.updateById(oriSta)) {
- throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(oriSta, task, 1, StaReserveType.OUT);
+ } else {
+ staReserveService.cancelStaReserve(oriSta, task, 1, StaReserveType.OUT);
}
destLoc = locService.getById(task.getDestLoc());
@@ -354,17 +354,17 @@
break;
case STA_TO_STA:
oriSta = staService.getById(task.getOriSta());
- oriSta.setStaSts(complete?StaStsType.IDLE.val():StaStsType.STOCK.val());
- oriSta.setUpdateTime(now);
- if (!staService.updateById(oriSta)) {
- throw new BusinessException("Sta [" + oriSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(oriSta, task, 1, StaReserveType.OUT);
+ } else {
+ staReserveService.cancelStaReserve(oriSta, task, 1, StaReserveType.OUT);
}
destSta = staService.getById(task.getDestSta());
- destSta.setStaSts(complete?StaStsType.STOCK.val():StaStsType.IDLE.val());
- destSta.setUpdateTime(now);
- if (!staService.updateById(destSta)) {
- throw new BusinessException("Sta [" + destSta.getStaNo() + "] 绔欑偣淇敼鐘舵�佸け璐� 锛侊紒锛�");
+ if (complete) {
+ staReserveService.confirmStaReserve(destSta, task, 1, StaReserveType.IN);
+ } else {
+ staReserveService.cancelStaReserve(destSta, task, 1, StaReserveType.IN);
}
break;
case TO_CHARGE:
--
Gitblit v1.9.1