From 914a092bc4c21d69641f94b68fecf61b25ddaca1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 13:11:38 +0800
Subject: [PATCH] #拣货单完成、上架规则

---
 src/main/java/com/zy/asrs/controller/WorkController.java |   18 ++++++++++++++++--
 1 files changed, 16 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 bc186d4..d656b7a 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -92,6 +92,20 @@
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
+    @RequestMapping("/turn/over/out/start")
+    @ManagerAuth(memo = "瀹㈡埛杞崲")
+    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+        workService.turnOverOut(param, getUserId());
+        return R.ok("瀹㈡埛杞崲鎴愬姛");
+    }
+
+    @RequestMapping("/turn/over/out/payment/start")
+    @ManagerAuth(memo = "璐х墿褰㈡�佽浆鎹�")
+    public R turnOverOutStartPayment(@RequestBody EmptyPlateOutParam param) {
+        workService.turnOverOutPayment(param, getUserId());
+        return R.ok("璐х墿褰㈡�佸凡杞负"+param.getPayment$(param.getPayment()));
+    }
+
     @RequestMapping("/empty/plate/in/start")
     @ManagerAuth(memo = "绌烘澘鍏ュ簱")
     public R emptyPlateInStart(@RequestParam Integer sourceStaNo) {
@@ -154,8 +168,8 @@
     @RequestMapping("/deal/preHave/start")
     @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
     public R dealPreHave(@RequestParam Integer wrkNo) {
-        StartupDto startupDto = workService.dealPreHaveStart(wrkNo, getUserId());
-        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + startupDto.getLocNo());
+        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
     }
 
 }

--
Gitblit v1.9.1