订单组托代码

zc

2024-07-29 907e117c441d409fab5922e655039138a4715126

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -418,23 +418,23 @@
    @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<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_id", billNo).like("matnr", 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 = waitMatinService.selectList(new EntityWrapper<WaitMatin>().eq("temp1", billNo).like("size", size).last("and qty > in_qty"));
            waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and qty > in_qty"));
        }

        List<CombBillQueryVo> vos = new ArrayList<>();
        if (!Cools.isEmpty(waitMatins)) {
            for (WaitMatin waitMatin : waitMatins) {
            for (OrderDetl waitMatin : waitMatins) {
                CombBillQueryVo vo = new CombBillQueryVo();
                vo.setMatNo(waitMatin.getMatNo());
                vo.setMatName(waitMatin.getMatName());
                vo.setMatNo(waitMatin.getMatnr());
                vo.setMatName(waitMatin.getMaktx());
                vo.setCount(waitMatin.getQty()-waitMatin.getInQty());
                vo.setQty(waitMatin.getQty()-waitMatin.getInQty());
                vo.setBillNo(waitMatin.getBillNo());
                vo.setBillNo(waitMatin.getOrderNo());
                vo.setSeqNo(waitMatin.getSeqNo());
                vo.setUnit(waitMatin.getUnit());
                vo.setSpecs(waitMatin.getSpecs());