From a144c412981c49658c951db098a701a58f8e1ee3 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 18 四月 2025 13:23:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms
---
src/main/java/com/zy/asrs/controller/WorkController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 2e5d066..692f5fa 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -50,7 +50,7 @@
@RequestMapping("/locMerge/out/start/sxk")
@ManagerAuth(memo = "骞舵澘鍑哄簱")
public R locMergeOutStartSxk(@RequestBody StockOutParam param) {
- workService.locMergeOut(param, getUserId());
+ workService.locMergeOutSxk(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
@@ -231,7 +231,7 @@
@RequestMapping("/locCheck/out/start/sxk")
@ManagerAuth(memo = "鐩樼偣鍑哄簱")
public R locCheckOutStartsxk(@RequestBody StockOutParam param) {
- workService.locCheckOut(param, getUserId());
+ workService.locCheckOutsxk(param, getUserId());
return R.ok("鍑哄簱鍚姩鎴愬姛");
}
--
Gitblit v1.9.1