diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 0955bc05..d1c67078 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -113,7 +113,11 @@ public class RepairServiceImpl implements RepairService { bean.setPartName(partList.get(0).getPartName()); bean.setPartType(partList.get(0).getPartType()); bean.setRepairContent(partList.get(0).getRepairContent()); - bean.setSupplierId(partList.get(0).getSupplierId()); + if (partList.get(0).getSupplierId() == null){ + throw new ServiceException("请选择返厂厂家"); + }else { + bean.setSupplierId(partList.get(0).getSupplierId()); + } if (bean.getPartPrice() == null || bean.getPartPrice().isEmpty()){ bean.setPartPrice("0"); }else { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java index a56e18c3..739a763e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.material.domain; import java.math.BigDecimal; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author bonus * @date 2023-12-18 */ +@Data public class RepairInputDetails extends BaseEntity { private static final long serialVersionUID = 1L; @@ -54,6 +56,7 @@ public class RepairInputDetails extends BaseEntity /** 数据所属组织 */ @Excel(name = "数据所属组织") private Long companyId; + private Long createById; public void setId(Long id) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java index 3a04fdd3..b482b662 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java @@ -105,6 +105,7 @@ public class ScrapApplyDetails extends BaseEntity @ApiModelProperty(value = "数据状态") private Integer repairStatus; + private Long createById; public void setId(Long id) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 44aa3f84..a8e2b792 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -191,8 +191,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService taskAgreement.setTaskId(task.getTaskId()); if (tmTaskAgreement.getAgreementId() == null){ throw new ServiceException("缺少协议数据"); + }else { + taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); } - taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); taskAgreement.setCreateBy(SecurityUtils.getUsername()); agreementMapper.insertTmTaskAgreement(taskAgreement); @@ -200,12 +201,13 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService RepairInputDetails repairInputDetails = new RepairInputDetails(); repairInputDetails.setTaskId(task.getTaskId()); repairInputDetails.setAuditId(repairAuditDetails.getId()); - repairInputDetails.setInputNum(repairAuditDetails.getRepairNum()); + repairInputDetails.setRepairId(repairAuditDetails.getRepairId()); + repairInputDetails.setRepairNum(repairAuditDetails.getRepairNum()); repairInputDetails.setTypeId(repairAuditDetails.getTypeId()); repairInputDetails.setMaId(repairAuditDetails.getMaId()); repairInputDetails.setStatus("0"); + repairInputDetails.setCreateById(SecurityUtils.getUserId()); repairInputDetails.setCreateTime(new Date()); - repairTestInputMapper.insertRepairInputDetails(repairInputDetails); } @@ -223,7 +225,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService // 添加协议信息表 TmTaskAgreement taskAgreement = new TmTaskAgreement(); taskAgreement.setTaskId(task.getTaskId()); - taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); + if (tmTaskAgreement.getAgreementId() == null){ + throw new ServiceException("缺少协议数据"); + }else { + taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); + } agreementMapper.insertTmTaskAgreement(taskAgreement); // 添加退料任务 @@ -232,9 +238,11 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setTypeId(typeId); scrapApplyDetails.setMaId(maId); scrapApplyDetails.setScrapNum(scrapNum); - scrapApplyDetails.setScrapSource("1"); + scrapApplyDetails.setScrapSource("2"); scrapApplyDetails.setStatus("0"); scrapApplyDetails.setParentId(taskId); + scrapApplyDetails.setCreateById(SecurityUtils.getUserId()); + scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml index 652a75db..42eab152 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml @@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select tk.code scrapNum,tk.task_status taskStatus, dic.name taskStatusName, bui.unit_name unitName,bpl.lot_name projectName, - tk.create_by createBy, tk.create_time createTime, tk.remark ,tk1.code repairNum,tk.task_id taskId + su.user_name createBy, tk.create_time createTime, tk.remark ,tk1.code repairNum,tk.task_id taskId from tm_task tk left join tm_task_agreement tta on tk.task_id = tta.task_id left join bm_agreement_info bai on tta.agreement_id = bai.agreement_id @@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join (select id,p_id,name from sys_dic where p_id in (select id from sys_dic where value = 'bf_task')) dic on tk.task_status = dic.id left join ma_type mt on sad.type_id = mt.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id + left join sys_user su on su.user_id = tk.create_by where sad.scrap_source in ('1','2') and tk.task_type = 57 and bui.unit_id = #{backUnit} @@ -140,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" audit_time, audit_remark, create_by, + create_by, create_time, update_by, update_time, @@ -162,6 +164,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{auditTime}, #{auditRemark}, #{createBy}, + #{createById}, #{createTime}, #{updateBy}, #{updateTime},