| | |
| | | @RequestMapping("/comb/auth") |
| | | @ManagerAuth(memo = "组托") |
| | | public R comb(@RequestBody CombParam combParam){ |
| | | mobileService.comb(combParam, getUserId()); |
| | | return R.ok("组托成功"); |
| | | if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) { |
| | | throw new CoolException(BaseRes.PARAM); |
| | | } |
| | | WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>() |
| | | .eq("barcode", combParam.getBarcode()) |
| | | .eq("io_type", 104) |
| | | .eq("wrk_sts", 14)); |
| | | if (Cools.isEmpty(wrkMast)) { |
| | | mobileService.comb(combParam, getUserId()); |
| | | return R.ok("组托成功"); |
| | | }else { |
| | | mobileService.mergeComb(combParam, getUserId()); |
| | | return R.ok("并板成功"); |
| | | } |
| | | |
| | | |
| | | } |
| | | |
| | | @RequestMapping("/pack/get/auth") |