From 608fb6f9529ce51291ef682638a5efc7dd51ac63 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 18 十一月 2025 08:21:08 +0800
Subject: [PATCH] 1.完善找库位 2.新增erp订单删除后,wms订单跟着删除功能 3.新增订单完成后,上报erp,erp报错后显现在出货单中 4.新增一键查询到异常完成订单 5.对销售单据和其他单据进行区分出库 6.对中间表订单状态进行完善 7.新增锁单功能 8.新增任务查询维护加上订单号

---
 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