Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

子单报工成功后再报母单

Browse Source
orign^2^2^2
zhaoxiaolin 1 year ago
parent d90f72417e
commit ed67be03ca
1 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File

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

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

Write Preview
Loading…
Cancel
Save