From dc63eb8bf1cd034c4e8f419a92a3a81af05dc303 Mon Sep 17 00:00:00 2001 From: mashuai Date: Thu, 19 Dec 2024 13:53:47 +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 --- .../lease/service/impl/LeaseOutDetailsServiceImpl.java | 2 ++ .../service/impl/RepairInputDetailsServiceImpl.java | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java index c97d47c6..56dacb37 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseOutDetailsServiceImpl.java @@ -11,6 +11,7 @@ import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; +import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.mapper.BmAgreementInfoMapper; import com.bonus.material.lease.domain.LeaseApplyDetails; import com.bonus.material.lease.mapper.LeaseApplyDetailsMapper; @@ -289,6 +290,7 @@ public class LeaseOutDetailsServiceImpl implements ILeaseOutDetailsService { } if (res > 0) { // 插入领料出库明细表（lease_out_details） + record.setCreateBy(SecurityUtils.getUsername()); res = leaseOutDetailsMapper.insertLeaseOutDetails(record); if (res > 0) { // 普通机具减少 (ma_type 设备规格表)的库存数量 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index f66077f9..6f05c333 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -238,7 +238,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService if (CollectionUtils.isNotEmpty(list)) { //插入任务表 - Long newTaskId = insertTt(); + Long newTaskId = insertTt(rePairDto.getTaskId()); result += insertTta(newTaskId, repairInputDetails1); for (RepairInputInfo repairInputInfo : list) { if (repairInputInfo.getStatus().equals(RepairInputStatusEnum.Input_TASK_IN_FINISHED.getStatus().toString()) @@ -322,7 +322,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService private int processCodeTypeReject(RepairInputDetails repairInputDetails) { int result = 0; //插入任务表 - Long newTaskId = insertTt(); + Long newTaskId = insertTt(repairInputDetails.getTaskId()); result += insertTta(newTaskId, repairInputDetails); for (RepairInputDetails inputDetails : repairInputDetails.getMaCodeList()) { inputDetails.setStatus(RepairInputStatusEnum.Input_TASK_TO_REJECT.getStatus().toString()); @@ -359,7 +359,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService repairInputInfo.setTypeId(repairInputDetails.getTypeId()); repairInputInfo.setInputNum(repairInputDetails.getInputNum()); repairInputDetailsMapper.updateNum(repairInputInfo); - Long newTaskId = insertTt(); + Long newTaskId = insertTt(repairInputDetails.getTaskId()); result += insertTta(newTaskId, repairInputDetails); result += insertWxTask(newTaskId, repairInputDetails); } @@ -397,7 +397,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService * 驳回后重新生成维修单 插入任务表 * @return */ - private Long insertTt() { + private Long insertTt(Long preTaskId) { Long newTask = null; int thisMonthMaxOrder = taskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()); // 生成维修单号 @@ -406,6 +406,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService null,thisMonthMaxOrder + 1, code); tmTask.setCreateTime(DateUtils.getNowDate()); tmTask.setCreateBy(SecurityUtils.getUsername()); + tmTask.setPreTaskId(preTaskId); // 插入任务 int taskId = taskMapper.insertTmTask(tmTask); // 如果插入成功且返回的 taskId 大于 0