#

lsh

2025-04-15 f25bd904560faada2a00e93fbd8abab6be238f9c

 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,34 +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){
@@ -201,12 +169,23 @@
                        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());
                combParams.add(combParam);
                return R.ok().add(combParam);

//                combParams.add(combParam);
            }
        }
        return R.ok().add(combParams);
@@ -215,10 +194,51 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
//        mobileService.comb(combParam, getUserId());
        mobileService.comb(combParam, getUserId());
        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){