Yangwl
/
lanju-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sap预报工+计划批次bug+报工备注bug修复3

Browse Source
master
zhaoxiaolin 1 year ago
parent cdf72a20f6
commit 2285e279b2
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File

24
op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
Unescape Escape View File

@ -358,9 +358,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 // if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); // sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
} // }
if(sHzWorks==null){ if(sHzWorks==null){
return R.fail("未查询到一层报工单"); return R.fail("未查询到一层报工单");
@ -386,9 +386,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 // if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); // sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
} // }
if(sHzWorks==null){ if(sHzWorks==null){
return R.fail("未查询到子报工单"); return R.fail("未查询到子报工单");
@ -405,9 +405,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 // if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); // pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
} // }
if(pHzWork==null){ if(pHzWork==null){
return R.fail("未查询到母报工单"); return R.fail("未查询到母报工单");
@ -444,9 +444,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
mesReportWork.setMachineCode(mesReportWork.getMachineCode()); mesReportWork.setMachineCode(mesReportWork.getMachineCode());
MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork); MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0 // if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork); // sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
} // }
if (sHzWorks == null) { if (sHzWorks == null) {
return R.fail(workOrder.getWorkorderCode()+"未查询到报工单"); return R.fail(workOrder.getWorkorderCode()+"未查询到报工单");

Write Preview
Loading…
Cancel
Save