From cf943cb90fde999773267cbc14bf51a70881481a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 14:24:21 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 76 ++++++++++++++++++++++++++++++++++----
1 files changed, 68 insertions(+), 8 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 06f9fcf..a18c83d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -12,15 +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.*;
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;
+import zy.cloud.wms.manager.entity.result.KeyValueVo;
+import zy.cloud.wms.manager.service.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -147,7 +144,7 @@
@RequestMapping("/stock/transfer")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockTransfer(@RequestBody AsrsTransferParam number) {
- return workService.asrsStockTransfer(number, getUserId());
+ return R.error();
}
@RequestMapping("/stock/check")
@@ -162,4 +159,67 @@
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