| | |
| | | System.out.println("-------------------------"); |
| | | System.out.println(billNo); |
| | | System.out.println(size); |
| | | List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", billNo).like("model", size).last("and anfme > work_qty")); |
| | | List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", billNo).like("model", size).last("and anfme > work_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 = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and qty > in_qty")); |
| | | } |
| | | // if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) { |
| | | // waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty")); |
| | | // } |
| | | |
| | | List<CombBillQueryVo> vos = new ArrayList<>(); |
| | | if (!Cools.isEmpty(waitMatins)) { |
| | |
| | | CombBillQueryVo vo = new CombBillQueryVo(); |
| | | vo.setMatNo(waitMatin.getMatnr()); |
| | | vo.setMatName(waitMatin.getMaktx()); |
| | | vo.setCount(waitMatin.getQty() - waitMatin.getAnfme()); |
| | | vo.setQty(waitMatin.getQty() - waitMatin.getWorkQty()); |
| | | vo.setQty(waitMatin.getQty()); |
| | | vo.setCount(waitMatin.getAnfme() - waitMatin.getWorkQty()); |
| | | vo.setBillNo(waitMatin.getOrderNo()); |
| | | vo.setSeqNo(waitMatin.getINo()); |
| | | vo.setUnit(waitMatin.getUnit()); |
| | |
| | | vo.setItemBatch(waitMatin.getBatch()); |
| | | //vo.setOveFlag(waitMatin.getOveFlag()); |
| | | vos.add(vo); |
| | | System.out.println(waitMatin.getAnfme()); |
| | | System.out.println(waitMatin.getWorkQty()); |
| | | System.out.println(vo); |
| | | } |
| | | } |
| | | return R.ok().add(vos); |