From d6ff18e0ff89d36e80195da43ca40bf3a8f42b2c Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期日, 15 六月 2025 09:38:14 +0800
Subject: [PATCH] wms分配库位异常
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 31 ++++++++++++++++++-------------
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 2 ++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 10 ++++------
3 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 531b742..d2dca63 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -138,12 +138,10 @@
} else {
staProtocol1 = staProtocol1.clone();
}
- if (staProtocol1.isLoading()) {
- return R.error(staProtocol.getSiteId() + "绔欑偣鏈夌墿!");
- }
- if (staProtocol.isLoading()) {
- return R.error(staProtocol.getSiteId() + "绔欑偣鏈夌墿!");
- }
+// if (staProtocol1.isLoading()) {
+// return R.error(staProtocol1.getSiteId() + "绔欑偣鏈夌墿!");
+// }
+
if (!staProtocol.isAutoing()) {
return R.error(staProtocol.getSiteId() + "绔欑偣fei鑷姩");
}
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index cf1083a..71ad90a 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
@@ -42,20 +43,24 @@
case 5:
break;
}
- TaskWrkReport taskWrkReport = new TaskWrkReport();
- TaskWrkLog taskWrkLog = new TaskWrkLog();
- Synchro.Copy(taskWrk, taskWrkReport);
- Synchro.Copy(taskWrk, taskWrkLog);
- if (!taskWrkReportService.insert(taskWrkReport)) {
- throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
- }
- if (!wrkLogService.insert(taskWrkLog)) {
- throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
- }
- if (!taskWrkService.deleteById(taskWrk)) {
- throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrk);
- }
+ exe(taskWrk);
}
}
+ @Transactional
+ public void exe(TaskWrk taskWrk) {
+ TaskWrkReport taskWrkReport = new TaskWrkReport();
+ TaskWrkLog taskWrkLog = new TaskWrkLog();
+ Synchro.Copy(taskWrk, taskWrkReport);
+ Synchro.Copy(taskWrk, taskWrkLog);
+ if (!wrkLogService.insert(taskWrkLog)) {
+ throw new CoolException("杞巻鍙叉。澶辫触" + taskWrk);
+ }
+ if (!taskWrkService.deleteById(taskWrk)) {
+ throw new CoolException("浠诲姟妗ｅ垹闄ゅけ璐�" + taskWrk);
+ }
+ if (!taskWrkReportService.insert(taskWrkReport)) {
+ throw new CoolException("杞Щ鑷充笂鎶ヨ〃" + taskWrk);
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 7cffabb..f574cce 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -31,6 +31,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.IOException;
@@ -83,6 +84,7 @@
// WMS鍒嗛厤鍏ュ簱搴撲綅寮傚父涓婃姤
@Scheduled(cron = "0/5 * * * * ? ")
+ @Transactional
public synchronized void locationAssignmentExceptionEscalation() {
List<TaskWrk> taskWrkList = taskWrkMapper.selectList(new EntityWrapper<TaskWrk>().eq("wrk_sts", 5));
--
Gitblit v1.9.1