From af11d4845251da536d564a82fa019b4306875da9 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 29 五月 2021 14:48:54 +0800
Subject: [PATCH] Merge branch 'htwms' of https://gitee.com/luxiaotao1123/wms-cloud into htwms
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 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 33dd07f..5968a24 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -36,12 +36,18 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private CustOrderService custOrderService;
+ private OrderService orderService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
return workService.stockPakin(number, getUserId());
+ }
+
+ @RequestMapping("/stock/pakout")
+ @ManagerAuth(memo = "鍑哄簱")
+ public R stockPakout(@RequestBody PakoutParam number) {
+ return workService.stockPakout(number, getUserId());
}
@RequestMapping("/stock/in")
@@ -125,18 +131,18 @@
}
@RequestMapping("/orderNo/init")
- @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+ @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
long nextId = snowflakeIdWorker.nextId();
- String number = "PR-" + String.valueOf(nextId).substring(0, 15);
- if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
- return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+ String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+ if (orderService.selectByOrderNo(orderNo) != null) {
+ return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
}
- return R.ok().add(number);
+ return R.ok().add(orderNo);
}
@RequestMapping("/order/init")
- @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+ @ManagerAuth(memo = "鐢熸垚璁㈠崟")
public R initOrder(@RequestBody InitOrderParam param) {
return workService.initOrder(param, getUserId());
}
@@ -144,7 +150,7 @@
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockTransfer(@RequestBody AsrsTransferParam number) {
- return R.error();
+ return workService.asrsStockTransfer(number, getUserId());
}
@RequestMapping("/stock/check")
@@ -159,6 +165,18 @@
return workService.stockCheckAuditing(checkId, getUserId());
}
+ @RequestMapping("/stock/checks/auditing")
+ @ManagerAuth(memo = "鐩樼偣璁板綍鎵归噺瀹℃牳")
+ public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
+ int success = 0;
+ for (Long checkId : checkIds) {
+ R r = workService.stockCheckAuditing(checkId, getUserId());
+ if (String.valueOf(r.get("code")).equals("200")) {
+ success ++;
+ }
+ }
+ return R.ok("瀹℃牳鎴愬姛鏁伴噺锛�" + success);
+ }
/******************************************************************************************************/
--
Gitblit v1.9.1