| | |
| | | |
| | | @RequestMapping("/combMeger/auth") |
| | | @ManagerAuth(memo = "并板") |
| | | public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam) { |
| | | public synchronized R adjustNewV2(@RequestBody CombParam combParam) { |
| | | mobileService.adjustNew(combParam, Boolean.TRUE, getUserId()); |
| | | return R.ok("并板成功"); |
| | | } |
| | | |
| | | @RequestMapping("/checkDetl/auth/v2") |
| | | @ManagerAuth |
| | | public R getCheckDetlV2(@RequestParam(required = false) String barcode) { |
| | | if (Cools.isEmpty(barcode)) { |
| | | return R.ok(); |
| | | } |
| | | WrkMast wrkMast = wrkMastService.selectByBarcode(barcode); |
| | | if (wrkMast != null && (wrkMast.getIoType() == 107 || wrkMast.getIoType() == 57)) { |
| | | List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); |
| | | if (!Cools.isEmpty(wrkDetls)) { |
| | | MobileAdjustResult result = new MobileAdjustResult(); |
| | | result.setBarcode(barcode); |
| | | result.setWrkNo(wrkMast.getWrkNo()); |
| | | result.setWrkDetls(wrkDetls); |
| | | return R.ok().add(result); |
| | | } |
| | | } |
| | | return R.ok(); |
| | | } |
| | | |
| | | @RequestMapping("/inventory/auth") |
| | | @ManagerAuth(memo = "盘点") |
| | | public synchronized R inventory(@RequestBody CombParam combParam) { |
| | | mobileService.inventory(combParam, Boolean.TRUE, getUserId()); |
| | | return R.ok("盘点成功"); |
| | | } |
| | | |
| | | @RequestMapping("/empty/plate/out/start") |
| | | @ManagerAuth(memo = "空板出库") |
| | | public R emptyPlateOutStart(EmptyPlateOutParam param) { |