From 87c4e71d3df072b799cf87f889be8249fbd3f684 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 6 May 2024 13:16:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=96=B9=E6=A1=88=E3=80=81?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=A4=E9=A1=B9+=E6=8A=A5=E5=B7=A5=E6=B1=87=E7=8E=87?= =?UTF-8?q?=E5=8A=A0=E5=88=B0=E6=88=90=E5=93=81=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IWCInterfaceServiceImpl.java | 5 ++-- .../op/quality/domain/QcCheckTaskDetail.java | 27 +++++++++++++++++++ .../quality/QcCheckReportIncomeMapper.xml | 4 ++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java index 4893bcfc..17b66bf8 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java @@ -382,8 +382,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { if(sHzWorks==null){ return R.fail("未查询到子报工单"); } - //查询base_product的report_rate//箱子-大盒-小盒 - BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode()); + //子工单报工 logger.info("==========================子工单报工开始"); sHzWorks.setMachineCode(mesReportWork.getMachineCode()); @@ -404,6 +403,8 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } //母工单报工 logger.info("==========================母工单报工开始"); + //查询base_product的report_rate//箱子-大盒-小盒 + BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(1).getProductCode()); if(reportRate != null){ BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP); pHzWork.setQuantityFeedback(newQuantity); diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java index e2193604..5583b8fb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTaskDetail.java @@ -138,6 +138,33 @@ public class QcCheckTaskDetail extends BaseEntity { private String defectCodes; private String defectNames; private String defectQualitys; + private String itemType; + private String judgeRate; + private String samplePlan; + + public String getSamplePlan() { + return samplePlan; + } + + public void setSamplePlan(String samplePlan) { + this.samplePlan = samplePlan; + } + + public String getItemType() { + return itemType; + } + + public void setItemType(String itemType) { + this.itemType = itemType; + } + + public String getJudgeRate() { + return judgeRate; + } + + public void setJudgeRate(String judgeRate) { + this.judgeRate = judgeRate; + } public String getDefectCodes() { return defectCodes; diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml index f7f997ba..4a797b31 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckReportIncomeMapper.xml @@ -153,7 +153,9 @@ qctp.upper_diff upperDiff, qctp.down_diff downDiff, qctp.sample, - qctp.sample_num sampleNum, + qcp.sample_plan samplePlan, + qctp.item_type itemType, + qctp.judge_rate judgeRate, qpt.standard_no standardNo from qc_check_task_detail td left join qc_check_type_project qctp on td.type_project_id = qctp.id