From 6276ae47f61a25f5d98c09266a90a6cbb779a672 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 11 Jul 2024 17:57:08 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/plan/service/impl/ProOrderServiceImpl.java | 4 ++-- .../com/op/quality/service/impl/QcProCheckServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java index a887f7ae..1a38c0d7 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java @@ -1347,8 +1347,8 @@ public class ProOrderServiceImpl implements IProOrderService { proOrder.setLineCode(proOrder.getLineCodes()[i]); ProLine plineInfo = proOrderWorkorderMapper.getLineProductInfo(proOrder);//线体母单产品产能和线体代码 if(plineInfo==null){ - logger.error("线体"+proOrder.getLineCodes()[i]+"产能"+plineInfo.getEfficiency()+"无法生产"); - break; + logger.error("线体"+proOrder.getLineCodes()[i]+"无法生产"); + return R.fail("线体"+proOrder.getLineCodes()[i]+"无法生产"); } Long efficiency = plineInfo.getEfficiency(); if(efficiency < orderQua){ diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index f2c56fe2..8fe9c061 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -135,7 +135,7 @@ public class QcProCheckServiceImpl implements QcProCheckService { } if("checkTypeCP".equals(qcCheckTaskIncome.getCheckType())){//成品检验数量取实际产量 - dto.setQuality(qcProCheckMapper.getMesReportQuality(qcCheckTaskIncome.getOrderNo())); + dto.setQuality(qcProCheckMapper.getMesReportQuality(dto.getOrderNo())); } }