From 801015c1c34d701f57563f307f7c3b335f1fa4df Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 05 九月 2025 09:11:44 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index caf7270..ac08693 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -178,8 +178,8 @@
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
- return R.error("宸插畬缁撴垨宸插彇娑�");
+ if (Cools.isEmpty(taskWrk)) {
+ return R.error("鎵句笉鍒板伐浣滄。");
}
LocMast locMast = new LocMast();
if (taskWrk.getIoType() == 1) {//鍏ュ簱浠诲姟瀹屾垚搴撲綅涓篎
@@ -214,8 +214,9 @@
locMast.setBarcode(taskWrk.getBarcode());
}
- toWmsService.addReportLog(taskWrk);
+// toWmsService.addReportLog(taskWrk);
locMastService.updateById(locMast);
+ taskWrk.setCompleteTime(new Date());
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
@@ -263,9 +264,9 @@
} catch (Exception e) {
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
- toWmsService.addReportLog(taskWrk);
+// toWmsService.addReportLog(taskWrk);
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrk.setCancelTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
}
--
Gitblit v1.9.1