From 2a370db9610af10873bd0292b5d5fd7246fd4039 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期二, 12 十二月 2023 16:13:38 +0800 Subject: [PATCH] 新增用户提示区县错误 --- consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java index dd21c13..0d2a6c6 100644 --- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java +++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java @@ -1,5 +1,7 @@ package com.consum.base.service.impl; +import static com.walker.db.Sorts.DESC; + import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -35,7 +37,7 @@ import com.consum.base.pojo.response.LWHFromTransferExtendVO; import com.consum.base.service.BaseWarehouseManagerService; import com.consum.base.service.BaseWarehouseService; -import com.consum.base.service.FinSysTenantServiceImpl; +import com.consum.base.service.FinSysTenantService; import com.consum.base.service.LWhFormTransferService; import com.consum.base.service.LWhGoodsService; import com.consum.base.service.LWhProcureModelService; @@ -67,7 +69,7 @@ @Autowired private CodeGeneratorService codeGeneratorService; @Autowired - private FinSysTenantServiceImpl finSysTenantService; + private FinSysTenantService finSysTenantService; @Autowired private LWhGoodsService lWhGoodsService; @Autowired @@ -132,9 +134,9 @@ // 浠庡綋鍓嶇櫥褰曞簱绠′汉浠庡簱涓嚭搴擄紝鍏ュ埌鎵�閫夐儴闂ㄧ殑涓� // 鏌ヨ搴撶鍛樹俊鎭拰鐩稿叧浠撳簱 - Long id = sysInfo.getId(); + Long sysUserId = sysInfo.getSysUserId(); BaseWarehouseManager manager = new BaseWarehouseManager(); - manager.setManagerId(id); + manager.setManagerId(sysUserId); List<BaseWarehouseManager> managerList = baseWarehouseManagerService.select(manager); if (CollectionUtils.isEmpty(managerList)) { log.error("璇ョ敤鎴蜂笉鏄簱绠″憳"); @@ -187,14 +189,14 @@ List<LWhProcureModel> modelList = new ArrayList<>(); // 鍒ゆ柇娣诲姞涓�娆′娇鐢ㄤ汉璁板綍 - List<LWhFormTransferGoodsInfoParam> type = transferGoods.stream() + List<LWhFormTransferGoodsInfoParam> recordType = transferGoods.stream() .filter( item -> businessType == TransferBusinessType.DEPARTMENT_PROCURE.getValue() && item.getModels().stream() .anyMatch(model -> baseGoodsModelsService.queryGoodsModelInfo(model.getBaseGoodsModelsId()).stream() .findFirst().orElse(null).get("type").equals(CategoryType.TYPE_A.getValue()))) .collect(Collectors.toList()); LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord(); - if (CollectionUtils.isEmpty(type)) { + if (!CollectionUtils.isEmpty(recordType)) { lWhProcureModelUserRecord.setId(IdUtil.generateId()); lWhProcureModelUserRecord.setTransBusinessId(lWhFormTransferId); lWhProcureModelUserRecord.setOperatorId(sysInfo.getId()); @@ -293,6 +295,11 @@ paramts.put("goodsTemplateName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); } + // 鐗╁搧id + if (param.getGoodsTemplateId() != null) { + sql.append("AND bgt.id = :goodsTemplateId "); + paramts.put("goodsTemplateId", param.getGoodsTemplateId()); + } // 璋冩嫧鏈烘瀯 if (param.getOutAgencyId() != null) { sql.append(" and OUT_AGENCY_ID = :OUT_AGENCY_ID "); @@ -332,9 +339,9 @@ paramts.put("inTimeEnd", param.getEndTime() * 1000000 + 240000); } // 鍒嗗彂閮ㄩ棬 - if (param.getInWarehouseId() != null) { + if (param.getDepartmentId() != null) { sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId "); - paramts.put("inWarehouseId", param.getInWarehouseId()); + paramts.put("inWarehouseId", param.getDepartmentId()); } sql.append(" ORDER BY ft.CREATE_TIME DESC"); @@ -393,8 +400,14 @@ && CategoryType.TYPE_A.getValue().equals(type)) { Long procureModelId = goodsModelVO.getId(); + LWhProcureModelUserRecord lWhProcureModelUserRecord = new LWhProcureModelUserRecord(); + lWhProcureModelUserRecord.setTransBusinessId(id); + List<LWhProcureModelUserRecord> select = lWhProcureModelUserRecordService + .select(lWhProcureModelUserRecord, DESC().setField("DEAL_TIME")); + LWhProcureModelUserRecord record = select.stream().findFirst().orElse(null); LWhProcureModelUser lWhProcureModelUser = new LWhProcureModelUser(); lWhProcureModelUser.setWhProcureModelId(procureModelId); + lWhProcureModelUser.setProcureModelUserRecordId(record.getId()); List<LWhProcureModelUser> procureModelUserList = this.lWhProcureModelUserService.select(lWhProcureModelUser); @@ -551,6 +564,11 @@ paramts.put("goodsName", StringUtils.CHAR_PERCENT + transferQry.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); } + // 鐗╁搧id + if (transferQry.getGoodsTemplateId() != null) { + sql.append("AND bgt.id =:goodsTemplateId "); + paramts.put("goodsTemplateId", transferQry.getGoodsTemplateId()); + } // 瑙勬牸鍨嬪彿 if (transferQry.getBaseGoodsModelsId() != null) { sql.append("AND bgm.id =:goodsModelId "); @@ -558,13 +576,13 @@ } // 璋冩嫧鏈烘瀯 if (transferQry.getOutAgencyId() != null) { - sql.append("AND OUT_AGENCY_ID = :OUT_AGENCY_ID "); - paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId()); + sql.append("AND OUT_AGENCY_ID like :OUT_AGENCY_ID "); + paramts.put("OUT_AGENCY_ID", transferQry.getOutAgencyId() + StringUtils.CHAR_PERCENT); } // 鍒嗗彂閮ㄩ棬 - if (transferQry.getInWarehouseId() != null) { + if (transferQry.getDepartmentId() != null) { sql.append("and ft.IN_WAREHOUSE_ID = :inWarehouseId "); - paramts.put("inWarehouseId", transferQry.getInWarehouseId()); + paramts.put("inWarehouseId", transferQry.getDepartmentId()); } // 鍒涘缓浜� if (StringUtils.isNotEmpty(transferQry.getOperatorName())) { @@ -598,7 +616,7 @@ + " ft.OUT_OPERATOR_NAME,\n" + " ft.OUTPUT_TIME\n" + "FROM l_wh_form_transfer ft\n" + " LEFT JOIN l_wh_procure_model pm ON ft.ID = pm.BUSINESS_ID\n" + " LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID\n" - + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where 1=1 "); + + " LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID where ft.BUSINESS_TYPE =0 "); if (StringUtils.isNotEmpty(param.getBusinessFormCode())) { sql.append("AND ft.BUSINESS_FORM_CODE = :businessFormCode "); params.put("businessFormCode", param.getBusinessFormCode()); @@ -607,6 +625,10 @@ sql.append("AND bgt.GOODS_NAME like :goodsName "); params.put("goodsName", StringUtils.CHAR_PERCENT + param.getGoodsTemplateName() + StringUtils.CHAR_PERCENT); } + if (param.getGoodsTemplateId() != null) { + sql.append("AND bgt.id = :goodsTemplateId "); + params.put("goodsTemplateId", param.getGoodsTemplateId()); + } if (param.getBaseGoodsModelsId() != null) { sql.append("AND bgm.id = :goodsModelId "); params.put("goodsModelId", param.getBaseGoodsModelsId()); -- Gitblit v1.9.1