#

lsh

2025-04-14 0f4540b504204b36f854c41cc2e89bb34af60211

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

@@ -38,10 +38,6 @@
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private DocTypeService docTypeService;
    @Autowired
    private WrkMastService wrkMastService;
@@ -137,82 +133,6 @@
        return R.ok("下架成功");
    }



    // 组托 ----------------------------------------------------------------------------------------------------

    /**
     * 根据单号检索单据数据
     * http://localhost:8081/jkwms/mobile/order/serach/orderNo/auth?orderNo=123123
     */
//    @RequestMapping("/order/search/orderNo/auth")
//    @ManagerAuth
//    public R orderSearchByBarcode(@RequestParam String orderNo){
//        Order order = orderService.selectByNo(orderNo);
//        if (order == null) {
//            return R.ok();
//        }
//        DocType docType = docTypeService.selectById(order.getDocType());
//        if (docType.getPakin() == null || docType.getPakin() != 1) {
//            return R.ok();
//        }
//        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);
//    }


//    @RequestMapping("/order/search/orderNo/auth")
//    @ManagerAuth
//    public R orderSearchByBarcode(@RequestParam String orderNo){
//        if (Cools.isEmpty(orderNo)){
//            orderNo=null;
//        }
////        List<Order> orders = orderService.selectorderNoL(orderNo);
//        List<Order> orders = OrderInAndOutUtil.selectOrderNoL(null, orderNo);
//        if (Cools.isEmpty(orders)){
//            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());
//                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());
//                        combMats.add(combMat);
//                    }
//                    combParam.setCombMats(combMats);
//                }
//                combParam.setOrderNo(order.getOrderNo());
//                combParams.add(combParam);
//            }
//        }
//        return R.ok().add(combParams);
//    }
    @RequestMapping("/order/search/orderNo/auth")
    @ManagerAuth
    public R orderSearchByBarcode(@RequestParam String orderNo){