初步完成调试

zc

8 天以前 1983ad87b61ccea8a24216bd9e9b44877abf2c01

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

@@ -62,6 +62,16 @@
    @Autowired
    private CommonService commonService;


//    @PostMapping("/agv/start")
//    @ManagerAuth
//    public R pdaStockCheck(@RequestBody StockCheckParam param){
//
//
//
//    }


    @PostMapping("/agv/start")
    @ManagerAuth
    public R pdaAgvStart(@RequestBody Map<String,Object> map){
@@ -269,8 +279,44 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        mobileService.comb(combParam, getUserId());
        return R.ok("组托成功");
        if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("barcode", combParam.getBarcode())
                .eq("io_type", 104)
                .in("wrk_sts", 14,105));
        if (Cools.isEmpty(wrkMast)) {
            mobileService.comb(combParam, getUserId());
            return R.ok("组托成功");
        }else {
            mobileService.mergeComb(combParam, getUserId());
            return R.ok("并板成功");
        }


    }

    @RequestMapping("/pingKu/Shelves/auth")
    @ManagerAuth(memo = "平库上架")
    public R pingKuShelves(@RequestBody CombParam combParam){
        if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        mobileService.pingKuShelves(combParam, getUserId());

        return R.ok();
    }

    @RequestMapping("/pingKu/unShelves/auth")
    @ManagerAuth(memo = "平库下架")
    public R pingKuUnShelves(@RequestBody CombParam combParam){
        if (Cools.isEmpty(combParam.getLocno(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
        mobileService.pingKuUnShelves(combParam, getUserId());

        return R.ok();
    }

    @RequestMapping("/pack/get/auth")
@@ -520,6 +566,13 @@
        return R.ok("盘点成功");
    }

    @RequestMapping("/pda/adjust/auth")
    @ManagerAuth(memo = "pda盘点")
    public R pdaAdjust(@RequestBody pdaAdjustParam param){
        mobileService.pdaAdjust(param,getUserId());
        return R.ok("盘点成功");
    }

    @PostMapping("/order/out/pakout/auth")
    @ManagerAuth(memo = "订单出库")
    public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
@@ -530,12 +583,20 @@
        return R.ok("出库成功");
    }

    @GetMapping("/checkOut/submit/auth")
    @ManagerAuth(memo = "盘点上传")
    public R CheckOutUploadERP(@RequestParam String orderId){
        mobileService.inventoryUpload(orderId);
        return R.ok("盘点成功");
    }


    @RequestMapping("/ddd/ddd")
    @ManagerAuth()
    public R ddd() {
        int w = 64;
        int w = 99999;
        for (int i = 17; i <= 37; i++) {
        for (int j = 1;j<=14;j++){
        for (int j = 8;j<=14;j++){
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 1));
            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 2));
            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", j).eq("lev1", 3));
@@ -544,8 +605,9 @@
                continue;
            }
//            locMast.setGro1(w);
            locMast2.setGro1(locMast.getGro1()+100);
            locMast3.setGro1(locMast.getGro1()+200);
//            locMast.setGro1(locMast.getGro1()+1000);
            locMast2.setGro1(locMast.getGro1()+1000);
            locMast3.setGro1(locMast.getGro1()+2000);
//            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
            locMastService.updateById(locMast2);
@@ -555,19 +617,23 @@
        }
        }
//        for (int i = 17; i <=37; i++) {
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 14).eq("lev1", 1));
////            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 10).eq("lev1", 1));
////            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 11).eq("lev1", 1));
//            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 3).eq("lev1", 1));
//            LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 8).eq("lev1", 1));
//            LocMast locMast3 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 13).eq("lev1", 1));
////            LocMast locMast4 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", i).eq("bay1", 12).eq("lev1", 1));
//            locMast.setGro1(w);
////            locMast2.setGro1(w);
////            locMast3.setGro1(w);
//            if (!Cools.isEmpty(locMast)) {
//                locMast.setGro1(w);
//                locMastService.updateById(locMast);
//            }
//
//            locMast2.setGro1(w);
//            locMast3.setGro1(w);
////            locMast4.setGro1(w);
//            locMastService.updateById(locMast);
////            locMastService.updateById(locMast2);
////            locMastService.updateById(locMast3);
//
//            locMastService.updateById(locMast2);
//            locMastService.updateById(locMast3);
////            locMastService.updateById(locMast4);
//            w++;
////            w++;
//        }
        return R.ok();