自动化立体仓库 - WMS系统
zc
2024-07-29 7ff441cde857c41ae9908100de9c469ed5ab76be
src/main/java/com/zy/asrs/controller/MobileController.java
@@ -159,7 +159,6 @@
                elem.setBatch(elem.getItemBatch());
            }
        });
        System.out.println(combParam);
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }
@@ -428,12 +427,14 @@
    @RequestMapping("/bill/query1/auth")
    @ManagerAuth(memo = "根据通知单查询明细")
    public R billQuery1(@RequestParam String billNo, @RequestParam String size) {
        System.out.println("-------------------------");
        System.out.println(billNo);
        System.out.println(size);
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("pg_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"));
        Order temp1 = orderService.selectOne(new EntityWrapper<Order>().eq("temp1", billNo));
        if (temp1 == null) {
            throw new CoolException("该订单不存在");
        }
        List<OrderDetl> waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", temp1.getOrderNo()).like("model", size).last("and anfme > work_qty"));
        if (waitMatins == null || waitMatins.isEmpty()) {
            throw new CoolException("该订单项不存在");
        }
        //如果通知单单号为空,则查询调拨单号
//        if (Cools.isEmpty(waitMatins) || waitMatins.size() <= 0) {
//            waitMatins = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("temp1", billNo).like("size", size).last("and anfme > work_qty"));
@@ -456,17 +457,10 @@
                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);
//                10.0
//                0.0
//                CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=1, matNo=41011659, matName=弹簧盘, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
//                10.0
//                0.0
//                CombBillQueryVo(billNo=ZJFLC2407280005, seqNo=2, matNo=4103020554, matName=支架, specs=null, size=null, color=null, count=10.0, qty=0.0, unit=Pcs, type=null, itemBatch=, oveFlag=null)
            }
        }
        return R.ok().add(vos);
    }
}