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()+"未查询到报工单");