diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java index 509e13f7..4296caea 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/ComplexQueryController.java @@ -222,6 +222,58 @@ public class ComplexQueryController extends BaseController { util.exportExcel(response, list, "综合查询--导出修饰待入库详情"); } + /** + * 查询待报废设备详情 + * @param bean + * @return + */ + @ApiOperation(value = "综合查询--查询待报废设备详情") + @GetMapping("/getScrapList") + public AjaxResult getScrapList(ScrapRecordInfo bean) { + startPage(); + List list = complexQueryService.getScrapList(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出待报废设备详情 + * @param response + * @param bean + */ + @ApiOperation(value = "综合查询--导出待报废设备详情") + @PostMapping("/exportScrapList") + public void exportScrapList(HttpServletResponse response, ScrapRecordInfo bean) { + List list = complexQueryService.getScrapList(bean); + ExcelUtil util = new ExcelUtil<>(ScrapRecordInfo.class); + util.exportExcel(response, list, "综合查询--导出待报废设备详情"); + } + + /** + * 查询已审核报废设备详情 + * @param bean + * @return + */ + @ApiOperation(value = "综合查询--查询已审核报废设备详情") + @GetMapping("/getScrapAuditList") + public AjaxResult getScrapAuditList(ScrapAuditInfo bean) { + startPage(); + List list = complexQueryService.getScrapAuditList(bean); + return AjaxResult.success(getDataTable(list)); + } + + /** + * 导出已审核报废设备详情 + * @param response + * @param bean + */ + @ApiOperation(value = "综合查询--导出已审核报废设备详情") + @PostMapping("/exportScrapAuditList") + public void exportScrapAuditList(HttpServletResponse response, ScrapAuditInfo bean) { + List list = complexQueryService.getScrapAuditList(bean); + ExcelUtil util = new ExcelUtil<>(ScrapAuditInfo.class); + util.exportExcel(response, list, "综合查询--导出已审核报废设备详情"); + } + /** * 工程机具使用列表 * @param bean diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java index 1d53dc27..fc891ff2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/OutRecordInfo.java @@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 综合查询-机具出库列表查询 @@ -105,6 +106,6 @@ public class OutRecordInfo { @ApiModelProperty(value = "二级ID") private Integer secondTypeId; - @ApiModelProperty(value = "一级ID") - private Integer firstTypeId; + @ApiModelProperty(value = "一级ID集合") + private List firstTypeIdList; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java new file mode 100644 index 00000000..4d96a4c5 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapAuditInfo.java @@ -0,0 +1,62 @@ +package com.bonus.material.basic.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 已报废审核详情 + * @Author ma_sh + * @create 2025/3/7 9:23 + */ +@Data +public class ScrapAuditInfo { + + @ApiModelProperty(value = "主键id") + private Integer id; + + @ApiModelProperty(value = "机具名称") + @Excel(name = "机具名称") + private String typeName; + + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "购置单价") + @Excel(name = "原值（元）") + private BigDecimal buyPrice; + + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + @ApiModelProperty(value = "报废人员") + @Excel(name = "报废人员") + private String scrapBy; + + @ApiModelProperty(value = "审核人员") + @Excel(name = "审核人员") + private String auditBy; + + @ApiModelProperty(value = "审核时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date auditTime; + + @ApiModelProperty(value = "报废类型") + @Excel(name = "报废类型") + private String scrapType; + + @ApiModelProperty(value = "关键字") + private String keyWord; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java new file mode 100644 index 00000000..a9d41a77 --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/ScrapRecordInfo.java @@ -0,0 +1,62 @@ +package com.bonus.material.basic.domain; + +import com.bonus.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 待报废详情 + * @Author ma_sh + * @create 2025/3/7 9:23 + */ +@Data +public class ScrapRecordInfo { + + @ApiModelProperty(value = "主键id") + private Integer id; + + @ApiModelProperty(value = "机具名称") + @Excel(name = "机具名称") + private String typeName; + + @ApiModelProperty(value = "规格ID") + private Integer typeId; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "购置单价") + @Excel(name = "原值（元）") + private BigDecimal buyPrice; + + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + @ApiModelProperty(value = "报废人员") + @Excel(name = "报废人员") + private String scrapBy; + + @ApiModelProperty(value = "审核人员") + @Excel(name = "审核人员") + private String auditBy; + + @ApiModelProperty(value = "报废时间") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "报废时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date scrapTime; + + @ApiModelProperty(value = "报废类型") + @Excel(name = "报废类型") + private String scrapType; + + @ApiModelProperty(value = "关键字") + private String keyWord; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java index d8fab774..1ff55c8d 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/ComplexQueryMapper.java @@ -109,4 +109,18 @@ public interface ComplexQueryMapper { * @return */ UseStorageInfo selectInFo(UseStorageInfo useStorageInfo); + + /** + * 查询待报废设备详情 + * @param bean + * @return + */ + List getScrapList(ScrapRecordInfo bean); + + /** + * 查询已审核报废设备详情 + * @param bean + * @return + */ + List getScrapAuditList(ScrapAuditInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java index 919bfd8d..f995ddc2 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/ComplexQueryService.java @@ -87,4 +87,18 @@ public interface ComplexQueryService { * @return */ List getRepairInputList(RepairInputRecord bean); + + /** + * 查询待报废设备详情 + * @param bean + * @return + */ + List getScrapList(ScrapRecordInfo bean); + + /** + * 查询已审核报废设备详情 + * @param bean + * @return + */ + List getScrapAuditList(ScrapAuditInfo bean); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java index 113be177..898bf8aa 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/ComplexQueryServiceImpl.java @@ -483,4 +483,24 @@ public class ComplexQueryServiceImpl implements ComplexQueryService { return complexQueryMapper.getRepairInputList(bean); } + /** + * 查询待报废设备详情 + * @param bean + * @return + */ + @Override + public List getScrapList(ScrapRecordInfo bean) { + return complexQueryMapper.getScrapList(bean); + } + + /** + * 查询已审核报废设备详情 + * @param bean + * @return + */ + @Override + public List getScrapAuditList(ScrapAuditInfo bean) { + return complexQueryMapper.getScrapAuditList(bean); + } + } 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 13170472..bdc7f462 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 @@ -56,7 +56,7 @@ public class RepairAuditDetailsController extends BaseController { @ApiOperation("查询修试审核任务列表") @GetMapping("/questList") @SysLog(title = "查询修试审核任务列表", businessType = OperaType.QUERY, module = "机具系统->查询修试审核任务列表") - @RequiresPermissions("service:auditing:list") + //@RequiresPermissions("service:auditing:list") public AjaxResult questList(RepairAuditDetails repairAuditDetails) { Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1); Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10); @@ -100,7 +100,7 @@ public class RepairAuditDetailsController extends BaseController { */ @ApiOperation("查看修饰审核任务详细列表") @GetMapping("/getRepairAuditList") - @RequiresPermissions("service:auditing:list") + //@RequiresPermissions("service:auditing:list") public AjaxResult getRepairAuditList(RepairAuditDetails repairAuditDetails) { List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); return AjaxResult.success(list); @@ -214,7 +214,7 @@ public class RepairAuditDetailsController extends BaseController { @ApiOperation(value = "(外层)批量修改修试审核详细") @PreventRepeatSubmit - @RequiresPermissions("repair:details:edit") + //@RequiresPermissions("repair:details:edit") @SysLog(title = "批量修试审核详细", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->批量修改修试审核详细") @PostMapping("/outerAudit") public AjaxResult outerAudit(@RequestBody @NotNull List repairAuditDetails) { diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java index 623b3d44..d30a8465 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java @@ -380,19 +380,23 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { if (scrapApplyDetails == null || CollectionUtils.isEmpty(scrapApplyDetails.getIdList())) { return AjaxResult.error("参数为空"); } - // 根据传参修改报废状态 - int result = 0; - for (Long id : scrapApplyDetails.getIdList()) { - scrapApplyDetails.setId(id); - scrapApplyDetails.setLedgerStatus("1"); - scrapApplyDetails.setLedgerBy(SecurityUtils.getUserId()); - scrapApplyDetails.setLedgerTime(DateUtils.getNowDate()); - result += scrapApplyDetailsMapper.ledgerApprove(scrapApplyDetails); + try { + // 根据传参修改报废状态 + int result = 0; + for (Long id : scrapApplyDetails.getIdList()) { + scrapApplyDetails.setId(id); + scrapApplyDetails.setLedgerStatus("1"); + scrapApplyDetails.setLedgerBy(SecurityUtils.getUserId()); + scrapApplyDetails.setLedgerTime(DateUtils.getNowDate()); + result += scrapApplyDetailsMapper.ledgerApprove(scrapApplyDetails); + } + if (result > 0) { + return AjaxResult.success("审核通过"); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); + } catch (Exception e) { + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } - if (result > 0) { - return AjaxResult.success("审核通过"); - } - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } /** diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 7a4cdc1c..67828154 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -363,8 +363,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bs.type_model_name like CONCAT('%',#{typeModelName},'%') - - and mt3.type_id = #{firstTypeId} + + and mt3.type_id in + + #{item} + AND bs.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') @@ -816,4 +819,79 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LIMIT 1 + + + +