From ecfd53965b24259b28369e785131fdc6f8380885 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 14 五月 2025 17:12:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/resources/mapper/TaskWrkMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 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 6cff224..8cb976b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1753,7 +1753,7 @@
issuedPut.setDirection(basDevpPositionEnd.getRgvSign()==1);
try{
- if (taskWrk.getIoType()==2){
+ if (taskWrk.getIoType()==2 && basDevpPositionEnd.getRgvSign()==1){
Date now = new Date();
taskWrk.setStatus(TaskStatusType.OVER.id);
taskWrk.setModiTime(now);//鏇存柊鏃堕棿
diff --git a/src/main/resources/mapper/TaskWrkMapper.xml b/src/main/resources/mapper/TaskWrkMapper.xml
index 6bbfc99..1cb2f11 100644
--- a/src/main/resources/mapper/TaskWrkMapper.xml
+++ b/src/main/resources/mapper/TaskWrkMapper.xml
@@ -123,7 +123,7 @@
select * from "SOURCE"."wcs_task_wrk"
where 1=1
and (("WRK_STS"=14 and "STATUS"=5) or "STATUS"=7 or "STATUS"=4
- or ("WRK_STS"=4 and "STATUS"=5) or ("WRK_STS"=14 and "STATUS"=9))
+ or ("WRK_STS"=4 and "STATUS"=5))
order by "IO_PRI" desc,"CREATE_TIME","WRK_NO" ASC
</select>
--
Gitblit v1.9.1