From 48826ae81913aafb28ff955e644687f9844bcaa6 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 10 Jul 2024 14:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/impl/TmTaskServiceImpl.java | 23 +++++++++---------- .../material/domain/PurchaseMacodeInfo.java | 12 ++++++++++ .../service/impl/MaWholeSetServiceImpl.java | 8 +++---- .../PurchaseCheckServiceCenterMapper.xml | 1 + 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index db79797c..c1e46b19 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -101,6 +101,7 @@ public class TmTaskServiceImpl implements TmTaskService { int result = 0; int taskId = 0; int num = 0; + HashSet set = new HashSet<>(); Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId(); if (StringUtils.isNotNull(record)) { // 内部审核 @@ -154,9 +155,15 @@ public class TmTaskServiceImpl implements TmTaskService { //短信通知人员进行出库 for (LeaseApplyDetails details : leaseApplyDetails) { //内部审核以后通知机具管理人进行出库 - smsNotification(details, record.getCode()); + set = smsNotification(details, record.getCode(), set); + } + for (String str : set) { + try { + remoteUserService.send(str, "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + record.getCode() + "的领料申请待处理，请及时查看"); + } catch (Exception e) { + log.info("手机号为：{}发送短信失败", str); + } } - } else if (record.getTaskStatus() == 32 && companyId != null) { // 再审核领料任务信息表 List leaseApplyInfoList = record.getLeaseApplyInfoList(); @@ -275,14 +282,12 @@ public class TmTaskServiceImpl implements TmTaskService { } } - private void smsNotification(LeaseApplyDetails details, String code) { + private HashSet smsNotification(LeaseApplyDetails details, String code, HashSet set) { log.info("短信通知：{}", code); TmTask tmTask = new TmTask(); tmTask.setId(details.getParenntId().toString()); //获取机具所属人员 List leaseDetailByParent = tmTaskMapper.getUserByParenntId(tmTask); - HashSet set = new HashSet<>(); - String message = "尊敬的用户，宁夏智慧仓储管理系统提醒您：您有一个领料单号为:" + code + "的领料申请待处理，请及时查看"; for (TmTask tmTaskNew : leaseDetailByParent) { //对手机号进行处理，因为存在一种类型的机具归属多个人的情况 log.info("短信通知人为：{}", tmTaskNew.getUserName()); @@ -294,13 +299,7 @@ public class TmTaskServiceImpl implements TmTaskService { } } } - for (String str : set) { - try { - remoteUserService.send(str, message); - } catch (Exception e) { - log.info("手机号为：{}发送短信失败", str); - } - } + return set; } @Override diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java index dd90d49b..3f19ec35 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java @@ -88,6 +88,18 @@ public class PurchaseMacodeInfo extends BaseEntity @ApiModelProperty(value = "验收数量") private BigDecimal checkNum; + public String getCheckUrl() { + return checkUrl; + } + + public void setCheckUrl(String checkUrl) { + this.checkUrl = checkUrl; + } + + /** 验收材料 */ + @ApiModelProperty(value = "验收材料") + private String checkUrl; + /** 验收数量 */ @ApiModelProperty(value = "绑定数量") private Integer bindNum; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java index e029c3d6..e6e8323c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java @@ -157,10 +157,10 @@ public class MaWholeSetServiceImpl implements MaWholeSetService { log.error("insertMaWholeSet方法插入异常"); throw new RuntimeException("insertMaWholeSet方法插入异常"); } - int count = selectByWholeTypeName(dto); - if (count > 1) { - throw new RuntimeException("配套名称已重复，请重新输入"); - } + /* int count = selectByWholeTypeName(dto); + if (count > 1) { + throw new RuntimeException("配套名称已重复，请重新输入"); + }*/ } catch (Exception e) { e.printStackTrace(); return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg()); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml index 57bbf0b5..277d18ee 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckServiceCenterMapper.xml @@ -375,6 +375,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" pmi.fix_code fixCode, pcd.type_id typeId, pcd.task_id taskId, + pcd.check_url checkUrl, tt.task_status taskStatus, mt.code specsCode, mt1.code typeCode,