From 2e45b26117ece01e208356b30beaa19e25d56967 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 30 十一月 2023 16:05:58 +0800
Subject: [PATCH] 部门报废、退回
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 108907d..30e84e6 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -26,10 +26,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -59,7 +56,7 @@
@Autowired
private LWhFormScrappedCoreService lWhFormScrappedCoreService;
- private static String QUERY_LIST = "SELECT fs.* FROM l_wh_form_scrapped fs left join l_wh_form_scrapped_goods fsg on fs.id = fsg.FORM_SCRAPPED_ID WHERE 1 = 1 ";
+ private static String QUERY_LIST = "SELECT DISTINCT fs.* FROM l_wh_form_scrapped fs left join l_wh_form_scrapped_goods fsg on fs.id = fsg.FORM_SCRAPPED_ID WHERE 1 = 1 ";
private static final String QUERY_BF_DETAIL_LIST = "select fs.id,fs.BUSINESS_FORM_CODE,fsg.GOODS_TEMPLATE_NAME,fsg.BASE_GOODS_MODELS_NAME,fsg.COUNTS,"
+ "fs.AGENCY_NAME,OPERATOR_NAME,DEAL_TIME from l_wh_form_scrapped fs "
@@ -82,11 +79,12 @@
lWhFormScrapped.setId(lWhFormScrappedId);
lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped));
lWhFormScrapped.setWarehouseType(warehouseType);
+
// 鍏敤
Long warehouseId = null;
//浠撳簱鍚嶇О
String wareHouseName = null;
- if (warehouseType == 0){
+ if (warehouseType == 0) {
warehouseId = param.getWarehouseId();
//鏍规嵁浠撳簱id鏌ヨ浠撳簱
BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId);
@@ -113,6 +111,7 @@
lWhFormScrapped.setOperatorName(sysInfo.getUserName());
lWhFormScrapped.setDealTime(param.getDealTime());
lWhFormScrapped.setStates(0);
+ lWhFormScrapped.setUploadFiles(param.getUploadFiles());
//鏍规嵁閮ㄩ棬id鏌ヨ閮ㄩ棬
FinSysTenantDepartment department = this.departmentService.getById(sysInfo.getSysDeptId());
if (department != null) {
@@ -181,7 +180,7 @@
scrappedGoodsList.add(scrappedGoods);
}
- int flag2 = this.scrappedGoodsService.insert(scrappedGoodsList);
+ int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
if (flag2 != scrappedGoodsList.size()) {
log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -264,6 +263,16 @@
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<GoodsModelVO> goodsModelList = Lists.newArrayList();
goodsList.forEach(item -> {
@@ -377,4 +386,5 @@
// }
// return scrappedExtend;
// }
+
}
--
Gitblit v1.9.1