From 5f0709c5a9ed526a9e3b95e75e1838e0b0269507 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 15 Nov 2024 13:16:00 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=AE=A1=E6=A0=B8--?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=AE=A1=E6=A0=B8=E9=A9=B3=E5=9B=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RepairAuditDetailsController.java | 16 +++++++++++++++- .../mapper/RepairAuditDetailsMapper.java | 8 ++++++++ .../service/IRepairAuditDetailsService.java | 8 ++++++++ .../impl/RepairAuditDetailsServiceImpl.java | 19 +++++++++++++++++-- .../repair/RepairAuditDetailsMapper.xml | 7 +++++++ 5 files changed, 55 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 2447a78d..4d60b421 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.NotNull; + import com.bonus.common.log.enums.OperaType; import com.bonus.material.common.annotation.PreventRepeatSubmit; import com.bonus.material.repair.domain.RepairPart; @@ -173,7 +175,7 @@ public class RepairAuditDetailsController extends BaseController { /** * 修改修试审核详细 - */ + @ApiOperation(value = "修改修试审核详细") @PreventRepeatSubmit @RequiresPermissions("repair:details:edit") @@ -185,6 +187,18 @@ public class RepairAuditDetailsController extends BaseController { } catch (Exception e) { return error("系统错误, " + e.getMessage()); } + }*/ + + /** + * 批量修改修试审核详细 + */ + @ApiOperation(value = "批量修改修试审核详细") + @PreventRepeatSubmit + @RequiresPermissions("repair:details:edit") + @SysLog(title = "批量修试审核详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->批量修改修试审核详细") + @PutMapping + public AjaxResult edit(@RequestBody @NotNull List repairAuditDetails) { + return toAjax(repairAuditDetailsService.updateRepairAuditDetailsBatch(repairAuditDetails)); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 77313a48..56d12821 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -61,6 +61,14 @@ public interface RepairAuditDetailsMapper { */ int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); + /** + * 批量修改修试审核详细--批量 + * + * @param repairAuditDetails 批量修试审核详细 + * @return 结果 + */ + int updateRepairAuditDetailsBatch(@Param("ids") List repairAuditDetails); + /** * 删除修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java index 02166752..722bd7dc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/IRepairAuditDetailsService.java @@ -80,6 +80,14 @@ public interface IRepairAuditDetailsService { */ int updateRepairAuditDetails(RepairAuditDetails repairAuditDetails); + /** + * 批量修改修试审核详细 + * + * @param repairAuditDetails 修试审核详细集合 + * @return 结果 + */ + int updateRepairAuditDetailsBatch(List repairAuditDetails); + /** * 批量删除修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index 1e47370a..b11d96e7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -68,8 +68,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } /** - * @param repairAuditDetails - * @return + * @param repairAuditDetails 查询参数 */ @Override public List getRepairAuditList(RepairAuditDetails repairAuditDetails) { @@ -445,6 +444,22 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService } } + /** + * 批量修改修试审核详细 + * + * @param repairAuditDetails 修试审核详细 + * @return 结果 + */ + @Override + public int updateRepairAuditDetailsBatch(@NotNull List repairAuditDetails) { + try { + repairAuditDetails.stream().filter(Objects::nonNull).forEach(item -> item.setUpdateTime(DateUtils.getNowDate())); + return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(repairAuditDetails); + } catch (Exception e) { + throw new ServiceException("错误信息描述"); + } + } + /** * 批量删除修试审核详细 * diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 111a8241..0271f92d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -474,4 +474,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY task_id + + + update repair_audit_details set status = #{status} where id in + + #{id} + + \ No newline at end of file From 0f7de5c916bcde3606362a8336ecb75ff755ce23 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 15 Nov 2024 13:54:57 +0800 Subject: [PATCH 02/23] =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9SQL=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/controller/RepairController.java | 23 ++++++++++--------- .../repair/domain/RepairAuditDetails.java | 2 +- .../mapper/RepairAuditDetailsMapper.java | 4 ++-- .../impl/RepairAuditDetailsServiceImpl.java | 19 +++++++++++---- .../repair/RepairAuditDetailsMapper.xml | 4 +++- 5 files changed, 33 insertions(+), 19 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 5fe7e31f..4531a2d3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -44,7 +44,7 @@ public class RepairController extends BaseController { /** * 获取维修任务列表 */ - @ApiOperation(value = "获取维修任务列表") + @ApiOperation(value = "获取维修任务列表--分页") @GetMapping("/getRepairTaskList") @RequiresPermissions(value = "repair:manage:list") public TableDataInfo getRepairTaskList(RepairTask bean) { @@ -53,6 +53,17 @@ public class RepairController extends BaseController { return getDataTable(list); } + /** + * 获取维修任务列表--不分页--NO_PAGE + */ + @ApiOperation(value = "获取维修任务列表---不分页") + @GetMapping("/getAppRepairTaskList") + @RequiresPermissions("repair:manage:list") + public AjaxResult getAppRepairTaskList(RepairTask bean) { + List list = service.getRepairTaskList(bean); + return AjaxResult.success(list); + } + /** * 导出维修任务列表 */ @@ -65,16 +76,6 @@ public class RepairController extends BaseController { util.exportExcel(response, list, "维修任务列表"); } - /** - * 获取维修任务列表--APP - */ - @ApiOperation(value = "获取维修任务列表---APP") - @GetMapping("/getAppRepairTaskList") - @RequiresPermissions("repair:manage:list") - public AjaxResult getAppRepairTaskList(RepairTask bean) { - List list = service.getRepairTaskList(bean); - return AjaxResult.success(list); - } /** * 获取维修任务物资设备列表--不分页 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index 98a460f8..5d4504ac 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -91,7 +91,7 @@ public class RepairAuditDetails extends BaseEntity { /** 0未审核1已审核2驳回 */ @Excel(name = "状态", readConverterExp = "0=未审核,1=已审核,2=驳回") @ApiModelProperty(value = "0未审核1已审核2驳回") - private char status; + private String status; /** 数据所属组织 */ @ApiModelProperty(value = "数据所属组织") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 56d12821..fb0f3734 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -64,10 +64,10 @@ public interface RepairAuditDetailsMapper { /** * 批量修改修试审核详细--批量 * - * @param repairAuditDetails 批量修试审核详细 + * @param ids 批量修试审核详细 * @return 结果 */ - int updateRepairAuditDetailsBatch(@Param("ids") List repairAuditDetails); + int updateRepairAuditDetailsBatch(@Param("ids") List ids, @Param("status") String status); /** * 删除修试审核详细 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index b11d96e7..be40e30b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -311,7 +311,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService if (CollectionUtil.isNotEmpty(auditDetailList)) { for (RepairAuditDetails bean : auditDetailList) { bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); - bean.setStatus(status); + bean.setStatus(String.valueOf(status)); bean.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); bean.setAuditRemark(scrapAudit.getRemark()); repairAuditDetailsMapper.updateStatus(bean); @@ -321,7 +321,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService if (auditAllList != null) { for (RepairAuditDetails bean : auditAllList) { bean.setAuditBy(SecurityUtils.getLoginUser().getUserid()); - bean.setStatus(status); + bean.setStatus(String.valueOf(status)); bean.setUpdateBy(String.valueOf(SecurityUtils.getLoginUser().getUserid())); bean.setAuditRemark(scrapAudit.getRemark()); repairAuditDetailsMapper.updateStatus(bean); @@ -452,9 +452,20 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService */ @Override public int updateRepairAuditDetailsBatch(@NotNull List repairAuditDetails) { + // 提取所有需要更新的 ID + List ids = repairAuditDetails.stream() + .filter(Objects::nonNull) + .map(RepairAuditDetails::getId) + .filter(Objects::nonNull) + .collect(Collectors.toList()); + + if (ids.isEmpty()) { + return 0; + } + try { - repairAuditDetails.stream().filter(Objects::nonNull).forEach(item -> item.setUpdateTime(DateUtils.getNowDate())); - return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(repairAuditDetails); + // 调用 Mapper 方法进行批量更新 + return repairAuditDetailsMapper.updateRepairAuditDetailsBatch(ids,repairAuditDetails.get(0).getStatus()); } catch (Exception e) { throw new ServiceException("错误信息描述"); } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index 0271f92d..4ab5963d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -476,7 +476,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - update repair_audit_details set status = #{status} where id in + update repair_audit_details + set status = #{status}, update_time = now() + where id in #{id} From b3a578e91b4e1a34f694ef45b6e52ac521402b10 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 15 Nov 2024 18:18:17 +0800 Subject: [PATCH 03/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/common/biz/domain/BaseVO.java | 53 ++++++++++++++ .../biz/enums/RepairTaskStatusEnum.java | 2 +- .../repair/controller/RepairController.java | 17 ++++- .../repair/domain/RepairTaskDetails.java | 15 ++-- .../repair/domain/vo/RepairDeviceListVo.java | 65 +++++++++++++++++ .../repair/domain/vo/RepairDeviceVO.java | 46 ++++++++++++ .../material/repair/mapper/RepairMapper.java | 3 +- .../repair/service/RepairService.java | 5 +- .../impl/RepairAuditDetailsServiceImpl.java | 2 + .../service/impl/RepairServiceImpl.java | 71 +++++++++++++++++-- .../mapper/material/repair/RepairMapper.xml | 3 +- 11 files changed, 262 insertions(+), 20 deletions(-) create mode 100644 bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BaseVO.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BaseVO.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BaseVO.java new file mode 100644 index 00000000..791c5975 --- /dev/null +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BaseVO.java @@ -0,0 +1,53 @@ +package com.bonus.common.biz.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +import java.util.Date; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @Description: 基础Base VO + */ +@Getter +@Setter +@ToString +public class BaseVO { + + @ApiModelProperty(value = "关键字") + private String keyword; + + @ApiModelProperty(value = "状态") + private String status; + + @ApiModelProperty(value = "组织id") + private Long companyId; + + @ApiModelProperty(value = "备注") + private String remark; + + @ApiModelProperty(value = "开始时间") + private String startTime; + + @ApiModelProperty(value = "结束时间") + private String endTime; + + @ApiModelProperty(value = "创建人") + private String createBy; + + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + @ApiModelProperty(value = "更新人") + private String updateBy; + + @ApiModelProperty(value = "更新时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + +} diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java index 19dcb150..58d90ba6 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/enums/RepairTaskStatusEnum.java @@ -13,7 +13,7 @@ public enum RepairTaskStatusEnum { TASK_STATUS_PROCESSING(0, "维修管理--进行中"), TASK_STATUS_COMPLETE(1, "维修管理--已完成"), - TASK_STATUS_REJECT(2, "维修管理--被驳回"), + TASK_STATUS_REJECT(2, "维修管理--驳回退料"), TASK_STATUS_TO_EXAM(3, "修饰审核--待审核"), TASK_STATUS_REVIEW(4, "修饰审核--审核通过"), TASK_STATUS_NO_REVIEW(5, "修饰审核--审核不通过"), diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 4531a2d3..3419966d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -10,6 +10,7 @@ import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairPartDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.service.RepairService; import com.bonus.system.api.domain.SysUser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -23,6 +24,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.constraints.NotNull; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -65,7 +67,7 @@ public class RepairController extends BaseController { } /** - * 导出维修任务列表 + * 导出维修任务列表--外层--壹级列表 */ @PostMapping("/export") @RequiresPermissions("repair:manage:export") @@ -85,7 +87,7 @@ public class RepairController extends BaseController { @RequiresPermissions("repair:manage:preview") public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { startPage(); - List list = service.getRepairMaTypeList(bean); + List list = service.getRepairMaTypeList(bean); return getDataTable(list); } @@ -95,7 +97,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修物资设备列表---不分页") @GetMapping("/getAppRepairMaTypeList") public AjaxResult getAppRepairMaTypeList(RepairTaskDetails bean) { - List list = service.getRepairMaTypeList(bean); + List list = service.getRepairMaTypeList(bean); return AjaxResult.success(list); } @@ -142,6 +144,15 @@ public class RepairController extends BaseController { return service.endRepairTask(taskList); } + /** + * 驳回退料--批量 + */ + @ApiOperation(value = "驳回退料") + @DeleteMapping("/{ids}") + public AjaxResult rejectRepair(@PathVariable Long[] ids) { + return service.rejectRepair(Arrays.asList(ids)); + } + /** * 获取维修员下拉选 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index 49aef973..99ca0a42 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -34,6 +34,13 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "类型名称") private String typeName; + + /** + * 规格类型id + */ + @ApiModelProperty(value = "规格型号id") + private String typeId; + /** * 规格型号 */ @@ -49,7 +56,7 @@ public class RepairTaskDetails extends BaseEntity { /** * 编码 */ - @ApiModelProperty(value = "编码") + @ApiModelProperty(value = "设备编码") private String code; /** * 维修总量 @@ -72,12 +79,6 @@ public class RepairTaskDetails extends BaseEntity { @ApiModelProperty(value = "待修状态") private String status; - /** - * 规格类型id - */ - @ApiModelProperty(value = "规格型号id") - private String typeId; - @ApiModelProperty(value = "组织id") private Long companyId; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java new file mode 100644 index 00000000..8ed4a21b --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceListVo.java @@ -0,0 +1,65 @@ +package com.bonus.material.repair.domain.vo; + +import com.bonus.common.biz.domain.BaseVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @CreateTime: 2024-11-15 13:26 + * @Description: 维修设备列表返回VO + */ +@EqualsAndHashCode(callSuper = false) +@Data +public class RepairDeviceListVo extends BaseVO { + + @ApiModelProperty(value = "id") + private Long id; + + @ApiModelProperty(value = "任务ID") + private Integer taskId; + + @ApiModelProperty(value = "类型id") + private Long typeNameId; + + @ApiModelProperty(value = "设备编码") + private String code; + + @ApiModelProperty(value = "类型名称") + private String typeName; + + @ApiModelProperty(value = "规格型号id") + private Long typeId; + + @ApiModelProperty(value = "规格型号") + private String type; + + @ApiModelProperty(value = "物资设备计量单位") + private String unitName; + + @ApiModelProperty(value = "管理模式") + private Integer manageType; + + @ApiModelProperty(value = "设备表主键id") + private Long maId; + + @ApiModelProperty(value = "维修人员") + private String repairer; + + @ApiModelProperty(value = "维修总量") + private int repairNum; + + @ApiModelProperty(value = "已修数量") + private int repairedNum; + + @ApiModelProperty(value = "维修报废数量") + private int scrapNum; + + @ApiModelProperty(value = "内层物资类型集合") + private List repairDeviceList = new ArrayList<>(); +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java new file mode 100644 index 00000000..51a02c7e --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java @@ -0,0 +1,46 @@ +package com.bonus.material.repair.domain.vo; + +import com.bonus.material.repair.domain.RepairPart; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +import java.util.List; + +/** + * @author : 阮世耀 + * @version : 1.0 + * @CreateTime: 2024-11-15 14:35 + * @Description: 维修设备VO + */ +@Data +public class RepairDeviceVO { + + @ApiModelProperty(value = "主键") + private Long id; + + @ApiModelProperty(value = "任务ID") + private Long taskId; + + @ApiModelProperty(value = "设备类型") + private String typeName; + + @ApiModelProperty(value = "规格型号") + private String type; + + @ApiModelProperty(value = "设备编码") + private String code; + + @ApiModelProperty(value = "状态") + private String status; + + @ApiModelProperty(value = "维修配件信息") + private String partInfo; + + @ApiModelProperty(value = "附件") + private String fileUrl; + + @ApiModelProperty(value = "维修配件集合") + private List repairPartList; + +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index 07326577..dd28fe6e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -4,6 +4,7 @@ import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairPartDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.system.api.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,7 +28,7 @@ public interface RepairMapper { * 获取维修详细列表 * @param bean 维修任务详情--查询条件 */ - List getRepairMaTypeList(RepairTaskDetails bean); + List getRepairMaTypeList(RepairTaskDetails bean); /** * 新增维修记录 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index e1e0ebe4..7a2d2a51 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -5,6 +5,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.system.api.domain.SysUser; import java.util.ArrayList; @@ -27,7 +28,7 @@ public interface RepairService { * @param bean * @return */ - List getRepairMaTypeList(RepairTaskDetails bean); + List getRepairMaTypeList(RepairTaskDetails bean); /** * 新增维修记录 @@ -63,6 +64,8 @@ public interface RepairService { */ AjaxResult endRepairTask(List taskList); + AjaxResult rejectRepair(List taskList); + /** * 导出维修列表 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index be40e30b..656bcab8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -24,6 +24,8 @@ import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.domain.TmTask; import javax.validation.constraints.NotNull; + +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 181d2ee3..d9d0cb0b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -1,5 +1,7 @@ package com.bonus.material.repair.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.bonus.common.biz.enums.RepairTaskStatusEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; @@ -7,17 +9,27 @@ import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairPartDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.vo.RepairDeviceListVo; +import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.mapper.RepairMapper; import com.bonus.material.repair.service.RepairService; +import com.bonus.material.task.domain.TmTask; +import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; +import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; /** * @author syruan @@ -28,6 +40,8 @@ public class RepairServiceImpl implements RepairService { @Resource private RepairMapper repairMapper; + private TmTaskMapper taskMapper; + @Override public List getRepairTaskList(RepairTask bean) { @@ -40,10 +54,44 @@ public class RepairServiceImpl implements RepairService { } @Override - public List getRepairMaTypeList(RepairTaskDetails bean) { - //Long companyId = SecurityUtils.getLoginUser().getSysUser().getDeptId(); + public List getRepairMaTypeList(RepairTaskDetails bean) { bean.setCompanyId(null); - return repairMapper.getRepairMaTypeList(bean); + List repairMaTypeList = repairMapper.getRepairMaTypeList(bean); + + if (repairMaTypeList.isEmpty()) { + return repairMaTypeList; + } + + // 创建Map集合，用于快速分组 + Map resultMap = new ConcurrentHashMap<>(); + + // 遍历处理，把相同的父级对象，拆分到子集合中 + repairMaTypeList.forEach(item -> { + // 创建对象，并复制字段value + RepairDeviceVO repairDeviceVO = new RepairDeviceVO(); + try { + BeanUtil.copyProperties(item, repairDeviceVO); + } catch (Exception e) { + // 记录异常日志，并提供更详细的错误信息 + System.err.println("复制属性时发生错误: {}" + e.getMessage()); + throw new RuntimeException("复制属性时发生错误", e); + } + + if (item.getTypeNameId() == null) { + // 处理 typeNameId 为空的情况 + System.err.println("typeNameId 为空，跳过当前项: " + item); + return; + } + + // 使用 computeIfAbsent 方法，如果 key 不存在，则创建一个新对象，并添加到 resultMap 中 + resultMap.computeIfAbsent(item.getTypeNameId(), k -> { + item.getRepairDeviceList().add(repairDeviceVO); + return item; + }).getRepairDeviceList().add(repairDeviceVO); + + }); + + return new ArrayList<>(resultMap.values()); } @@ -69,7 +117,7 @@ public class RepairServiceImpl implements RepairService { } switch (bean.getRepairType()) { case "1": { - int repairNum = (details.getRepairedNum() + bean.getRepairNum()); + int repairNum = details.getRepairedNum() + bean.getRepairNum(); int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); @@ -78,7 +126,7 @@ public class RepairServiceImpl implements RepairService { break; } case "2": { - int repairNum = (int) (details.getRepairedNum() + bean.getRepairNum()); + int repairNum = details.getRepairedNum() + bean.getRepairNum(); int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); @@ -87,7 +135,7 @@ public class RepairServiceImpl implements RepairService { break; } case "3": { - int scrapNum = (int) (details.getScrapNum() + bean.getScrapNum()); + int scrapNum = details.getScrapNum() + bean.getScrapNum(); int num = scrapNum + details.getRepairedNum(); if (num > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); @@ -216,6 +264,17 @@ public class RepairServiceImpl implements RepairService { return AjaxResult.success(); } + @Override + public AjaxResult rejectRepair(@NotNull List taskList) { + try { + taskList.forEach(taskId -> taskMapper.updateTmTaskStatusByTaskId(taskId, RepairTaskStatusEnum.TASK_STATUS_REJECT.getStatus())); + } catch (DataAccessException e) { + System.err.println(e.getMessage()); + throw new RuntimeException(e); + } + return AjaxResult.success("执行完成"); + } + @Override public int completeRepair(ArrayList ids) { diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 2dc94a4b..370645ea 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -197,12 +197,13 @@ tt.create_time DESC - select rad.id as id, rad.task_id as taskId, rad.ma_id as maId, mt2.type_name as typeName, + mt2.type_id as typeNameId, mt.type_name as type, mt.unit_name as unitName, mt.manage_type as manageType, From befffbc5a82c069a3b5e1da9d2ab1a35647dd886 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Sat, 16 Nov 2024 18:30:55 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96=E3=80=81?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/controller/RepairController.java | 35 ++-- .../material/repair/domain/RepairTask.java | 7 + .../repair/domain/vo/RepairDeviceVO.java | 75 ++++++++- .../material/repair/mapper/RepairMapper.java | 4 +- .../repair/service/RepairService.java | 13 +- .../service/impl/RepairServiceImpl.java | 152 ++++++++++++------ .../mapper/material/repair/RepairMapper.xml | 4 +- 7 files changed, 209 insertions(+), 81 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 3419966d..45f1f471 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -26,6 +27,7 @@ import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; /** * @author syruan @@ -84,7 +86,7 @@ public class RepairController extends BaseController { */ @ApiOperation(value = "获取维修物资设备列表---分页") @GetMapping("/getRepairMaTypeList") - @RequiresPermissions("repair:manage:preview") +// @RequiresPermissions("repair:manage:preview") public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { startPage(); List list = service.getRepairMaTypeList(bean); @@ -92,7 +94,7 @@ public class RepairController extends BaseController { } /** - * 获取维修任务机具列表 + * 获取维修任务机具列表--Ⅱ级页面详情列表 */ @ApiOperation(value = "获取维修物资设备列表---不分页") @GetMapping("/getAppRepairMaTypeList") @@ -109,8 +111,10 @@ public class RepairController extends BaseController { public AjaxResult submitRepairApply(@RequestBody @NotNull RepairApplyRecord bean) { try { String partStrList = bean.getPartStrList(); - List repairPartDetails = objectMapper.readValue(partStrList, new TypeReference>() {}); - bean.setPartList(repairPartDetails); + if (StringUtils.isNoneBlank(partStrList)) { + List repairPartDetails = objectMapper.readValue(partStrList, new TypeReference>() {}); + bean.setPartList(Optional.ofNullable(repairPartDetails).orElse(new ArrayList<>())); + } return service.submitRepairApply(bean); } catch (JsonProcessingException e) { throw new ServiceException("Jackson反序列化异常:" + e.getMessage()); @@ -118,27 +122,36 @@ public class RepairController extends BaseController { } /** - * 快捷维修记录 + * 快捷维修 1.把维修都设置为内部维修，增加维修配件明细 */ - @ApiOperation(value = "快捷维修记录") + @ApiOperation(value = "快捷维修--批量--默认内部维修") @PostMapping("/fastRepairApply") public AjaxResult fastRepairApply(@RequestBody List list) { return service.fastRepairApply(list); } /** - * 完成维修 + * 批量维修 1.判断维修方式，增加维修配件明细 */ - @ApiOperation(value = "完成维修") + @ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修") + @PostMapping("/batchRepairApply") + public AjaxResult batchRepairApply(@RequestBody List list) { + return service.fastRepairApply(list); + } + + /** + * 维修明细--批量审核--更新明细status + */ + @ApiOperation(value = "维修明细更新status--批量") @PostMapping("/completeRepair") public AjaxResult completeRepair(@RequestBody ArrayList ids) { return toAjax(service.completeRepair(ids)); } /** - * 提交审核 + * 任务维修完成--提交修饰审核 */ - @ApiOperation(value = "提交审核") + @ApiOperation(value = "任务维修完成--提交至修饰审核") @PostMapping("/endRepairTask") public AjaxResult endRepairTask(@RequestBody ArrayList taskList) { return service.endRepairTask(taskList); @@ -147,7 +160,7 @@ public class RepairController extends BaseController { /** * 驳回退料--批量 */ - @ApiOperation(value = "驳回退料") + @ApiOperation(value = "驳回退料--批量") @DeleteMapping("/{ids}") public AjaxResult rejectRepair(@PathVariable Long[] ids) { return service.rejectRepair(Arrays.asList(ids)); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index 6155f031..5b0c6ea1 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -18,6 +18,13 @@ public class RepairTask { */ @ApiModelProperty(value = "任务id") private String taskId; + + @ApiModelProperty(value = "任务状态") + private Integer taskStatus; + + @ApiModelProperty(value = "任务类型") + private Integer taskType; + /** * 维修单号 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java index 51a02c7e..18f32154 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java @@ -2,9 +2,10 @@ package com.bonus.material.repair.domain.vo; import com.bonus.material.repair.domain.RepairPart; import io.swagger.annotations.ApiModelProperty; -import io.swagger.annotations.ApiOperation; import lombok.Data; +import lombok.experimental.Accessors; +import java.util.ArrayList; import java.util.List; /** @@ -14,6 +15,7 @@ import java.util.List; * @Description: 维修设备VO */ @Data +@Accessors(chain = true) public class RepairDeviceVO { @ApiModelProperty(value = "主键") @@ -37,10 +39,77 @@ public class RepairDeviceVO { @ApiModelProperty(value = "维修配件信息") private String partInfo; + @ApiModelProperty(value = "维修方式: 1内部 2外部返厂 3报废") + private Integer repairType; + @ApiModelProperty(value = "附件") private String fileUrl; - @ApiModelProperty(value = "维修配件集合") - private List repairPartList; + @ApiModelProperty(value = "编码--内部维修配件集合") + private List codeInRepairPartList; + @ApiModelProperty(value = "编码--返厂维修配件集合") + private List codeOutRepairPartList; + + @ApiModelProperty(value = "编码--报废维修配件集合") + private List codeScrapRepairPartList; + + @ApiModelProperty(value = "数量--内部维修配件集合") + private List numberInRepairPartList; + + @ApiModelProperty(value = "数量--返厂维修配件集合") + private List numberOutRepairPartList; + + @ApiModelProperty(value = "数量--报废维修配件集合") + private List numberScrapRepairPartList; + + // 手动覆盖 getter 方法，确保 List 始终被初始化 + public List getCodeInRepairPartList() { + if (this.codeInRepairPartList == null) {this.codeInRepairPartList = new ArrayList<>();} + return this.codeInRepairPartList; + } + + public List getCodeOutRepairPartList() { + if (this.codeOutRepairPartList == null) {this.codeOutRepairPartList = new ArrayList<>();} + return this.codeOutRepairPartList; + } + + public List getCodeScrapRepairPartList() { + if (this.codeScrapRepairPartList == null) {this.codeScrapRepairPartList = new ArrayList<>();} + return this.codeScrapRepairPartList; + } + + public List getNumberInRepairPartList() { + if (this.numberInRepairPartList == null) {this.numberInRepairPartList = new ArrayList<>();} + return this.numberInRepairPartList; + } + + public List getNumberOutRepairPartList() { + if (this.numberOutRepairPartList == null) {this.numberOutRepairPartList = new ArrayList<>();} + return this.numberOutRepairPartList; + } + + public List getNumberScrapRepairPartList() { + if (this.numberScrapRepairPartList == null) {this.numberScrapRepairPartList = new ArrayList<>();} + return this.numberScrapRepairPartList; + } + + // 自定义 clear 方法 + public void clear() { + this.id = null; + this.taskId = null; + this.typeName = null; + this.type = null; + this.code = null; + this.status = null; + this.partInfo = null; + this.repairType = null; + this.fileUrl = null; + this.codeInRepairPartList.clear(); + this.codeOutRepairPartList.clear(); + this.codeScrapRepairPartList.clear(); + this.numberInRepairPartList.clear(); + this.numberOutRepairPartList.clear(); + this.numberScrapRepairPartList.clear(); + } } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index dd28fe6e..67ef5235 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -82,7 +82,7 @@ public interface RepairMapper { * @param taskList 任务列表集合 * @param userid 用户id */ - int updateTaskStatus(@Param("taskList") List taskList, @Param("userId") Long userid); + int updateTaskStatus(@Param("taskList") List taskList, @Param("userId") Long userid, @Param("taskStatus") Integer taskStatus); /** * 新增任务 @@ -123,7 +123,7 @@ public interface RepairMapper { List getDetailsListByTaskId(RepairTask task); /** - * 新增实验建议审核数据 + * 新增修饰审核审核数据 * @param details 数据详情 */ int addAuditDetails(RepairTaskDetails details); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index 7a2d2a51..4608da83 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -25,15 +25,11 @@ public interface RepairService { /** * 获取维修详细列表 - * @param bean - * @return */ List getRepairMaTypeList(RepairTaskDetails bean); /** - * 新增维修记录 - * @param bean - * @return + * 提交维修记录 */ AjaxResult submitRepairApply(RepairApplyRecord bean); @@ -45,9 +41,7 @@ public interface RepairService { AjaxResult fastRepairApply(List list); /** - * 完成维修 - * @param ids - * @return + * 维修明细--批量审核--更新明细status */ int completeRepair(ArrayList ids); @@ -59,8 +53,7 @@ public interface RepairService { /** * 提交审核 - * @param taskList - * @return + * @param taskList 任务信息集合 */ AjaxResult endRepairTask(List taskList); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index d9d0cb0b..c53c9450 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -1,7 +1,9 @@ package com.bonus.material.repair.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import com.bonus.common.biz.enums.RepairTaskStatusEnum; +import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; @@ -13,7 +15,6 @@ import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.mapper.RepairMapper; import com.bonus.material.repair.service.RepairService; -import com.bonus.material.task.domain.TmTask; import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; @@ -24,12 +25,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; /** * @author syruan @@ -40,6 +37,7 @@ public class RepairServiceImpl implements RepairService { @Resource private RepairMapper repairMapper; + @Resource private TmTaskMapper taskMapper; @@ -62,7 +60,7 @@ public class RepairServiceImpl implements RepairService { return repairMaTypeList; } - // 创建Map集合，用于快速分组 + // 创建Map集合，用于快速分组，使用 ConcurrentHashMap 保证线程安全 Map resultMap = new ConcurrentHashMap<>(); // 遍历处理，把相同的父级对象，拆分到子集合中 @@ -83,54 +81,54 @@ public class RepairServiceImpl implements RepairService { return; } - // 使用 computeIfAbsent 方法，如果 key 不存在，则创建一个新对象，并添加到 resultMap 中 - resultMap.computeIfAbsent(item.getTypeNameId(), k -> { - item.getRepairDeviceList().add(repairDeviceVO); - return item; - }).getRepairDeviceList().add(repairDeviceVO); - + // 使用 computeIfAbsent 方法，如果 key 不存在，则创建一个新对象，并添加到 resultMap 中 + resultMap.computeIfAbsent(item.getTypeNameId(), k -> item).getRepairDeviceList().add(repairDeviceVO); }); - return new ArrayList<>(resultMap.values()); } /** - * 新增维修记录 + * 提交维修记录 * @param bean repairApplyRecord */ @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult submitRepairApply(RepairApplyRecord bean) { + public AjaxResult submitRepairApply(@NotNull(message = "参数不能为空") RepairApplyRecord bean) { + // 获取维修详情记录：待维修、已维修、报废的数量 RepairTaskDetails details = repairMapper.getById(bean.getId()); LoginUser loginUser = SecurityUtils.getLoginUser(); bean.setCreateBy(String.valueOf(loginUser.getUserid())); + + // 获取维修配件列表 List partList = bean.getPartList(); BigDecimal sfCosts = new BigDecimal("0"); - String nbType = "1"; - String fcType = "2"; + + // 内部维修类型 + String inRepairType = "1"; + // 返厂维修类型 + String outRepairType = "2"; + // 收费配件 String sfPart = "1"; + // 不收费配件 String bsfPart = "0"; - if (partList != null && !partList.isEmpty()) { + + if (CollectionUtil.isNotEmpty(partList)) { bean.setRepairNum(partList.get(0).getRepairNum()); bean.setRepairer(partList.get(0).getRepairer()); } + + // 根据维修类型，更新维修数量、报废数量 switch (bean.getRepairType()) { case "1": { - int repairNum = details.getRepairedNum() + bean.getRepairNum(); - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { - throw new ServiceException("维修数量大于维修总量"); - } + int repairNum = getNum(bean, details); + // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNum(bean.getId(), repairNum, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); break; } case "2": { - int repairNum = details.getRepairedNum() + bean.getRepairNum(); - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { - throw new ServiceException("维修数量大于维修总量"); - } + int repairNum = getNum(bean, details); + // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); break; } @@ -140,17 +138,22 @@ public class RepairServiceImpl implements RepairService { if (num > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); } + // 更新报废数量 repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); break; } default: break; } - if (partList != null && !partList.isEmpty()) { - if (nbType.equals(bean.getRepairType())) { + + // 判断配件列表是否为空 + if (CollectionUtil.isNotEmpty(partList)) { + // 内部维修 + if (inRepairType.equals(bean.getRepairType())) { + // 遍历配件列表，判断配件类型，收费还是不收费 for (RepairPartDetails partDetails : partList) { if (partDetails.getPartId() != null) { - // 有维修配件时 + // 有维修配件时,如果价格为空，设置为0 if (partDetails.getPartCost() == null) { partDetails.setPartCost(new BigDecimal(0)); } @@ -159,23 +162,30 @@ public class RepairServiceImpl implements RepairService { partDetails.setTypeId(bean.getTypeId()); partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); partDetails.setCompanyId(bean.getCompanyId()); - // 根据partid 找到配件单价 + + // 根据 partId 找配件单价 BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); + // 设置配件费用 partDetails.setPartCost(partPrice); + // 添加【维修配件明细表】 repairMapper.addPart(partDetails); + bean.setPartPrice(partDetails.getPartCost()); bean.setPartId((long) partDetails.getPartId().intValue()); bean.setPartNum(partDetails.getPartNum()); bean.setRepairContent(partDetails.getRepairContent()); bean.setPartType(partDetails.getPartType()); + // 添加【维修记录表】 repairMapper.addRecord(bean); } else { - // 不选维修配件时 + // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(bean); } } } - if (fcType.equals(bean.getRepairType())) { + + // 返厂维修 + if (outRepairType.equals(bean.getRepairType())) { bean.setPartName(partList.get(0).getPartName()); bean.setPartType(partList.get(0).getPartType()); bean.setRepairContent(partList.get(0).getRepairContent()); @@ -190,8 +200,11 @@ public class RepairServiceImpl implements RepairService { bean.setPartPrice(partList.get(0).getPartPrice()); } bean.setPartNum(partList.get(0).getPartNum()); + // 新增【维修记录表】 repairMapper.addRecord(bean); } + + // 配件费用计算 for (RepairPartDetails partDetails : partList) { if (partDetails.getPartCost() != null) { BigDecimal partCost = partDetails.getPartCost(); @@ -200,64 +213,95 @@ public class RepairServiceImpl implements RepairService { } } - if (!"0".equals(sfCosts.toString())) { + // 判断是否是收费配件 + if (sfPart.equals(sfCosts.toString())) { + // SQL: 新增【维修费用记录表】 repairMapper.addRepairCost(bean, sfCosts, sfPart); } } else { - // 新增预报废记录 + // 新增【维修记录表--预报废】 repairMapper.addRecord(bean); } return AjaxResult.success(); } + private static int getNum(RepairApplyRecord bean, RepairTaskDetails details) { + int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } + return repairNum; + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult fastRepairApply(List list) { LoginUser loginUser = SecurityUtils.getLoginUser(); + + // 判断待维修数量是否大于0 for (RepairTaskDetails bean : list) { int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); if (repairedNum <= 0) { throw new ServiceException("选中的数据中包含待维修数量为0的机具，请重新选择"); } } + + // 执行SQL： 1.增加【维修记录表】、 2.修改【维修明细表】的维修数量 for (RepairTaskDetails bean : list) { int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); - RepairApplyRecord partDetails = new RepairApplyRecord(); - partDetails.setTaskId(Long.valueOf(bean.getTaskId())); - partDetails.setMaId(Long.valueOf(bean.getMaId())); - partDetails.setTypeId(Long.valueOf(bean.getTypeId())); - partDetails.setRepairNum(repairedNum); - partDetails.setRepairType("1"); - partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); - partDetails.setCompanyId(bean.getCompanyId()); - repairMapper.addRecord(partDetails); + RepairApplyRecord repairRecord = new RepairApplyRecord(); + repairRecord.setTaskId(Long.valueOf(bean.getTaskId())); + repairRecord.setMaId(Long.valueOf(bean.getMaId())); + repairRecord.setTypeId(Long.valueOf(bean.getTypeId())); + repairRecord.setRepairNum(repairedNum); + // 快捷维修，设置为内部维修 + repairRecord.setRepairType("1"); + repairRecord.setCreateBy(String.valueOf(loginUser.getUserid())); + repairRecord.setCompanyId(bean.getCompanyId()); + repairMapper.addRecord(repairRecord); int i = repairedNum + bean.getRepairedNum(); repairMapper.updateRepairedNumTwo(bean.getId(), i, loginUser.getUserid()); } + + // 执行完毕，无异常返回至前端 return AjaxResult.success(); } @Override @Transactional(rollbackFor = Exception.class) - public AjaxResult endRepairTask(List taskList) { + public AjaxResult endRepairTask(@NotNull List taskList) { LoginUser loginUser = SecurityUtils.getLoginUser(); + + // 1.查询选择任务是否还有未完成维修的数据 for (RepairTask task : taskList) { - int i = repairMapper.getUnFinish(task); - if (i > 0) { - throw new ServiceException("选中的数据中包含维修未完成的，请完成维修再进行提交审核"); + if (repairMapper.getUnFinish(task) > 0) { + return AjaxResult.error("选中的数据中包含维修未完成的，请完成维修再进行提交审核"); } } - int i = repairMapper.updateTaskStatus(taskList, loginUser.getUserid()); + + // 2.更新tm_task任务状态 + repairMapper.updateTaskStatus(taskList, loginUser.getUserid(), RepairTaskStatusEnum.TASK_STATUS_COMPLETE.getStatus()); + + // 3.业务逻辑处理 for (RepairTask task : taskList) { task.setCreateBy(loginUser.getUserid()); + // 查询任务的协议id Long agreementId = repairMapper.getAgreementId(task); + // 查询维修任务的详情表 List detailsList = repairMapper.getDetailsListByTaskId(task); + // 新增tm_task表数据、修饰审核任务、状态是待审核 + task.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR_STORAGE.getTaskTypeId()); + task.setTaskStatus(RepairTaskStatusEnum.TASK_STATUS_TO_EXAM.getStatus()); repairMapper.addTask(task); + + // 循环插入【修饰审核明细表】 for (RepairTaskDetails details : detailsList) { details.setCreateBy(String.valueOf(loginUser.getUserid())); details.setTaskId(task.getTaskId()); repairMapper.addAuditDetails(details); } + // 新增协议任务表--关联修饰任务与协议 task.setAgreementId(agreementId); repairMapper.createAgreementTask(task); } @@ -270,12 +314,14 @@ public class RepairServiceImpl implements RepairService { taskList.forEach(taskId -> taskMapper.updateTmTaskStatusByTaskId(taskId, RepairTaskStatusEnum.TASK_STATUS_REJECT.getStatus())); } catch (DataAccessException e) { System.err.println(e.getMessage()); - throw new RuntimeException(e); + return AjaxResult.error("数据库SQL修改执行失败" + e.getMessage()); } return AjaxResult.success("执行完成"); } - + /** + * 维修明细--批量审核--更新明细status + */ @Override public int completeRepair(ArrayList ids) { LoginUser loginUser = SecurityUtils.getLoginUser(); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 370645ea..d6731c80 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -13,7 +13,7 @@ insert into tm_task (task_status,task_type,code,create_by,create_time,company_id) - values (46,45,#{repairCode},#{createBy},now(),#{companyId}); + values (#{taskStatus},#{taskType},#{repairCode},#{createBy},now(),#{companyId}); @@ -61,7 +61,7 @@ update tm_task - set task_status = '44', + set task_status = #{taskStatus}, update_by = #{userId}, update_time = now() where task_id in From 4821406f98151437939f44004e3f8e3c155c47d9 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 14:01:20 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/controller/RepairController.java | 31 +-- .../repair/domain/RepairApplyRecord.java | 12 +- .../repair/domain/vo/RepairDeviceVO.java | 46 ++-- .../material/repair/mapper/RepairMapper.java | 2 +- .../repair/service/RepairService.java | 3 + .../service/impl/RepairServiceImpl.java | 197 ++++++++++++++++-- 6 files changed, 242 insertions(+), 49 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 45f1f471..5862a027 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -11,6 +11,7 @@ import com.bonus.material.repair.domain.RepairPartDetails; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; import com.bonus.material.repair.domain.vo.RepairDeviceListVo; +import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.service.RepairService; import com.bonus.system.api.domain.SysUser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -68,19 +69,6 @@ public class RepairController extends BaseController { return AjaxResult.success(list); } - /** - * 导出维修任务列表--外层--壹级列表 - */ - @PostMapping("/export") - @RequiresPermissions("repair:manage:export") - @ApiOperation(value = "导出维修任务列表") - public void export(HttpServletResponse response, RepairTask bean) { - List list = service.exportRepairTaskList(bean); - ExcelUtil util = new ExcelUtil<>(RepairTask.class); - util.exportExcel(response, list, "维修任务列表"); - } - - /** * 获取维修任务物资设备列表--不分页 */ @@ -135,8 +123,8 @@ public class RepairController extends BaseController { */ @ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修") @PostMapping("/batchRepairApply") - public AjaxResult batchRepairApply(@RequestBody List list) { - return service.fastRepairApply(list); + public AjaxResult batchRepairApply(@RequestBody List list) { + return service.batchRepairApply(list); } /** @@ -175,4 +163,17 @@ public class RepairController extends BaseController { return AjaxResult.success(list); } + /** + * 导出维修任务列表--外层--壹级列表 + */ + @PostMapping("/export") + @RequiresPermissions("repair:manage:export") + @ApiOperation(value = "导出维修任务列表") + public void export(HttpServletResponse response, RepairTask bean) { + List list = service.exportRepairTaskList(bean); + ExcelUtil util = new ExcelUtil<>(RepairTask.class); + util.exportExcel(response, list, "维修任务列表"); + } + + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java index 261b17d0..8061f653 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java @@ -7,20 +7,22 @@ import java.util.List; import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import lombok.experimental.Accessors; /** * 维修记录对象 repair_apply_record * - * @author xsheng - * @date 2024-10-16 + * @author syruan */ - - +@EqualsAndHashCode(callSuper = false) @Data @ToString +@Accessors(chain = true) public class RepairApplyRecord extends BaseEntity { + private static final long serialVersionUID = 1L; /** $column.columnComment */ @@ -53,7 +55,7 @@ public class RepairApplyRecord extends BaseEntity { /** 维修方式（1内部2返厂3报废） */ @Excel(name = "维修方式", readConverterExp = "1=内部2返厂3报废") - private String repairType; + private Integer repairType; /** 数据所属组织 */ @Excel(name = "数据所属组织") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java index 18f32154..b67d30fe 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairDeviceVO.java @@ -1,6 +1,7 @@ package com.bonus.material.repair.domain.vo; import com.bonus.material.repair.domain.RepairPart; +import com.bonus.material.repair.domain.RepairPartDetails; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -24,12 +25,18 @@ public class RepairDeviceVO { @ApiModelProperty(value = "任务ID") private Long taskId; + @ApiModelProperty(value = "设备表主键id") + private Long maId; + @ApiModelProperty(value = "设备类型") private String typeName; @ApiModelProperty(value = "规格型号") private String type; + @ApiModelProperty(value = "规格型号ID") + private Long typeId; + @ApiModelProperty(value = "设备编码") private String code; @@ -42,54 +49,69 @@ public class RepairDeviceVO { @ApiModelProperty(value = "维修方式: 1内部 2外部返厂 3报废") private Integer repairType; + @ApiModelProperty(value = "维修人员") + private String repairer; + + @ApiModelProperty(value = "管理模式") + private Integer manageType; + @ApiModelProperty(value = "附件") private String fileUrl; + @ApiModelProperty(value = "维修数量") + private int repairNum; + + @ApiModelProperty(value = "维修合格数量") + private int repairedNum; + + @ApiModelProperty(value = "维修报废数量") + private int scrapNum; + @ApiModelProperty(value = "编码--内部维修配件集合") - private List codeInRepairPartList; + private List codeInRepairPartList; @ApiModelProperty(value = "编码--返厂维修配件集合") - private List codeOutRepairPartList; + private List codeOutRepairPartList; @ApiModelProperty(value = "编码--报废维修配件集合") - private List codeScrapRepairPartList; + private List codeScrapRepairPartList; @ApiModelProperty(value = "数量--内部维修配件集合") - private List numberInRepairPartList; + private List numberInRepairPartList; @ApiModelProperty(value = "数量--返厂维修配件集合") - private List numberOutRepairPartList; + private List numberOutRepairPartList; @ApiModelProperty(value = "数量--报废维修配件集合") - private List numberScrapRepairPartList; + private List numberScrapRepairPartList; // 手动覆盖 getter 方法，确保 List 始终被初始化 - public List getCodeInRepairPartList() { + public List getCodeInRepairPartList() { if (this.codeInRepairPartList == null) {this.codeInRepairPartList = new ArrayList<>();} return this.codeInRepairPartList; } - public List getCodeOutRepairPartList() { + public List getCodeOutRepairPartList() { if (this.codeOutRepairPartList == null) {this.codeOutRepairPartList = new ArrayList<>();} return this.codeOutRepairPartList; } - public List getCodeScrapRepairPartList() { + public List getCodeScrapRepairPartList() { if (this.codeScrapRepairPartList == null) {this.codeScrapRepairPartList = new ArrayList<>();} return this.codeScrapRepairPartList; } - public List getNumberInRepairPartList() { + public List getNumberInRepairPartList() { if (this.numberInRepairPartList == null) {this.numberInRepairPartList = new ArrayList<>();} return this.numberInRepairPartList; } - public List getNumberOutRepairPartList() { + public List getNumberOutRepairPartList() { if (this.numberOutRepairPartList == null) {this.numberOutRepairPartList = new ArrayList<>();} return this.numberOutRepairPartList; } - public List getNumberScrapRepairPartList() { + public List getNumberScrapRepairPartList() { if (this.numberScrapRepairPartList == null) {this.numberScrapRepairPartList = new ArrayList<>();} return this.numberScrapRepairPartList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index 67ef5235..a9668836 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -108,7 +108,7 @@ public interface RepairMapper { * @param repairNum 维修数量 * @param userid 用户id */ - int updateRepairedNumTwo(@Param("id")Long id, @Param("repairNum")int repairNum, @Param("userId")Long userid); + int updateRepairedNumTwo(@Param("id") Long id, @Param("repairNum") int repairNum, @Param("userId") Long userid); /** * 查询是否存在未完成维修的 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java index 4608da83..ee87204d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java @@ -6,6 +6,7 @@ import com.bonus.material.repair.domain.RepairApplyRecord; import com.bonus.material.repair.domain.RepairTask; import com.bonus.material.repair.domain.RepairTaskDetails; import com.bonus.material.repair.domain.vo.RepairDeviceListVo; +import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.system.api.domain.SysUser; import java.util.ArrayList; @@ -40,6 +41,8 @@ public interface RepairService { */ AjaxResult fastRepairApply(List list); + AjaxResult batchRepairApply(List repairDeviceVOList); + /** * 维修明细--批量审核--更新明细status */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index c53c9450..805a0b83 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -7,10 +7,7 @@ import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.repair.domain.RepairApplyRecord; -import com.bonus.material.repair.domain.RepairPartDetails; -import com.bonus.material.repair.domain.RepairTask; -import com.bonus.material.repair.domain.RepairTaskDetails; +import com.bonus.material.repair.domain.*; import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; import com.bonus.material.repair.mapper.RepairMapper; @@ -40,6 +37,17 @@ public class RepairServiceImpl implements RepairService { @Resource private TmTaskMapper taskMapper; + // 内部维修类型 + private final int inRepairType = 1; + // 返厂维修类型 + private final int outRepairType = 2; + // 报废维修类型 + private final int scrapRepairType = 3; + + // 维修管理方式--编码 + private final int manageTypeByCode = 0; + private final int manageTypeByNumber = 1; + @Override public List getRepairTaskList(RepairTask bean) { @@ -104,14 +112,9 @@ public class RepairServiceImpl implements RepairService { List partList = bean.getPartList(); BigDecimal sfCosts = new BigDecimal("0"); - // 内部维修类型 - String inRepairType = "1"; - // 返厂维修类型 - String outRepairType = "2"; + // 收费配件 String sfPart = "1"; - // 不收费配件 - String bsfPart = "0"; if (CollectionUtil.isNotEmpty(partList)) { bean.setRepairNum(partList.get(0).getRepairNum()); @@ -120,19 +123,19 @@ public class RepairServiceImpl implements RepairService { // 根据维修类型，更新维修数量、报废数量 switch (bean.getRepairType()) { - case "1": { + case inRepairType: { int repairNum = getNum(bean, details); // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNum(bean.getId(), repairNum, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); break; } - case "2": { + case outRepairType: { int repairNum = getNum(bean, details); // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); break; } - case "3": { + case scrapRepairType: { int scrapNum = details.getScrapNum() + bean.getScrapNum(); int num = scrapNum + details.getRepairedNum(); if (num > details.getRepairNum()) { @@ -149,7 +152,7 @@ public class RepairServiceImpl implements RepairService { // 判断配件列表是否为空 if (CollectionUtil.isNotEmpty(partList)) { // 内部维修 - if (inRepairType.equals(bean.getRepairType())) { + if (Objects.equals(inRepairType, bean.getRepairType())) { // 遍历配件列表，判断配件类型，收费还是不收费 for (RepairPartDetails partDetails : partList) { if (partDetails.getPartId() != null) { @@ -185,7 +188,7 @@ public class RepairServiceImpl implements RepairService { } // 返厂维修 - if (outRepairType.equals(bean.getRepairType())) { + if (outRepairType == bean.getRepairType()) { bean.setPartName(partList.get(0).getPartName()); bean.setPartType(partList.get(0).getPartType()); bean.setRepairContent(partList.get(0).getRepairContent()); @@ -256,7 +259,7 @@ public class RepairServiceImpl implements RepairService { repairRecord.setTypeId(Long.valueOf(bean.getTypeId())); repairRecord.setRepairNum(repairedNum); // 快捷维修，设置为内部维修 - repairRecord.setRepairType("1"); + repairRecord.setRepairType(inRepairType); repairRecord.setCreateBy(String.valueOf(loginUser.getUserid())); repairRecord.setCompanyId(bean.getCompanyId()); repairMapper.addRecord(repairRecord); @@ -268,6 +271,168 @@ public class RepairServiceImpl implements RepairService { return AjaxResult.success(); } + @Override + public AjaxResult batchRepairApply(@NotNull List repairDeviceVOList) { + // 准备业务逻辑数据 + LoginUser loginUser = SecurityUtils.getLoginUser(); + // 配件集合 + List partList = new ArrayList<>(); + + // 校验参数，过滤空数据 + repairDeviceVOList.removeIf(Objects::isNull); + + for (RepairDeviceVO bean : repairDeviceVOList) { + if (bean.getManageType() == null) { + throw new ServiceException("请选择物资管理方式"); + } + if (Objects.equals(manageTypeByCode, bean.getManageType())) { + // 物资管理方式--编码管理 + // 根据维修方式，更新维修数量、报废数量 + switch (bean.getRepairType()) { + case inRepairType: { + partList = bean.getCodeInRepairPartList(); + // 更新维修数量、并修改维修人员 + repairMapper.updateRepairedNum(bean.getId(), 1, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); + break; + } + case outRepairType: { + partList = bean.getCodeOutRepairPartList(); + // 更新维修数量、维修人员不变 + repairMapper.updateRepairedNumTwo(bean.getId(), 1, loginUser.getUserid()); + break; + } + case scrapRepairType: { + partList = bean.getCodeScrapRepairPartList(); + // 更新报废数量 + repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); + break; + } + default: + System.err.println("请输入正确的维修类型:" + bean.getRepairType()); + break; + } + + // 处理配件集合数据 + if (CollectionUtil.isNotEmpty(partList)) { + // 遍历配件列表，判断配件类型，收费还是不收费 + for (RepairPartDetails partDetails : partList) { + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); + repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + + if (partDetails.getPartId() != null) { + // 有维修配件时,如果价格为空，设置为0 + if (partDetails.getPartCost() == null) { + partDetails.setPartCost(new BigDecimal(0)); + } + partDetails.setTaskId(bean.getTaskId()); + partDetails.setMaId(bean.getMaId()); + partDetails.setTypeId(bean.getTypeId()); + partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); + partDetails.setCompanyId(null); + + // 根据 partId 找配件单价 + BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); + // 设置配件费用 + partDetails.setPartCost(partPrice); + // 添加【维修配件明细表】 + repairMapper.addPart(partDetails); + + // 设置配件费用 + repairApplyRecord.setPartPrice(partDetails.getPartCost()); + repairApplyRecord.setPartId((long) partDetails.getPartId().intValue()); + repairApplyRecord.setPartNum(partDetails.getPartNum()); + repairApplyRecord.setRepairContent(partDetails.getRepairContent()); + repairApplyRecord.setPartType(partDetails.getPartType()); + // 添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } else { + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } + } else { + // 配件为空，添加【维修记录表】 + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setRepairNum(bean.getRepairType() != 3 ? 1 : 0); + repairApplyRecord.setScrapNum(bean.getRepairType() == 3 ? 1 : 0); + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + + + } else if (Objects.equals(manageTypeByNumber, bean.getManageType())) { + // 物资管理方式--数量管理 + + if (bean.getId() == null) { + throw new ServiceException("请完善参数，维修详情ID为空!"); + } + // 获取维修详情表中的维修详情记录：待维修、已维修、报废的数量 + RepairTaskDetails details = repairMapper.getById(bean.getId()); + + if (details == null) { + throw new ServiceException("此维修记录不存在，请检查!"); + } + + // 根据维修方式，更新维修数量、报废数量 + switch (bean.getRepairType()) { + case inRepairType: { + partList = bean.getCodeInRepairPartList(); + // 更新维修数量、并修改维修人员 + repairMapper.updateRepairedNum(bean.getId(), 1, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); + break; + } + case outRepairType: { + partList = bean.getCodeOutRepairPartList(); + // 更新维修数量、维修人员不变 + repairMapper.updateRepairedNumTwo(bean.getId(), 1, loginUser.getUserid()); + break; + } + case scrapRepairType: { + partList = bean.getCodeScrapRepairPartList(); + + // -------------校验维修数量---------------- + // 统计历史已报废数量 + 本次报废数量 = 报废总数 + int scrapNum = details.getScrapNum() + bean.getScrapNum(); + // 统计 报废总数 + 历史已维修数量, + int num = scrapNum + details.getRepairedNum(); + // 不能大与总的待维修数量 + if (num > details.getRepairNum()) { + throw new ServiceException("报废数量大于维修总量! 本次报废数量:" + bean.getScrapNum() + ",已报废数量:" + details.getScrapNum() + ",维修总量:" + details.getRepairNum()); + } + + // 更新报废数量 + repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); + break; + } + default: + System.err.println("请输入正确的维修类型:" + bean.getRepairType()); + break; + } + + } else { + throw new ServiceException("请选择维修类型"); + } + } + + + return AjaxResult.success("维修完成"); + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult endRepairTask(@NotNull List taskList) { From 7a381a0de4266afbdea553f759853df60713cb49 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 14:51:19 +0800 Subject: [PATCH 06/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=B4=E4=BF=AE=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RepairServiceImpl.java | 215 ++++++++++-------- 1 file changed, 119 insertions(+), 96 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 805a0b83..690357d6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -46,6 +46,7 @@ public class RepairServiceImpl implements RepairService { // 维修管理方式--编码 private final int manageTypeByCode = 0; + // 维修管理方式--数量 private final int manageTypeByNumber = 1; @@ -126,7 +127,7 @@ public class RepairServiceImpl implements RepairService { case inRepairType: { int repairNum = getNum(bean, details); // 更新维修数量、并修改维修人员 - repairMapper.updateRepairedNum(bean.getId(), repairNum, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); + repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); break; } case outRepairType: { @@ -292,7 +293,7 @@ public class RepairServiceImpl implements RepairService { case inRepairType: { partList = bean.getCodeInRepairPartList(); // 更新维修数量、并修改维修人员 - repairMapper.updateRepairedNum(bean.getId(), 1, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); + repairMapper.updateRepairedNum(bean.getId(), 1, loginUser.getUserid(), loginUser.getUserid()); break; } case outRepairType: { @@ -313,66 +314,7 @@ public class RepairServiceImpl implements RepairService { } // 处理配件集合数据 - if (CollectionUtil.isNotEmpty(partList)) { - // 遍历配件列表，判断配件类型，收费还是不收费 - for (RepairPartDetails partDetails : partList) { - // 维修记录表信息 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); - repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setStatus(0L); - - if (partDetails.getPartId() != null) { - // 有维修配件时,如果价格为空，设置为0 - if (partDetails.getPartCost() == null) { - partDetails.setPartCost(new BigDecimal(0)); - } - partDetails.setTaskId(bean.getTaskId()); - partDetails.setMaId(bean.getMaId()); - partDetails.setTypeId(bean.getTypeId()); - partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); - partDetails.setCompanyId(null); - - // 根据 partId 找配件单价 - BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); - // 设置配件费用 - partDetails.setPartCost(partPrice); - // 添加【维修配件明细表】 - repairMapper.addPart(partDetails); - - // 设置配件费用 - repairApplyRecord.setPartPrice(partDetails.getPartCost()); - repairApplyRecord.setPartId((long) partDetails.getPartId().intValue()); - repairApplyRecord.setPartNum(partDetails.getPartNum()); - repairApplyRecord.setRepairContent(partDetails.getRepairContent()); - repairApplyRecord.setPartType(partDetails.getPartType()); - // 添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); - } else { - // 不选维修配件时, 只添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); - } - } - } else { - // 配件为空，添加【维修记录表】 - // 维修记录表信息 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(bean.getRepairType() != 3 ? 1 : 0); - repairApplyRecord.setScrapNum(bean.getRepairType() == 3 ? 1 : 0); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setStatus(0L); - // 不选维修配件时, 只添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); - } + copeNumberManageInList(bean, partList, loginUser); } else if (Objects.equals(manageTypeByNumber, bean.getManageType())) { @@ -381,47 +323,64 @@ public class RepairServiceImpl implements RepairService { if (bean.getId() == null) { throw new ServiceException("请完善参数，维修详情ID为空!"); } - // 获取维修详情表中的维修详情记录：待维修、已维修、报废的数量 + // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 RepairTaskDetails details = repairMapper.getById(bean.getId()); if (details == null) { - throw new ServiceException("此维修记录不存在，请检查!"); + throw new ServiceException("此维修记录不存在，请检查后提交!"); } - // 根据维修方式，更新维修数量、报废数量 - switch (bean.getRepairType()) { - case inRepairType: { - partList = bean.getCodeInRepairPartList(); - // 更新维修数量、并修改维修人员 - repairMapper.updateRepairedNum(bean.getId(), 1, Long.valueOf(bean.getRepairer()), loginUser.getUserid()); - break; - } - case outRepairType: { - partList = bean.getCodeOutRepairPartList(); - // 更新维修数量、维修人员不变 - repairMapper.updateRepairedNumTwo(bean.getId(), 1, loginUser.getUserid()); - break; - } - case scrapRepairType: { - partList = bean.getCodeScrapRepairPartList(); + if (CollectionUtil.isNotEmpty(bean.getNumberInRepairPartList())) { + partList = bean.getNumberInRepairPartList(); - // -------------校验维修数量---------------- - // 统计历史已报废数量 + 本次报废数量 = 报废总数 - int scrapNum = details.getScrapNum() + bean.getScrapNum(); - // 统计 报废总数 + 历史已维修数量, - int num = scrapNum + details.getRepairedNum(); - // 不能大与总的待维修数量 - if (num > details.getRepairNum()) { - throw new ServiceException("报废数量大于维修总量! 本次报废数量:" + bean.getScrapNum() + ",已报废数量:" + details.getScrapNum() + ",维修总量:" + details.getRepairNum()); - } - - // 更新报废数量 - repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); - break; + // ---------------校验维修数量----------------- + // 统计已维修数量 + 本次维修数量 + int repairNum = details.getRepairedNum() + bean.getRepairNum(); + // 统计报废数量 + 维修合计数量 + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); } - default: - System.err.println("请输入正确的维修类型:" + bean.getRepairType()); - break; + // ---------------校验维修数量----------------- + + // 更新维修数量、并修改维修人员 + repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); + + copeNumberManageInList(bean, partList, loginUser); + + } + if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { + partList = bean.getNumberOutRepairPartList(); + + // ---------------校验维修数量----------------- + // 统计已维修数量 + 本次维修数量 + int repairNum = details.getRepairedNum() + bean.getRepairNum(); + // 统计报废数量 + 维修合计数量 + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } + // ---------------校验维修数量----------------- + + // 更新维修数量、维修人员不变 + repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); + } + if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { + partList = bean.getNumberScrapRepairPartList(); + + // -------------校验维修数量开始---------------- + // 统计历史已报废数量 + 本次报废数量 = 报废总数 + int scrapNum = details.getScrapNum() + bean.getScrapNum(); + // 统计 报废总数 + 历史已维修数量, + int num = scrapNum + details.getRepairedNum(); + // 不能大与总的待维修数量 + if (num > details.getRepairNum()) { + throw new ServiceException("报废数量大于维修总量! 本次报废数量:" + bean.getScrapNum() + ",已报废数量:" + details.getScrapNum() + ",维修总量:" + details.getRepairNum()); + } + // -------------校验维修数量结束---------------- + + // 更新报废数量 + repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); } } else { @@ -433,6 +392,70 @@ public class RepairServiceImpl implements RepairService { return AjaxResult.success("维修完成"); } + private void copeNumberManageInList(RepairDeviceVO bean, List partList, LoginUser loginUser) { + // 处理配件集合数据 + if (CollectionUtil.isNotEmpty(partList)) { + // 遍历配件列表，判断配件类型，收费还是不收费 + for (RepairPartDetails partDetails : partList) { + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); + repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + + if (partDetails.getPartId() != null) { + // 有维修配件时,如果价格为空，设置为0 + if (partDetails.getPartCost() == null) { + partDetails.setPartCost(new BigDecimal(0)); + } + partDetails.setTaskId(bean.getTaskId()); + partDetails.setMaId(bean.getMaId()); + partDetails.setTypeId(bean.getTypeId()); + partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); + partDetails.setCompanyId(null); + + // 根据 partId 找配件单价 + BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); + // 设置配件费用 + partDetails.setPartCost(partPrice); + // 添加【维修配件明细表】 + repairMapper.addPart(partDetails); + + // 设置配件费用 + repairApplyRecord.setPartPrice(partDetails.getPartCost()); + repairApplyRecord.setPartId((long) partDetails.getPartId().intValue()); + repairApplyRecord.setPartNum(partDetails.getPartNum()); + repairApplyRecord.setRepairContent(partDetails.getRepairContent()); + repairApplyRecord.setPartType(partDetails.getPartType()); + // 添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } else { + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } + } else { + // 配件为空，添加【维修记录表】 + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setRepairNum(bean.getRepairType() != 3 ? 1 : 0); + repairApplyRecord.setScrapNum(bean.getRepairType() == 3 ? 1 : 0); + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult endRepairTask(@NotNull List taskList) { From 7e4725c23189626b2efae55a0d066b53859a8799 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 17:30:07 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95=E6=8A=BD=E5=8F=96=E3=80=81?= =?UTF-8?q?=E5=B8=B8=E9=87=8F=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/domain/RepairApplyRecord.java | 2 +- .../repair/domain/RepairPartDetails.java | 4 +- .../material/repair/mapper/RepairMapper.java | 2 +- .../service/impl/RepairServiceImpl.java | 254 ++++++++++++------ .../mapper/material/repair/RepairMapper.xml | 4 +- 5 files changed, 181 insertions(+), 85 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java index 8061f653..026cabcc 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairApplyRecord.java @@ -93,7 +93,7 @@ public class RepairApplyRecord extends BaseEntity { /** 类型（0不收费，1收费） */ @Excel(name = "类型", readConverterExp = "0=不收费，1收费") - private String partType; + private Integer partType; /** 配件名称 */ @Excel(name = "配件名称") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java index e7cf18b6..0cc08f07 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java @@ -13,8 +13,6 @@ import com.bonus.common.core.web.domain.BaseEntity; * @author xsheng * @date 2024-10-16 */ - - @Data @ToString public class RepairPartDetails extends BaseEntity { @@ -55,7 +53,7 @@ public class RepairPartDetails extends BaseEntity { /** 类型（0不收费，1收费） */ @Excel(name = "类型", readConverterExp = "0=不收费，1收费") - private String partType; + private Integer partType; /** 数据所属组织 */ @Excel(name = "数据所属组织") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java index a9668836..90ebeed6 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java @@ -136,7 +136,7 @@ public interface RepairMapper { /** * 新增维修费用 */ - int addRepairCost(@Param("bean") RepairApplyRecord bean, @Param("costs") BigDecimal costs,@Param("partType") String partType); + int addRepairCost(@Param("bean") RepairApplyRecord bean, @Param("costs") BigDecimal costs, @Param("partType") String partType); /** * 查询配件价格 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 690357d6..b36eca9b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -37,17 +37,11 @@ public class RepairServiceImpl implements RepairService { @Resource private TmTaskMapper taskMapper; - // 内部维修类型 - private final int inRepairType = 1; - // 返厂维修类型 - private final int outRepairType = 2; - // 报废维修类型 - private final int scrapRepairType = 3; + // 1:内部维修 2:外部返厂维修 3:报废 + private final int inRepairType = 1, outRepairType = 2, scrapRepairType = 3; - // 维修管理方式--编码 - private final int manageTypeByCode = 0; - // 维修管理方式--数量 - private final int manageTypeByNumber = 1; + // 维修管理方式--0：编码管理 1：数量管理 + private final int manageTypeByCode = 0, manageTypeByNumber = 1; @Override @@ -113,7 +107,6 @@ public class RepairServiceImpl implements RepairService { List partList = bean.getPartList(); BigDecimal sfCosts = new BigDecimal("0"); - // 收费配件 String sfPart = "1"; @@ -125,13 +118,13 @@ public class RepairServiceImpl implements RepairService { // 根据维修类型，更新维修数量、报废数量 switch (bean.getRepairType()) { case inRepairType: { - int repairNum = getNum(bean, details); + int repairNum = verifyRepairNum(bean, details); // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); break; } case outRepairType: { - int repairNum = getNum(bean, details); + int repairNum = verifyRepairNum(bean, details); // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); break; @@ -209,13 +202,7 @@ public class RepairServiceImpl implements RepairService { } // 配件费用计算 - for (RepairPartDetails partDetails : partList) { - if (partDetails.getPartCost() != null) { - BigDecimal partCost = partDetails.getPartCost(); - BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); - sfCosts = sfCosts.add(partCost.multiply(partNumber)); - } - } + sfCosts = countPartCosts(partList, sfCosts); // 判断是否是收费配件 if (sfPart.equals(sfCosts.toString())) { @@ -229,7 +216,10 @@ public class RepairServiceImpl implements RepairService { return AjaxResult.success(); } - private static int getNum(RepairApplyRecord bean, RepairTaskDetails details) { + /** + * 校验维修数量 + */ + private static int verifyRepairNum(RepairApplyRecord bean, RepairTaskDetails details) { int repairNum = details.getRepairedNum() + bean.getRepairNum(); int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -303,7 +293,8 @@ public class RepairServiceImpl implements RepairService { break; } case scrapRepairType: { - partList = bean.getCodeScrapRepairPartList(); + // 报废无需上传配件、直接初始化空集合 + partList = new ArrayList<>(0); // 更新报废数量 repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); break; @@ -313,13 +304,11 @@ public class RepairServiceImpl implements RepairService { break; } - // 处理配件集合数据 - copeNumberManageInList(bean, partList, loginUser); - + // 统一处理配件集合数据 + copeNumberManageInList(bean, partList, loginUser, bean.getManageType()); } else if (Objects.equals(manageTypeByNumber, bean.getManageType())) { // 物资管理方式--数量管理 - if (bean.getId() == null) { throw new ServiceException("请完善参数，维修详情ID为空!"); } @@ -330,6 +319,7 @@ public class RepairServiceImpl implements RepairService { throw new ServiceException("此维修记录不存在，请检查后提交!"); } + // 处理配件--数量管理--内部维修 if (CollectionUtil.isNotEmpty(bean.getNumberInRepairPartList())) { partList = bean.getNumberInRepairPartList(); @@ -342,14 +332,15 @@ public class RepairServiceImpl implements RepairService { throw new ServiceException("维修数量大于维修总量"); } // ---------------校验维修数量----------------- - // 更新维修数量、并修改维修人员 repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); - - copeNumberManageInList(bean, partList, loginUser); - + // 处理配件集合数据 + copeNumberManageInList(bean, partList, loginUser, bean.getManageType()); } + + // 处理配件集合数据 -- 数量管理--外部返厂维修 if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { + BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); // ---------------校验维修数量----------------- @@ -364,10 +355,37 @@ public class RepairServiceImpl implements RepairService { // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); - } - if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { - partList = bean.getNumberScrapRepairPartList(); + // 数量管理--外部返厂维修 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(outRepairType); + repairApplyRecord.setPartName(partList.get(0).getPartName()); + repairApplyRecord.setPartType(partList.get(0).getPartType()); + repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); + if (partList.get(0).getSupplierId() == null) { + throw new ServiceException("请选择返厂厂家"); + } else { + repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); + } + if (partList.get(0).getPartPrice() == null) { + repairApplyRecord.setPartPrice(new BigDecimal(0)); + } else { + repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); + } + repairApplyRecord.setPartNum(partList.get(0).getPartNum()); + // 新增【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + + sfCosts = countPartCosts(partList, sfCosts); + // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 + // SQL: 新增【维修费用记录表】 + repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); + } + + if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { // -------------校验维修数量开始---------------- // 统计历史已报废数量 + 本次报废数量 = 报废总数 int scrapNum = details.getScrapNum() + bean.getScrapNum(); @@ -380,65 +398,145 @@ public class RepairServiceImpl implements RepairService { // -------------校验维修数量结束---------------- // 更新报废数量 - repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); + repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); } - } else { - throw new ServiceException("请选择维修类型"); + throw new ServiceException("请选择正确的维修类型"); } } - return AjaxResult.success("维修完成"); } - private void copeNumberManageInList(RepairDeviceVO bean, List partList, LoginUser loginUser) { - // 处理配件集合数据 + /** + * 配件列表价格合计 + * @param partList 配件列表 + * @param sfCosts 配件价格合计 + * @return 配件合计后的价格 + */ + private static BigDecimal countPartCosts(List partList, BigDecimal sfCosts) { + for (RepairPartDetails partDetails : partList) { + if (partDetails.getPartCost() != null) { + BigDecimal partCost = partDetails.getPartCost(); + BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); + sfCosts = sfCosts.add(partCost.multiply(partNumber)); + } + } + return sfCosts; + } + + /** + * 处理配件集合数据 + * @param bean 维修申请单 + * @param partList 配件列表 + * @param loginUser 当前登录用户 + * @param manageType 管理方式：0编码管理 1数量管理 + */ + private void copeNumberManageInList(RepairDeviceVO bean, List partList, LoginUser loginUser, Integer manageType) { if (CollectionUtil.isNotEmpty(partList)) { - // 遍历配件列表，判断配件类型，收费还是不收费 - for (RepairPartDetails partDetails : partList) { - // 维修记录表信息 + // 内部维修 + if (bean.getRepairType() == inRepairType) { + // 遍历配件列表，判断配件类型，收费还是不收费 + for (RepairPartDetails partDetails : partList) { + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + if (manageType == manageTypeByCode) { + repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); + repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); + } + if (manageType == manageTypeByNumber) { + repairApplyRecord.setRepairNum(bean.getRepairNum()); + repairApplyRecord.setScrapNum(bean.getScrapNum()); + } + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + + if (partDetails.getPartId() != null) { + // 有维修配件时,如果价格为空，设置为0 + if (partDetails.getPartCost() == null) { + partDetails.setPartCost(new BigDecimal(0)); + } + partDetails.setTaskId(bean.getTaskId()); + partDetails.setMaId(bean.getMaId()); + partDetails.setTypeId(bean.getTypeId()); + partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); + partDetails.setCompanyId(null); + + // 根据 partId 找配件单价 + BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); + // 设置配件费用 + partDetails.setPartCost(partPrice); + // 添加【维修配件明细表】 + repairMapper.addPart(partDetails); + + // 设置维修记录的配件费用 + repairApplyRecord.setPartPrice(partDetails.getPartCost()); + repairApplyRecord.setPartId(partDetails.getPartId() == null ? 0L : partDetails.getPartId()); + repairApplyRecord.setPartNum(partDetails.getPartNum()); + repairApplyRecord.setRepairContent(partDetails.getRepairContent()); + repairApplyRecord.setPartType(partDetails.getPartType()); + // 添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } else { + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } + } + + // 外部维修 + if (bean.getRepairType() == outRepairType) { + BigDecimal sfCosts = new BigDecimal("0"); + partList = bean.getNumberOutRepairPartList(); + + // ---------------校验维修数量----------------- + // 统计已维修数量 + 本次维修数量 + int repairNum = bean.getRepairedNum() + bean.getRepairNum(); + // 统计报废数量 + 维修合计数量 + int num = repairNum + bean.getScrapNum(); + if (num > bean.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } + // ---------------校验维修数量----------------- + + // 更新维修数量、维修人员不变 + repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); + + // 编码管理--外部返厂维修 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); repairApplyRecord.setTaskId(bean.getTaskId()); repairApplyRecord.setMaId(bean.getMaId()); repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); - repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setStatus(0L); - - if (partDetails.getPartId() != null) { - // 有维修配件时,如果价格为空，设置为0 - if (partDetails.getPartCost() == null) { - partDetails.setPartCost(new BigDecimal(0)); - } - partDetails.setTaskId(bean.getTaskId()); - partDetails.setMaId(bean.getMaId()); - partDetails.setTypeId(bean.getTypeId()); - partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); - partDetails.setCompanyId(null); - - // 根据 partId 找配件单价 - BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); - // 设置配件费用 - partDetails.setPartCost(partPrice); - // 添加【维修配件明细表】 - repairMapper.addPart(partDetails); - - // 设置配件费用 - repairApplyRecord.setPartPrice(partDetails.getPartCost()); - repairApplyRecord.setPartId((long) partDetails.getPartId().intValue()); - repairApplyRecord.setPartNum(partDetails.getPartNum()); - repairApplyRecord.setRepairContent(partDetails.getRepairContent()); - repairApplyRecord.setPartType(partDetails.getPartType()); - // 添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); + repairApplyRecord.setRepairType(outRepairType); + repairApplyRecord.setPartName(partList.get(0).getPartName()); + repairApplyRecord.setPartType(partList.get(0).getPartType()); + repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); + if (partList.get(0).getSupplierId() == null) { + throw new ServiceException("请选择返厂厂家"); } else { - // 不选维修配件时, 只添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); + repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); } + if (partList.get(0).getPartPrice() == null) { + repairApplyRecord.setPartPrice(new BigDecimal(0)); + } else { + repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); + } + repairApplyRecord.setPartNum(partList.get(0).getPartNum()); + // 新增【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + + // 配件费用计算 + sfCosts = countPartCosts(partList, sfCosts); + + // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 + // SQL: 新增【维修费用记录表】 + repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); } + } else { // 配件为空，添加【维修记录表】 // 维修记录表信息 @@ -447,8 +545,8 @@ public class RepairServiceImpl implements RepairService { repairApplyRecord.setMaId(bean.getMaId()); repairApplyRecord.setTypeId(bean.getTypeId()); repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(bean.getRepairType() != 3 ? 1 : 0); - repairApplyRecord.setScrapNum(bean.getRepairType() == 3 ? 1 : 0); + repairApplyRecord.setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0); + repairApplyRecord.setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0); repairApplyRecord.setCreateBy(loginUser.getUsername()); repairApplyRecord.setStatus(0L); // 不选维修配件时, 只添加【维修记录表】 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index d6731c80..45459e42 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -27,8 +27,8 @@ - insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status,company_id) - values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0',#{bean.companyId}); + insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status) + values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0'); From 1aa586b07d3ee15ba971dc66ada40bb1bc45796e Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 18:20:25 +0800 Subject: [PATCH 08/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=9A=E7=BB=B4=E4=BF=AE=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/controller/RepairController.java | 2 +- .../repair/service/impl/RepairServiceImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 5862a027..e5181e3d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -123,7 +123,7 @@ public class RepairController extends BaseController { */ @ApiOperation(value = "批量维修--批量--按照传参维修方式进行维修") @PostMapping("/batchRepairApply") - public AjaxResult batchRepairApply(@RequestBody List list) { + public AjaxResult batchRepairApply(@RequestBody @NotNull List list) { return service.batchRepairApply(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index b36eca9b..81993905 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -43,7 +43,6 @@ public class RepairServiceImpl implements RepairService { // 维修管理方式--0：编码管理 1：数量管理 private final int manageTypeByCode = 0, manageTypeByNumber = 1; - @Override public List getRepairTaskList(RepairTask bean) { return repairMapper.getRepairTaskList(bean); @@ -90,7 +89,6 @@ public class RepairServiceImpl implements RepairService { return new ArrayList<>(resultMap.values()); } - /** * 提交维修记录 * @param bean repairApplyRecord @@ -325,7 +323,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -340,12 +338,13 @@ public class RepairServiceImpl implements RepairService { // 处理配件集合数据 -- 数量管理--外部返厂维修 if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { + BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -388,7 +387,8 @@ public class RepairServiceImpl implements RepairService { if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { // -------------校验维修数量开始---------------- // 统计历史已报废数量 + 本次报废数量 = 报废总数 - int scrapNum = details.getScrapNum() + bean.getScrapNum(); + // TODO : get数组的维修数量不对，后续修改对象 + int scrapNum = details.getScrapNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计 报废总数 + 历史已维修数量, int num = scrapNum + details.getRepairedNum(); // 不能大与总的待维修数量 From 8b02d0d3ec8d56a6df749ed5706f848af1c7b528 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 18:46:20 +0800 Subject: [PATCH 09/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86-null?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 81993905..31de3f9e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -323,7 +323,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -344,7 +344,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = details.getRepairedNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -388,7 +388,7 @@ public class RepairServiceImpl implements RepairService { // -------------校验维修数量开始---------------- // 统计历史已报废数量 + 本次报废数量 = 报废总数 // TODO : get数组的维修数量不对，后续修改对象 - int scrapNum = details.getScrapNum() + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int scrapNum = OptionalInt.of(details.getScrapNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); // 统计 报废总数 + 历史已维修数量, int num = scrapNum + details.getRepairedNum(); // 不能大与总的待维修数量 From 7b9b0eac6562f7b1337e9b7cb3621104203aae16 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 18 Nov 2024 18:49:22 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/repair/service/impl/RepairServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 31de3f9e..140e76d2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -323,7 +323,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberInRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { @@ -344,7 +344,7 @@ public class RepairServiceImpl implements RepairService { // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberOutRepairPartList().get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 int num = repairNum + details.getScrapNum(); if (num > details.getRepairNum()) { From a759a4bdbaf212de1d7c9cab4da96f4d90970d1b Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 10:01:43 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/domain/RepairPartDetails.java | 14 ++ .../service/impl/RepairServiceImpl.java | 162 +++++++++++------- 2 files changed, 111 insertions(+), 65 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java index 0cc08f07..6af1a446 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java @@ -66,9 +66,23 @@ public class RepairPartDetails extends BaseEntity { private String repairContent; /** 维修数量 */ + @ApiModelProperty(value = "维修数量") private Integer repairNum; + /** 报废数量 */ + @ApiModelProperty(value = "报废数量") + private Integer scrapNum; + + /** 报废原因 */ + @ApiModelProperty(value = "报废原因") + private String scrapReason; + + /** 报废原因类型（0：自然损坏，1人为损坏） */ + @Excel(name = "损坏原因类型", readConverterExp = "0=：自然损坏，1人为损坏") + private String scrapType; + /** 维修人员 */ + @ApiModelProperty(value = "维修人") private String repairer; @ApiModelProperty(value = "配件名称") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 140e76d2..97e52e6a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -320,85 +320,106 @@ public class RepairServiceImpl implements RepairService { // 处理配件--数量管理--内部维修 if (CollectionUtil.isNotEmpty(bean.getNumberInRepairPartList())) { partList = bean.getNumberInRepairPartList(); - - // ---------------校验维修数量----------------- - // 统计已维修数量 + 本次维修数量 - int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberInRepairPartList().get(0).getRepairNum(); - // 统计报废数量 + 维修合计数量 - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { - throw new ServiceException("维修数量大于维修总量"); + if (bean.getNumberInRepairPartList().get(0).getRepairNum() != null && bean.getNumberInRepairPartList().get(0).getRepairNum() != 0) { + // ---------------校验维修数量----------------- + // 统计已维修数量 + 本次维修数量 + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberInRepairPartList().get(0).getRepairNum(); + // 统计报废数量 + 维修合计数量 + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } + // ---------------校验维修数量----------------- + // 更新维修数量、并修改维修人员 + repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); + // 处理配件集合数据 + copeNumberManageInList(bean, partList, loginUser, bean.getManageType()); } - // ---------------校验维修数量----------------- - // 更新维修数量、并修改维修人员 - repairMapper.updateRepairedNum(bean.getId(), repairNum, loginUser.getUserid(), loginUser.getUserid()); - // 处理配件集合数据 - copeNumberManageInList(bean, partList, loginUser, bean.getManageType()); } // 处理配件集合数据 -- 数量管理--外部返厂维修 if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { - BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); - // ---------------校验维修数量----------------- - // 统计已维修数量 + 本次维修数量 - int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getNumberOutRepairPartList().get(0).getRepairNum(); - // 统计报废数量 + 维修合计数量 - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { - throw new ServiceException("维修数量大于维修总量"); - } - // ---------------校验维修数量----------------- + // 判断外部维修配件数量是否为空 + if (partList.get(0).getRepairNum() != null && partList.get(0).getRepairNum() != 0) { - // 更新维修数量、维修人员不变 - repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); + // ---------------校验维修数量----------------- + // 统计已维修数量 + 本次维修数量 + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + partList.get(0).getRepairNum(); + // 统计报废数量 + 维修合计数量 + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } + // ---------------校验维修数量----------------- - // 数量管理--外部返厂维修 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(outRepairType); - repairApplyRecord.setPartName(partList.get(0).getPartName()); - repairApplyRecord.setPartType(partList.get(0).getPartType()); - repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); - if (partList.get(0).getSupplierId() == null) { - throw new ServiceException("请选择返厂厂家"); - } else { - repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); - } - if (partList.get(0).getPartPrice() == null) { - repairApplyRecord.setPartPrice(new BigDecimal(0)); - } else { - repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); - } - repairApplyRecord.setPartNum(partList.get(0).getPartNum()); - // 新增【维修记录表】 - repairMapper.addRecord(repairApplyRecord); + // 更新维修数量、维修人员不变 + repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); - sfCosts = countPartCosts(partList, sfCosts); - // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 - // SQL: 新增【维修费用记录表】 - repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); + // 数量管理--外部返厂维修 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(outRepairType); + repairApplyRecord.setPartName(partList.get(0).getPartName()); + repairApplyRecord.setPartType(partList.get(0).getPartType()); + repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); + if (partList.get(0).getSupplierId() == null) { + throw new ServiceException("请选择返厂厂家"); + } else { + repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); + } + if (partList.get(0).getPartPrice() == null) { + repairApplyRecord.setPartPrice(new BigDecimal(0)); + } else { + repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); + } + repairApplyRecord.setPartNum(partList.get(0).getPartNum()); + // 新增【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + + sfCosts = countPartCosts(partList, sfCosts); + // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 + // SQL: 新增【维修费用记录表】 + repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); + } } + // 处理配件集合数据 -- 数量管理--报废维修 if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { - // -------------校验维修数量开始---------------- - // 统计历史已报废数量 + 本次报废数量 = 报废总数 - // TODO : get数组的维修数量不对，后续修改对象 - int scrapNum = OptionalInt.of(details.getScrapNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getRepairNum(); - // 统计 报废总数 + 历史已维修数量, - int num = scrapNum + details.getRepairedNum(); - // 不能大与总的待维修数量 - if (num > details.getRepairNum()) { - throw new ServiceException("报废数量大于维修总量! 本次报废数量:" + bean.getScrapNum() + ",已报废数量:" + details.getScrapNum() + ",维修总量:" + details.getRepairNum()); - } - // -------------校验维修数量结束---------------- + // 判断报废数量是否为空 + if (bean.getNumberScrapRepairPartList().get(0).getScrapNum() != null && bean.getNumberScrapRepairPartList().get(0).getScrapNum() > 0) { + // -------------校验维修数量开始---------------- + // 统计历史已报废数量 + 本次报废数量 = 报废总数 + int scrapNum = OptionalInt.of(details.getScrapNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getScrapNum(); + // 统计 报废总数 + 历史已维修数量, + int num = scrapNum + details.getRepairedNum(); + // 不能大与总的待维修数量 + if (num > details.getRepairNum()) { + throw new ServiceException("报废数量大于维修总量! 本次报废数量:" + bean.getScrapNum() + ",已报废数量:" + details.getScrapNum() + ",维修总量:" + details.getRepairNum()); + } + // -------------校验维修数量结束---------------- - // 更新报废数量 - repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); + // 更新报废数量 + repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); + + // 报废类型无需配件，所以配件为空，添加【维修记录表】 + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()); + repairApplyRecord.setMaId(bean.getMaId()); + repairApplyRecord.setTypeId(bean.getTypeId()); + repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setRepairNum(null); + repairApplyRecord.setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()); + repairApplyRecord.setCreateBy(loginUser.getUsername()); + repairApplyRecord.setStatus(0L); + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } } } else { throw new ServiceException("请选择正确的维修类型"); @@ -434,6 +455,17 @@ public class RepairServiceImpl implements RepairService { */ private void copeNumberManageInList(RepairDeviceVO bean, List partList, LoginUser loginUser, Integer manageType) { if (CollectionUtil.isNotEmpty(partList)) { + + // 如果是数量管理，那么默认为内部维修 + if (bean.getRepairType() == null && bean.getManageType() != null && manageType == manageTypeByNumber) { + bean.setRepairType(inRepairType); + } + + // 再检查还是null的话直接结束任务 + if (bean.getRepairType() == null) { + return; + } + // 内部维修 if (bean.getRepairType() == inRepairType) { // 遍历配件列表，判断配件类型，收费还是不收费 @@ -455,7 +487,7 @@ public class RepairServiceImpl implements RepairService { repairApplyRecord.setCreateBy(loginUser.getUsername()); repairApplyRecord.setStatus(0L); - if (partDetails.getPartId() != null) { + if (partDetails.getPartId() != null && partDetails.getPartNum() != null) { // 有维修配件时,如果价格为空，设置为0 if (partDetails.getPartCost() == null) { partDetails.setPartCost(new BigDecimal(0)); From cfd1e9162de5ab9a28a6a2ce33978e6abed334ce Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 10:23:09 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 97e52e6a..cafeda6f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -364,6 +364,9 @@ public class RepairServiceImpl implements RepairService { repairApplyRecord.setMaId(bean.getMaId()); repairApplyRecord.setTypeId(bean.getTypeId()); repairApplyRecord.setRepairType(outRepairType); + repairApplyRecord.setRepairNum(partList.get(0).getRepairNum()); + repairApplyRecord.setScrapNum(0); + repairApplyRecord.setCreateBy(loginUser.getUsername()); repairApplyRecord.setPartName(partList.get(0).getPartName()); repairApplyRecord.setPartType(partList.get(0).getPartType()); repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); @@ -378,6 +381,7 @@ public class RepairServiceImpl implements RepairService { repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); } repairApplyRecord.setPartNum(partList.get(0).getPartNum()); + repairApplyRecord.setRepairer(loginUser.getUsername()); // 新增【维修记录表】 repairMapper.addRecord(repairApplyRecord); @@ -415,8 +419,12 @@ public class RepairServiceImpl implements RepairService { repairApplyRecord.setRepairType(bean.getRepairType()); repairApplyRecord.setRepairNum(null); repairApplyRecord.setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()); + repairApplyRecord.setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()); + repairApplyRecord.setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()); repairApplyRecord.setCreateBy(loginUser.getUsername()); repairApplyRecord.setStatus(0L); + repairApplyRecord.setIsSlt(0L); + // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); } From 4c86d69f4b48c15a5b80f18ddcde5a2e1c200e31 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 11:10:52 +0800 Subject: [PATCH 13/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/domain/RepairPartDetails.java | 2 + .../service/impl/RepairServiceImpl.java | 127 ++++++------------ 2 files changed, 46 insertions(+), 83 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java index 6af1a446..81bb8943 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import lombok.experimental.Accessors; /** * 维修配件详细对象 repair_part_details @@ -15,6 +16,7 @@ import com.bonus.common.core.web.domain.BaseEntity; */ @Data @ToString +@Accessors(chain = true) public class RepairPartDetails extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index cafeda6f..82e4cfc4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -218,9 +218,8 @@ public class RepairServiceImpl implements RepairService { * 校验维修数量 */ private static int verifyRepairNum(RepairApplyRecord bean, RepairTaskDetails details) { - int repairNum = details.getRepairedNum() + bean.getRepairNum(); - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { + int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + bean.getRepairNum(); + if (repairNum + OptionalInt.of(details.getScrapNum()).orElse(0) > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); } return repairNum; @@ -301,7 +300,6 @@ public class RepairServiceImpl implements RepairService { System.err.println("请输入正确的维修类型:" + bean.getRepairType()); break; } - // 统一处理配件集合数据 copeNumberManageInList(bean, partList, loginUser, bean.getManageType()); @@ -313,7 +311,7 @@ public class RepairServiceImpl implements RepairService { // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 RepairTaskDetails details = repairMapper.getById(bean.getId()); - if (details == null) { + if (Objects.isNull(details)) { throw new ServiceException("此维修记录不存在，请检查后提交!"); } @@ -358,30 +356,20 @@ public class RepairServiceImpl implements RepairService { // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); - // 数量管理--外部返厂维修 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(outRepairType); - repairApplyRecord.setRepairNum(partList.get(0).getRepairNum()); - repairApplyRecord.setScrapNum(0); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setPartName(partList.get(0).getPartName()); - repairApplyRecord.setPartType(partList.get(0).getPartType()); - repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); if (partList.get(0).getSupplierId() == null) { throw new ServiceException("请选择返厂厂家"); - } else { - repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); } - if (partList.get(0).getPartPrice() == null) { - repairApplyRecord.setPartPrice(new BigDecimal(0)); - } else { - repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); - } - repairApplyRecord.setPartNum(partList.get(0).getPartNum()); - repairApplyRecord.setRepairer(loginUser.getUsername()); + + // 数量管理--外部返厂维修 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(outRepairType).setRepairNum(partList.get(0).getRepairNum()).setScrapNum(0) + .setPartName(partList.get(0).getPartName()).setPartType(partList.get(0).getPartType()) + .setRepairContent(partList.get(0).getRepairContent()).setSupplierId(partList.get(0).getSupplierId()) + .setPartNum(partList.get(0).getPartNum()).setRepairer(loginUser.getUsername()) + .setPartPrice(Optional.ofNullable(partList.get(0).getPartPrice()).orElse(new BigDecimal(0))) + .setCreateBy(loginUser.getUsername()); + // 新增【维修记录表】 repairMapper.addRecord(repairApplyRecord); @@ -413,17 +401,12 @@ public class RepairServiceImpl implements RepairService { // 报废类型无需配件，所以配件为空，添加【维修记录表】 // 维修记录表信息 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(null); - repairApplyRecord.setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()); - repairApplyRecord.setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()); - repairApplyRecord.setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setStatus(0L); - repairApplyRecord.setIsSlt(0L); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(bean.getRepairType()).setStatus(0L).setIsSlt(0L) + .setRepairNum(null).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) + .setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()) + .setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()) + .setCreateBy(loginUser.getUsername()); // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); @@ -446,7 +429,7 @@ public class RepairServiceImpl implements RepairService { private static BigDecimal countPartCosts(List partList, BigDecimal sfCosts) { for (RepairPartDetails partDetails : partList) { if (partDetails.getPartCost() != null) { - BigDecimal partCost = partDetails.getPartCost(); + BigDecimal partCost = partDetails.getPartPrice(); BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); sfCosts = sfCosts.add(partCost.multiply(partNumber)); } @@ -480,10 +463,7 @@ public class RepairServiceImpl implements RepairService { for (RepairPartDetails partDetails : partList) { // 维修记录表信息 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setRepairType(bean.getRepairType()); if (manageType == manageTypeByCode) { repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); @@ -500,11 +480,8 @@ public class RepairServiceImpl implements RepairService { if (partDetails.getPartCost() == null) { partDetails.setPartCost(new BigDecimal(0)); } - partDetails.setTaskId(bean.getTaskId()); - partDetails.setMaId(bean.getMaId()); - partDetails.setTypeId(bean.getTypeId()); + partDetails.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setCompanyId(null); partDetails.setCreateBy(String.valueOf(loginUser.getUserid())); - partDetails.setCompanyId(null); // 根据 partId 找配件单价 BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); @@ -514,11 +491,11 @@ public class RepairServiceImpl implements RepairService { repairMapper.addPart(partDetails); // 设置维修记录的配件费用 - repairApplyRecord.setPartPrice(partDetails.getPartCost()); - repairApplyRecord.setPartId(partDetails.getPartId() == null ? 0L : partDetails.getPartId()); - repairApplyRecord.setPartNum(partDetails.getPartNum()); - repairApplyRecord.setRepairContent(partDetails.getRepairContent()); - repairApplyRecord.setPartType(partDetails.getPartType()); + repairApplyRecord.setPartPrice(partDetails.getPartCost()) + .setPartNum(partDetails.getPartNum()) + .setRepairContent(partDetails.getRepairContent()) + .setPartType(partDetails.getPartType()) + .setPartId(partDetails.getPartId() == null ? 0L : partDetails.getPartId()); // 添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); } else { @@ -530,47 +507,35 @@ public class RepairServiceImpl implements RepairService { // 外部维修 if (bean.getRepairType() == outRepairType) { - BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 - int repairNum = bean.getRepairedNum() + bean.getRepairNum(); - // 统计报废数量 + 维修合计数量 - int num = repairNum + bean.getScrapNum(); - if (num > bean.getRepairNum()) { - throw new ServiceException("维修数量大于维修总量"); - } - // ---------------校验维修数量----------------- + int repairNum = OptionalInt.of(bean.getRepairedNum()).orElse(0) + bean.getRepairNum(); + // 统计报废数量 + 维修合计数量 不能 大与> 总的待维修量 + if (repairNum + OptionalInt.of(bean.getScrapNum()).orElse(0) > bean.getRepairNum()) {throw new ServiceException("维修数量大于维修总量");} // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); // 编码管理--外部返厂维修 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(outRepairType); - repairApplyRecord.setPartName(partList.get(0).getPartName()); - repairApplyRecord.setPartType(partList.get(0).getPartType()); - repairApplyRecord.setRepairContent(partList.get(0).getRepairContent()); + RepairApplyRecord repairApplyRecord = new RepairApplyRecord().setTaskId(bean.getTaskId()).setMaId(bean.getMaId()) + .setTypeId(bean.getTypeId()).setRepairType(outRepairType) + .setPartName(partList.get(0).getPartName()) + .setPartType(partList.get(0).getPartType()) + .setRepairContent(partList.get(0).getRepairContent()).setPartNum(partList.get(0).getPartNum()); + if (partList.get(0).getSupplierId() == null) { throw new ServiceException("请选择返厂厂家"); } else { repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); } - if (partList.get(0).getPartPrice() == null) { - repairApplyRecord.setPartPrice(new BigDecimal(0)); - } else { - repairApplyRecord.setPartPrice(partList.get(0).getPartPrice()); - } - repairApplyRecord.setPartNum(partList.get(0).getPartNum()); + repairApplyRecord.setPartPrice(Optional.ofNullable(partList.get(0).getPartPrice()).orElse(new BigDecimal(0))); // 新增【维修记录表】 repairMapper.addRecord(repairApplyRecord); // 配件费用计算 - sfCosts = countPartCosts(partList, sfCosts); + BigDecimal sfCosts = countPartCosts(partList, new BigDecimal(0)); // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 // SQL: 新增【维修费用记录表】 @@ -579,16 +544,12 @@ public class RepairServiceImpl implements RepairService { } else { // 配件为空，添加【维修记录表】 - // 维修记录表信息 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()); - repairApplyRecord.setMaId(bean.getMaId()); - repairApplyRecord.setTypeId(bean.getTypeId()); - repairApplyRecord.setRepairType(bean.getRepairType()); - repairApplyRecord.setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0); - repairApplyRecord.setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0); - repairApplyRecord.setCreateBy(loginUser.getUsername()); - repairApplyRecord.setStatus(0L); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(bean.getRepairType()).setStatus(0L) + .setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0) + .setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0).setCreateBy(loginUser.getUsername()); + // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); } From 9ad10a3d8e3b8dee81c384c0dca288473fa17c60 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 11:16:31 +0800 Subject: [PATCH 14/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=85=8D=E4=BB=B6=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 82e4cfc4..404146ad 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -428,10 +428,10 @@ public class RepairServiceImpl implements RepairService { */ private static BigDecimal countPartCosts(List partList, BigDecimal sfCosts) { for (RepairPartDetails partDetails : partList) { - if (partDetails.getPartCost() != null) { - BigDecimal partCost = partDetails.getPartPrice(); + if (partDetails.getPartPrice() != null) { + BigDecimal partPrice = partDetails.getPartPrice(); BigDecimal partNumber = new BigDecimal(partDetails.getPartNum()); - sfCosts = sfCosts.add(partCost.multiply(partNumber)); + sfCosts = sfCosts.add(partPrice.multiply(partNumber)); } } return sfCosts; From 4eaca91a802930cfb679520f945ce921540fd5fd Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 11:30:29 +0800 Subject: [PATCH 15/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 404146ad..ab24f0e9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -402,11 +402,11 @@ public class RepairServiceImpl implements RepairService { // 维修记录表信息 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) - .setRepairType(bean.getRepairType()).setStatus(0L).setIsSlt(0L) - .setRepairNum(null).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) + .setRepairType(scrapRepairType).setStatus(0L).setIsSlt(0L).setPartNum(0) + .setRepairNum(0).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) .setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()) .setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()) - .setCreateBy(loginUser.getUsername()); + .setRepairer(loginUser.getUsername()).setCreateBy(loginUser.getUsername()); // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); From 1585841ab10767b3963d6a258e67950c998f0314 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 14:21:18 +0800 Subject: [PATCH 16/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=8A=A5=E5=BA=9F=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/domain/BmFileInfo.java | 8 +- .../repair/domain/RepairPartDetails.java | 7 ++ .../service/impl/RepairServiceImpl.java | 100 +++++++++++++----- 3 files changed, 86 insertions(+), 29 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java index 1e144095..4eb08151 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmFileInfo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import com.bonus.common.core.web.domain.BaseEntity; +import lombok.experimental.Accessors; /** * 附件 @@ -13,12 +14,11 @@ import com.bonus.common.core.web.domain.BaseEntity; * @author xsheng * @date 2024-09-26 */ - - @Data @ToString -public class BmFileInfo extends BaseEntity -{ +@Accessors(chain = true) +public class BmFileInfo extends BaseEntity { + private static final long serialVersionUID = 1L; /** 主键id */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java index 81bb8943..43560cdb 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairPartDetails.java @@ -1,7 +1,10 @@ package com.bonus.material.repair.domain; import java.math.BigDecimal; +import java.util.List; + import com.bonus.common.core.annotation.Excel; +import com.bonus.material.basic.domain.BmFileInfo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -83,6 +86,10 @@ public class RepairPartDetails extends BaseEntity { @Excel(name = "损坏原因类型", readConverterExp = "0=：自然损坏，1人为损坏") private String scrapType; + /** 附件集合 */ + @ApiModelProperty(value = "附件集合") + private List fileList; + /** 维修人员 */ @ApiModelProperty(value = "维修人") private String repairer; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index ab24f0e9..d0f774d5 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -7,6 +7,8 @@ import com.bonus.common.biz.enums.TmTaskTypeEnum; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.material.basic.domain.BmFileInfo; +import com.bonus.material.basic.mapper.BmFileInfoMapper; import com.bonus.material.repair.domain.*; import com.bonus.material.repair.domain.vo.RepairDeviceListVo; import com.bonus.material.repair.domain.vo.RepairDeviceVO; @@ -37,6 +39,9 @@ public class RepairServiceImpl implements RepairService { @Resource private TmTaskMapper taskMapper; + @Resource + private BmFileInfoMapper bmFileInfoMapper; + // 1:内部维修 2:外部返厂维修 3:报废 private final int inRepairType = 1, outRepairType = 2, scrapRepairType = 3; @@ -291,7 +296,7 @@ public class RepairServiceImpl implements RepairService { } case scrapRepairType: { // 报废无需上传配件、直接初始化空集合 - partList = new ArrayList<>(0); + partList = bean.getCodeScrapRepairPartList(); // 更新报废数量 repairMapper.updateScrapNum(bean.getId(), 1, loginUser.getUserid()); break; @@ -343,15 +348,12 @@ public class RepairServiceImpl implements RepairService { // 判断外部维修配件数量是否为空 if (partList.get(0).getRepairNum() != null && partList.get(0).getRepairNum() != 0) { - // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 int repairNum = OptionalInt.of(details.getRepairedNum()).orElse(0) + partList.get(0).getRepairNum(); // 统计报废数量 + 维修合计数量 - int num = repairNum + details.getScrapNum(); - if (num > details.getRepairNum()) { + if ((repairNum + OptionalInt.of(details.getScrapNum()).orElse(0)) > details.getRepairNum()) { throw new ServiceException("维修数量大于维修总量"); } - // ---------------校验维修数量----------------- // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); @@ -398,18 +400,42 @@ public class RepairServiceImpl implements RepairService { // 更新报废数量 repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); - // 报废类型无需配件，所以配件为空，添加【维修记录表】 - // 维修记录表信息 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) - .setRepairType(scrapRepairType).setStatus(0L).setIsSlt(0L).setPartNum(0) - .setRepairNum(0).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) - .setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()) - .setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()) - .setRepairer(loginUser.getUsername()).setCreateBy(loginUser.getUsername()); + if (CollectionUtil.isNotEmpty(partList.get(0).getFileList())) { + for (BmFileInfo fileInfo : partList.get(0).getFileList()) { + fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) + .setTaskId(bean.getTaskId()).setModelId(bean.getId()) + .setCreateBy(loginUser.getUsername()); + bmFileInfoMapper.insertBmFileInfo(fileInfo); + + // 报废类型无需配件，所以配件为空，添加【维修记录表】 + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(scrapRepairType).setStatus(0L).setIsSlt(0L).setPartNum(0) + .setFileIds(fileInfo.getId() == null ? "" : String.valueOf(fileInfo.getId())) + .setRepairNum(0).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) + .setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()) + .setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()) + .setRepairer(loginUser.getUsername()).setCreateBy(loginUser.getUsername()); + + // 因报废操作无需配件, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } else { + // 报废类型无需配件，所以配件为空，添加【维修记录表】 + // 维修记录表信息 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(scrapRepairType).setStatus(0L).setIsSlt(0L).setPartNum(0) + .setRepairNum(0).setScrapNum(bean.getNumberScrapRepairPartList().get(0).getScrapNum()) + .setScrapReason(bean.getNumberScrapRepairPartList().get(0).getScrapReason()) + .setScrapType(bean.getNumberScrapRepairPartList().get(0).getScrapType()) + .setRepairer(loginUser.getUsername()).setCreateBy(loginUser.getUsername()); + + // 因报废操作无需配件, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } - // 不选维修配件时, 只添加【维修记录表】 - repairMapper.addRecord(repairApplyRecord); } } } else { @@ -446,12 +472,13 @@ public class RepairServiceImpl implements RepairService { */ private void copeNumberManageInList(RepairDeviceVO bean, List partList, LoginUser loginUser, Integer manageType) { if (CollectionUtil.isNotEmpty(partList)) { - + if (bean.getManageType() == null) { + throw new ServiceException("请选择物资管理方式"); + } // 如果是数量管理，那么默认为内部维修 - if (bean.getRepairType() == null && bean.getManageType() != null && manageType == manageTypeByNumber) { + if (bean.getRepairType() == null && manageType == manageTypeByNumber) { bean.setRepairType(inRepairType); } - // 再检查还是null的话直接结束任务 if (bean.getRepairType() == null) { return; @@ -507,13 +534,13 @@ public class RepairServiceImpl implements RepairService { // 外部维修 if (bean.getRepairType() == outRepairType) { - partList = bean.getNumberOutRepairPartList(); - // ---------------校验维修数量----------------- // 统计已维修数量 + 本次维修数量 int repairNum = OptionalInt.of(bean.getRepairedNum()).orElse(0) + bean.getRepairNum(); // 统计报废数量 + 维修合计数量 不能 大与> 总的待维修量 - if (repairNum + OptionalInt.of(bean.getScrapNum()).orElse(0) > bean.getRepairNum()) {throw new ServiceException("维修数量大于维修总量");} + if (repairNum + OptionalInt.of(bean.getScrapNum()).orElse(0) > bean.getRepairNum()) { + throw new ServiceException("维修数量大于维修总量"); + } // 更新维修数量、维修人员不变 repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); @@ -527,9 +554,8 @@ public class RepairServiceImpl implements RepairService { if (partList.get(0).getSupplierId() == null) { throw new ServiceException("请选择返厂厂家"); - } else { - repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); } + repairApplyRecord.setSupplierId(partList.get(0).getSupplierId()); repairApplyRecord.setPartPrice(Optional.ofNullable(partList.get(0).getPartPrice()).orElse(new BigDecimal(0))); // 新增【维修记录表】 repairMapper.addRecord(repairApplyRecord); @@ -542,13 +568,37 @@ public class RepairServiceImpl implements RepairService { repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); } + // 如果是报废类型，进行上传附件相关处理 + if (scrapRepairType == bean.getRepairType()) { + if (CollectionUtil.isNotEmpty(partList.get(0).getFileList())) { + for (BmFileInfo fileInfo : partList.get(0).getFileList()) { + fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) + .setTaskId(bean.getTaskId()).setModelId(bean.getId()) + .setCreateBy(loginUser.getUsername()); + bmFileInfoMapper.insertBmFileInfo(fileInfo); + + // 配件为空，添加【维修记录表】 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(bean.getRepairType()).setStatus(0L).setFileIds(String.valueOf(fileInfo.getId())) + .setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0) + .setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0) + .setCreateBy(loginUser.getUsername()); + + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } + } + } + } else { // 配件为空，添加【维修记录表】 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) .setRepairType(bean.getRepairType()).setStatus(0L) .setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0) - .setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0).setCreateBy(loginUser.getUsername()); + .setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0) + .setCreateBy(loginUser.getUsername()); // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); From 2941434e9ed2f6479bedacbf7e46952968fba8c6 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 14:52:37 +0800 Subject: [PATCH 17/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E2=80=94=E2=80=94=E6=9B=B4=E6=96=B0=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/service/impl/RepairServiceImpl.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index d0f774d5..9aecafe7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -400,8 +400,8 @@ public class RepairServiceImpl implements RepairService { // 更新报废数量 repairMapper.updateScrapNum(bean.getId(), scrapNum, loginUser.getUserid()); - if (CollectionUtil.isNotEmpty(partList.get(0).getFileList())) { - for (BmFileInfo fileInfo : partList.get(0).getFileList()) { + if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList().get(0).getFileList())) { + for (BmFileInfo fileInfo : bean.getNumberScrapRepairPartList().get(0).getFileList()) { fileInfo.setTaskType(TmTaskTypeEnum.TM_TASK_REPAIR.getTaskTypeId()) .setTaskId(bean.getTaskId()).setModelId(bean.getId()) .setCreateBy(loginUser.getUsername()); @@ -588,6 +588,17 @@ public class RepairServiceImpl implements RepairService { // 不选维修配件时, 只添加【维修记录表】 repairMapper.addRecord(repairApplyRecord); } + } else { + // 配件为空，添加【维修记录表】 + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(bean.getRepairType()).setStatus(0L) + .setRepairNum(bean.getRepairType() != scrapRepairType ? 1 : 0) + .setScrapNum(bean.getRepairType() == scrapRepairType ? 1 : 0) + .setCreateBy(loginUser.getUsername()); + + // 不选维修配件时, 只添加【维修记录表】 + repairMapper.addRecord(repairApplyRecord); } } From 750c0af1df47af03f9a1d7cd68908c2840c072a8 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 15:05:17 +0800 Subject: [PATCH 18/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RepairServiceImpl.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 9aecafe7..7a0dfc73 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -313,15 +313,16 @@ public class RepairServiceImpl implements RepairService { if (bean.getId() == null) { throw new ServiceException("请完善参数，维修详情ID为空!"); } - // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 - RepairTaskDetails details = repairMapper.getById(bean.getId()); - - if (Objects.isNull(details)) { - throw new ServiceException("此维修记录不存在，请检查后提交!"); - } // 处理配件--数量管理--内部维修 if (CollectionUtil.isNotEmpty(bean.getNumberInRepairPartList())) { + // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 + RepairTaskDetails details = repairMapper.getById(bean.getId()); + + if (Objects.isNull(details)) { + throw new ServiceException("此维修记录不存在，请检查后提交!"); + } + partList = bean.getNumberInRepairPartList(); if (bean.getNumberInRepairPartList().get(0).getRepairNum() != null && bean.getNumberInRepairPartList().get(0).getRepairNum() != 0) { // ---------------校验维修数量----------------- @@ -342,9 +343,19 @@ public class RepairServiceImpl implements RepairService { // 处理配件集合数据 -- 数量管理--外部返厂维修 if (CollectionUtil.isNotEmpty(bean.getNumberOutRepairPartList())) { + // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 + RepairTaskDetails details = repairMapper.getById(bean.getId()); + + if (Objects.isNull(details)) { + throw new ServiceException("此维修记录不存在，请检查后提交!"); + } + BigDecimal sfCosts = new BigDecimal("0"); partList = bean.getNumberOutRepairPartList(); + // 重新查询维修详情 + details = repairMapper.getById(bean.getId()); + // 判断外部维修配件数量是否为空 if (partList.get(0).getRepairNum() != null && partList.get(0).getRepairNum() != 0) { @@ -386,6 +397,12 @@ public class RepairServiceImpl implements RepairService { if (CollectionUtil.isNotEmpty(bean.getNumberScrapRepairPartList())) { // 判断报废数量是否为空 if (bean.getNumberScrapRepairPartList().get(0).getScrapNum() != null && bean.getNumberScrapRepairPartList().get(0).getScrapNum() > 0) { + // 获取维修详情表中的维修详情记录：待维修、已维修、已报废的数量 + RepairTaskDetails details = repairMapper.getById(bean.getId()); + + if (Objects.isNull(details)) { + throw new ServiceException("此维修记录不存在，请检查后提交!"); + } // -------------校验维修数量开始---------------- // 统计历史已报废数量 + 本次报废数量 = 报废总数 int scrapNum = OptionalInt.of(details.getScrapNum()).orElse(0) + bean.getNumberScrapRepairPartList().get(0).getScrapNum(); From 8781a3b74e5a7d5ff3f7583ed465551b9b9a9992 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 15:39:27 +0800 Subject: [PATCH 19/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repair/domain/RepairTaskDetails.java | 7 +++++ .../service/impl/RepairServiceImpl.java | 29 ++++++++++++------- .../mapper/material/repair/RepairMapper.xml | 10 ++++--- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index 99ca0a42..118bdea4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -63,6 +63,13 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "维修总量") private int repairNum; + + /** + * 维修方式: 1内部 2外部返厂 3报废 + */ + @ApiModelProperty(value = "维修方式: 1内部 2外部 3报废") + private Integer repairType; + /** * 维修合格数量 */ diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 7a0dfc73..9af4f1f8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -373,18 +373,20 @@ public class RepairServiceImpl implements RepairService { throw new ServiceException("请选择返厂厂家"); } - // 数量管理--外部返厂维修 + // 数量管理--外部返厂维修 -- 记录表插入数据 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); - repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) - .setRepairType(outRepairType).setRepairNum(partList.get(0).getRepairNum()).setScrapNum(0) - .setPartName(partList.get(0).getPartName()).setPartType(partList.get(0).getPartType()) - .setRepairContent(partList.get(0).getRepairContent()).setSupplierId(partList.get(0).getSupplierId()) - .setPartNum(partList.get(0).getPartNum()).setRepairer(loginUser.getUsername()) - .setPartPrice(Optional.ofNullable(partList.get(0).getPartPrice()).orElse(new BigDecimal(0))) - .setCreateBy(loginUser.getUsername()); + for (RepairPartDetails repairPartDetails : partList) { + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + .setRepairType(outRepairType).setRepairNum(repairPartDetails.getRepairNum()).setScrapNum(0) + .setPartName(repairPartDetails.getPartName()).setPartType(repairPartDetails.getPartType()) + .setRepairContent(repairPartDetails.getRepairContent()).setSupplierId(repairPartDetails.getSupplierId()) + .setPartNum(repairPartDetails.getPartNum()).setRepairer(loginUser.getUsername()) + .setPartPrice(Optional.ofNullable(repairPartDetails.getPartPrice()).orElse(new BigDecimal(0))) + .setCreateBy(loginUser.getUsername()); - // 新增【维修记录表】 - repairMapper.addRecord(repairApplyRecord); + // 新增【维修记录表】 + repairMapper.addRecord(repairApplyRecord); + } sfCosts = countPartCosts(partList, sfCosts); // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 @@ -503,10 +505,10 @@ public class RepairServiceImpl implements RepairService { // 内部维修 if (bean.getRepairType() == inRepairType) { + RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); // 遍历配件列表，判断配件类型，收费还是不收费 for (RepairPartDetails partDetails : partList) { // 维修记录表信息 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setRepairType(bean.getRepairType()); if (manageType == manageTypeByCode) { repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); @@ -547,6 +549,11 @@ public class RepairServiceImpl implements RepairService { repairMapper.addRecord(repairApplyRecord); } } + + BigDecimal sfCosts = countPartCosts(partList, new BigDecimal(0)); + // TODO: 判断是否是收费配件，因数据存在多条，可能有些是免费配件 有些收费，所以这里用价格统一做处理，后续讨论 + // SQL: 新增【维修费用记录表】 + repairMapper.addRepairCost(repairApplyRecord, sfCosts, sfCosts.equals(new BigDecimal("0")) ? "0" : "1"); } // 外部维修 diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml index 45459e42..d183abf8 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml @@ -22,13 +22,15 @@ - insert into repair_audit_details (task_id,repair_id,ma_id,type_id,repair_num,repaired_num,scrap_num,status,create_by,create_time,company_id) - values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(),#{companyId}); + insert into repair_audit_details (task_id,repair_id,ma_id,type_id,repair_num,repaired_num,scrap_num,status, + create_by,create_time,company_id) + values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(), + #{companyId}); - insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status) - values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0'); + insert into repair_cost (task_id,repair_id,type_id,ma_id,repair_num,costs,part_type,status,repair_type) + values (#{bean.taskId},#{bean.id},#{bean.typeId},#{bean.maId},#{bean.repairNum},#{costs},#{partType},'0',#{bean.repairType}); From 4cbede39d1a5d9fdb23228f3def2a95dc41288fd Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 16:13:02 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 9af4f1f8..e0acb898 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -509,14 +509,13 @@ public class RepairServiceImpl implements RepairService { // 遍历配件列表，判断配件类型，收费还是不收费 for (RepairPartDetails partDetails : partList) { // 维修记录表信息 - repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setRepairType(bean.getRepairType()); + repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()).setRepairType(inRepairType); if (manageType == manageTypeByCode) { repairApplyRecord.setRepairNum(scrapRepairType != bean.getRepairType() ? 1 : 0); repairApplyRecord.setScrapNum(scrapRepairType == bean.getRepairType() ? 1 : 0); } if (manageType == manageTypeByNumber) { - repairApplyRecord.setRepairNum(bean.getRepairNum()); - repairApplyRecord.setScrapNum(bean.getScrapNum()); + repairApplyRecord.setRepairNum(partDetails.getRepairNum()); } repairApplyRecord.setCreateBy(loginUser.getUsername()); repairApplyRecord.setStatus(0L); From 44d3b24295e846cc6652e91f9394ccec4411a6a8 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 16:27:32 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96--=E9=85=8D=E4=BB=B6=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/repair/service/impl/RepairServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index e0acb898..ec251540 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -530,8 +530,8 @@ public class RepairServiceImpl implements RepairService { // 根据 partId 找配件单价 BigDecimal partPrice = repairMapper.selectPartPrice(partDetails.getPartId()); - // 设置配件费用 - partDetails.setPartCost(partPrice); + // 设置配件单价费用 + partDetails.setPartPrice(partPrice); // 添加【维修配件明细表】 repairMapper.addPart(partDetails); From 9b2e7d38972dd2bd28ba60d04aa1c174bb5b6ef3 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 16:39:58 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E5=AE=8C=E5=96=84=E8=B4=B9=E7=94=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/repair/service/impl/RepairServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index ec251540..13efcfbf 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -376,7 +376,7 @@ public class RepairServiceImpl implements RepairService { // 数量管理--外部返厂维修 -- 记录表插入数据 RepairApplyRecord repairApplyRecord = new RepairApplyRecord(); for (RepairPartDetails repairPartDetails : partList) { - repairApplyRecord.setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) + repairApplyRecord.setId(bean.getId()).setTaskId(bean.getTaskId()).setMaId(bean.getMaId()).setTypeId(bean.getTypeId()) .setRepairType(outRepairType).setRepairNum(repairPartDetails.getRepairNum()).setScrapNum(0) .setPartName(repairPartDetails.getPartName()).setPartType(repairPartDetails.getPartType()) .setRepairContent(repairPartDetails.getRepairContent()).setSupplierId(repairPartDetails.getSupplierId()) @@ -536,7 +536,7 @@ public class RepairServiceImpl implements RepairService { repairMapper.addPart(partDetails); // 设置维修记录的配件费用 - repairApplyRecord.setPartPrice(partDetails.getPartCost()) + repairApplyRecord.setId(bean.getId()).setPartPrice(partDetails.getPartCost()) .setPartNum(partDetails.getPartNum()) .setRepairContent(partDetails.getRepairContent()) .setPartType(partDetails.getPartType()) @@ -569,7 +569,7 @@ public class RepairServiceImpl implements RepairService { repairMapper.updateRepairedNumTwo(bean.getId(), repairNum, loginUser.getUserid()); // 编码管理--外部返厂维修 - RepairApplyRecord repairApplyRecord = new RepairApplyRecord().setTaskId(bean.getTaskId()).setMaId(bean.getMaId()) + RepairApplyRecord repairApplyRecord = new RepairApplyRecord().setId(bean.getId()).setTaskId(bean.getTaskId()).setMaId(bean.getMaId()) .setTypeId(bean.getTypeId()).setRepairType(outRepairType) .setPartName(partList.get(0).getPartName()) .setPartType(partList.get(0).getPartType()) From ad7d0e9c67381cc12ad845a880204be35cc0ba5f Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Tue, 19 Nov 2024 16:54:46 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96--=E9=85=8D=E4=BB=B6=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/material/repair/service/impl/RepairServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java index 13efcfbf..1665af0b 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java @@ -536,7 +536,7 @@ public class RepairServiceImpl implements RepairService { repairMapper.addPart(partDetails); // 设置维修记录的配件费用 - repairApplyRecord.setId(bean.getId()).setPartPrice(partDetails.getPartCost()) + repairApplyRecord.setId(bean.getId()).setPartPrice(partPrice) .setPartNum(partDetails.getPartNum()) .setRepairContent(partDetails.getRepairContent()) .setPartType(partDetails.getPartType())