From e7e49e01c56362fed2b9655dd286a74bb0fb1db2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 01 四月 2025 08:29:59 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/controller/TaskWrkController.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index cacb0a1..04a0a73 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -242,9 +242,12 @@
             log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
 //            throw new CoolException(e);
         }
+        Date now = new Date();
+        locMast.setModiTime(now);
         locMastService.updateById(locMast);
         taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
-        taskWrk.setModiTime(new Date());
+        taskWrk.setModiTime(now);
+        taskWrk.setCompleteTime(now);
         taskWrkService.updateById(taskWrk);
         return R.ok();
     }
@@ -262,10 +265,11 @@
         Date now = new Date();
         taskWrk.setStatus(TaskStatusType.CANCEL.id);
         taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+        taskWrk.setCancelTime(now);
         try{
             taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
         }catch (Exception e){
-            taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+            taskWrk.setModiUser(1111L);//鎿嶄綔鍛�
         }
         String response="";
         try{
@@ -329,5 +333,28 @@
                 return "鏈煡";
         }
     }
+    @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+    @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+    public R returnWorkingCondition(@RequestParam String taskNo) {
+        TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+        if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+            taskWrk.setWrkSts(11);
+            if(!taskWrkService.updateById(taskWrk)){
+                return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+            }
+            return R.ok();
+        } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+            taskWrk.setWrkSts(2);
+            taskWrkService.updateById(taskWrk);
+            if(!taskWrkService.updateById(taskWrk)){
+                return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+            }
+            return R.ok();
+        }else{
+            return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+        }
+
+    }
+
 
 }

--
Gitblit v1.9.1