#

lty

8 小时以前 9db6b4c55b96998676c46d7f787d97b8637cd865

#

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

@@ -137,60 +137,67 @@
    @ManagerAuth
    public R orderSearchByBarcode(@RequestParam String orderNo){
        if (Cools.isEmpty(orderNo)){
            orderNo=null;
            orderNo = null;
        }
//        List<Order> orders = orderService.selectorderNoL(orderNo);

        List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
        if (Cools.isEmpty(orders)){
            return R.ok();
            return R.ok().add(new LinkedList<>());
        }
        LinkedList<CombParam> combParams = new LinkedList<>();
        if (!Cools.isEmpty(orders)){
            for (Order order:orders){
                CombParam combParam=new CombParam();
                if (order == null) {
                    continue;
                }
                DocType docType = docTypeService.selectById(order.getDocType());
                if (docType.getPakin() == null || docType.getPakin() != 1) {
                    continue;
                }
                if (order.getSettle() > 2) {
                    continue;
                }
//                List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                List<OrderDetl> orderDetls = OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());
                if (!Cools.isEmpty(orderDetls)) {
                    LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
                    for (OrderDetl orderDetl:orderDetls){
                        CombParam.CombMat combMat = new CombParam.CombMat();
                        combMat.setMatnr(orderDetl.getMatnr());
                        combMat.setBatch(orderDetl.getBatch());
                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMat.setBrand(orderDetl.getBrand());
                        combMat.setSku(orderDetl.getSku());
                        combMat.setMemo(orderDetl.getMemo());
                        combMat.setBoxType1(orderDetl.getBoxType1());
                        combMat.setBoxType2(orderDetl.getBoxType2());
                        combMat.setBoxType3(orderDetl.getBoxType3());
                        combMat.setStandby1(orderDetl.getStandby1());
                        combMat.setStandby2(orderDetl.getStandby2());
                        combMat.setStandby3(orderDetl.getStandby3());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setOrderNo(order.getOrderNo());
                return R.ok().add(combParam);

//                combParams.add(combParam);
        LinkedList<CombParam> combParams = new LinkedList<>();

        for (Order order : orders) {
            if (order == null) {
                continue;
            }

            DocType docType = docTypeService.selectById(order.getDocType());
            if (docType.getPakin() == null || docType.getPakin() != 1) {
                continue;
            }
            if (order.getSettle() > 2) {
                continue;
            }

            List<OrderDetl> orderDetls =
                    OrderInAndOutUtil.selectWorkingDetls(order.getPakinPakoutStatus$(), order.getId());

            CombParam combParam = new CombParam();

            if (!Cools.isEmpty(orderDetls)) {
                LinkedList<CombParam.CombMat> combMats = new LinkedList<>();

                for (OrderDetl od : orderDetls) {
                    CombParam.CombMat mat = new CombParam.CombMat();
                    mat.setMatnr(od.getMatnr());
                    mat.setBatch(od.getBatch());
                    mat.setAnfme(od.getAnfme() - od.getWorkQty());
                    mat.setMaktx(od.getMaktx());
                    mat.setSpecs(od.getSpecs());
                    mat.setBrand(od.getBrand());
                    mat.setSku(od.getSku());
                    mat.setMemo(od.getMemo());
                    mat.setSupp(od.getSupp());
                    mat.setBoxType1(od.getBoxType1());
                    mat.setBoxType2(od.getBoxType2());
                    mat.setBoxType3(od.getBoxType3());
                    mat.setStandby1(od.getStandby1());
                    mat.setStandby2(od.getStandby2());
                    mat.setStandby3(od.getStandby3());
                    combMats.add(mat);
                }
                combParam.setCombMats(combMats);
            }

            combParam.setOrderNo(order.getOrderNo());
            combParams.add(combParam);
        }

        return R.ok().add(combParams);
    }


    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){