From f31629c857a5cb607f67b1a7f89a826ad3f72563 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 11 一月 2024 14:56:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 5 +++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++++----
src/main/resources/mapper/TaskWrkMapper.xml | 4 ++--
3 files changed, 9 insertions(+), 8 deletions(-)
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 57e662c..dfeb919 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1001,8 +1001,8 @@
//鎸囦护宸插畬鎴愶紝鏇存柊浠诲姟
if (taskWrk.getIoType() == 1) {
//鍏ュ簱浠诲姟
- taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
- //taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(4);//3.鍚婅溅鍏ュ簱涓� => 4.鍏ュ簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
@@ -1015,8 +1015,8 @@
locMastService.updateById(locMast);
} else if (taskWrk.getIoType() == 2) {
//鍑哄簱浠诲姟
- taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
-// taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+// taskWrk.setWrkSts(14);//12.鍚婅溅鍑哄簱涓� => 14.鍑哄簱瀹屾垚
+ taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);
taskWrkService.updateById(taskWrk);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index ca36b71..f031338 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -271,10 +271,11 @@
);
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)){
- if (taskWrk.getIoType() == 3){
+ if (taskWrk.getIoType() == 3 || taskWrk.getIoType() == 1){
taskWrk.setWrkSts(4);
+ }else {
+ taskWrk.setWrkSts(14);
}
- taskWrk.setStatus(5);
if (!taskWrkService.updateById(taskWrk)){
log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝鏀瑰彉浠诲姟鐘舵�佸け璐�");
}
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index cc05d5d..2b4155d 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -129,8 +129,8 @@
<select id="selectWorkingTask" resultMap="BaseResultMap">
select * from dbo.wcs_task_wrk
- where (wrk_sts=3 and io_type = 1)
- or (wrk_sts=12 and io_type = 2)
+ where (wrk_sts=4 and io_type = 1)
+ or (wrk_sts=14 and io_type = 2)
order by io_pri desc,create_time,wrk_no ASC
</select>
--
Gitblit v1.9.1