From d7ec100166068db8197d218c57d2a6c86a5289a4 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 04 十一月 2025 14:10:42 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 27 +++++++++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 990db0d..1216a4a 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -311,6 +311,16 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
+ }
if ((Cools.isEmpty(taskWrk) || taskWrk.getStatus()>=3) && !taskWrk.getStatus().equals(TaskStatusType.OVER3.id)){
return R.error("宸插畬缁撴垨宸插彇娑�") ;
}
@@ -394,8 +404,15 @@
@ManagerAuth(memo = "鎵嬪姩鍙栨秷浠诲姟")
public R cancel(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error();
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ try{
+ return this.delete(taskNo);
+ } catch (Exception e) {
+ return R.error();
+ }
}
if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
@@ -485,6 +502,12 @@
@ManagerAuth(memo = "杈撻�佺嚎涓嬪彂瀹屾垚")
public R returnAssign(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("浠诲姟宸蹭笉瀛樺湪") ;
+ }
+ if (taskWrk.getIoType()==4){
+ return R.error("褰撳墠浠诲姟涓嶆敮鎸佹鎿嶄綔") ;
+ }
if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==1){
taskWrk.setStatus(TaskStatusType.RECEIVE.id);//娲惧彂鐘舵��
taskWrk.setWrkSts(2);
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 dd397d3..e8ee51c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3007,7 +3007,7 @@
* 2022-06-09 TQS淇敼锛屾煡璇㈠伐浣滄。LIST锛岄亶鍘嗕笅鍙戯紝闃叉绗竴涓换鍔″牭濉炲嚭搴�
*/
public void locToCrnStnDemo(CrnSlave slave, CrnProtocol crnProtocol) {
- List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOut(crnProtocol.getLaneNo(), null);
+ List<TaskWrk> taskWrksInitial = taskWrkMapper.selectPakOutDemo(crnProtocol.getLaneNo(), null);
if (taskWrksInitial.size() == 0) {
return;
}
--
Gitblit v1.9.1