From d80dd0abcb56aacf30bc32e424ff398f7ccce730 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 26 三月 2021 13:17:00 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index b14e242..756728f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -125,10 +125,11 @@
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
+ String number = "PR-" + String.valueOf(nextId).substring(0, 15);
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
}
- return R.ok().add(String.valueOf(nextId));
+ return R.ok().add(number);
}
@RequestMapping("/order/init")
@@ -143,4 +144,16 @@
return workService.stockTransfer(number, getUserId());
}
+ @RequestMapping("/stock/check")
+ @ManagerAuth(memo = "搴撳瓨鐩樼偣")
+ public R stockCheck(@RequestBody StoCheckParam param) {
+ return workService.stockCheck(param, getUserId());
+ }
+
+ @RequestMapping("/stock/check/auditing")
+ @ManagerAuth(memo = "鐩樼偣璁板綍瀹℃牳")
+ public R checkAuditing(@RequestParam Long checkId) {
+ return workService.stockCheckAuditing(checkId, getUserId());
+ }
+
}
--
Gitblit v1.9.1