| | |
|---|
| | | if (wrkMast != null) { |
|---|
| | | if (wrkMast.getIoType()==110&& wrkMast.getWrkSts()>12){ |
|---|
| | | wrkMast.setWrkSts(32L);//32.等待组托 |
|---|
| | | }else if (wrkMast.getIoType()==101){ |
|---|
| | | }else if (wrkMast.getIoType()==101 && wrkMast.getWrkSts()>12){ |
|---|
| | | wrkMast.setWrkSts(15L);//15.出库更新完成 |
|---|
| | | }else if (wrkMast.getIoType()==103 && wrkMast.getWrkSts()>12){ |
|---|
| | | wrkMast.setWrkSts(20L);//20.等待回库 |
|---|
| | | } |
|---|
| | | wrkMast.setModiTime(new Date()); |
|---|
| | | wrkMast.setOveMk("Y"); |
|---|
| | | wrkMastService.updateById(wrkMast); |
|---|
| | | task.setWrkSts(305L);//任务状态从304--》305 |
|---|
| | | task.setModiTime(new Date()); |
|---|
| | | taskService.updateById(task); |
|---|
| | | |
|---|
| | | //对转序搬运完成的任务结果反馈给mes |
|---|
| | | }else if(task.getTaskType().equals("ZX-AGV")){ |
|---|
| | | HashMap<String,Object> map = new HashMap<>(); |
|---|
| | | map.put("taskno", task.getTaskNo()); |
|---|
| | | String mesUrl = url+"AGVArrivalCompletedFit"; |
|---|
| | | String response = RcsServiceImpl.sendPost(mesUrl, JSONObject.toJSONString(map)); |
|---|
| | | if (!StringUtils.isEmpty(response) && response.contains("Success")){ |
|---|
| | | MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class); |
|---|
| | | if("1".equals(mesReturn.getSuccess())) { |
|---|
| | | task.setWrkSts(305L);//任务状态从304--》305 |
|---|
| | | task.setModiTime(new Date()); |
|---|
| | | taskService.updateById(task); |
|---|
| | | }else { |
|---|
| | | return new ReturnT<>(500, mesReturn.getMessage()); |
|---|
| | | }else if(task.getTaskType().equals("ZX-AGV-08-1")||task.getTaskType().equals("ZX-AGV-08-2")){ |
|---|
| | | if(!task.getStaNo().equals("307")){ |
|---|
| | | HashMap<String,Object> map = new HashMap<>(); |
|---|
| | | map.put("taskno", task.getTaskNo()); |
|---|
| | | map.put("StationId", task.getSourceStaNo()); |
|---|
| | | String mesUrl = url+"AGVArrivalCompletedFit"; |
|---|
| | | String response = RcsServiceImpl.sendPost(mesUrl, JSONObject.toJSONString(map)); |
|---|
| | | if (!StringUtils.isEmpty(response) && response.contains("Success")){ |
|---|
| | | MesReturn mesReturn = JSONObject.parseObject(response, MesReturn.class); |
|---|
| | | if("1".equals(mesReturn.getSuccess())) { |
|---|
| | | task.setWrkSts(305L);//任务状态从304--》305 |
|---|
| | | task.setModiTime(new Date()); |
|---|
| | | taskService.updateById(task); |
|---|
| | | }else { |
|---|
| | | return new ReturnT<>(500, mesReturn.getMessage()); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | }else { |
|---|
