From 72c06d5800d3a99dbd7002a6946be749d9264b15 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 26 六月 2025 10:44:26 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/controller/TaskWrkController.java |    7 ++++---
 1 files changed, 4 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 caf7270..b35d47a 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -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