From 1a2f494454d0da24bb9ca7ad7c0e91902819405a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 21 十一月 2025 13:18:42 +0800
Subject: [PATCH] 1.获取erp订单数据时过滤掉状态》5 2.同步erp删除数据时,只删除指定的订单明细 3.订单出库按批号排序

---
 src/main/java/com/zy/asrs/controller/WorkController.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index bd09690..29c274e 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -86,7 +86,7 @@
     @RequestMapping("/plate/out/start")
     @ManagerAuth(memo = "鍑哄簱浣滀笟")
     public R fullStoreTakeStart(@RequestBody StockOutParam param) {
-        workService.startupFullTakeStore(param, getUserId());
+        workService.startupFullTakeStore(param, getUser());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
@@ -106,7 +106,7 @@
     @RequestMapping("/locCheck/out/start")
     @ManagerAuth(memo = "鐩樼偣鍑哄簱")
     public R locCheckOutStart(@RequestBody StockOutParam param) {
-        workService.locCheckOut(param, getUserId());
+        workService.locCheckOut(param, getUser());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
@@ -149,11 +149,11 @@
         return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
     }
 
-    @RequestMapping("/deal/preHave/start")
-    @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
-    public R dealPreHave(@RequestParam Integer wrkNo) {
-        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
-        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
-    }
+//    @RequestMapping("/deal/preHave/start")
+//    @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+//    public R dealPreHave(@RequestParam Integer wrkNo) {
+//        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+//        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+//    }
 
 }

--
Gitblit v1.9.1