From 9f7e6118506fbbd2f83e0912c37f3a4809e6d3e7 Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 21 May 2025 18:14:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/constant/BmConfigItems.java | 3 +++ .../back/service/impl/BackApplyInfoServiceImpl.java | 12 ++++++++++-- .../material/purchase/domain/PurchaseCheckInfo.java | 3 +++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java index 9be63db6..808a8a2d 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/constant/BmConfigItems.java @@ -17,4 +17,7 @@ public class BmConfigItems { /** 物资状态流转： 【】允许一个新购单的部分物资提前流转到下一个阶段 */ public static final String BOOLEAN_ALLOW_PURCHASE_PART_TRANSFER = "allow_purchase_part_transfer"; + // 安徽省公司短信平台key + public static final String ANHUI_COMPANY_SMS_KEY = "Wq1FZobZC5iJIAGKWh6gpKUmdGKBOQq7koHmx+Vg49g/dSjSFlw+2qRQmMmyXvJT"; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index b286fb57..5efc29f1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -127,6 +127,12 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { } } } + List list = backApplyInfoMapper.selectByCode(details.getParentId()); + if (CollectionUtils.isNotEmpty(list)) { + // 将goodNum和badNum分别相加 + details.setGoodNum(list.stream().map(MaCodeVo::getGoodNum).reduce(BigDecimal.ZERO, BigDecimal::add)); + details.setBadNum(list.stream().map(MaCodeVo::getBadNum).reduce(BigDecimal.ZERO, BigDecimal::add)); + } // 为每个退料详情设置附件信息 setBmFileInfosForDetails(details, bmFileInfos); // 如果是编码设备，查询并设置相关的编码信息和附件 @@ -242,6 +248,8 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { maCodeDto.setTypeId(maCodeVo.getTypeId()); maCodeDto.setMaStatus(maCodeVo.getMaStatus()); maCodeDto.setMaterialType(maCodeVo.getMaterialType()); + maCodeDto.setGoodNum(maCodeVo.getGoodNum()); + maCodeDto.setBadNum(maCodeVo.getBadNum()); // 查询并设置编码附件 List bmFileInfoList = fetchBmFileInfos(details.getId(), maCodeVo.getMaId()); if (CollectionUtils.isNotEmpty(bmFileInfoList)) { @@ -925,7 +933,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { // 插入 CheckDetails result += backApplyInfoMapper.insertCheckDetails(details); //更新ma_machine表状态为11（退料暂存） - result += machineMapper.updateStatus(details.getMaId(), MaMachineStatusEnum.RETURNED_MATERIAL.getStatus()); + //result += machineMapper.updateStatus(details.getMaId(), MaMachineStatusEnum.RETURNED_MATERIAL.getStatus()); if (CollectionUtils.isNotEmpty(details.getBmFileInfos())) { for (BmFileInfo bmFileInfo : details.getBmFileInfos()) { bmFileInfo.setCreateBy(SecurityUtils.getUsername()); @@ -1039,7 +1047,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { result += backApplyInfoMapper.insertCheckDetails(details); } //更新ma_machine表状态为3（退料检修） - result += machineMapper.updateStatus(details.getMaId(), MaMachineStatusEnum.BACK_REPAIR.getStatus()); + // result += machineMapper.updateStatus(details.getMaId(), MaMachineStatusEnum.BACK_REPAIR.getStatus()); if (CollectionUtils.isNotEmpty(details.getBmFileInfos())) { for (BmFileInfo bmFileInfo : details.getBmFileInfos()) { bmFileInfo.setCreateBy(SecurityUtils.getUsername()); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java index c401b5bd..70dd8820 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckInfo.java @@ -139,6 +139,9 @@ public class PurchaseCheckInfo extends BaseEntity { private String checkUser; + @ApiModelProperty(value = "会签层级 1 代表供应科层级，2 代表技术科层级，3 代表库管班层级") + private String signLevel; + public String getCheckUser() { return checkUser; }