From 01107e8aadfaf1e84a971d8eeb9ab37e1c5569f3 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:38:56 +0800
Subject: [PATCH] feat: 部门退回/报废公用接口
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 160 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 128 insertions(+), 32 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 7b482b3..af3e13f 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,7 +1,10 @@
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.core.utils.CommonUtil;
import com.consum.base.core.utils.IdUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
@@ -13,13 +16,22 @@
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.*;
-import com.consum.model.po.*;
-import com.consum.model.vo.LWhFormOutputVo;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.LWhFormTransferCoreService;
+import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
+import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -29,14 +41,26 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.net.URLEncoder;
+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.*;
-
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 璋冩嫧绠＄悊
@@ -59,8 +83,6 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
- @Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
/**
@@ -69,7 +91,12 @@
@ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板")
@ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam")
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormTransferParam param) throws Exception {
+ 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -78,11 +105,32 @@
if (CollectionUtils.isEmpty(transferGoods)) {
return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
}
- int result = this.lWhFormTransferService.add(param, this.getSysInfo());
- if (result > 0) {
- return ResponseValue.success();
+ 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();
}
/**
@@ -101,7 +149,12 @@
@ApiImplicitParam(name = "param", value = "鏉′欢鍙傛暟", required = true, dataType = "TransferQry"),
})
@GetMapping("/list")
- public ResponseValue queryFormTransferList(TransferQry 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -169,7 +222,12 @@
@ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"),
})
@GetMapping("/detail/list")
- public ResponseValue queryFormTransferDetailList(TransferQry param) {
+ 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("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -248,20 +306,31 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- @GetMapping("/export")
- public ResponseValue export(Long id) {
- if (id == null) {
- return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
+ @GetMapping("/list/export")
+ public void export(Long id, Integer type, HttpServletResponse response) throws IOException {
+
+ TemplateExportParams params;
+ if (type == 1) {
+ params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+ } else {
+ params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
}
- LWhFormOutputVo vo = this.lWhFormTransferService.export(id, this.getCurrentUser());
- return ResponseValue.success(vo);
+ Map<String, Object> map = this.lWhFormTransferService.export(id, type);
+
+ Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+ try (OutputStream outputStream = response.getOutputStream()) {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xls", "utf-8"));
+ workbook.write(outputStream);
+ workbook.close();
+ }
}
/**
* 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
*
- * @param transferQry
+ * @param
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏")
@@ -269,13 +338,17 @@
@ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)
})
@GetMapping("/department/list")
- public ResponseValue departmentTransferList(TransferQry transferQry) {
+ 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(transferQry);
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(param);
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
@@ -285,17 +358,22 @@
@ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)
})
@PostMapping("/useInfo/update")
- public ResponseValue infoUpdate(@RequestBody List<ProcureModelInfoParam> procureModelInfoParam) {
+ 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(procureModelInfoParam)) {
+ if (CollectionUtils.isEmpty(param.getRecordInfoList())) {
return ResponseValue.error("鍙傛暟閿欒");
}
- Map<Long, List<ProcureModelInfoParam>> collect = procureModelInfoParam.stream()
+ 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();
@@ -314,7 +392,7 @@
lWhProcureModelUserRecordService.insert(lWhProcureModelUserRecord);
List<LWhProcureModelUser> procureModelUserList = Lists.newArrayList();
- if (CollectionUtils.isEmpty(procureModelInfoList)) {
+ if (!CollectionUtils.isEmpty(procureModelInfoList)) {
for (ProcureModelInfoParam item : procureModelInfoList) {
LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser();
lWhProcureModelUser.setId(IdUtil.generateId());
@@ -357,7 +435,7 @@
if (CollectionUtils.isEmpty(useRecordDTOList)) {
return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍");
}
- List<GoodsUseRecordVO> result = Lists.newArrayList();
+ List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
//鍒嗙粍
Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()
.collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
@@ -391,10 +469,15 @@
useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
useRecordSkuList.add(useRecordSkuVO);
goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
- result.add(goodsUseRecordVO);
+ 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);
}
@@ -411,4 +494,17 @@
lWhFormTransferService.queryDepartmentTransferOrder();
return ResponseValue.success(transferInfoVO);
}
+
+ @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
+ })
+ @GetMapping("/query/transfList")
+ public ResponseValue queryDepartmentTransferOrderList() {
+
+ TransferInfoVO transferInfoVO = new TransferInfoVO();
+
+ lWhFormTransferService.queryDepartmentTransferOrder();
+ return ResponseValue.success(transferInfoVO);
+ }
}
--
Gitblit v1.9.1