From 641de82a0458ab5ba66b5e735895caad26708fa8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 12 四月 2021 11:24:56 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 101 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 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 7c826d2..9e38fa4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -5,21 +5,16 @@
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.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.service.PakoutService;
-import zy.cloud.wms.manager.service.WorkService;
-import zy.cloud.wms.manager.service.WrkStsService;
+import zy.cloud.wms.manager.entity.*;
+import zy.cloud.wms.manager.entity.param.*;
+import zy.cloud.wms.manager.service.*;
import java.util.List;
@@ -36,6 +31,16 @@
private PakoutService pakoutService;
@Autowired
private WrkStsService wrkStsService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+ @Autowired
+ private CustOrderService custOrderService;
+
+ @RequestMapping("/stock/pakin")
+ @ManagerAuth(memo = "鍏ュ簱")
+ public R stockPakin(@RequestBody PakinParam number) {
+ return workService.stockPakin(number, getUserId());
+ }
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -47,6 +52,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")
@@ -76,7 +87,7 @@
}
Long sts = pakouts.get(0).getWrkSts();
if (sts == 1) {
- sts =2L;
+ sts = 2L;
}
WrkSts wrkSts = wrkStsService.selectById(sts);
return R.ok().add(Cools
@@ -100,7 +111,6 @@
return workService.initPakout(params, getUserId());
}
-
@RequestMapping("/hand/control/pakout")
@ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
@@ -112,4 +122,73 @@
return R.ok();
}
+ @RequestMapping("/orderNo/init")
+ @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("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+ }
+ 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(@RequestBody AsrsTransferParam number) {
+ return R.error();
+ }
+
+ @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());
+ }
+
+
+ /******************************************************************************************************/
+
+ @Autowired
+ private DocTypeService docTypeService;
+ @Autowired
+ private CstmrService cstmrService;
+ @Autowired
+ private ItemService itemService;
+
+ // 鑾峰彇鎵�鏈夊崟鎹被鍨�
+ @RequestMapping("/docType/all/get")
+ @ManagerAuth
+ public R getDocTypeData() {
+ List<DocType> docTypes = docTypeService.selectList(new EntityWrapper<DocType>().eq("status", 1).orderBy("create_time", false));
+ return R.ok().add(docTypes);
+ }
+
+ // 鑾峰彇鎵�鏈夊鎴�
+ @RequestMapping("/cstmr/all/get")
+ @ManagerAuth
+ public R getCstmrData() {
+ List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
+ return R.ok().add(cstmrs);
+ }
+
+ // 鑾峰彇鎵�鏈夐」鐩�
+ @RequestMapping("/item/all/get")
+ @ManagerAuth
+ public R getItemData() {
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
+ return R.ok().add(items);
+ }
+
}
--
Gitblit v1.9.1