From 4d1c6ea6ef875f46cf448fd1ea0ea37045da752f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 14 四月 2021 14:24:08 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 51 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 41 insertions(+), 10 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 9e38fa4..3bb9361 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -14,8 +14,10 @@
import zy.cloud.wms.common.web.BaseController;
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;
/**
@@ -34,7 +36,7 @@
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
@Autowired
- private CustOrderService custOrderService;
+ private OrderService orderService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
@@ -60,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")
@@ -123,14 +125,14 @@
}
@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")
@@ -142,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")
@@ -183,6 +185,21 @@
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
@@ -190,5 +207,19 @@
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