Merge remote-tracking branch 'origin/master'

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()+"无法生产");
+                logger.error("线体"+proOrder.getLineCodes()[i]+"无法生产");
-                break;
+                return R.fail("线体"+proOrder.getLineCodes()[i]+"无法生产");
             }
             Long efficiency = plineInfo.getEfficiency();
             if(efficiency < orderQua){

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()));
             }
         }