From 47015b98442acc527509235d5b9c22857751aeef Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 17:39:00 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 128 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 111 insertions(+), 17 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..501063d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -12,18 +12,12 @@
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.service.CustOrderService;
-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.entity.result.KeyValueVo;
+import zy.cloud.wms.manager.service.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -44,6 +38,12 @@
@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 = "涓婃灦")
public R stockIn(@RequestBody StockInParam stockInParam) {
@@ -56,8 +56,14 @@
return workService.stockOutCheck(number, getUserId());
}
- @RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎷ｈ揣")
+ @RequestMapping("/stock/out/preview")
+ @ManagerAuth(memo = "鎷ｈ揣棰勮")
+ public R stockOutPreview(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPreview(stockOutParam, getUserId());
+ }
+
+ @RequestMapping("/stock/out/create")
+ @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
return workService.stockOut(stockOutParam, getUserId());
}
@@ -83,7 +89,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 +128,98 @@
@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(@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("/cstmr/all/get/kv")
+ @ManagerAuth
+ public R getCstmrDataKV() {
+ List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Cstmr cstmr : cstmrs) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(cstmr.getName());
+ vo.setValue(cstmr.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
+ }
+
+ // 鑾峰彇鎵�鏈夐」鐩�
+ @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);
+ }
+ // 鑾峰彇鎵�鏈夐」鐩�
+ @RequestMapping("/item/all/get/kv")
+ @ManagerAuth
+ public R getItemDataKV() {
+ List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
+ List<KeyValueVo> valueVos = new ArrayList<>();
+ for (Item item : items) {
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(item.getName());
+ vo.setValue(item.getId());
+ valueVos.add(vo);
+ }
+ return R.ok().add(valueVos);
}
}
--
Gitblit v1.9.1