From 47e7bcbafeb3c70d911ef77f14013cf0cb9478e9 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Tue, 10 Feb 2026 09:26:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E8=B4=AD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseCheckInfoController.java | 17 +++++ .../material/domain/PurchaseInputDto.java | 67 +++++++++++++++++++ .../mapper/PurchaseCheckInfoMapper.java | 3 + .../service/IPurchaseCheckInfoService.java | 15 +++-- .../impl/PurchaseCheckInfoServiceImpl.java | 5 ++ .../material/PurchaseCheckInfoMapper.xml | 50 ++++++++++++-- 6 files changed, 146 insertions(+), 11 deletions(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInputDto.java diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index c066169e..ed6d991b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -2,9 +2,12 @@ package com.bonus.sgzb.material.controller; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; import com.bonus.sgzb.base.api.domain.MachinePart; +import com.bonus.sgzb.material.domain.PurchaseInputDto; import com.bonus.sgzb.material.domain.PurchaseInputVo; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; @@ -12,6 +15,7 @@ import com.bonus.sgzb.material.service.PurchaseCheckServiceCenterService; import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.bonus.sgzb.common.log.annotation.Log; @@ -46,6 +50,19 @@ public class PurchaseCheckInfoController extends BaseController { startPage(); return getDataTable(purchaseCheckInfoService.selectPutInListList(purchaseCheckInfo)); } + @ApiOperation("查询新购入库数据列表") + @GetMapping("/getPutInList") + public TableDataInfo getPutInList(PurchaseInputDto purchaseInputDto) { + startPage(); + return getDataTable(purchaseCheckInfoService.getPutInList(purchaseInputDto)); + } + @ApiOperation("导出新购入库数据列表") + @PostMapping("/exportPutInList") + public void exportPutInList(HttpServletResponse response, PurchaseInputDto purchaseInputDto) { + List list = purchaseCheckInfoService.getPutInList(purchaseInputDto); + ExcelUtil util = new ExcelUtil(PurchaseInputDto.class); + util.exportExcel(response, list, "新购入库数据列表"); + } /** * 成套机具明细查看 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInputDto.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInputDto.java new file mode 100644 index 00000000..7e434232 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseInputDto.java @@ -0,0 +1,67 @@ +package com.bonus.sgzb.material.domain; + +import com.bonus.sgzb.common.core.annotation.Excel; +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.List; + +/** + * 新购工机具入库 + * + * @author bonus + * @date 2023-12-10 + */ +@Data +public class PurchaseInputDto { + + /** + * 主键id + */ + @ApiModelProperty(value = "主键id") + private Long id; + /** + * 采购单号 + */ + @ApiModelProperty(value = "采购单号") + @Excel(name = "采购单号") + private String code; + + @ApiModelProperty(value = "数量") + @Excel(name = "数量") + private String checkNum; + + @ApiModelProperty(value = "采购日期") + @Excel(name = "采购日期") + private String purchaseTime; + + @ApiModelProperty(value = "入库日期") + @Excel(name = "入库日期") + private String inputTime; + + @ApiModelProperty(value = "类型名称") + @Excel(name = "类型名称") + private String typeName; + + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") + private String typeModelName; + + @ApiModelProperty(value = "采购人") + @Excel(name = "采购人") + private String purchaser; + + @ApiModelProperty(value = "入库人") + @Excel(name = "入库人") + private String inputUser; + + private String keyWord; + private String startTime; + private String endTime; + private String startTime1; + private String endTime1; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java index 40c1fbb0..39bc1a85 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/PurchaseCheckInfoMapper.java @@ -4,6 +4,7 @@ import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.material.domain.BmNoticeInfo; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; +import com.bonus.sgzb.material.domain.PurchaseInputDto; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -138,4 +139,6 @@ public interface PurchaseCheckInfoMapper { * @return */ int deletePurchaseMacodeInfoByTaskId(String code); + + List getPutInList(PurchaseInputDto purchaseInputDto); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java index e694e88b..eb54e7df 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IPurchaseCheckInfoService.java @@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.base.api.domain.MachinePart; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.PurchaseCheckInfo; +import com.bonus.sgzb.material.domain.PurchaseInputDto; import com.bonus.sgzb.material.domain.PurchaseInputVo; import com.bonus.sgzb.material.vo.NoticeInfoVO; @@ -10,11 +11,11 @@ import java.util.List; /** * 新购验收任务purchase_check_infoService接口 - * + * * @author bonus * @date 2023-12-10 */ -public interface IPurchaseCheckInfoService +public interface IPurchaseCheckInfoService { /** * 查询新购验收任务purchase_check_info @@ -26,7 +27,7 @@ public interface IPurchaseCheckInfoService /** * 查询新购验收任务purchase_check_info列表 - * + * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 新购验收任务purchase_check_info集合 */ @@ -34,7 +35,7 @@ public interface IPurchaseCheckInfoService /** * 新增新购验收任务purchase_check_info - * + * * @param purchaseCheckInfo 新购验收任务purchase_check_info * @return 结果 */ @@ -50,7 +51,7 @@ public interface IPurchaseCheckInfoService /** * 批量删除新购验收任务purchase_check_info - * + * * @param taskIds 需要删除的新购验收任务purchase_check_info主键集合 * @return 结果 */ @@ -58,7 +59,7 @@ public interface IPurchaseCheckInfoService /** * 删除新购验收任务purchase_check_info信息 - * + * * @param taskId 新购验收任务purchase_check_info主键 * @return 结果 */ @@ -110,4 +111,6 @@ public interface IPurchaseCheckInfoService List selectPutInListExamine(PurchaseCheckInfo purchaseCheckInfo); List getWholeSetDetails(PurchaseCheckInfo purchaseCheckInfo); + + List getPutInList(PurchaseInputDto purchaseInputDto); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index 0bed3f3a..d075b59f 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -171,6 +171,11 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { return purchaseCheckInfoMapper.getWholeSetDetails(purchaseCheckInfo); } + @Override + public List getPutInList(PurchaseInputDto purchaseInputDto) { + return purchaseCheckInfoMapper.getPutInList(purchaseInputDto); + } + /** * 查询新购验收任务列表 * diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml index 1cd2fc66..d10beaf4 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" GROUP BY pcd.task_id order by pci.create_time desc - + - + insert into purchase_check_info @@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from purchase_check_info where task_id in + delete from purchase_check_info where task_id in #{taskId} @@ -385,4 +385,44 @@ WHERE ma_machine.ma_code = WHERE task_id=#{taskId} - \ No newline at end of file + +