From 43a322430e7e6dcea64242bec6918037da160986 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 04 十二月 2023 10:50:23 +0800
Subject: [PATCH] 分转元
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 466 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 302 insertions(+), 164 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index 737e33f..8659f28 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -1,30 +1,38 @@
package com.consum.base.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
-import com.consum.base.pojo.LWhFormTransferParam;
-import com.consum.base.pojo.LWhProcureModelParams;
-import com.consum.base.pojo.ProcureModelInfoDto;
-import com.consum.base.pojo.UseRecordDto;
-import com.consum.base.pojo.UseRecordSkuDto;
-import com.consum.base.pojo.query.TransferQryDto;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.core.utils.IdUtil;
+import com.consum.base.core.utils.MapUtils;
+import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.pojo.GoodsUseRecordVO;
+import com.consum.base.pojo.LWhFormTransferGoodsInfoParam;
+import com.consum.base.pojo.RecordUserInfoVO;
+import com.consum.base.pojo.UseRecordSkuVO;
+import com.consum.base.pojo.dto.UseRecordDTO;
+import com.consum.base.pojo.excel.TransferExcelTemplate;
+import com.consum.base.pojo.query.TransferQry;
+import com.consum.base.pojo.request.LWhFormTransferParam;
+import com.consum.base.pojo.request.ProcureModelInfoParam;
+import com.consum.base.pojo.request.RecordInfoParam;
+import com.consum.base.pojo.response.FormTransferVO;
+import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
+import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormTransferCoreService;
-import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
import com.consum.base.service.LWhProcureModelUserServiceImpl;
-import com.consum.base.core.utils.IdUtil;
-import com.consum.model.po.BaseGoodsModels;
+import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormTransfer;
-import com.consum.model.po.LWhProcureModel;
import com.consum.model.po.LWhProcureModelUser;
import com.consum.model.po.LWhProcureModelUserRecord;
-import com.consum.model.vo.LWhFormOutputVo;
-import com.consum.model.vo.LWhFormTransferVo;
-import com.consum.model.vo.LWhProcureModelVo;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -36,14 +44,19 @@
import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
import org.apache.commons.compress.utils.Lists;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -54,13 +67,11 @@
*/
@RestController
@RequestMapping("/pc/l/wh/form/transfer")
-@Api(tags = "璋冩嫧鍒嗗彂绠＄悊")
+@Api(value = "璋冩嫧鍒嗗彂绠＄悊", tags = "璋冩嫧鍒嗗彂绠＄悊")
public class LWhFormTransferController extends BaseController {
@Autowired
- private LWhFormTransferServiceImpl lWhFormTransferService;
- @Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private LWhFormTransferService lWhFormTransferService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
@@ -70,7 +81,7 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
@@ -78,90 +89,108 @@
@ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板")
@ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam")
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormTransferParam param) {
+ public ResponseValue add() throws Exception {
+ LWhFormTransferParam param = CommonUtil.getObjFromReqBody(LWhFormTransferParam.class);
+ LWhFormTransferParam param2 = new LWhFormTransferParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- List<LWhProcureModelParams> transferGoods = param.getModels();
+ List<LWhFormTransferGoodsInfoParam> transferGoods = param.getTransferGoods();
if (CollectionUtils.isEmpty(transferGoods)) {
return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
}
- int result = this.lWhFormTransferService.add(param, currentUser, this.getSysInfo());
- if (result > 0) {
- return ResponseValue.success(1);
+ long id = this.lWhFormTransferService.add(param, this.getSysInfo());
+
+ Integer transferBusinessType = param.getTransferBusinessType();
+ //閮ㄩ棬鍒嗗彂涓氬姟闇�瑕佸鐞�
+ if (transferBusinessType == 1) {
+ // 鍏堝嚭搴擄紝鍐嶅叆搴�
+ // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String agencyId = sysTenantUser.getTenantId();
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1);
+ if (CollectionUtils.isEmpty(baseWarehouseList)) {
+ return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ }
+ BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
+ Long wareHouseId = baseWarehouse.getId();
+ String warehouseName = baseWarehouse.getWarehouseName();
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
+ lWhFormTransfer.setOutWarehouseId(wareHouseId);
+ lWhFormTransfer.setOutWarehouseName(warehouseName);
+ lWhFormTransferService.update(lWhFormTransfer);
+ lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
}
- return ResponseValue.error("鏂板澶辫触锛�");
+
+ return ResponseValue.success();
}
/**
* @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
+ * <p>
+ * 1.鏌ヨ璋冩嫧鍗�
+ * <p>
+ * 2.鏌ヨ鐗╁搧鍨嬪彿
*/
-// 1.鏌ヨ璋冩嫧鍗�
-// 2.鏌ヨ鐗╁搧鍨嬪彿
+ @ApiOperation(value = "鍗曟嵁鍒楄〃鏌ヨ", notes = "鍗曟嵁鍒楄〃鏌ヨ")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "page", value = "椤电爜", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "size", value = "姣忛〉鏉℃暟", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"),
+ })
@GetMapping("/list")
- public ResponseValue queryFormTransferList(TransferQryDto param) {
+ public ResponseValue queryFormTransferList() {
+ TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
+ TransferQry param2 = new TransferQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- FinSysTenantUser sysInfo = getSysInfo();
-
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑璋冩嫧鍗�
- //??????
-
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
- ArrayList<LWhFormTransferVo> newDatas = new ArrayList<>();
+ ArrayList<FormTransferVO> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
+ FormTransferVO formTransferVO = new FormTransferVO();
+ BeanUtils.copyProperties(item, formTransferVO);
+
+ List<FromTransferTemplateInfoVO> templateInfoList = Lists.newArrayList();
+
// 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- Integer businessType = item.getBusinessType();
- // TODO 璋冩嫧=0 鍒嗗彂=1 閫�鍥�=2
- switch (businessType) {
- case 0:
- lWhProcureModel.setBusinessType(2);
- break;
- case 1:
- lWhProcureModel.setBusinessType(4);
- break;
+ 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) {
+ FromTransferTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class);
+ templateInfoList.add(procureTemplateInfoVO);
}
- lWhProcureModel.setBusinessId(item.getId());
+ formTransferVO.setFromTransferTemplateInfoList(templateInfoList);
- LWhFormTransferVo formTransferExtend = new LWhFormTransferVo();
- BeanUtils.copyProperties(item, formTransferExtend);
-
- List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
- List<LWhProcureModelVo> lWhProcureModelVoList = new ArrayList<>();
- if (!CollectionUtils.isEmpty(models)) {
- models.forEach(model -> {
- LWhProcureModelVo lWhProcureModelVo = new LWhProcureModelVo();
- BeanUtils.copyProperties(model, lWhProcureModelVo);
-
- Long baseGoodsModelsId = model.getBaseGoodsModelsId();
- Long businessId = model.getBusinessId();
- Long id = model.getId();
- LWhProcureModelUser lWhFormTransferUser = new LWhProcureModelUser();
- lWhFormTransferUser.setTransBusinessId(businessId);
- lWhFormTransferUser.setWhProcureModelId(id);
- lWhFormTransferUser.setBaseGoodsModelsId(baseGoodsModelsId);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhFormTransferUser);
- lWhProcureModelVo.setProcureModelUsersList(procureModelUserList);
- lWhProcureModelVoList.add(lWhProcureModelVo);
- });
- }
-
- formTransferExtend.setModels(lWhProcureModelVoList);
- newDatas.add(formTransferExtend);
+ result.add(formTransferVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, newDatas);
+// fieldDatas.setAccessible(true);
+// fieldDatas.set(genericPager, result);
+ ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -173,13 +202,37 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
+ @ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@GetMapping("/detail")
public ResponseValue getById(Long id) {
if (id == null) {
return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
}
- LWhFormTransferVo vo = this.lWhFormTransferService.getById(id);
+ LWHFromTransferExtendVO vo = this.lWhFormTransferService.getById(id);
return ResponseValue.success(vo);
+ }
+
+ @ApiOperation(value = "璋冩嫧鏄庣粏鍒楄〃", notes = "璋冩嫧鏄庣粏鍒楄〃")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"),
+ })
+ @GetMapping("/detail/list")
+ public ResponseValue queryFormTransferDetailList() {
+ TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
+ TransferQry param2 = new TransferQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
+
+ return ResponseValue.success(mapGenericPager);
}
/**
@@ -188,6 +241,10 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
+ @ApiOperation(value = "鎾ら攢", notes = "鎾ら攢")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/updStatus")
public ResponseValue updateStatus(Long id) {
if (id == null) {
@@ -203,6 +260,10 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/income")
public ResponseValue income(Long id) {
lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
@@ -214,31 +275,78 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
+ @ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ })
@PostMapping("/output")
public ResponseValue output(Long id) {
+ // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String agencyId = sysTenantUser.getTenantId();
+ List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1);
+ if (CollectionUtils.isEmpty(baseWarehouseList)) {
+ return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ }
+ BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
+ Long wareHouseId = baseWarehouse.getId();
+ String warehouseName = baseWarehouse.getWarehouseName();
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
+ lWhFormTransfer.setOutWarehouseId(wareHouseId);
+ lWhFormTransfer.setOutWarehouseName(warehouseName);
+ lWhFormTransferService.update(lWhFormTransfer);
lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
return ResponseValue.success();
}
- /**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
- @GetMapping("/export")
- public ResponseValue export(Long id) {
- if (id == null) {
- return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
+
+ @ApiOperation(value = "璋冩嫧鍗曞鍑�", notes = "璋冩嫧鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
+ @ApiImplicitParam(name = "type", value = "瀵煎嚭绫诲瀷 1 鍏ュ簱 2 鍑哄簱", required = true, dataType = "Integer"),
+ })
+ @GetMapping("/list/export")
+ public void export(Long id, Integer type, HttpServletResponse response) throws Exception {
+
+ TemplateExportParams params;
+ String fileName;
+ if (type == 1) {
+ params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+ fileName = "璋冩嫧鍏ュ簱鍗�";
+ } else {
+ params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
+ fileName = "璋冩嫧鍑哄簱鍗�";
}
- LWhFormOutputVo vo = this.lWhFormTransferService.export(id, this.getCurrentUser());
- return ResponseValue.success(vo);
+ params.setHeadingStartRow(2);
+ List<TransferExcelTemplate> export = this.lWhFormTransferService.export(id, type);
+
+ int countNum = export.stream().filter(item -> item.getNum() != null).mapToInt(TransferExcelTemplate::getNum).sum();
+ double totalAmount = export.stream().filter(item -> item.getTotalAmount() != null).mapToDouble(TransferExcelTemplate::getAmount).sum();
+ Optional<TransferExcelTemplate> first = export.stream().findFirst();
+ TransferExcelTemplate entity = first.get();
+ String businessFormCode = entity.getBusinessFormCode();
+ Long createTime = entity.getCreateTime();
+ String operatorName = entity.getOperatorName();
+ String tenantName = entity.getTenantName();
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("code", businessFormCode);
+ map.put("date", DateUtils.toShowDate(createTime));
+ map.put("tenantName", tenantName);
+ map.put("name", operatorName);
+ map.put("countNum", countNum);
+ map.put("totalAmount", totalAmount);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, TransferExcelTemplate.class, export, map);
+ downLoadExcel(fileName, response, workbook);
+
}
/**
* 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
*
- * @param transferQryDto
+ * @param
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏")
@@ -246,65 +354,80 @@
@ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)
})
@GetMapping("/department/list")
- public ResponseValue departmentTransferList(TransferQryDto transferQryDto) {
+ public ResponseValue departmentTransferList() {
+ TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
+ TransferQry param2 = new TransferQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(transferQryDto);
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(param);
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
- /**
- * 閮ㄩ棬鐗╁搧浣跨敤璁板綍
- *
- * @param procureModelInfoDto
- * @return
- */
+
+ @ApiOperation(value = "浣跨敤浜轰慨鏀�", notes = "浣跨敤浜轰慨鏀�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)
+ })
@PostMapping("/useInfo/update")
- public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoDto> procureModelInfoDto) {
+ public ResponseValue infoUpdate() {
+
+ RecordInfoParam param = CommonUtil.getObjFromReqBody(RecordInfoParam.class);
+ RecordInfoParam recordInfoParam = new RecordInfoParam();
+ CommonUtil.copyProperties(param, recordInfoParam);
+ param = recordInfoParam;
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- if (CollectionUtils.isEmpty(procureModelInfoDto)) {
+ if (CollectionUtils.isEmpty(param.getRecordInfoList())) {
return ResponseValue.error("鍙傛暟閿欒");
}
- for (ProcureModelInfoDto procureModelInfo : procureModelInfoDto) {
+ Map<Long, List<ProcureModelInfoParam>> collect = param.getRecordInfoList().stream()
+ .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
+ for (Map.Entry<Long, List<ProcureModelInfoParam>> entry : collect.entrySet()) {
+ Long baseGoodModelId = entry.getKey();
- String transferOrderId = procureModelInfo.getTransferOrderId();
- String baseGoodModelId = procureModelInfo.getBaseGoodModelId();
+ List<ProcureModelInfoParam> procureModelInfoList = entry.getValue();
+ Optional<ProcureModelInfoParam> first = procureModelInfoList.stream().findFirst();
+ ProcureModelInfoParam procureModelInf = first.get();
+ Long businessId = procureModelInf.getBusinessId();
+ LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
+ lWhProcureModelUserRecord.setId(IdUtil.generateId());
+ lWhProcureModelUserRecord.setTransBusinessId(businessId);
+ FinSysTenantUser sysInfo = getSysInfo();
+ lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
+ lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
+ lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+ lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setBusinessId(Long.valueOf(transferOrderId));
- lWhProcureModel.setBaseGoodsModelsId(Long.valueOf(baseGoodModelId));
- // 閮ㄩ棬鍒嗗彂
- lWhProcureModel.setBusinessType(4);
- List<LWhProcureModel> lWhProcureModelList = lWhProcureModelService.select(lWhProcureModel);
- lWhProcureModelList.forEach(item -> {
- Long id = item.getId();
- LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(id);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
- procureModelUserList.forEach(procureModelUser -> {
- procureModelUser.setNowUserName(procureModelInfo.getUserName());
- procureModelUser.setNowUserPhone(procureModelInfo.getPhone());
+ List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
+ if (!CollectionUtils.isEmpty(procureModelInfoList)) {
+ for (ProcureModelInfoParam item : procureModelInfoList) {
+ LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
+ lWhProcureModelUser.setId(IdUtil.generateId());
+ lWhProcureModelUser.setTransBusinessId(businessId);
+ lWhProcureModelUser.setProcureModelUserRecordId(lWhProcureModelUserRecord.getId());
+ lWhProcureModelUser.setWhProcureModelId(procureModelInf.getProcureModelId());
+ lWhProcureModelUser.setBaseGoodsModelsId(baseGoodModelId);
+ lWhProcureModelUser.setNowUserPhone(item.getPhone());
+ lWhProcureModelUser.setNowUserName(item.getUserName());
+ lWhProcureModelUser.setGoodsNum(item.getCount());
+ procureModelUserList.add(lWhProcureModelUser);
+ }
- LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- lWhProcureModelUserRecord.setId(IdUtil.generateId());
- lWhProcureModelUserRecord.setTransBusinessId(Long.valueOf(transferOrderId));
- FinSysTenantUser sysInfo = getSysInfo();
- lWhProcureModelUserRecord.setOperatorId(sysInfo.getId());
- lWhProcureModelUserRecord.setOperatorName(sysInfo.getUserName());
- lWhProcureModelUserRecord.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
- lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
- });
- lWhProcureModelUserService.updateBatch(procureModelUserList);
- });
+ lWhProcureModelUserService.insert(procureModelUserList);
+ }
+
}
+ // TODO 浣跨敤浜轰慨鏀硅皟鐢�
+
return ResponseValue.success();
}
@@ -314,6 +437,10 @@
* @param transferOrderId
* @return
*/
+ @ApiOperation(value = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�", notes = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)
+ })
@GetMapping("/use/record")
public ResponseValue useRecord(Long transferOrderId) {
@@ -321,41 +448,53 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord();
- lWhProcureModelUserRecord.setTransBusinessId(transferOrderId);
- List<LWhProcureModelUserRecord> modelUserRecords = lWhProcureModelUserRecordService.select(lWhProcureModelUserRecord);
-
- List<UseRecordDto> result = Lists.newArrayList();
- for (LWhProcureModelUserRecord item : modelUserRecords) {
- Long id = item.getId();
- UseRecordDto useRecordDto = new UseRecordDto();
- useRecordDto.setId(id);
- useRecordDto.setUpdateUserName(item.getOperatorName());
- useRecordDto.setUpdateTime(DateUtils.toShowDate(item.getDealTime()));
-
- LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
- lWhProcureModelUser.setWhProcureModelId(id);
- List<LWhProcureModelUser> procureModelUserList = lWhProcureModelUserService.select(lWhProcureModelUser);
-
- List<UseRecordSkuDto> recordSkuDtoList = Lists.newArrayList();
- procureModelUserList.forEach(procureModelUser -> {
- UseRecordSkuDto useRecordSkuDto = new UseRecordSkuDto();
-
- BaseGoodsModels baseGoodsModels = new BaseGoodsModels();
- baseGoodsModels.setId(procureModelUser.getBaseGoodsModelsId());
- BaseGoodsModels baseGoodsModel = baseGoodsModelsService.getByModelNameAndGoodsTemplatesId(baseGoodsModels);
- String unit = baseGoodsModel.getUnit();
- useRecordSkuDto.setBaseUnit(unit);
- useRecordSkuDto.setBaseGoodModelName(baseGoodsModel.getModelName());
- useRecordSkuDto.setCount(procureModelUser.getGoodsNum());
- useRecordSkuDto.setPhone(procureModelUser.getNowUserPhone());
- useRecordSkuDto.setUserName(procureModelUser.getNowUserName());
-
- recordSkuDtoList.add(useRecordSkuDto);
- });
- useRecordDto.setRecordSkuDtoList(recordSkuDtoList);
-
+ List<UseRecordDTO> useRecordDTOList = lWhProcureModelUserService.selectUseRecord(transferOrderId);
+ if (CollectionUtils.isEmpty(useRecordDTOList)) {
+ return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍");
}
+ List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
+ //鍒嗙粍
+ Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()
+ .collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
+ //寮�濮嬪惊鐜痗ollect
+ for (Map.Entry<Long, Map<Long, List<UseRecordDTO>>> entry : collect.entrySet()) {
+ Long id = entry.getKey();
+ Map<Long, List<UseRecordDTO>> value = entry.getValue();
+ //寮�濮嬪惊鐜痸alue
+ List<UseRecordSkuVO> useRecordSkuList = Lists.newArrayList();
+ for (Map.Entry<Long, List<UseRecordDTO>> item : value.entrySet()) {
+ List<UseRecordDTO> list = item.getValue();
+ List<RecordUserInfoVO> recordUserInfoList = Lists.newArrayList();
+ for (UseRecordDTO useRecordDto : list) {
+
+ GoodsUseRecordVO goodsUseRecordVO = new GoodsUseRecordVO();
+ goodsUseRecordVO.setId(id);
+ goodsUseRecordVO.setUpdateUserName(useRecordDto.getUpdateUserName());
+ goodsUseRecordVO.setUpdateTime(useRecordDto.getUpdateTime());
+
+ UseRecordSkuVO useRecordSkuVO = new UseRecordSkuVO();
+ useRecordSkuVO.setBaseGoodModelId(useRecordDto.getBaseGoodsModelsId());
+ useRecordSkuVO.setBaseGoodModelName(useRecordDto.getBaseGoodsModelsName());
+ useRecordSkuVO.setUnit(useRecordDto.getUnit());
+ useRecordSkuVO.setProcureModelId(useRecordDto.getProcureModelId());
+
+ RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setUseName(useRecordDto.getUseName());
+ recordUserInfoVO.setPhone(useRecordDto.getPhone());
+ recordUserInfoVO.setNum(useRecordDto.getNum());
+ recordUserInfoList.add(recordUserInfoVO);
+ useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
+ useRecordSkuList.add(useRecordSkuVO);
+ goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
+ goodsUseRecordList.add(goodsUseRecordVO);
+ }
+ }
+ }
+ //鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
+ List<GoodsUseRecordVO> result = goodsUseRecordList.stream()
+ .sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime
+ , Comparator.nullsFirst(Long::compareTo)).reversed())
+ .collect(Collectors.toList());
return ResponseValue.success(result);
}
@@ -364,13 +503,12 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
})
- @GetMapping("/query/detail")
- public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
-
-
+ @GetMapping("/query/transfList")
+ public ResponseValue queryDepartmentTransferOrderList() {
TransferInfoVO transferInfoVO = new TransferInfoVO();
+
+ lWhFormTransferService.queryDepartmentTransferOrder();
return ResponseValue.success(transferInfoVO);
}
}
--
Gitblit v1.9.1