From e3bb506579f395c5dbca3d9f0e1e10a18170240f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 26 四月 2021 15:01:15 +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, 23 insertions(+), 11 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 a18c83d..6cc673a 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -36,7 +36,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private CustOrderService custOrderService;
+ private OrderService orderService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
@@ -62,10 +62,10 @@
return workService.stockOutPreview(stockOutParam, getUserId());
}
- @RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎷ｈ揣")
+ @RequestMapping("/stock/out/create")
+ @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
- return workService.stockOut(stockOutParam, getUserId());
+ return workService.stockOutCreate(stockOutParam, getUserId());
}
@RequestMapping("/stock/out/print")
@@ -125,18 +125,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 +144,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 +159,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