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 474a82bb..a20c67ac 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 @@ -310,44 +310,32 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } //子工单报工 logger.info("==========================子工单报工开始"); - this.reportHzToSap(sHzWorks); - logger.info("==========================子工单报工结束"); - mesReportWork.setWorkorderCode(sapWorkOrders.get(0).getWorkorderCode()); - MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); - if(pHzWork==null){ - return R.fail("未查询到母报工单"); - } - //母工单报工 - logger.info("==========================母工单报工开始"); - pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); - pHzWork.setSac1(sHzWorks.getSac1()); - R sapR = this.reportHzToSap(pHzWork); - logger.info("==========================母工单报工结束"); - //最终报工标识且sap报工成功:关闭子母工单 - MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork); - if("1".equals(endReport.getEndReport())&&sapR.getCode()==200){ - /** - logger.info("报工======母sap工单编码:"+sapWorkOrders.get(0).getWorkorderCodeSap()+ - "子sap工单编码:"+sapWorkOrders.get(1).getWorkorderCodeSap() - ); - //关闭母子订单//订单的订单编码 - SapCloseOrderQuery sapCloseOrderQuery = new SapCloseOrderQuery(); - sapCloseOrderQuery.setLeadOrder(sapWorkOrders.get(0).getWorkorderCodeSap()); - sapCloseOrderQuery.setOrder(sapWorkOrders.get(1).getWorkorderCodeSap()); - R closeR = remoteSapService.sapCloseOrder(sapCloseOrderQuery); - logger.info("报工======关闭母子sap工单"+sapCloseOrderQuery.getLeadOrder()+":"+ - sapCloseOrderQuery.getOrder()+":"+ - closeR.getCode()+","+ - closeR.getMsg()+","+ - closeR.getData()); - **/ - MesReportWork rworkVo = new MesReportWork(); - rworkVo.setStatus("w3"); - rworkVo.setUpdateTime(DateUtils.getNowDate()); - rworkVo.setUpdateBy(SecurityUtils.getUsername()); - rworkVo.setWorkorderCode(belongWorkOrder); - //pro_work_order status->w3报工--belong_work_order - mesReportWorkMapper.updateOrderWorkStatus(rworkVo); + R sapRson = this.reportHzToSap(sHzWorks); + logger.info("==========================子工单报工结束:"+JSONObject.toJSONString(sapRson)); + if(sapRson.getCode()== 200){ + //一定是子单报工成功返回后,再母单报工 + mesReportWork.setWorkorderCode(sapWorkOrders.get(0).getWorkorderCode()); + MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork); + if(pHzWork==null){ + return R.fail("未查询到母报工单"); + } + //母工单报工 + logger.info("==========================母工单报工开始"); + pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback()); + pHzWork.setSac1(sHzWorks.getSac1()); + R sapR = this.reportHzToSap(pHzWork); + logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR)); + //最终报工标识且sap报工成功:关闭子母工单 + MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork); + if("1".equals(endReport.getEndReport())&&sapR.getCode()==200){ + MesReportWork rworkVo = new MesReportWork(); + rworkVo.setStatus("w3"); + rworkVo.setUpdateTime(DateUtils.getNowDate()); + rworkVo.setUpdateBy(SecurityUtils.getUsername()); + rworkVo.setWorkorderCode(belongWorkOrder); + //pro_work_order status->w3报工--belong_work_order + mesReportWorkMapper.updateOrderWorkStatus(rworkVo); + } } return R.ok(); }