From 6592c7de3c380dd464e05ca4b47ae5d2d5536a6e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 25 三月 2021 10:44:44 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 48220e5..756728f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -15,10 +15,7 @@
import zy.cloud.wms.manager.entity.CustOrder;
import zy.cloud.wms.manager.entity.Pakout;
import zy.cloud.wms.manager.entity.WrkSts;
-import zy.cloud.wms.manager.entity.param.InitPakoutParam;
-import zy.cloud.wms.manager.entity.param.StockConfirmParam;
-import zy.cloud.wms.manager.entity.param.StockInParam;
-import zy.cloud.wms.manager.entity.param.StockOutParam;
+import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
@@ -56,6 +53,12 @@
return workService.stockOutCheck(number, getUserId());
}
+ @RequestMapping("/stock/out/preview")
+ @ManagerAuth(memo = "鎷ｈ揣棰勮")
+ public R stockOutPreview(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPreview(stockOutParam, getUserId());
+ }
+
@RequestMapping("/stock/out")
@ManagerAuth(memo = "鎷ｈ揣")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
@@ -83,7 +86,7 @@
}
Long sts = pakouts.get(0).getWrkSts();
if (sts == 1) {
- sts =2L;
+ sts = 2L;
}
WrkSts wrkSts = wrkStsService.selectById(sts);
return R.ok().add(Cools
@@ -122,10 +125,35 @@
@ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
- return R.error("鎶辨瓑杩愭皵涓嶅ソ锛岃鍐嶇敓鎴愪竴娆�");
+ 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")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ public R initOrder(@RequestBody InitOrderParam param) {
+ return workService.initOrder(param, getUserId());
+ }
+
+ @RequestMapping("/stock/transfer")
+ @ManagerAuth(memo = "搴撳瓨璋冩嫧")
+ public R stockTransfer(@RequestParam String number) {
+ 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