From 307c528e59b0edc5f473954fae25ff3dbce1b2df Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 16 Dec 2025 17:16:14 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-16=20=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E9=80=9A=E7=9F=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IssureNotifyController.java | 9 + .../entity/IssueNotifyReportData.java | 214 ++++++++++++++++++ .../mapper/IssureNotifyMapper.java | 8 + .../service/IssureNotifyService.java | 7 + .../service/impl/IssureNotifyServiceImpl.java | 7 + .../mapper/orderIssure/IssureNotifyMapper.xml | 62 +++++ 6 files changed, 307 insertions(+) create mode 100644 src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java diff --git a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java index 81674fb..3f4d09b 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java +++ b/src/main/java/com/gaotao/modules/orderIssure/controller/IssureNotifyController.java @@ -385,4 +385,13 @@ public class IssureNotifyController { return R.ok().put("rows", list); } + /** + * 生产领料任务通知报表查询 + */ + @PostMapping("/searchIssueNotifyReport") + public R searchIssueNotifyReport(@RequestBody IssueNotifyReportData data) { + PageUtils page = issureNotifyService.searchIssueNotifyReport(data); + return R.ok().put("page", page); + } + } diff --git a/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java new file mode 100644 index 0000000..27c00c9 --- /dev/null +++ b/src/main/java/com/gaotao/modules/orderIssure/entity/IssueNotifyReportData.java @@ -0,0 +1,214 @@ +package com.gaotao.modules.orderIssure.entity; + +import java.math.BigDecimal; + +/** + * 生产领料任务通知报表数据实体 + */ +public class IssueNotifyReportData { + + // 分页参数 + private Integer page; + private Integer limit; + + // 查询条件 + private String site; + private String userName; + private String notifyNo; + private String startDate; + private String endDate; + private String status; + private String soOrderNo; + private String bomItemNo; + private String componentPartNo; + private String partDescription; + private String spec; + private String workCenterNo; + private java.util.List workCenterNoList; + + // 列表数据 + private String notifyDate; + private String umName; + private BigDecimal componentScrap; + private BigDecimal firstInspectionQty; + private BigDecimal standardDosage; + private BigDecimal qtyToIssue; + private BigDecimal actualOutQty; + + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + + public Integer getLimit() { + return limit; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getNotifyNo() { + return notifyNo; + } + + public void setNotifyNo(String notifyNo) { + this.notifyNo = notifyNo; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getSoOrderNo() { + return soOrderNo; + } + + public void setSoOrderNo(String soOrderNo) { + this.soOrderNo = soOrderNo; + } + + public String getBomItemNo() { + return bomItemNo; + } + + public void setBomItemNo(String bomItemNo) { + this.bomItemNo = bomItemNo; + } + + public String getComponentPartNo() { + return componentPartNo; + } + + public void setComponentPartNo(String componentPartNo) { + this.componentPartNo = componentPartNo; + } + + public String getPartDescription() { + return partDescription; + } + + public void setPartDescription(String partDescription) { + this.partDescription = partDescription; + } + + public String getSpec() { + return spec; + } + + public void setSpec(String spec) { + this.spec = spec; + } + + public String getWorkCenterNo() { + return workCenterNo; + } + + public void setWorkCenterNo(String workCenterNo) { + this.workCenterNo = workCenterNo; + } + + public java.util.List getWorkCenterNoList() { + return workCenterNoList; + } + + public void setWorkCenterNoList(java.util.List workCenterNoList) { + this.workCenterNoList = workCenterNoList; + } + + public String getNotifyDate() { + return notifyDate; + } + + public void setNotifyDate(String notifyDate) { + this.notifyDate = notifyDate; + } + + public String getUmName() { + return umName; + } + + public void setUmName(String umName) { + this.umName = umName; + } + + public BigDecimal getComponentScrap() { + return componentScrap; + } + + public void setComponentScrap(BigDecimal componentScrap) { + this.componentScrap = componentScrap; + } + + public BigDecimal getFirstInspectionQty() { + return firstInspectionQty; + } + + public void setFirstInspectionQty(BigDecimal firstInspectionQty) { + this.firstInspectionQty = firstInspectionQty; + } + + public BigDecimal getStandardDosage() { + return standardDosage; + } + + public void setStandardDosage(BigDecimal standardDosage) { + this.standardDosage = standardDosage; + } + + public BigDecimal getQtyToIssue() { + return qtyToIssue; + } + + public void setQtyToIssue(BigDecimal qtyToIssue) { + this.qtyToIssue = qtyToIssue; + } + + public BigDecimal getActualOutQty() { + return actualOutQty; + } + + public void setActualOutQty(BigDecimal actualOutQty) { + this.actualOutQty = actualOutQty; + } +} + diff --git a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java index 597b0e5..90d8db0 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java +++ b/src/main/java/com/gaotao/modules/orderIssure/mapper/IssureNotifyMapper.java @@ -187,4 +187,12 @@ public interface IssureNotifyMapper extends BaseMapper { void deleteNotifyMaterial2(SOIssueNotifyOrderMaterialListData data); List getWorkCenterList(BuData data); + + /** + * 生产领料任务通知报表查询 + * @param page 分页对象 + * @param data 查询条件 + * @return 分页数据 + */ + IPage searchIssueNotifyReport(Page page, @Param("query") IssueNotifyReportData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java index 3591d59..3b041b3 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/IssureNotifyService.java @@ -160,4 +160,11 @@ public interface IssureNotifyService { List getBomAlternativeParts(BomAlternativePartsData data); List getWorkCenterList(BuData data); + + /** + * 生产领料任务通知报表查询 + * @param data 查询条件 + * @return 分页数据 + */ + PageUtils searchIssueNotifyReport(IssueNotifyReportData data); } diff --git a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index e44857c..a01be9c 100644 --- a/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -543,4 +543,11 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { return issureNotifyMapper.getBomAlternativeParts(data); } + @Override + public PageUtils searchIssueNotifyReport(IssueNotifyReportData data) { + IPage resultList = issureNotifyMapper.searchIssueNotifyReport( + new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } + } diff --git a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml index 6932366..a599465 100644 --- a/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml +++ b/src/main/resources/mapper/orderIssure/IssureNotifyMapper.xml @@ -652,4 +652,66 @@ from WorkCenter where site = #{site} and bu_no = #{buNo} + + + \ No newline at end of file