From dc1800d4d2d252b7b37d80d9f54285200c94ff3c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 15 十一月 2023 19:34:40 +0800
Subject: [PATCH] 出库单管理
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 5d0b7c4..4d66964 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -3,14 +3,15 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
-import com.consum.base.pojo.LWhFormOutputExtend;
-import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
import com.consum.base.pojo.response.FormOutputGoodsVO;
import com.consum.base.pojo.response.FormOutputTemplateInfoVO;
import com.consum.base.pojo.response.FormOutputVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWhFormOutputExtendVO;
+import com.consum.base.service.LWarehouseFlowService;
import com.consum.base.service.LWhFormOutputServiceImpl;
import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
@@ -27,6 +28,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,6 +53,8 @@
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -63,7 +67,7 @@
})
@PostMapping("/add")
public ResponseValue add() {
- LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
+ LWhFormOutputParam param = CommonUtil.getObjFromReqBody(LWhFormOutputParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -107,9 +111,9 @@
+ "WHERE pm.BUSINESS_ID =:id GROUP BY bgm.GOODS_TEMPLATES_ID";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", item.getId());
- List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap);
+ List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
for (Map<String, Object> map : procureModelList) {
- FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FormOutputTemplateInfoVO.class);
+ FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputTemplateInfoVO.class);
procureTemplateInfoList.add(procureTemplateInfoVO);
}
formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList);
@@ -139,10 +143,6 @@
}
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
-
- LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
-
BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
@@ -151,10 +151,10 @@
+ "WHERE pm.BUSINESS_ID =:id GROUP BY bgt.id ";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", lWhFormOutputExtendVO.getId());
- List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap);
+ List<Map<String, Object>> procureModelList = lWhFormOutputService.select(sql, paramMap, new MapperUtil());
List<FormOutputGoodsVO> fromOutputGoods = Lists.newArrayList();
for (Map<String, Object> map : procureModelList) {
- FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FormOutputGoodsVO.class);
+ FormOutputGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputGoodsVO.class);
// 鏌ヨ鍨嬪彿鏁伴噺
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
@@ -162,9 +162,9 @@
+ "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
+ "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID "
+ "WHERE pm.BUSINESS_ID =:id";
- List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap);
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
modelList.forEach(item -> {
- GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(item), GoodsModelVO.class);
+ GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
goodsModelVOList.add(goodsModelVO);
});
procureTemplateInfoVO.setModels(goodsModelVOList);
@@ -194,5 +194,18 @@
return ResponseValue.success(num);
}
+ @ApiOperation(value = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�", notes = "鏌ヨ鍑哄簱鍗曡鎯呮槑缁�")
+ @ApiImplicitParam(name = "formOutputQry", value = "鍑哄簱鍗曡鎯呮煡璇㈡潯浠�", required = true, dataType = "LWhFormOutputQry", paramType = "query")
+ @GetMapping("/detail/list")
+ public ResponseValue queryFormOutputDetailList() {
+ LWhFormOutputQry formOutputQry = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
+ S_user_core currentUser = this.getCurrentUser();
+ if (currentUser == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> mapGenericPager = lWarehouseFlowService.queryBusinessFlowDetail(formOutputQry);
+ return ResponseValue.success(mapGenericPager);
+ }
+
}
--
Gitblit v1.9.1