| | |
| | | |
| | | if(!isJSON(orderNo)){ |
| | | //检查订单是否已完成 |
| | | orderService.checkComplete(orderNo); |
| | | orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); |
| | | }else{ |
| | | List<Map> maps = JSONArray.parseArray(orderNo, Map.class); |
| | | maps.forEach(map -> { |
| | | String o = map.get("orderNo").toString(); |
| | | orderService.checkComplete(o); |
| | | orderService.checkComplete(o,agvWrkMast.getLocNo()); |
| | | }); |
| | | } |
| | | |
| | |
| | | }catch (Exception e){ |
| | | log.error(""+e.getMessage()); |
| | | } |
| | | reportMes(agvWrkMast,agvWrkDetlListOld); |
| | | //TODO |
| | | //reportMes(agvWrkMast,agvWrkDetlListOld); |
| | | return SUCCESS; |
| | | } |
| | | |
| | |
| | | agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); |
| | | if(!isJSON(orderNo)){ |
| | | //检查订单是否已完成 |
| | | orderService.checkComplete(orderNo); |
| | | orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); |
| | | }else{ |
| | | List<Map> maps = JSONArray.parseArray(orderNo, Map.class); |
| | | maps.forEach(map -> { |
| | | String o = map.get("orderNo").toString(); |
| | | orderService.checkComplete(o); |
| | | orderService.checkComplete(o,agvWrkMast.getLocNo()); |
| | | }); |
| | | } |
| | | |
| | |
| | | agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo)); |
| | | if(!isJSON(orderNo)){ |
| | | //检查订单是否已完成 |
| | | orderService.checkComplete(orderNo); |
| | | orderService.checkComplete(orderNo,agvWrkMast.getLocNo()); |
| | | }else{ |
| | | List<Map> maps = JSONArray.parseArray(orderNo, Map.class); |
| | | maps.forEach(map -> { |
| | | String o = map.get("orderNo").toString(); |
| | | orderService.checkComplete(o); |
| | | orderService.checkComplete(o,agvWrkMast.getLocNo()); |
| | | }); |
| | | } |
| | | //上报mes |