From 2285e279b2d633acb56e4d3bdfc2e8ca91b3267f Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Sat, 25 May 2024 10:40:43 +0800 Subject: [PATCH] =?UTF-8?q?sap=E9=A2=84=E6=8A=A5=E5=B7=A5+=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E6=89=B9=E6=AC=A1bug+=E6=8A=A5=E5=B7=A5=E5=A4=87?= =?UTF-8?q?=E6=B3=A8bug=E4=BF=AE=E5=A4=8D3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IWCInterfaceServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 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 02dca470..7f6dd6d6 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 @@ -358,9 +358,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { mesReportWork.setMachineCode(mesReportWork.getMachineCode()); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 - sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); - } +// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 +// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); +// } if(sHzWorks==null){ return R.fail("未查询到一层报工单"); @@ -386,9 +386,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { mesReportWork.setMachineCode(mesReportWork.getMachineCode()); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 - sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); - } +// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 +// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); +// } if(sHzWorks==null){ return R.fail("未查询到子报工单"); @@ -405,9 +405,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { mesReportWork.setMachineCode(mesReportWork.getMachineCode()); MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 - pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); - } +// if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 +// pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); +// } if(pHzWork==null){ return R.fail("未查询到母报工单"); @@ -444,9 +444,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { mesReportWork.setMachineCode(mesReportWork.getMachineCode()); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 - sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); - } +// if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 +// sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); +// } if (sHzWorks == null) { return R.fail(workOrder.getWorkorderCode()+"未查询到报工单");