From e386fa74739a128349c9c0e60913896713044e43 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 28 四月 2025 13:30:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 9780001..3136a88 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{
@@ -298,21 +302,6 @@
// throw new CoolException(e);
}
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
- taskWrkService.updateById(taskWrk);
- return R.ok();
- }
-
- @PostMapping(value = "/taskWrk/updateCommandStep")
- @ManagerAuth(memo = "鏇存柊姝ュ簭")
- public R updateCommandStep(@RequestParam Integer wrkNo, @RequestParam Integer commandStep) {
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(wrkNo);
- if (taskWrk == null) {
- return R.error();
- }
- Date now = new Date();
- taskWrk.setCommandStep(commandStep);
- taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
taskWrkService.updateById(taskWrk);
return R.ok();
}
--
Gitblit v1.9.1