| | |
| | | continue; |
| | | } |
| | | |
| | | if(Cools.isEmpty(wcsStationDto.getTaskNo())){ |
| | | continue; |
| | | } |
| | | |
| | | String errorMsg = ""; |
| | | if (!Cools.isEmpty(wcsStationDto.getErrorMsg())) { |
| | | errorMsg += wcsStationDto.getErrorMsg(); |
| | |
| | | tvDataDto.setBarcode(wcsStationDto.getBarcode()); |
| | | tvDataDto.setErrorMsg(errorMsg); |
| | | tvDataDto.setIoType(wcsStationDto.getIoType()); |
| | | tvDataDto.setOrderNo(wcsStationDto.getOrderNo()); |
| | | tvDataDto.setWrkDetls(wcsStationDto.getWrkDetls()); |
| | | |
| | | if (Cools.isEmpty(errorMsg)) { |
| | |
| | | |
| | | |
| | | map.put("data", list); |
| | | System.out.println(map); |
| | | return R.ok().add(map); |
| | | } |
| | | |
| | |
| | | if(o == null){ |
| | | return R.error(); |
| | | } |
| | | |
| | | return R.ok().add(JSON.parseObject(o.toString())); |
| | | } |
| | | |