From 20d547eedee62cfaa99e35d21f71dbfae0faad74 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 18 Nov 2024 11:24:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E5=85=A5=E5=BA=93=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PurchaseMacodeInfoMapper.java | 3 +++ .../impl/PurchaseCheckInfoServiceImpl.java | 24 ++++++++++++++----- .../purchase/PurchaseCheckDetailsMapper.xml | 5 +--- .../purchase/PurchaseMacodeInfoMapper.xml | 4 ++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseMacodeInfoMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseMacodeInfoMapper.java index bdf33408..da4b527a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseMacodeInfoMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseMacodeInfoMapper.java @@ -2,6 +2,7 @@ package com.bonus.material.purchase.mapper; import java.util.List; import com.bonus.material.purchase.domain.PurchaseMacodeInfo; +import org.apache.ibatis.annotations.Param; /** * 新购验收编号管理Mapper接口 @@ -57,4 +58,6 @@ public interface PurchaseMacodeInfoMapper { * @return 结果 */ public int deletePurchaseMacodeInfoByIds(Long[] ids); + + public int getPurchaseMaCodeCount(@Param("taskId") Long taskId, @Param("typeId") Long typeId); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java index 8556b2c7..0d9aaf0e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.bonus.material.purchase.domain.dto.PurchaseQueryDto; import com.bonus.material.purchase.domain.vo.PurchaseVerifyVo; import com.bonus.material.purchase.mapper.PurchaseCheckDetailsMapper; import com.bonus.material.purchase.domain.vo.PurchaseCheckFormVo; +import com.bonus.material.purchase.mapper.PurchaseMacodeInfoMapper; import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.mapper.TmTaskMapper; import org.apache.commons.lang3.BooleanUtils; @@ -55,6 +56,9 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { @Resource private PurchaseCheckDetailsMapper purchaseCheckDetailsMapper; + @Autowired + private PurchaseMacodeInfoMapper purchaseMacodeInfoMapper; + @Resource private TmTaskMapper tmTaskMapper; @@ -74,18 +78,28 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { if (purchaseCheckInfo != null) { purchaseCheckDtoResult.setPurchaseCheckInfo(purchaseCheckInfo); boolean isAllowPartTransfer = bmConfigService.isBmConfigEnabledWithDefaultFalse(BmConfigItems.BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER); - List purchaseCheckDetails; + List purchaseCheckDetailsList; if (isAllowPartTransfer) { - purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); + purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); + if (purchaseQueryDto.getStatusList().contains(PurchaseTaskStatusEnum.TO_STORE.getStatus())) { + purchaseCheckDetailsList = purchaseCheckDetailsList.stream() + .filter(o -> MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(o.getManageType()) || + MaTypeManageTypeEnum.CODE_DEVICE.getTypeId().equals(o.getManageType()) && getPurchaseMaCodeCount(o.getTaskId(), o.getTypeId()) > 0) + .collect(Collectors.toList()); + } } else { purchaseQueryDto.setStatusList(null); - purchaseCheckDetails = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); + purchaseCheckDetailsList = purchaseCheckDetailsMapper.selectPurchaseCheckDetailsListByQueryDto(purchaseQueryDto); } - purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetails); + purchaseCheckDtoResult.setPurchaseCheckDetailsList(purchaseCheckDetailsList); } return purchaseCheckDtoResult; } + private int getPurchaseMaCodeCount(Long taskId, Long typeId) { + return purchaseMacodeInfoMapper.getPurchaseMaCodeCount(taskId, typeId); + } + /** * 查询新购验收任务列表 * @@ -191,8 +205,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PURCHASE.getTaskTypeId(), PurchaseTaskStatusEnum.TO_NOTICE.getStatus(), purchaseCheckInfo.getPurchaseCheckInfo().getCompanyId(), "1", thisMonthMaxOrder + 1, taskCode); - //tmTask.setMonthOrder(thisMonthMaxOrder); - //tmTask.setCode(genderTaskCode(purchaseCheckInfo, thisMonthMaxOrder)); tmTask.setCreateTime(DateUtils.getNowDate()); tmTaskMapper.insertTmTask(tmTask); Long taskId = tmTask.getTaskId(); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml index eca38ca0..0843dddc 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml @@ -109,9 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pcd.production_time between #{startTime} and #{endTime} - - - and pcd.status in @@ -301,7 +298,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" (#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseTaxPrice}, #{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId}, - #{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy}, + #{item.status},#{item.productionTime},#{item.createBy},NOW(),#{item.updateBy}, #{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum}, #{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId},#{item.fixCode}) diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml index c6694080..206ecb8e 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseMacodeInfoMapper.xml @@ -122,4 +122,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + + \ No newline at end of file