| | |
| | | combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty()); |
| | | combMat.setMaktx(orderDetl.getMaktx()); |
| | | combMat.setSpecs(orderDetl.getSpecs()); |
| | | combMat.setDetId(orderDetl.getDetId()); |
| | | combMat.setDetlId(orderDetl.getId()); |
| | | combMats.add(combMat); |
| | | } |
| | | combParam.setCombMats(combMats); |
| | | } |
| | | combParam.setBillNo(order.getOrderNo()); |
| | | combParam.setOrderNo(order.getOrderNo()); |
| | | combParams.add(combParam); |
| | | } |
| | |
| | | mobileService.comb(combParam, getUserId()); |
| | | return R.ok("组托成功"); |
| | | } |
| | | @RequestMapping("/order/search/orderNoList/auth") |
| | | @ManagerAuth |
| | | public R orderSearchList(@RequestParam String orderNo) { |
| | | if (Cools.isEmpty(orderNo)) { |
| | | orderNo = null; |
| | | } |
| | | List<Order> orders = orderService.selectorderNoL2(orderNo); |
| | | if (Cools.isEmpty(orders)) { |
| | | return R.ok(); |
| | | } |
| | | return R.ok().add(orders); |
| | | } |
| | | |
| | | @RequestMapping("/pickIn/auth") |
| | | // @ManagerAuth(memo="盘点入库") |