| | |
| | | return R.ok("出库成功"); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 根据通知单查询明细 |
| | | */ |
| | | @RequestMapping("/bill/query1/auth") |
| | | @ManagerAuth(memo = "根据通知单查询明细") |
| | | public R billQuery1(@RequestParam String billNo, @RequestParam String size){ |
| | | List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).like("size", size).last("and qty > in_qty")); |
| | | // List<WaitMatin> waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("bill_no", billNo).last("and qty > in_qty")); |
| | | |
| | | //如果通知单单号为空,则查询调拨单号 |
| | | if(Cools.isEmpty(waitMatins) || waitMatins.size()<=0){ |
| | | waitMatins = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("temp1", billNo).like("size", size).last("and qty > in_qty")); |
| | | } |
| | | |
| | | List<CombBillQueryVo> vos = new ArrayList<>(); |
| | | if (!Cools.isEmpty(waitMatins)) { |
| | | for (WaitMatin waitMatin : waitMatins) { |
| | | CombBillQueryVo vo = new CombBillQueryVo(); |
| | | vo.setMatNo(waitMatin.getMatNo()); |
| | | vo.setMatName(waitMatin.getMatName()); |
| | | vo.setCount(waitMatin.getQty()-waitMatin.getInQty()); |
| | | vo.setQty(waitMatin.getQty()-waitMatin.getInQty()); |
| | | vo.setBillNo(waitMatin.getBillNo()); |
| | | vo.setSeqNo(waitMatin.getSeqNo()); |
| | | vo.setUnit(waitMatin.getUnit()); |
| | | vo.setSpecs(waitMatin.getSpecs()); |
| | | vo.setSize(waitMatin.getSize()); |
| | | vo.setColor(waitMatin.getColor()); |
| | | vo.setItemBatch(waitMatin.getItemBatch()); |
| | | vo.setOveFlag(waitMatin.getOveFlag()); |
| | | vos.add(vo); |
| | | } |
| | | } |
| | | return R.ok().add(vos); |
| | | } |
| | | } |