From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
consum-base/src/main/java/com/consum/base/controller/LWarehouseFlowController.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 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 ff8cd13..3d9c761 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
@@ -1,6 +1,16 @@
package com.consum.base.controller;
-import cn.hutool.core.util.ReflectUtil;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Map;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.compress.utils.Lists;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
@@ -11,16 +21,9 @@
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;
-import org.springframework.web.bind.annotation.RestController;
-import javax.annotation.Resource;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Map;
+import cn.hutool.core.util.ReflectUtil;
+import io.swagger.annotations.Api;
/**
* @ClassName lWarehouseFlowController
@@ -34,7 +37,7 @@
public class LWarehouseFlowController extends BaseController {
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
@GetMapping("/list")
public ResponseValue queryFormProcureList() {
@@ -47,16 +50,15 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryBusinessFlow(param);
ArrayList<WarehouseFlowVO> result = Lists.newArrayList();
genericPager.getDatas().forEach(map -> {
- WarehouseFlowVO warehouseFlowVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), WarehouseFlowVO.class);
+ WarehouseFlowVO warehouseFlowVO =
+ MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), WarehouseFlowVO.class);
result.add(warehouseFlowVO);
});
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
logger.error(e.getMessage(), e);
@@ -64,7 +66,6 @@
return ResponseValue.success(genericPager);
}
-
@GetMapping("/detail/list")
public ResponseValue queryFormProcureList1() {
@@ -76,7 +77,7 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryBusinessFlow(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryBusinessFlow(param);
return ResponseValue.success(genericPager);
}
@@ -97,7 +98,7 @@
if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
param.setAgencyId(Long.valueOf(tenantId));
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryTaiZhangList(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryTaiZhangList(param);
return ResponseValue.success(genericPager);
}
@@ -123,7 +124,7 @@
if (paramAgencyId == null || !paramAgencyId.toString().startsWith(tenantId)) {
param.setAgencyId(Long.valueOf(tenantId));
}
- GenericPager<Map<String, Object>> genericPager = lWarehouseFlowService.queryDeptTaiZhangList(param);
+ GenericPager<Map<String, Object>> genericPager = lWarehouseFlowServiceImpl.queryDeptTaiZhangList(param);
return ResponseValue.success(genericPager);
}
--
Gitblit v1.9.1