From ef93c6869d4e77f5e02acf2a6011556446b307a8 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 25 Jan 2024 17:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E5=A2=9E=E5=8A=A0bom?= =?UTF-8?q?=E5=8F=82=E8=80=83tab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesReportWorkConsumeController.java | 7 ++ .../op/mes/domain/MesReportWorkConsume.java | 73 +++++++++++++++++++ .../mapper/MesReportWorkConsumeMapper.java | 2 + .../service/IMesReportWorkConsumeService.java | 2 + .../impl/MesReportWorkConsumeServiceImpl.java | 7 ++ .../mapper/mes/MesReportWorkConsumeMapper.xml | 18 +++++ .../quality/QcCheckTaskProduceMapper.xml | 1 + 7 files changed, 110 insertions(+) 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 c67141d86..5a075762c 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 @@ -153,4 +153,11 @@ public class MesReportWorkConsumeController extends BaseController { public AjaxResult submitReportInfo(@RequestBody MesReportWork mesReportWork) { return toAjax(mesReportWorkConsumeService.submitReportInfo(mesReportWork)); } + + /**获取母子BOM**/ + @GetMapping("/getBomList") + public List getBomList(MesReportWorkConsume mesReportWorkConsume) { + List rlist = mesReportWorkConsumeService.getBomList(mesReportWorkConsume); + return rlist; + } } 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 d1a1d7fb1..597b5c834 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 @@ -72,6 +72,79 @@ public class MesReportWorkConsume extends BaseEntity { private String parentOrder; private String batch; private String recoil; + private String standardDosage; + private String lossRate; + private String lossAmount; + private String cilosses; + private String sanka; + private String productGroup; + private String productGroupName; + //上级物料 + private String pMaterialCode; + + public String getpMaterialCode() { + return pMaterialCode; + } + + public void setpMaterialCode(String pMaterialCode) { + this.pMaterialCode = pMaterialCode; + } + + public String getProductGroup() { + return productGroup; + } + + public void setProductGroup(String productGroup) { + this.productGroup = productGroup; + } + + public String getProductGroupName() { + return productGroupName; + } + + public void setProductGroupName(String productGroupName) { + this.productGroupName = productGroupName; + } + + public String getStandardDosage() { + return standardDosage; + } + + public void setStandardDosage(String standardDosage) { + this.standardDosage = standardDosage; + } + + public String getLossRate() { + return lossRate; + } + + public void setLossRate(String lossRate) { + this.lossRate = lossRate; + } + + public String getLossAmount() { + return lossAmount; + } + + public void setLossAmount(String lossAmount) { + this.lossAmount = lossAmount; + } + + public String getCilosses() { + return cilosses; + } + + public void setCilosses(String cilosses) { + this.cilosses = cilosses; + } + + public String getSanka() { + return sanka; + } + + public void setSanka(String sanka) { + this.sanka = sanka; + } public String getRecoil() { return recoil; 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 b349ef97b..410ed0f39 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 @@ -77,4 +77,6 @@ public interface MesReportWorkConsumeMapper { int addConsumePS(@Param("list")List rconsumes); List getSonConsumeList(MesReportWorkConsume mesReportWorkConsume); + + List getBomList(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 b3c49ded9..e2d134c2d 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 @@ -82,4 +82,6 @@ public interface IMesReportWorkConsumeService { int submitConsumePS(List mesReportWorkConsume); int submitReportInfo(MesReportWork mesReportWork); + + List getBomList(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 4cb75a1f9..b3adfb61e 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 @@ -252,4 +252,11 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer } return rconsumes; } + + @Override + @DS("#header.poolName") + public List getBomList(MesReportWorkConsume mesReportWorkConsume) { + List dtos = mesReportWorkConsumeMapper.getBomList(mesReportWorkConsume); + return dtos; + } } 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 45bba0c25..20c6b2e19 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 @@ -110,6 +110,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where mrwc.del_flag = '0' and pow.del_flag = '0' and pow.parent_order = #{workorderCode} + insert into mes_report_work_consume diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml index 052ac4030..806ecc9e5 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml @@ -124,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.check_type = #{checkType} and q.type_code = #{typeCode} + order by qct.create_time desc