| | |
| | | excludeTrash(param); |
| | | EntityWrapper<AgvBasDevp> wrapper = new EntityWrapper<>(); |
| | | convert(param, wrapper); |
| | | if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} |
| | | if (!Cools.isEmpty(orderByField)) { |
| | | wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); |
| | | } |
| | | return R.ok(agvBasDevpService.selectPage(new Page<>(curr, limit), wrapper)); |
| | | } |
| | | |
| | |
| | | |
| | | return R.ok(result); |
| | | } |
| | | |
| | | @RequestMapping(value = "/basDevp/visualized/list/auth/v2") |
| | | public R visualizedList(@RequestParam String stationCode){ |
| | | |
| | |
| | | |
| | | return R.ok(result); |
| | | } |
| | | |
| | | /* |
| | | 任务完成 |
| | | */ |
| | |
| | | @RequestMapping(value = "/basDevp/visualized/container/pickIn") |
| | | @ManagerAuth(memo = "已拣料回库") |
| | | public R visualiZedPickIn(@RequestBody Map<String,Object> map){ |
| | | if (Cools.isEmpty(map.get("devNo"))) { |
| | | return R.error("站点不能为空"); |
| | | } |
| | | if (Cools.isEmpty(map.get("barcode"))) { |
| | | return R.error("货架码不能为空"); |
| | | } |
| | | List<AgvWrkMast> agvWrkMastList = new ArrayList<>(); |
| | | String devNo = map.get("devNo").toString(); |
| | | String barcode = map.get("barcode").toString(); |
| | |
| | | } else { |
| | | return R.error("查不到拣料出库任务"); |
| | | } |
| | | |
| | | |
| | | |
| | | return R.ok("生成拣料回库任务成功"); |