| | |
|---|
| | | |
|---|
| | | @RequestMapping("/comb/auth") |
|---|
| | | @ManagerAuth(memo = "组托") |
|---|
| | | public R comb(@RequestBody CombParam combParam) { |
|---|
| | | public synchronized R comb(@RequestBody CombParam combParam) { |
|---|
| | | log.info("组托数据：{}", combParam.toString()); |
|---|
| | | mobileService.comb(combParam, getUserId(), getUser().getEmail()); |
|---|
| | | return R.ok("组托成功"); |
|---|
| | |
|---|
| | | if (wrkMast != null) { |
|---|
| | | List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo()); |
|---|
| | | // 去除已出库确认的明细 |
|---|
| | | wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0); |
|---|
| | | // wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() != null && wrkDetl.getInspect() != 0); |
|---|
| | | return R.ok().add(Cools.add("wrkNo", wrkMast.getWrkNo()).add("ioType", wrkMast.getIoType()).add("list", wrkDetls)); |
|---|
| | | } |
|---|
| | | return R.ok(); |
|---|
