From 0ec6c7ee0b8236cbc6f49a8cc0e466099a09e08d Mon Sep 17 00:00:00 2001
From: haoyahui <2032914783@qq.com>
Date: 星期一, 27 十一月 2023 10:25:32 +0800
Subject: [PATCH] 物品报废
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 144 ++++++++++++++++++++++++++++++++----------------
1 files changed, 96 insertions(+), 48 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 4521463..fae394a 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
@@ -2,25 +2,35 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
-import com.consum.base.pojo.LWhFormOutputExtend;
-import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.core.utils.MapUtils;
+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;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormOutput;
-import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.web.ResponseValue;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
-import java.util.ArrayList;
+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;
import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +54,8 @@
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhGoodsService lWhGoodsService;
+ @Resource
+ private LWarehouseFlowService lWarehouseFlowService;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -51,10 +63,12 @@
* @Date 2023/10/27
*/
@ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
-// @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", dataType = "lWhFormOutputParam", dataTypeClass = LWhFormOutputParam.class, paramType = "body")
+ })
@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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -73,79 +87,113 @@
@ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
@GetMapping("/list")
public ResponseValue queryFormOutputList() {
- LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
+ LWhFormOutputQry param = CommonUtil.getObjFromReq(LWhFormOutputQry.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑鍑哄簱鍗�
- //??????
-
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
- List<LWhFormOutput> datas = genericPager.getDatas();
- ArrayList<LWhFormOutputExtend> newDatas = new ArrayList<>();
- if (!CollectionUtils.isEmpty(datas)) {
- datas.forEach(item -> {
+ List<LWhFormOutput> data = genericPager.getDatas();
+
+ List<FormOutputVO> resultList = Lists.newArrayList();
+ if (!CollectionUtils.isEmpty(data)) {
+ data.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- LWhFormOutputExtend formProcureExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(item, formProcureExtend);
- formProcureExtend.setModels(models);
- newDatas.add(formProcureExtend);
+ FormOutputVO formOutputVO = new FormOutputVO();
+ BeanUtils.copyProperties(item, formOutputVO);
+
+ List<FormOutputTemplateInfoVO> procureTemplateInfoList = Lists.newArrayList();
+
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ String sql = "SELECT bgt.id,bgm.GOODS_TEMPLATES_ID,GOODS_NAME,sum( counts ) count FROM "
+ + "l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON pm.BASE_GOODS_MODELS_ID = bgm.id "
+ + "LEFT JOIN base_goods_template bgt ON bgm.GOODS_TEMPLATES_ID = bgt.id "
+ + "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, new MapperUtil());
+ for (Map<String, Object> map : procureModelList) {
+ FormOutputTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormOutputTemplateInfoVO.class);
+ procureTemplateInfoList.add(procureTemplateInfoVO);
+ }
+ formOutputVO.setFormOutputTemplateInfoList(procureTemplateInfoList);
+
+ resultList.add(formOutputVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, newDatas);
+ fieldDatas.set(genericPager, resultList);
} catch (Exception e) {
e.printStackTrace();
}
-// genericPager.setDatas(newDatas);
return ResponseValue.success(genericPager);
}
/**
* 鏍规嵁id鏌ヨ璇︽儏
*/
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/detail")
public ResponseValue getById(Long id) throws IllegalAccessException {
if (id == null) {
return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
}
LWhFormOutput lWhFormOutput = lWhFormOutputService.get(new LWhFormOutput(id));
- LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
- BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
+ LWhFormOutputExtendVO lWhFormOutputExtendVO = new LWhFormOutputExtendVO();
+ BeanUtils.copyProperties(lWhFormOutput, lWhFormOutputExtendVO);
- // 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessType(3);
- lWhProcureModel.setBusinessId(id);
- List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
- formOutputExtend.setModels(models);
+ String sql = "SELECT bgt.id, CATEGORY_ID, CATEGORY_NAME, GOODS_NAME "
+ + "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 GROUP BY bgt.id ";
+ Map<String, Object> paramMap = new HashMap<>();
+ paramMap.put("id", lWhFormOutputExtendVO.getId());
+ 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(map, FormOutputGoodsVO.class);
- return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
- }
-
- /**
- * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
- @GetMapping("/select/number")
- public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) {
- if (warehouseId == null || baseGoodsModelsId == null) {
- return ResponseValue.error("鍙傛暟閿欒");
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
+ String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ + "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, new MapperUtil());
+ modelList.forEach(item -> {
+ GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
+ goodsModelVOList.add(goodsModelVO);
+ });
+ procureTemplateInfoVO.setModels(goodsModelVOList);
+ fromOutputGoods.add(procureTemplateInfoVO);
}
- int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
- return ResponseValue.success(num);
+ lWhFormOutputExtendVO.setFromOutputGoods(fromOutputGoods);
+
+ return ResponseValue.success("鏌ヨ鎴愬姛!", lWhFormOutputExtendVO);
}
+ @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