From b650e00a5e5ecdad78014452c8bfa60b3ffbfca7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 20 三月 2021 10:56:11 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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 7c826d2..47649e2 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -5,18 +5,18 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
+import com.core.common.SnowflakeIdWorker;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
+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;
import zy.cloud.wms.manager.service.WrkStsService;
@@ -36,6 +36,10 @@
private PakoutService pakoutService;
@Autowired
private WrkStsService wrkStsService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private CustOrderService custOrderService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -47,6 +51,12 @@
@ManagerAuth(memo = "搴撳瓨鏁伴噺妫�娴�")
public R stockOutCheck(@RequestParam String number) {
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")
@@ -100,7 +110,6 @@
return workService.initPakout(params, getUserId());
}
-
@RequestMapping("/hand/control/pakout")
@ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
@@ -112,4 +121,26 @@
return R.ok();
}
+ @RequestMapping("/orderNo/init")
+ @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+ public R initOrderNo() {
+ long nextId = snowflakeIdWorker.nextId();
+ if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
+ return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+ }
+ return R.ok().add(String.valueOf(nextId));
+ }
+
+ @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());
+ }
+
}
--
Gitblit v1.9.1