From d0dd51a7777060adc3ff87190bb4ad7eeffff97a Mon Sep 17 00:00:00 2001 From: A0010407 Date: Fri, 25 Aug 2023 14:42:15 +0800 Subject: [PATCH] =?UTF-8?q?mes=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesReportWorkConsumeController.java | 11 ++++++++ .../op/mes/domain/MesReportWorkConsume.java | 28 ++++++++++++++++++- .../mapper/MesReportWorkConsumeMapper.java | 2 ++ .../service/IMesReportWorkConsumeService.java | 8 ++++++ .../impl/MesReportWorkConsumeServiceImpl.java | 12 ++++++++ .../mapper/mes/MesReportWorkConsumeMapper.xml | 14 ++++++++-- 6 files changed, 72 insertions(+), 3 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java index 4c07ab6af..674a1bbd3 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkConsumeController.java @@ -97,4 +97,15 @@ public class MesReportWorkConsumeController extends BaseController { public AjaxResult remove(@PathVariable String[] recordIds) { return toAjax(mesReportWorkConsumeService.deleteMesReportWorkConsumeByRecordIds(recordIds)); } + + /** + * 查询生产报工物料消耗列表 + */ + @RequiresPermissions("mes:reportWorkConsume:list") + @GetMapping("/consumeList") + public TableDataInfo consumeList(MesReportWorkConsume mesReportWorkConsume) { + startPage(); + List list = mesReportWorkConsumeService.selectMesReportWorkConsumeList(mesReportWorkConsume); + return getDataTable(list); + } } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java index 2effd3eb7..f2f1616f4 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java @@ -61,6 +61,13 @@ public class MesReportWorkConsume extends BaseEntity { @Excel(name = "工厂编码") private String factoryCode; + /** 工厂编码 */ + @Excel(name = "报工编码") + private String reportCode; + + //虚拟字段 + private String id; + public void setRecordId(String recordId) { this.recordId = recordId; } @@ -68,13 +75,21 @@ public class MesReportWorkConsume extends BaseEntity { public String getRecordId() { return recordId; } + public void setWorkorderCode(String workorderCode) { this.workorderCode = workorderCode; } - public String getWorkorderCode() { return workorderCode; } + + public void setReportCode(String reportCode) { + this.reportCode = reportCode; + } + public String getReportCode() { + return reportCode; + } + public void setMaterialCode(String materialCode) { this.materialCode = materialCode; } @@ -146,10 +161,21 @@ public class MesReportWorkConsume extends BaseEntity { return factoryCode; } + //虚拟字段 + public void setId(String factoryCode) { + this.id = id; + } + + public String getId() { + return id; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("recordId", getRecordId()) + .append("id", getId()) + .append("reportCode", getReportCode()) .append("workorderCode", getWorkorderCode()) .append("materialCode", getMaterialCode()) .append("materialName", getMaterialName()) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java index 9cb360ca6..daea48774 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java @@ -58,4 +58,6 @@ public interface MesReportWorkConsumeMapper { * @return 结果 */ public int deleteMesReportWorkConsumeByRecordIds(String[] recordIds); + + List selectMesReportWorkConsumeListById(MesReportWorkConsume mesReportWorkConsume); } diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java index c2c849d1e..b60e9f5e1 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/IMesReportWorkConsumeService.java @@ -18,6 +18,14 @@ public interface IMesReportWorkConsumeService { */ public MesReportWorkConsume selectMesReportWorkConsumeByRecordId(String recordId); + /** + * 查询生产报工物料消耗 + * + * @param mesReportWorkConsume 生产报工物料消耗主键 + * @return 生产报工物料消耗 + */ + public List selectMesReportWorkConsumeListById(MesReportWorkConsume mesReportWorkConsume); + /** * 查询生产报工物料消耗列表 * diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java index fda3beed2..875e24eb7 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java @@ -45,6 +45,18 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer return mesReportWorkConsumeMapper.selectMesReportWorkConsumeList(mesReportWorkConsume); } + /** + * 查询生产报工物料消耗列表 + * + * @param mesReportWorkConsume 生产报工物料消耗 + * @return 生产报工物料消耗 + */ + @Override + @DS("#header.poolName") + public List selectMesReportWorkConsumeListById(MesReportWorkConsume mesReportWorkConsume) { + return mesReportWorkConsumeMapper.selectMesReportWorkConsumeListById(mesReportWorkConsume); + } + /** * 新增生产报工物料消耗 * diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml index 80811a628..a0db2c828 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -25,12 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select record_id, workorder_code, material_code, material_name, material_spc, quantity, unit, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code from mes_report_work_consume + select record_id, workorder_code, material_code, material_name, material_spc, quantity, unit, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time, factory_code,report_code from mes_report_work_consume + +