From e72f4bde2d285e0f7fdcd4d21c97233998e1ff77 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 17:08:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 4 ----
src/main/java/com/zy/asrs/entity/TaskWrk.java | 6 +++++-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 +++++++++++++++++++------
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 2 +-
src/main/resources/mapper/TaskWrkMapper.xml | 2 +-
src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java | 4 +++-
src/main/resources/application.yml | 3 ++-
7 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 856ae84..e78a475 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -349,7 +349,7 @@
Date now = new Date();
locMast.setModiTime(now);
- taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
+ taskWrk.setStatus(TaskStatusType.OVER2.id);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
// try{
diff --git a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
index 248701c..2b64771 100644
--- a/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
+++ b/src/main/java/com/zy/asrs/domain/enums/TaskStatusType.java
@@ -6,7 +6,9 @@
DISTRIBUTE(2,"娲惧彂"),
COMPLETE(3,"鍛戒护瀹屾垚"),
CANCEL(4,"鍙栨秷"),
- OVER(5,"瀹岀粨")
+ OVER(5,"瀹岀粨"),
+ OVER2(7,"鎵嬪姩瀹岀粨"),
+ OVER3(9,"鍑哄簱鍒拌緭閫佺嚎")
;
public Integer id;
diff --git a/src/main/java/com/zy/asrs/entity/TaskWrk.java b/src/main/java/com/zy/asrs/entity/TaskWrk.java
index 1bb934f..d4eba75 100644
--- a/src/main/java/com/zy/asrs/entity/TaskWrk.java
+++ b/src/main/java/com/zy/asrs/entity/TaskWrk.java
@@ -248,11 +248,15 @@
case 2:
return "娲惧彂";
case 3:
- return "姝ュ簭瀹屾垚";
+ return "鍛戒护瀹屾垚";
case 4:
return "鍙栨秷";
case 5:
return "瀹岀粨";
+ case 7:
+ return "鎵嬪姩瀹岀粨";
+ case 9:
+ return "鍑哄簱鍒拌緭閫佺嚎";
default:
return String.valueOf(this.status);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index aae0581..6cff224 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -31,6 +31,7 @@
import com.zy.core.thread.RgvThread;
import com.zy.core.thread.SiemensDevpThread;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -621,7 +622,7 @@
if (offer) {
log.info("涓嬪彂杈撻�佺嚎浠诲姟鎴愬姛锛歵askWrk:" + JSON.toJSONString(taskWrk));
Date now = new Date();
- taskWrk.setStatus(9);
+ taskWrk.setStatus(TaskStatusType.OVER3.id);
taskWrk.setWrkSts(14);
taskWrk.setModiTime(now);
taskWrk.setCompleteTime(now);
@@ -924,7 +925,7 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
- taskWrk.setStatus(2);
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);
taskWrk.setModiTime(now);
taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
@@ -1035,7 +1036,7 @@
// 淇敼宸ヤ綔妗ｇ姸鎬� 11.鐢熸垚鍑哄簱ID => 12.鍚婅溅鍑哄簱涓�
Date now = new Date();
taskWrk.setWrkSts(12);
- taskWrk.setStatus(2);
+ taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);
taskWrk.setModiTime(now);
taskWrk.setExecuteTime(now);
if (taskWrkMapper.updateById(taskWrk) == 0) {
@@ -1119,7 +1120,7 @@
if (!Cools.isEmpty(taskWrk)) {
if (taskWrk.getIoType() == 1 && taskWrk.getWrkSts() == 3) {
taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
- taskWrk.setStatus(5);//瀹岀粨
+ taskWrk.setStatus(TaskStatusType.OVER.id);//瀹岀粨
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
@@ -1129,7 +1130,7 @@
locMastService.updateById(locMast);
} else if (taskWrk.getIoType() == 2 && taskWrk.getWrkSts() == 12) {
taskWrk.setWrkSts(13);//鍑哄簱瀹屾垚
- taskWrk.setStatus(5);//瀹岀粨
+ taskWrk.setStatus(TaskStatusType.OVER.id);//瀹岀粨
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getStartPoint());
locMast.setLocSts("O");//O.绌哄簱浣�
@@ -1139,7 +1140,7 @@
locMastService.updateById(locMast);
} else if (taskWrk.getIoType() == 3 && taskWrk.getWrkSts() == 12) {
taskWrk.setWrkSts(4);//鍏ュ簱瀹屾垚
- taskWrk.setStatus(5);//瀹岀粨
+ taskWrk.setStatus(TaskStatusType.OVER.id);//瀹岀粨
//鏇存柊搴撲綅鐘舵��
LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
locMast.setLocSts("F");//F.鍦ㄥ簱
@@ -1750,6 +1751,18 @@
issuedPut.setTargetPosition(basDevpPositionEnd.getPlcPosition());
issuedPut.setIsRunning(1);
issuedPut.setDirection(basDevpPositionEnd.getRgvSign()==1);
+
+ try{
+ if (taskWrk.getIoType()==2){
+ Date now = new Date();
+ taskWrk.setStatus(TaskStatusType.OVER.id);
+ taskWrk.setModiTime(now);//鏇存柊鏃堕棿
+ taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrkService.updateById(taskWrk);
+ }
+ } catch (Exception e){
+
+ }
} catch (Exception e) {
log.error("浠诲姟鐢熸垚澶辫触issued1===銆嬪紓甯镐俊鎭細{}", e.getMessage());
return false;
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 2da886f..174fbdf 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -57,10 +57,6 @@
public void execute() throws IOException {
List<TaskWrk> taskWrkList = taskWrkService.selectToBeHistoryData();
for (TaskWrk taskWrk : taskWrkList) {
- if (taskWrkService.saveToHistory(taskWrk.getTaskNo()) == 0) {
- log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
- return ;
- }
JSONObject jsonObject = null;
String response = null;
boolean success = false;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 627f978..a4ddf92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,8 @@
# password: sa@123
driver-class-name: dm.jdbc.driver.DmDriver
# url: jdbc:dm://27.172.2.101:5236/SOURCE
- url: jdbc:dm://127.0.0.1:5236/SOURCE
+ url: jdbc:dm://27.172.2.102:5236/SOURCE
+# url: jdbc:dm://127.0.0.1:5236/SOURCE
username: SYSDBA
password: Zy@12345
mvc:
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 9787512..6bbfc99 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -131,7 +131,7 @@
insert into "SOURCE"."wcs_task_wrk_log"
select * from "SOURCE"."wcs_task_wrk"
where "TASK_NO" = #{taskNo}
- and ("STATUS"=5 or "STATUS"=4 or "STATUS"=6 or "STATUS"=7 or "STATUS"=9)
+ and ("STATUS"=5 or "STATUS"=4 or "STATUS"=7)
and ("WRK_NO" not in (select "WRK_NO" from "SOURCE"."asr_bas_devp"))
</insert>
--
Gitblit v1.9.1