From edc87e2fc3760cd7d1230bc058acf5620ea2c465 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期六, 02 十二月 2023 15:03:15 +0800 Subject: [PATCH] 部门分发添加,分发单型号查询 --- consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 97 +++++++++++++++++++++++++++++++----------------- 1 files changed, 63 insertions(+), 34 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 79fa7b3..daf8093 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 @@ -9,6 +9,7 @@ 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; @@ -30,6 +31,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import org.apache.commons.compress.utils.Lists; import org.springframework.beans.BeanUtils; @@ -51,7 +53,7 @@ @Autowired private BaseWarehouseServiceImpl baseWarehouseService; @Autowired - private FinSysTenantDepartmentServiceImpl departmentService; + private FinSysTenantDepartmentService departmentService; @Autowired private LWhGoodsService lWhGoodsService; @Autowired @@ -65,12 +67,11 @@ @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 " - + "inner 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 " + + "inner join l_wh_form_scrapped_goods fsg on fs.ID = fsg.FORM_SCRAPPED_ID where 1=1 "; /** * 鏂板 @@ -78,10 +79,9 @@ * @param param * @param currentUser 褰撳墠鐧诲綍鐢ㄦ埛 * @param sysInfo 褰撳墠鐧诲綍鐢ㄦ埛 - * @return + * @return 1.鏂板鎶ュ簾鍗� 2.鏂板鎶ュ簾鍗曠墿鍝� */ - //1.鏂板鎶ュ簾鍗� - //2.鏂板鎶ュ簾鍗曠墿鍝� + public int add(LWhFormScrappedParam param, S_user_core currentUser, FinSysTenantUser sysInfo) { //1.鏂板鎶ュ簾鍗曡褰� LWhFormScrapped lWhFormScrapped = new LWhFormScrapped(); @@ -90,21 +90,28 @@ lWhFormScrapped.setId(lWhFormScrappedId); lWhFormScrapped.setBusinessFormCode(codeGeneratorService.createBusinessFormCode(CodeGeneratorEnum.Scrapped)); lWhFormScrapped.setWarehouseType(0); - Long warehouseId = param.getWarehouseId(); - lWhFormScrapped.setWarehouseId(warehouseId); + + // 鍏敤 + Long warehouseId = null; + //浠撳簱鍚嶇О + String wareHouseName = null; + warehouseId = param.getWarehouseId(); //鏍规嵁浠撳簱id鏌ヨ浠撳簱 BaseWarehouse warehouse = this.baseWarehouseService.getById(warehouseId); if (warehouse == null) { log.error("浠撳簱涓嶅瓨鍦�"); return 0; } - lWhFormScrapped.setWarehouseName(warehouse.getWarehouseName()); + wareHouseName = warehouse.getWarehouseName(); + lWhFormScrapped.setWarehouseId(warehouseId); + lWhFormScrapped.setWarehouseName(wareHouseName); lWhFormScrapped.setAgencyId(Long.valueOf(sysInfo.getTenantId())); lWhFormScrapped.setAgencyName(sysInfo.getTenantName()); lWhFormScrapped.setOperatorId(sysInfo.getSysUserId()); 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) { @@ -173,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(); @@ -257,6 +264,16 @@ 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 -> { GoodsModelVO goodsModelVO = new GoodsModelVO(); @@ -336,25 +353,37 @@ return pageUtil; } - /** - * @Description 瀵煎嚭鎶ュ簾鐧昏鍗� - * @Author 鍗㈠簡闃� - * @Date 2023/11/2 - */ -// public LWhFormScrappedExtendVO export(Long id, FinSysTenantUser sysInfo) { -// LWhFormScrappedExtendVO scrappedExtend = new LWhFormScrappedExtendVO(); -// //1.鏌ヨ鎶ュ簾鍗� -// LWhFormScrapped lWhFormScrapped = this.get(new LWhFormScrapped(id)); -// if (lWhFormScrapped != null) { -// lWhFormScrapped.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); -// lWhFormScrapped.setOperatorName(sysInfo.getUserName()); -// BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend); -// } -// //2.鏌ヨ鎶ュ簾鍗曠墿鍝� -// List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id); -// if (!CollectionUtils.isEmpty(scrappedGoodsList)) { -// scrappedExtend.setScrappedGoodsList(scrappedGoodsList); -// } -// return scrappedExtend; -// } + public List<ScrappedInfoExcelTemplate> export(Long id) { + String sql = + "SELECT\n" + + "\tBUSINESS_FORM_CODE,\n" + + "\tfs.DEAL_TIME,\n" + + "\tOPERATOR_NAME,\n" + + "\tAGENCY_NAME tenantName,\n" + + "\tGOODS_TEMPLATE_NAME templateName,\n" + + "\tBASE_GOODS_MODELS_NAME baseModelName,\n" + + "\tCOUNTS num,\n" + + "\tSCRAPPED_NAME deception,\n" + + "\tBEIZ remark\n" + + "FROM\n" + + "\tl_wh_form_scrapped_goods fsg\n" + + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID\n" + + "WHERE\n" + + "\tfs.ID = :id\n" + + "\tAND STATES = 1"; + Map<String, Object> param = new HashMap<>(); + param.put("id", id); + List<Map<String, Object>> select = this.select(sql, param, new MapperUtil()); + if (CollectionUtils.isEmpty(select)) { + return null; + } + List<ScrappedInfoExcelTemplate> list = Lists.newArrayList(); + select.forEach(item -> { + ScrappedInfoExcelTemplate inventoryExcelTemplate = MapUtils.convertMapToObj(item, ScrappedInfoExcelTemplate.class); + list.add(inventoryExcelTemplate); + }); + return list; + } + + } -- Gitblit v1.9.1