From b268fd73f060108b8214ed1afcbbf03480435f3a Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 15 十二月 2023 17:27:41 +0800
Subject: [PATCH] 1.出库手续回显 2.调拨申请时库存查询更换接口 3.调拨出库时从已有物品所在的仓库中选择
---
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
index b55681b..ff8cd13 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java
@@ -11,6 +11,7 @@
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
import org.apache.commons.compress.utils.Lists;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,7 @@
* @Description
* @Version 1.0
**/
+@Api(value = "浠撳簱娴佹按", tags = "浠撳簱娴佹按")
@RestController
@RequestMapping("/pc/warehouse/flow")
public class LWarehouseFlowController extends BaseController {
@@ -79,7 +81,7 @@
}
@GetMapping("/getTaiZhangList")
- public ResponseValue getTaiZhangList( ) {
+ public ResponseValue getTaiZhangList() {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -99,4 +101,30 @@
return ResponseValue.success(genericPager);
}
+ /**
+ * 閮ㄩ棬鍙拌处
+ *
+ * @return
+ */
+ @GetMapping("/getDeptTaiZhangList")
+ public ResponseValue getDeptTaiZhangList() {
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ LWarehouseFlowParam param = CommonUtil.getObjFromReq(LWarehouseFlowParam.class);
+ LWarehouseFlowParam param2 = new LWarehouseFlowParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ Long paramAgencyId = param.getAgencyId();
+ if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryDeptTaiZhangList(param);
+ return ResponseValue.success(genericPager);
+ }
+
}
--
Gitblit v1.9.1