From 01fa93b5dd9f20286ef8f22515caf55307f76a9d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 20 三月 2026 09:52:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

---
 src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 07d0aec..b546436 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -123,9 +123,9 @@
 //       if (!wrkMastService.updateById(mast)) {
 //           throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
 //       }
-        workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
 
-        return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+        return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
+
     }
 
     /**

--
Gitblit v1.9.1