diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 927cf5e..5152ba0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -477,7 +477,7 @@ public class TmTaskController extends BaseController { * @return 列表 */ @Log(title = "查询单个领料出库详情- app/web", businessType = BusinessType.QUERY) - @GetMapping(value = "getLeaseAuditListDetail") + @GetMapping(value = "/getLeaseAuditListDetail") public AjaxResult getLeaseAuditListDetail(TmTask task) { if (StringUtils.isNull(task)) { return AjaxResult.error("参数错误"); @@ -497,13 +497,33 @@ public class TmTaskController extends BaseController { } } + + @Log(title = "领料出库详情记录", businessType = BusinessType.QUERY) + @GetMapping(value = "/getLeaseOutDetailRecord") + public AjaxResult getLeaseOutDetailRecord(TmTask task) { + if (StringUtils.isNull(task)) { + return AjaxResult.error("参数错误"); + } + List leaseAuditList = tmTaskService.getLeaseOutDetailRecord(task); + return AjaxResult.success(leaseAuditList); + } + + @Log(title = "导出领料出库详情明细记录", businessType = BusinessType.EXPORT) + @PostMapping(value = "/exportLeaseOutDetailRecord") + public void exportLeaseOutDetailRecord(HttpServletResponse response, TmTask task) { + List leaseAuditList = tmTaskService.getLeaseOutDetailRecord(task); + List tmTaskDtos = Convert.toList(LeaseOutDetailRecord.class, leaseAuditList); + ExcelUtil util = new ExcelUtil(LeaseOutDetailRecord.class); + util.exportExcel(response, tmTaskDtos, "领料出库明细记录"); + } + /** * 导出领料出库列表 * * @param task 筛选条件 * @return 列表 */ - @Log(title = "导出领料出库列表", businessType = BusinessType.QUERY) + @Log(title = "导出领料出库列表", businessType = BusinessType.EXPORT) @PostMapping(value = "export") public void export(HttpServletResponse response, TmTask task) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java new file mode 100644 index 0000000..269e787 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/LeaseOutDetailRecord.java @@ -0,0 +1,30 @@ +package com.bonus.sgzb.app.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import lombok.Data; + +/** + * @Author:liang.chao + * @Date:2024/9/26 - 18:01 + */ + +@Data +public class LeaseOutDetailRecord { + @Excel(name = "规格型号") + private String typeModelName; + + @Excel(name = "类型名称") + private String typeName; + + private String maCode; + + @Excel(name = "出库时间") + private String createTime; + + @Excel(name = "出库数量") + private String outNum; + + @Excel(name = "出库人") + private String userName; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java index 68cc2ed..9641055 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/mapper/TmTaskMapper.java @@ -147,4 +147,6 @@ public interface TmTaskMapper { int updateLeaseApplyInfoRejectInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); int updateLeaseApplyInfoAuditInfoCq(@Param("record") LeaseApplyInfo leaseApplyInfo); + + List getLeaseOutDetailRecord(TmTask record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java index d8243cd..5eef3c8 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/TmTaskService.java @@ -27,6 +27,7 @@ public interface TmTaskService{ List getLeaseAuditList(TmTask record); List getLeaseAuditListByOne(TmTask record); + List getLeaseOutDetailRecord(TmTask record); List getLeaseAuditListByAdmin(TmTask record); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 0da6bf4..1cf0938 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -270,6 +270,11 @@ public class TmTaskServiceImpl implements TmTaskService { return leaseDetailByParentId; } + @Override + public List getLeaseOutDetailRecord(TmTask record) { + return tmTaskMapper.getLeaseOutDetailRecord(record); + } + /** * 创建审批流领料申请 * diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java index fb5afc4..5e0d5fc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java @@ -6,6 +6,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.material.domain.InputRecord; +import com.bonus.sgzb.material.domain.OutRecord; import com.bonus.sgzb.material.domain.ScrapRecord; import com.bonus.sgzb.material.service.InputRecordService; import com.bonus.sgzb.material.service.ScrapRecordService; @@ -21,10 +22,10 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; /** -* @description 综合查询--机具入库查询 -* @author hay -* @date 2024/2/26 14:15 -*/ + * @author hay + * @description 综合查询--机具入库查询 + * @date 2024/2/26 14:15 + */ @Api(tags = "综合查询--机具入库查询") @RestController @RequestMapping("/inputRecord") @@ -43,17 +44,33 @@ public class InputRecordController extends BaseController { return AjaxResult.success(getDataTable(list)); } + @ApiOperation(value = "综合查询--机具出库查询列表") + @GetMapping("/getOutputRecordList") + public AjaxResult getOutputRecordList(OutRecord bean) { + startPage(); + List list = inputRecordService.getOutputRecordList(bean); + return AjaxResult.success(getDataTable(list)); + } + /** * 导出综合查询机具入库查询列表 */ @ApiOperation("导出综合查询机具入库查询列表") @Log(title = "导出综合查询机具入库查询列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, InputRecord bean) - { + public void exInputport(HttpServletResponse response, InputRecord bean) { List list = inputRecordService.getInputRecordList(bean); ExcelUtil util = new ExcelUtil(InputRecord.class); util.exportExcel(response, list, "综合查询--入库记录"); } + @ApiOperation("导出综合查询机具出库查询列表") + @Log(title = "导出综合查询机具出库查询列表", businessType = BusinessType.EXPORT) + @PostMapping("/exOutputport") + public void exOutputport(HttpServletResponse response, OutRecord bean) { + List list = inputRecordService.getOutputRecordList(bean); + ExcelUtil util = new ExcelUtil(OutRecord.class); + util.exportExcel(response, list, "综合查询--出库记录"); + } + } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/OutRecord.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/OutRecord.java new file mode 100644 index 0000000..8416385 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/OutRecord.java @@ -0,0 +1,80 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * @author hay + * @description 综合查询--机具入库查询 + * @date 2024/2/26 14:51 + */ +@ApiModel(description = "机具出库查询") +@Data +public class OutRecord { + + private static final long serialVersionUID = 2227217051604273598L; + + @ApiModelProperty(value = "领料单号") + @Excel(name = "领料单号") + private String code; + + @ApiModelProperty(value = "工程名称") + @Excel(name = "工程名称") + private String lotName; + + @ApiModelProperty(value = "单位id") + private String unitId; + + @ApiModelProperty(value = "工程id") + private String lotId; + + @ApiModelProperty(value = "领料单位") + @Excel(name = "领料单位") + private String unitName; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "机具名称") + @Excel(name = "机具名称") + private String typeName; + + @ApiModelProperty(value = "设备编码") + @Excel(name = "设备编码") + private String maCode; + + @ApiModelProperty(value = "出库时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "出库时间") + private Date createTime; + + @ApiModelProperty(value = "出库数量") + @Excel(name = "出库数量") + private Integer outNum; + + @ApiModelProperty(value = "设备状态") + @Excel(name = "设备状态") + private String maStauts; + + @ApiModelProperty(value = "开始时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String startTime; + + @ApiModelProperty(value = "结束时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private String endTime; + + @ApiModelProperty(value = "关键字") + private String keyWord; + +} \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InputRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InputRecordMapper.java index 2eaa6df..8e0e330 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InputRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InputRecordMapper.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.mapper; import com.bonus.sgzb.material.domain.InputRecord; +import com.bonus.sgzb.material.domain.OutRecord; import com.bonus.sgzb.material.domain.ScrapRecord; import org.apache.ibatis.annotations.Mapper; @@ -20,4 +21,6 @@ public interface InputRecordMapper { * @return List */ List getInputRecordList(InputRecord bean); + + List getOutputRecordList(OutRecord bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InputRecordService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InputRecordService.java index 676a831..ff356e9 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InputRecordService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/InputRecordService.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.material.domain.InputRecord; +import com.bonus.sgzb.material.domain.OutRecord; import com.bonus.sgzb.material.domain.ScrapRecord; import java.util.List; @@ -18,4 +19,5 @@ public interface InputRecordService { * @return List */ List getInputRecordList(InputRecord bean); + List getOutputRecordList(OutRecord bean); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InputRecordServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InputRecordServiceImpl.java index ffc9c8b..54b7397 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InputRecordServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InputRecordServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.sgzb.material.service.impl; import com.bonus.sgzb.material.domain.InputRecord; +import com.bonus.sgzb.material.domain.OutRecord; import com.bonus.sgzb.material.domain.ScrapRecord; import com.bonus.sgzb.material.mapper.InputRecordMapper; import com.bonus.sgzb.material.mapper.ScrapRecordMapper; @@ -26,4 +27,9 @@ public class InputRecordServiceImpl implements InputRecordService { public List getInputRecordList(InputRecord bean) { return inputRecordMapper.getInputRecordList(bean); } + + @Override + public List getOutputRecordList(OutRecord bean) { + return inputRecordMapper.getOutputRecordList(bean); + } } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml index 6dda43f..4205c7c 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml @@ -1193,4 +1193,25 @@ left join ma_type mt3 on mt2.parent_id = mt3.type_id where lod.id = #{id} + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml index 29b08b8..9f11484 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/InputRecordMapper.xml @@ -50,4 +50,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND iad.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + \ No newline at end of file