*

lsh

9 天以前 27a23f95828bb954df5f7d340ec203cc4bd26e62

 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){
@@ -272,13 +192,69 @@
    }

    @RequestMapping("/comb/auth")
//    @ManagerAuth(memo = "组托")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 9999L);
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/combAuto/auth")
    @ManagerAuth(memo = "组托")
    public R combAuto(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
    }

    @RequestMapping("/combAuto/wcs/auth")
//    @ManagerAuth(memo = "组托")
    public R combAutoWcs(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, 7777L);
        return R.ok("组托成功");
    }

    @RequestMapping("/kitting/query/auth")
    @ManagerAuth(memo = "齐套入库查询")
    public R kittingQuery(@RequestBody CombParam combParam){
        try {
            return mobileService.kittingQuery(combParam, getUserId());
        } catch (Exception e){

        }
//        return R.ok("齐套入库查询成功");
        return R.error("齐套入库查询失败");
    }

    @RequestMapping("/kitting/call/auth")
    @ManagerAuth(memo = "齐套入库呼叫")
    public R kittingCall(@RequestParam("locNo") String locNo){
        mobileService.kittingCall(locNo, getUserId());
        return R.ok("齐套入库呼叫成功");
    }

    @RequestMapping("/kitting/call/all/auth")//寄  前端改不了一点
    @ManagerAuth(memo = "齐套入库呼叫")
    public R kittingCall(@RequestBody CombParam combParam){
        List<CombParam.CombMat> combMats = combParam.getCombMats();
        for (CombParam.CombMat locDetl : combMats) {
            mobileService.kittingCall(locDetl.getMemo(), getUserId());
        }
        return R.ok("齐套入库呼叫成功");
    }
    @RequestMapping("/loc/origin/query/auth")
    @ManagerAuth(memo = "库存查询")
    public R locOriginQuery(@RequestParam("barcode") String barcode){
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("zpallet", barcode));
        return R.ok("在库标记修改成功").add(locDetlList);
    }
    @RequestMapping("/loc/origin/in/out/auth")
    @ManagerAuth(memo = "在库标记修改")
    public R locOriginInOut(@RequestBody LocDetl locDetl){
        return mobileService.locOriginInOut(locDetl, getUserId());
    }

    @RequestMapping("/pack/get/auth")
    @ManagerAuth
    public R packGet(@RequestParam String barcode){