From 7fc948e6ddc958a2c7379b8eb3b240f77350ce4b Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 09 十二月 2023 11:02:42 +0800
Subject: [PATCH] feat: 报废后台账不对；出库后预警
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java | 113 +++++++++++++++++++++-----------------------------------
1 files changed, 42 insertions(+), 71 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
index b82944a..83aa02f 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormScrappedServiceImpl.java
@@ -1,12 +1,22 @@
package com.consum.base.service.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
+import com.consum.base.core.CodeGeneratorEnum;
+import com.consum.base.core.CodeGeneratorService;
+import com.consum.base.core.utils.*;
+import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
+import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
+import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.dto.GoodModelInfoDTO;
+import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
+import com.consum.base.pojo.query.LWhFormScrappedQry;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
+import com.iplatform.model.po.S_user_core;
+import com.walker.db.page.GenericPager;
+import com.walker.infrastructure.utils.DateUtils;
+import com.walker.infrastructure.utils.StringUtils;
+import com.walker.jdbc.service.BaseServiceImpl;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,42 +24,11 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import com.consum.base.core.CodeGeneratorEnum;
-import com.consum.base.core.CodeGeneratorService;
-import com.consum.base.core.utils.CurrencyUtil;
-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.core.utils.PageUtil;
-import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
-import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
-import com.consum.base.pojo.LWhFormScrappedParam;
-import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
-import com.consum.base.pojo.query.LWhFormScrappedQry;
-import com.consum.base.pojo.response.FormScrappedGoodsDetailVO;
-import com.consum.base.pojo.response.FormScrappedGoodsVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.GoodsTemplateCountVO;
-import com.consum.base.pojo.response.LWhFormScrappedExtendVO;
-import com.consum.base.service.BaseGoodsModelsService;
-import com.consum.base.service.BaseGoodsTemplateService;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantDepartmentService;
-import com.consum.base.service.LWhFormScrappedService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.SDictDataServiceImpl;
-import com.consum.model.po.BaseGoodsModels;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantDepartment;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LWhFormScrapped;
-import com.consum.model.po.LWhFormScrappedGoods;
-import com.consum.model.po.SDictData;
-import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
-import com.walker.infrastructure.utils.StringUtils;
-import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
/**
* @Description 鎶ュ簾鍗�
@@ -68,7 +47,7 @@
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
- private LWhFormScrappedGoodsServiceImpl scrappedGoodsService;
+ private LWhFormScrappedGoodsService scrappedGoodsService;
@Autowired
private SDictDataServiceImpl sDictDataService;
@Autowired
@@ -124,6 +103,7 @@
lWhFormScrapped.setOperatorName(sysInfo.getUserName());
lWhFormScrapped.setDealTime(param.getDealTime());
lWhFormScrapped.setStates(0);
+ lWhFormScrapped.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
lWhFormScrapped.setUploadFiles(param.getUploadFiles());
// 鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
@@ -199,15 +179,14 @@
scrappedGoodsList.add(scrappedGoods);
}
int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
- if (flag2 != scrappedGoodsList.size()) {
+ if (flag2 == 0) {
log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return 0;
}
}
// 3.鏍规嵁鎶ュ簾鍗曟姤搴熺墿鍝�
- Long lWarehouseFlowId =
- this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
+ Long lWarehouseFlowId = this.lWhFormScrappedCoreService.outFormByTransId(lWhFormScrappedId, currentUser, param.getDealTime());
if (lWarehouseFlowId == null) {
log.error("鏍规嵁鍑哄簱鍗曞嚭搴� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -272,31 +251,23 @@
if (lWhFormScrapped != null) {
BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
}
- // 2.鏌ヨ鎶ュ簾鍗�
- List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
+ // 2.鏌ヨ鎶ュ簾鍗曞晢鍝佷俊鎭�
+ List<GoodModelInfoDTO> scrappedGoodsInfoList = scrappedGoodsService.getScrappedGoodsByScrappedId(id);
// 閫氳繃baseGoodsTemplateId 杩涜鍒嗙粍
- Map<Long, List<LWhFormScrappedGoods>> map =
- scrappedGoodsList.stream().collect(Collectors.groupingBy(LWhFormScrappedGoods::getBaseGoodsTemplateId));
+ Map<Long, List<GoodModelInfoDTO>> map =
+ scrappedGoodsInfoList.stream().collect(Collectors.groupingBy(GoodModelInfoDTO::getBaseGoodsTemplateId));
// 寰幆map鐨刱ey鍜寁alue
- List<FormScrappedGoodsVO> scrappedGoodsVO = Lists.newArrayList();
- for (Map.Entry<Long, List<LWhFormScrappedGoods>> entry : map.entrySet()) {
- Long baseGoodsTemplateId = entry.getKey();
- List<LWhFormScrappedGoods> goodsList = entry.getValue();
- LWhFormScrappedGoods lWhFormScrappedGoods = goodsList.stream().findFirst().get();
- FormScrappedGoodsVO formScrappedGoodsVO = new FormScrappedGoodsVO();
- formScrappedGoodsVO.setBaseGoodsTemplateId(baseGoodsTemplateId);
- formScrappedGoodsVO.setGoodsName(lWhFormScrappedGoods.getGoodsTemplateName());
-
- String sql = "select CATEGORY_NAME from base_goods_template where id = :id";
- Map<String, Object> param = new HashMap<>();
- param.put("id", baseGoodsTemplateId);
- List<Map<String, Object>> goodTemplate = this.select(sql, param, new MapperUtil());
- if (!CollectionUtils.isEmpty(goodTemplate)) {
- Optional<Map<String, Object>> first = goodTemplate.stream().findFirst();
- Map<String, Object> objectMap = first.get();
- formScrappedGoodsVO.setCategoryName(objectMap.get("categoryName").toString());
+ List<GoodsTemplateInfoVO> scrappedGoodsVO = Lists.newArrayList();
+ for (Map.Entry<Long, List<GoodModelInfoDTO>> entry : map.entrySet()) {
+ List<GoodModelInfoDTO> goodsList = entry.getValue();
+ GoodModelInfoDTO goodModelInfoDTO = goodsList.stream().findFirst().orElse(null);
+ GoodsTemplateInfoVO goodsTemplateInfoVO = new GoodsTemplateInfoVO();
+ if (goodModelInfoDTO != null) {
+ goodsTemplateInfoVO.setId(goodModelInfoDTO.getId());
+ goodsTemplateInfoVO.setGoodsName(goodModelInfoDTO.getBaseGoodsName());
+ goodsTemplateInfoVO.setCategoryName(goodModelInfoDTO.getCategoryName());
+ goodsTemplateInfoVO.setId(goodModelInfoDTO.getId());
}
-
List<GoodsModelVO> goodsModelList = Lists.newArrayList();
goodsList.forEach(item -> {
GoodsModelVO goodsModelVO = new GoodsModelVO();
@@ -308,8 +279,8 @@
goodsModelVO.setScrappedName(item.getScrappedName());
goodsModelList.add(goodsModelVO);
});
- formScrappedGoodsVO.setModels(goodsModelList);
- scrappedGoodsVO.add(formScrappedGoodsVO);
+ goodsTemplateInfoVO.setModels(goodsModelList);
+ scrappedGoodsVO.add(goodsTemplateInfoVO);
}
scrappedExtend.setScrappedGoods(scrappedGoodsVO);
--
Gitblit v1.9.1