diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 4ff9eee2..ce7869a8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -458,6 +458,19 @@ public class ComplexQueryController extends BaseController { return AjaxResult.success(getDataTable(pageList)); } + /** + * 配件库存个人查询 + * @param bean + * @return + */ + @ApiOperation(value = "综合查询--配件库存个人查询") + @GetMapping("/getPartPersonNum") + public AjaxResult getPartPersonNum(RetainedEquipmentInfo bean) { + startPage(); + List pageList = complexQueryService.getPartPersonNum(bean); + return AjaxResult.success(getDataTable(pageList)); + } + /** * 施工机具需求、供应分析统计表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java index 06d79edd..d52f502f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java @@ -190,4 +190,11 @@ public interface ComplexQueryMapper { List getAllUsDetails(ProjUsingRecord bean); List batchSelectInfo(@Param("list") Set leaseIds); + + /** + * 查询配件使用数量 + * @param bean + * @return + */ + List getPartPersonNum(RetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java index 08b28664..0335f21a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java @@ -130,4 +130,11 @@ public interface ComplexQueryService { * @return */ List getAllUsDetails(ProjUsingRecord bean); + + /** + * 配件库存个人查询 + * @param bean + * @return + */ + List getPartPersonNum(RetainedEquipmentInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 5ad3e14a..26113b32 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -377,16 +377,6 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { try { List list = complexQueryMapper.getUserRecords(bean); if (CollectionUtils.isNotEmpty(list)) { - /*for (UseStorageInfo useStorageInfo : list) { - // 查询出库信息 - if (useStorageInfo.getLeaseId() != null) { - UseStorageInfo dto = complexQueryMapper.selectInFo(useStorageInfo); - if (dto != null) { - useStorageInfo.setCreator(dto.getCreator()); - useStorageInfo.setOutTime(dto.getOutTime()); - } - } - }*/ // 提取所有非空的leaseId，批量查询出库信息 Set leaseIds = list.stream() .map(UseStorageInfo::getLeaseId) @@ -701,4 +691,16 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return new ArrayList<>(); } } + + /** + * 配件库存个人查询 + * @param bean + * @return + */ + @Override + public List getPartPersonNum(RetainedEquipmentInfo bean) { + Long userId = SecurityUtils.getLoginUser().getUserid(); + bean.setUserId(userId); + return complexQueryMapper.getPartPersonNum(bean); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 4502caa8..807885e2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -863,28 +863,26 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService details.setStatus(MaMachineStatusEnum.SCRAP_TO_AUDIT.getStatus().toString()); repairAuditDetailsMapper.updateMachine(details); } - ScrapApplyDetails bean = null; if (!CollectionUtils.isEmpty(list)) { - bean = list.get(0); + for (ScrapApplyDetails info : list) { + if (info.getScrapNum().compareTo(BigDecimal.ZERO) == 0) { + continue; + } + ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); + scrapApplyDetails.setTaskId(newScrapTaskId); + scrapApplyDetails.setTypeId(details.getTypeId()); + scrapApplyDetails.setMaId(details.getMaId() == null ? null : details.getMaId()); + scrapApplyDetails.setScrapNum(info.getScrapNum()); + scrapApplyDetails.setScrapSource("2"); + scrapApplyDetails.setStatus("0"); + scrapApplyDetails.setParentId(details.getId()); + scrapApplyDetails.setCreateTime(new Date()); + scrapApplyDetails.setScrapReason(info.getScrapReason() == null ? "" : info.getScrapReason()); + scrapApplyDetails.setScrapType(info.getScrapType() == null ? null : info.getScrapType()); + scrapApplyDetails.setCreateBy(info.getCreateBy() == null ? SecurityUtils.getLoginUser().getSysUser().getNickName() : info.getCreateBy()); + scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); + } } - if (!CollectionUtils.isEmpty(scrapApplyDetailList)) { - bean = scrapApplyDetailList.get(0); - } - ScrapApplyDetails scrapApplyDetails = new ScrapApplyDetails(); - scrapApplyDetails.setTaskId(newScrapTaskId); - scrapApplyDetails.setTypeId(details.getTypeId()); - scrapApplyDetails.setMaId(details.getMaId() == null ? null : details.getMaId()); - scrapApplyDetails.setScrapNum(details.getScrapNum()); - scrapApplyDetails.setScrapSource("2"); - scrapApplyDetails.setStatus("0"); - scrapApplyDetails.setParentId(details.getId()); - scrapApplyDetails.setCreateTime(new Date()); - if (bean != null) { - scrapApplyDetails.setScrapReason(bean.getScrapReason() == null ? "" : bean.getScrapReason()); - scrapApplyDetails.setScrapType(bean.getScrapType() == null ? null : bean.getScrapType()); - scrapApplyDetails.setCreateBy(bean.getCreateBy() == null ? SecurityUtils.getLoginUser().getSysUser().getNickName() : bean.getCreateBy()); - } - scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); } } // 插入维修入库明细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index e8010770..6cf4a630 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -563,7 +563,7 @@ public class RepairServiceImpl implements RepairService { fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setFileType(Long.valueOf(RepairTypeEnum.INNER_REPAIR.getTypeId())) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); fileInfo.setCreateTime(DateUtils.getNowDate()); bmFileInfoMapper.insertBmFileInfo(fileInfo); } @@ -582,7 +582,7 @@ public class RepairServiceImpl implements RepairService { fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setFileType(Long.valueOf(RepairTypeEnum.RETURN_FACTORY.getTypeId())) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); fileInfo.setCreateTime(DateUtils.getNowDate()); bmFileInfoMapper.insertBmFileInfo(fileInfo); } @@ -635,7 +635,7 @@ public class RepairServiceImpl implements RepairService { for (BmFileInfo bmFileInfo : partDetails.getFileList()) { bmFileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_NUM.getTaskTypeId()) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); bmFileInfoMapper.insertBmFileInfo(bmFileInfo); } } @@ -667,7 +667,7 @@ public class RepairServiceImpl implements RepairService { fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setFileType(Long.valueOf(RepairTypeEnum.INNER_REPAIR.getTypeId())) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); fileInfo.setCreateTime(DateUtils.getNowDate()); bmFileInfoMapper.insertBmFileInfo(fileInfo); } @@ -702,7 +702,7 @@ public class RepairServiceImpl implements RepairService { .setRepairContent(repairPartDetails.getRepairContent()).setSupplierId(repairPartDetails.getSupplierId()) .setPartNum(repairPartDetails.getPartNum()).setRepairer(loginUser.getUsername()) .setPartPrice(Optional.ofNullable(repairPartDetails.getPartPrice()).orElse(BigDecimal.ZERO)) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); if (CollectionUtil.isNotEmpty(bean.getOutRepairList())) { repairApplyRecord.setRemark(StringUtils.isNotBlank(bean.getOutRepairList().get(0).getRemark()) ? bean.getOutRepairList().get(0).getRemark() : ""); } @@ -716,7 +716,7 @@ public class RepairServiceImpl implements RepairService { fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setFileType(Long.valueOf(RepairTypeEnum.RETURN_FACTORY.getTypeId())) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) - .setCreateBy(loginUser.getUsername()); + .setCreateBy(loginUser.getSysUser().getNickName()); fileInfo.setCreateTime(DateUtils.getNowDate()); bmFileInfoMapper.insertBmFileInfo(fileInfo); } @@ -919,7 +919,7 @@ public class RepairServiceImpl implements RepairService { if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(manageType)) { repairApplyRecord.setRepairNum(partDetails.getRepairNum()); } - repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setCreateBy(loginUser.getSysUser().getNickName()); repairApplyRecord.setStatus(0L); if(bean.getInRepairList()!=null){ repairApplyRecord.setRemark(StringUtils.isNotBlank(bean.getInRepairList().get(0).getRemark()) ? bean.getInRepairList().get(0).getRemark() : ""); @@ -1019,7 +1019,7 @@ public class RepairServiceImpl implements RepairService { if (null == partList.get(i).getSupplierId()) { throw new ServiceException("请选择返厂厂家"); } - repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setCreateBy(loginUser.getSysUser().getNickName()); repairApplyRecord.setSupplierId(partList.get(i).getSupplierId()); repairApplyRecord.setPartPrice(Optional.ofNullable(partList.get(i).getBackCost()).orElse(BigDecimal.ZERO)); repairApplyRecord.setRemark(StringUtils.isNotBlank(bean.getOutRepairList().get(0).getRemark()) ? bean.getOutRepairList().get(0).getRemark() : ""); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java index bf1979d6..b91318a6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java @@ -5,11 +5,9 @@ import javax.servlet.http.HttpServletResponse; import cn.hutool.core.convert.Convert; import com.bonus.common.biz.config.ListPagingUtil; -import com.bonus.common.biz.domain.lease.LeaseApplyInfo; import com.bonus.common.core.utils.ServletUtils; import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; -import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo; import com.bonus.material.scrap.domain.vo.ScrapTaskListVo; import com.bonus.material.scrap.domain.vo.ScrapTotalListVo; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index b1b1e959..8d3a4844 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -831,33 +831,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt2.type_name AS typeName, mt.type_name AS typeModelName, mt.buy_price AS buyPrice, - sai.num AS usNum, + sai_agg.usNum, mm.ma_code AS maCode, bp.pro_name AS projectName, - sai.lease_id AS leaseId, - sai.type_id AS typeId, + sai_agg.lease_id AS leaseId, + sai_agg.type_id AS typeId, GROUP_CONCAT( DISTINCT su.nick_name ORDER BY su.nick_name SEPARATOR ', ' ) AS maKeeper FROM - slt_agreement_info sai - LEFT JOIN ma_type mt ON mt.type_id = sai.type_id - LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id - LEFT JOIN ma_machine mm ON mm.ma_id = sai.ma_id - LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai.agreement_id - LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id - LEFT JOIN ma_type_keeper mtk ON sai.type_id = mtk.type_id - LEFT JOIN sys_user su ON mtk.user_id = su.user_id + ( + SELECT + type_id, + ma_id, + lease_id, + agreement_id, + SUM( num ) AS usNum + + FROM + slt_agreement_info WHERE - sai.`status` = '0' - AND sai.end_time IS NULL - AND sai.back_id IS NULL - AND sai.`is_slt` = '0' + `status` = '0' + AND end_time IS NULL + AND back_id IS NULL + AND `is_slt` = '0' - AND sai.type_id = #{typeId} + AND type_id = #{typeId} GROUP BY - sai.type_id, - sai.ma_id, - bp.pro_id + type_id, + ma_id, + lease_id, + agreement_id + ) AS sai_agg + LEFT JOIN ma_type mt ON mt.type_id = sai_agg.type_id + LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id + LEFT JOIN ma_machine mm ON mm.ma_id = sai_agg.ma_id + LEFT JOIN bm_agreement_info bai ON bai.agreement_id = sai_agg.agreement_id + LEFT JOIN bm_project bp ON bai.project_id = bp.pro_id + LEFT JOIN ma_type_keeper mtk ON sai_agg.type_id = mtk.type_id + LEFT JOIN sys_user su ON mtk.user_id = su.user_id + GROUP BY + sai_agg.type_id, + sai_agg.ma_id, + bp.pro_id, + sai_agg.lease_id + + diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml index 4044b4db..6e4dbec7 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml @@ -102,8 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ifnull(rad.repair_num,0) as repairNum, ifnull(rad.repaired_num,0) as repairedNum, mt.buy_price as buyPrice, - rar.scrap_reason as scrapReason, - rar.scrap_type as scrapType + sad.scrap_reason as scrapReason, + sad.scrap_type as scrapType from scrap_apply_details sad left join ma_type mt on sad.type_id = mt.type_id @@ -111,11 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user su on sad.create_by = su.user_id left join ma_type mt2 on mt.parent_id = mt2.type_id left join repair_audit_details rad on sad.parent_id = rad.id - LEFT JOIN repair_apply_details ra on rad.repair_id = ra.id - LEFT JOIN repair_apply_record rar on rar.task_id = ra.task_id - and (case when mt.manage_type = 0 then rar.ma_id = ra.ma_id - when mt.manage_type = 1 then rar.type_id = ra.type_id - else false end) and rar.repair_type = '3' where sad.task_id = #{taskId} @@ -366,6 +361,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN repair_apply_details ra ON rad.repair_id = ra.id WHERE sad.parent_id = #{parentId} + LIMIT 1 \ No newline at end of file