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/LWhFormTransferController.java | 459 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 283 insertions(+), 176 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 af3e13f..ba8e8dc 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,35 +1,59 @@
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 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.Set;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.consum.base.util.ExcelStyleUtil;
+import org.apache.commons.compress.utils.Lists;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import com.consum.base.BaseController;
+import com.consum.base.core.WhBusinessEnum;
+import com.consum.base.core.type.StatesType;
+import com.consum.base.core.type.TransferStatesType;
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.GoodsInfoDTO;
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.GoodsTemplateCountVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.LWhFormTransferCoreService;
-import com.consum.base.service.LWhFormTransferServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.LGoodsUserRecordCoreService;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.base.service.LWhProcureModelService;
-import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
-import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.base.service.LWhProcureModelUserRecordService;
+import com.consum.base.service.LWhProcureModelUserService;
+import com.consum.base.service.core.LWhFormTransferCoreService;
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.iplatform.model.po.S_user_core;
@@ -37,30 +61,13 @@
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.web.ResponseValue;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
+import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
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.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
/**
* @Description 璋冩嫧绠＄悊
@@ -73,17 +80,21 @@
public class LWhFormTransferController extends BaseController {
@Autowired
- private LWhFormTransferServiceImpl lWhFormTransferService;
+ private LWhFormTransferService lWhFormTransferService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
private LWhFormTransferCoreService lWhFormTransferCoreService;
@Autowired
- private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
+ private LWhProcureModelUserService lWhProcureModelUserService;
@Autowired
- private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
+ private LWhProcureModelUserRecordService lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private LGoodsUserRecordCoreService lGoodsUserRecordCoreService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
+ @Autowired
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
@@ -91,6 +102,7 @@
@ApiOperation(value = "鍗曟嵁鏂板", notes = "鍗曟嵁鏂板")
@ApiImplicitParam(name = "param", value = "鍗曟嵁鏂板", required = true, dataType = "LWhFormTransferParam")
@PostMapping("/add")
+ @Transactional(rollbackFor = Exception.class)
public ResponseValue add() throws Exception {
LWhFormTransferParam param = CommonUtil.getObjFromReqBody(LWhFormTransferParam.class);
LWhFormTransferParam param2 = new LWhFormTransferParam();
@@ -105,33 +117,123 @@
if (CollectionUtils.isEmpty(transferGoods)) {
return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�");
}
- long id = this.lWhFormTransferService.add(param, this.getSysInfo());
+ long id = this.lWhFormTransferService.add(param, this.getSysInfo(), StrUtil.isEmpty(param.getProcureDoc()));
+ if(id == -1L){
+ return ResponseValue.error("鎮ㄤ笉鏄簱绠″憳");
+ }
+ if(id == -2L){
+ return ResponseValue.error("浠撳簱涓嶅瓨鍦�");
+ }
Integer transferBusinessType = param.getTransferBusinessType();
- //閮ㄩ棬鍒嗗彂涓氬姟闇�瑕佸鐞�
- if (transferBusinessType == 1) {
+ // 閮ㄩ棬鍒嗗彂涓氬姟闇�瑕佸鐞�
+ // todo 鎷嗗垎 鏂伴�昏緫
+ if (transferBusinessType == 1 && !StrUtil.isEmpty(param.getProcureDoc())) {
// 鍏堝嚭搴擄紝鍐嶅叆搴�
// 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
+ Set<Long> baseModelIds =
+ modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+
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("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+ Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
+ // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
+ List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, null);
+ GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
+ if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+ return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
- BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
- Long wareHouseId = baseWarehouse.getId();
- String warehouseName = baseWarehouse.getWarehouseName();
+
+ Long wareHouseId = goodsInfoDTO.getWarehouseId();
+ String warehouseName = goodsInfoDTO.getWarehouseName();
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
-
- lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+ Long l = lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
+ if(l == -1L){
+ return ResponseValue.error("浠撳簱鏁伴噺涓嶈冻");
+ }
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), param.getOperatorName());
}
return ResponseValue.success();
}
+
+
+ /**
+ * 涓婁紶鍒嗗彂鍗曪紙娴佺▼淇敼锛�
+ *
+ * @param idStr 璋冩嫧鍗昳d json
+ * @return
+ * @throws Exception
+ */
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("import")
+ public ResponseValue upload(@RequestBody String idStr) throws Exception {
+ Map<String, Object> map = JSONObject.parseObject(idStr, Map.class);
+ String type = map.get("type").toString();
+ Long id = Convert.toLong(map.get("idStr"));
+ String procureDoc = map.get("procureDoc").toString();
+ // [璋冩嫧]
+ if ("0".equals(type)) {
+ // 淇敼
+ LWhFormTransfer addLWhFormTransfer = new LWhFormTransfer();
+ addLWhFormTransfer.setId(id);
+ addLWhFormTransfer.setProcureDoc(procureDoc);
+ int update = lWhFormTransferService.update(addLWhFormTransfer);
+ if (update < 1) {
+ return ResponseValue.error();
+ }
+ return ResponseValue.success();
+ }
+
+ // [鍒嗗彂]
+ Long opTime = Convert.toLong(map.get("opTime"));
+ // 淇敼琛ㄧ殑鏂囦欢閫昏緫
+ LWHFromTransferExtendVO lwhFromTransferExtendVO = lWhFormTransferService.getById(id);
+ // 淇敼
+ LWhFormTransfer addLWhFormTransfer = new LWhFormTransfer();
+ addLWhFormTransfer.setId(id);
+ addLWhFormTransfer.setProcureDoc(procureDoc);
+ addLWhFormTransfer.setInTime(opTime);
+ addLWhFormTransfer.setOutputTime(opTime);
+ int update = lWhFormTransferService.update(addLWhFormTransfer);
+ if (update < 1) {
+ return ResponseValue.error();
+ }
+ // 涓诲垎鍙戦�昏緫
+ // 鍏堝嚭搴擄紝鍐嶅叆搴�
+ // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.BUMENFENFA, id);
+ Set<Long> baseModelIds =
+ modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+ FinSysTenantUser sysTenantUser = this.getSysInfo();
+ String agencyId = sysTenantUser.getTenantId();
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+ Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
+ // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
+ List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, null);
+ GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
+ if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+ return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
+ }
+ Long wareHouseId = goodsInfoDTO.getWarehouseId();
+ String warehouseName = goodsInfoDTO.getWarehouseName();
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
+ lWhFormTransfer.setOutWarehouseId(wareHouseId);
+ lWhFormTransfer.setOutWarehouseName(warehouseName);
+ lWhFormTransferService.update(lWhFormTransfer);
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.BUMENFENFA);
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), lwhFromTransferExtendVO.getOperatorName());
+ return ResponseValue.success();
+ }
+
/**
* @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
@@ -143,11 +245,9 @@
* 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"),
- })
+ @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() {
TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
@@ -168,29 +268,18 @@
FormTransferVO formTransferVO = new FormTransferVO();
BeanUtils.copyProperties(item, formTransferVO);
- List<FromTransferTemplateInfoVO> templateInfoList = 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) {
- FromTransferTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromTransferTemplateInfoVO.class);
- templateInfoList.add(procureTemplateInfoVO);
- }
- formTransferVO.setFromTransferTemplateInfoList(templateInfoList);
+ List<GoodsTemplateCountVO> goodsTemplateCount =
+ lWhProcureModelService.getGoodsTemplateCountByBusinessId(item.getId());
+ formTransferVO.setFromTransferTemplateInfoList(goodsTemplateCount);
result.add(formTransferVO);
});
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
-// fieldDatas.setAccessible(true);
-// fieldDatas.set(genericPager, result);
+ // fieldDatas.setAccessible(true);
+ // fieldDatas.set(genericPager, result);
ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
@@ -205,9 +294,7 @@
* @Date 2023/10/30
*/
@ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@GetMapping("/detail")
public ResponseValue getById(Long id) {
if (id == null) {
@@ -218,9 +305,7 @@
}
@ApiOperation(value = "璋冩嫧鏄庣粏鍒楄〃", notes = "璋冩嫧鏄庣粏鍒楄〃")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"),
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "param", value = "鏉′欢", required = true, dataType = "TransferQry"),})
@GetMapping("/detail/list")
public ResponseValue queryFormTransferDetailList() {
TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
@@ -231,6 +316,10 @@
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ String tenantId = sysInfo.getTenantId();
+ if (param.getInAgencyId() == null) {
+ param.setInAgencyId(Long.valueOf(tenantId));
}
GenericPager<Map<String, Object>> mapGenericPager = lWhFormTransferService.queryFormTransferDetailList(param);
@@ -244,13 +333,15 @@
* @date 2023/10/31
*/
@ApiOperation(value = "鎾ら攢", notes = "鎾ら攢")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/updStatus")
public ResponseValue updateStatus(Long id) {
if (id == null) {
return ResponseValue.error("鍙傛暟閿欒");
+ }
+ LWhFormTransfer lWhFormTransfer = lWhFormTransferService.selectById(id);
+ if (lWhFormTransfer.getStates() != TransferStatesType.OUT_PENDING.getValue()) {
+ return ResponseValue.error("鐘舵�侀敊璇紝涓嶈兘鎾ら攢");
}
int num = this.lWhFormTransferService.updateStatus(id);
@@ -263,12 +354,10 @@
* @Date 2023/10/31
*/
@ApiOperation(value = "璋冩嫧鍏ュ簱", notes = "璋冩嫧鍏ュ簱")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/income")
- public ResponseValue income(Long id) {
- lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+ public ResponseValue income(Long id) throws Exception {
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser(), null);
return ResponseValue.success();
}
@@ -278,54 +367,83 @@
* @Date 2023/10/31
*/
@ApiOperation(value = "璋冩嫧鍑哄簱", notes = "璋冩嫧鍑哄簱")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "璋冩嫧鍗昳d", required = true, dataType = "Long"),})
@PostMapping("/output")
- public ResponseValue output(Long id) {
- // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱
+ public ResponseValue output(Long id) throws Exception {
+
+ List<LWhProcureModel> modelByForm = lWhProcureModelService.getModelByForm(WhBusinessEnum.DIAOBO, id);
+ Set<Long> baseModelIds =
+ modelByForm.stream().map(LWhProcureModel::getBaseGoodsModelsId).collect(Collectors.toSet());
+
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("鏈烘瀯鏃犻粯璁や粨搴擄紒");
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(Long.valueOf(agencyId), StatesType.NORMAL.getValue());
+ Set<Long> wareHouseIds = baseWarehouseList.stream().map(BaseWarehouse::getId).collect(Collectors.toSet());
+
+ // 閫氳繃璋冩嫧鍗曚腑鐨勫瀷鍙穒d鏌ヨ鍑鸿鍨嬪彿鐗╁搧鎵�鍦ㄧ殑浠撳簱浣嶇疆
+ List<GoodsInfoDTO> goodsInfoDTOS = lWhGoodsService.queryGoodsInfo(baseModelIds, wareHouseIds, 1);
+ GoodsInfoDTO goodsInfoDTO = goodsInfoDTOS.stream().findFirst().orElse(null);
+ if (ObjectUtils.isEmpty(goodsInfoDTO)) {
+ return ResponseValue.error("璇ュ瀷鍙锋病鏈夊簱瀛樺彲浣跨敤");
}
- BaseWarehouse baseWarehouse = baseWarehouseList.get(0);
- Long wareHouseId = baseWarehouse.getId();
- String warehouseName = baseWarehouse.getWarehouseName();
+ Long wareHouseId = goodsInfoDTO.getWarehouseId();
+ String warehouseName = goodsInfoDTO.getWarehouseName();
LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id);
lWhFormTransfer.setOutWarehouseId(wareHouseId);
lWhFormTransfer.setOutWarehouseName(warehouseName);
lWhFormTransferService.update(lWhFormTransfer);
- lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ // lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ lWhFormTransferCoreService.doTransferOutPutNew(id, getCurrentUser(), WhBusinessEnum.DIAOBO);
return ResponseValue.success();
}
- /**
- * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
+ @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 IOException {
+ public ResponseValue<String> export(Long id, Integer type, HttpServletResponse response) throws Exception {
TemplateExportParams params;
- if (type == 1) {
+ String fileName;
+ if (type == 0) {
params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+ fileName = "璋冩嫧鍏ュ簱鍗�";
+ }else if (type == 1) {
+ params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�1.xls");
+ fileName = "璋冩嫧鍏ュ簱鍗�";
} else {
params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
+ fileName = "璋冩嫧鍑哄簱鍗�";
}
- Map<String, Object> map = this.lWhFormTransferService.export(id, type);
+ params.setHeadingStartRow(2);
+ params.setStyle(ExcelStyleUtil.class);
+ List<TransferExcelTemplate> export = 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();
- }
+ 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);
+ String filePath = downLoadExcel(fileName, workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
+
}
-
/**
* 閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏
@@ -334,9 +452,7 @@
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏", notes = "閮ㄩ棬鐗╁搧鍒嗗彂鍒楄〃鏄庣粏")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "transferQryDto", value = "璋冩嫧鍗曟煡璇㈡潯浠�", required = true)})
@GetMapping("/department/list")
public ResponseValue departmentTransferList() {
TransferQry param = CommonUtil.getObjFromReq(TransferQry.class);
@@ -344,19 +460,21 @@
CommonUtil.copyProperties(param, param2);
param = param2;
- S_user_core currentUser = this.getCurrentUser();
- if (currentUser == null) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager = this.lWhFormTransferService.queryTransferInfo(param);
+ String tenantId = sysInfo.getTenantId();
+ if (param.getOutAgencyId() == null) {
+ param.setOutAgencyId(Long.valueOf(tenantId));
+ }
+ GenericPager<Map<String, Object>> transferInfoDetailsVoGenericPager =
+ this.lWhFormTransferService.queryTransferInfo(param);
return ResponseValue.success(transferInfoDetailsVoGenericPager);
}
-
@ApiOperation(value = "浣跨敤浜轰慨鏀�", notes = "浣跨敤浜轰慨鏀�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "procureModelInfoDto", value = "浣跨敤淇℃伅", required = true)})
@PostMapping("/useInfo/update")
public ResponseValue infoUpdate() {
@@ -374,7 +492,7 @@
}
Map<Long, List<ProcureModelInfoParam>> collect = param.getRecordInfoList().stream()
- .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
+ .collect(Collectors.groupingBy(ProcureModelInfoParam::getBaseGoodModelId));
for (Map.Entry<Long, List<ProcureModelInfoParam>> entry : collect.entrySet()) {
Long baseGoodModelId = entry.getKey();
@@ -403,12 +521,19 @@
lWhProcureModelUser.setNowUserPhone(item.getPhone());
lWhProcureModelUser.setNowUserName(item.getUserName());
lWhProcureModelUser.setGoodsNum(item.getCount());
+
+ // 璁剧疆涓�涓嬪湪鐢ㄦ暟閲�
+ Long oldProcureModelId = item.getOldProcureModelId();
+ LWhProcureModelUser oldInfo =
+ lWhProcureModelUserService.get(new LWhProcureModelUser(oldProcureModelId));
+ lWhProcureModelUser.setUseCount(oldInfo.getUseCount());
procureModelUserList.add(lWhProcureModelUser);
}
lWhProcureModelUserService.insert(procureModelUserList);
}
-
+ // 浣跨敤浜轰慨鏀硅皟鐢�
+ lGoodsUserRecordCoreService.modifyGoodsUser(null, lWhProcureModelUserRecord.getId());
}
return ResponseValue.success();
@@ -421,84 +546,66 @@
* @return
*/
@ApiOperation(value = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�", notes = "閮ㄩ棬鐗╁搧浣跨敤浜鸿褰�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)
- })
+ @ApiImplicitParams({@ApiImplicitParam(name = "transferOrderId", value = "璋冩嫧鍗昳d", required = true)})
@GetMapping("/use/record")
public ResponseValue useRecord(Long transferOrderId) {
-
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
+
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) {
+
+ List<GoodsUseRecordVO> goodsUseRecordList = useRecordDTOList.stream()
+ .collect(Collectors.groupingBy(UseRecordDTO::getId)).entrySet().stream().map(entry -> {
+ Long id = entry.getKey();
+ List<UseRecordDTO> useRecordList = entry.getValue();
+ UseRecordDTO useRecordDto = useRecordList.get(0);
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());
+ List<UseRecordSkuVO> useRecordSkuList =
+ useRecordList.stream().collect(Collectors.groupingBy(UseRecordDTO::getProcureModelId)).values()
+ .stream().map(recordList -> {
+ UseRecordDTO useRecordDTO = recordList.get(0);
+ 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);
+ List<RecordUserInfoVO> recordUserInfoList = recordList.stream().map(userInfo -> {
+ RecordUserInfoVO recordUserInfoVO = new RecordUserInfoVO();
+ recordUserInfoVO.setOldProcureModelId(userInfo.getOldProcureModelId());
+ recordUserInfoVO.setUseName(userInfo.getUseName());
+ recordUserInfoVO.setPhone(userInfo.getPhone());
+ recordUserInfoVO.setNum(userInfo.getNum());
+ return recordUserInfoVO;
+ }).collect(Collectors.toList());
+
+ useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
+ return useRecordSkuVO;
+ }).collect(Collectors.toList());
+
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);
- }
+ return goodsUseRecordVO;
+ }).sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime, Comparator.nullsFirst(Long::compareTo))
+ .reversed())
+ .collect(Collectors.toList());
- @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
- @GetMapping("/query/detail")
- public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
- TransferInfoVO transferInfoVO = new TransferInfoVO();
-
- lWhFormTransferService.queryDepartmentTransferOrder();
- return ResponseValue.success(transferInfoVO);
+ return ResponseValue.success(goodsUseRecordList);
}
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
+ @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")})
@GetMapping("/query/transfList")
public ResponseValue queryDepartmentTransferOrderList() {
--
Gitblit v1.9.1