#

18516761980

2023-03-04 a2f28fb1c32aeefbe549f48c4ed07929ef851b1b

#

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

@@ -57,22 +57,46 @@
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
    public R orderSearchByBarcode(@RequestParam String orderNo){
        Order order = orderService.selectByNo(orderNo);
        if (order == null) {
        if (Cools.isEmpty(orderNo)){
            orderNo=null;
        }
        List<Order> orders = orderService.selectorderNoL(orderNo);
        if (Cools.isEmpty(orders)){
            return R.ok();
        }
        DocType docType = docTypeService.selectById(order.getDocType());
        if (docType.getPakin() == null || docType.getPakin() != 1) {
            return R.ok();
        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());
                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.getQty());
                        combMat.setMaktx(orderDetl.getMaktx());
                        combMat.setSpecs(orderDetl.getSpecs());
                        combMats.add(combMat);
                    }
                    combParam.setCombMats(combMats);
                }
                combParam.setOrderNo(order.getOrderNo());
                combParams.add(combParam);
            }
        }
        if (order.getSettle() > 2) {
            return R.ok();
        }
        List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
        if (Cools.isEmpty(orderDetls)) {
            return R.ok();
        }
        return R.ok().add(orderDetls);
        return R.ok().add(combParams);
    }

    @RequestMapping("/comb/auth")

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -16,6 +16,9 @@
    // 托盘条码
    private String barcode;

    // 库位编号
    private String locno;

    private List<CombMat> combMats;

    @Data
@@ -30,6 +33,12 @@
        // 物料数量
        private Double anfme;

        // 商品名称
        private String maktx;

        // 规格
        private String specs;

    }

}

 src/main/java/com/zy/asrs/mapper/OrderMapper.java

@@ -16,4 +16,6 @@

    List<Order> selectComplete();

    List<Order> selectorderNoL(@Param("orderNo")String orderNo);

}

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -30,4 +30,6 @@
     */
    List<OrderMergeVo> mergePreview(List<Long> ids);

    List<Order> selectorderNoL(String orderNo);

}

 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java

@@ -204,5 +204,9 @@
        }
        return result;
    }
    @Override
    public List<Order> selectorderNoL(String orderNo) {
        return this.baseMapper.selectorderNoL(orderNo);
    }

}