From f52d9436819b56a68da35a603c76e525ee626c0d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 8 Aug 2024 13:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E6=A3=80bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/plan/ProOrderWorkorderMapper.xml | 3 +- .../op/quality/controller/QuaController.java | 9 ++--- .../quality/domain/QcCheckReportIncome.java | 9 +++++ .../mapper/QcCheckReportIncomeMapper.java | 2 +- .../impl/QcCheckReportIncomeServiceImpl.java | 4 ++ .../impl/QcCheckReportProduceServiceImpl.java | 27 ++++++++++---- .../impl/QcCheckTaskIncomeServiceImpl.java | 1 + .../quality/QcCheckReportIncomeMapper.xml | 37 ++++++++++++------- .../quality/QcCheckTaskIncomeMapper.xml | 1 + 9 files changed, 64 insertions(+), 29 deletions(-) diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index f18ce253..72b80400 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -685,7 +685,8 @@ pow.product_date productDateStr, pow.workorder_code_sap workorderCode, powb.batch_code batchCode, - powb.batch_quantity batchQuantity, + case when powbp.quantity is not null then powbp.quantity + else powb.batch_quantity end batchQuantity, bpa.pallet_num palletNum, concat(pow.workorder_code_sap,'-', powb.batch_code) palletCode, powbp.pallet_num palletNo diff --git a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java index e44657e9..f3a49d2d 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/controller/QuaController.java @@ -214,18 +214,15 @@ public class QuaController extends BaseController { @PostMapping(value = "commitCheckResults") public AjaxResult commitCheckResults(@RequestBody QcCheckTaskIncome qcCheckTaskIncome) { DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); - if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ - return error("[List]不能为空"); - } +// if(CollectionUtils.isEmpty(qcCheckTaskIncome.getQcCheckTaskDetails())){ +// return error("[List]不能为空"); +// } if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateBy())){ return error("[updateBy]不能为空"); } if(StringUtils.isBlank(qcCheckTaskIncome.getUpdateByName())){ return error("[updateByName]不能为空"); } -// if(StringUtils.isBlank(qcCheckTaskIncome.getCheckResult())){ -// return error("[checkResult]不能为空"); -// } return toAjax(qcCheckTaskIncomeService.commitCheckResults(qcCheckTaskIncome)); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java index 9e3b6297..fbaad8a7 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckReportIncome.java @@ -187,6 +187,15 @@ public class QcCheckReportIncome extends BaseEntity { private Boolean myself; private String shiftId; private String orderType; + private String standardNo; + + public String getStandardNo() { + return standardNo; + } + + public void setStandardNo(String standardNo) { + this.standardNo = standardNo; + } public String getOrderType() { return orderType; diff --git a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java index ce996f4f..8f8612cb 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckReportIncomeMapper.java @@ -82,7 +82,7 @@ public interface QcCheckReportIncomeMapper { QcCheckReportIncome getLastXJTaskInfo(QcCheckReportIncome qcCheckReportIncome); - QcCheckTaskProduce getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); + List getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce); List getBatchsByTaskId(String recordId); } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java index 5d799988..27e55801 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportIncomeServiceImpl.java @@ -208,6 +208,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi dto.setActualValue(dto.getRemark()); } + if(StringUtils.isNotBlank(dto.getActualValue()) && dto.getActualValue().equals("[\"/\"]")){ + dto.setStatus("未检验"); + } + //检验项目 String ruleName = dto.getRuleName(); if(StringUtils.isNotBlank(ruleName)){ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java index 0b70e824..6dfb5cd8 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckReportProduceServiceImpl.java @@ -221,13 +221,26 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId()); List checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable); produce.setCheckInfos(checkInfos); - QcCheckTaskProduce lastProduce = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); - if (lastProduce != null) { - produce.setProductType(lastProduce.getProductType()); - produce.setCheckManCode(lastProduce.getCheckManCode()); - produce.setCheckManName(lastProduce.getCheckManName()); - produce.setConfirmManCode(lastProduce.getConfirmManCode()); - produce.setConfirmManName(lastProduce.getConfirmManName()); + List lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce); + if (!CollectionUtils.isEmpty(lastProduces)) { + produce.setProductType(lastProduces.get(0).getProductType()); + String mancodes = lastProduces.stream() + .map(QcCheckTaskProduce::getCheckManCode) + .collect(Collectors.joining(", ")); + produce.setCheckManCode(mancodes); + String mannames = lastProduces.stream() + .map(QcCheckTaskProduce::getCheckManName) + .collect(Collectors.joining(", ")); + produce.setCheckManName(mannames); + String cmancodes = lastProduces.stream() + .map(QcCheckTaskProduce::getConfirmManCode) + .collect(Collectors.joining(", ")); + produce.setConfirmManCode(cmancodes); + String cmannames = lastProduces.stream() + .map(QcCheckTaskProduce::getConfirmManName) + .filter(confirmManName -> confirmManName != null) + .collect(Collectors.joining(", ")); + produce.setConfirmManName(cmannames); } return produce; } diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java index d9b9951c..17eba19c 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskIncomeServiceImpl.java @@ -689,6 +689,7 @@ public class QcCheckTaskIncomeServiceImpl implements qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName()); qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality()); qcCheckTask.setReason(qcCheckTaskIncome.getReason()); + qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3()); /**qc_check_task**/ n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask); logger.info("qc_check_task:"+n); 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 3c43be89..2738f0b1 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 @@ -39,6 +39,8 @@ + + @@ -90,8 +92,16 @@