增加库位明细导出功能，曾加物料、单据、库存全局搜索功能

zyx

2024-07-20 a3776853fa6ff1c4a9805615a79852d54f700e3f

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

@@ -70,6 +70,12 @@
        return mobileService.WarehouseIn(locNo,barcode,getHostId());
    }

    @RequestMapping("/pda/WarehouseOut")
    @ManagerAuth
    public R WarehouseOut(@RequestBody CombParam combParam){
        return mobileService.WarehouseOut(combParam,getHostId());
    }

    @RequestMapping("/menu/pda/auth")
    @ManagerAuth
    public R menuPda(){
@@ -83,6 +89,45 @@
        List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
        List<Permission> permissions = permissionService.listByIds(collect);
        return R.ok().add(permissions);
    }

    /**
     * 入库制令检测  -- 指令在库存里面借用批号字段batch
     * 1.可正常入库
     * 2.库存包含相同制令货物，是否进行补货
     * 3.工作档存在正在入库任务，拒绝入库
     */
    @RequestMapping("/pda/decrees/check")
    @ManagerAuth
    public R pdaDecreesCheck(@RequestParam String decrees){
        if (Cools.isEmpty(decrees)) {
            return R.error("制令不能为空");
        }
        Long hostId = getHostId();
        //查询是否有库存
        List<LocDetl> list = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getBatch, decrees));
        //查询是否有正在工作的工作档
        List<WrkDetl> wrkDetls = wrkDetlService.list(new LambdaQueryWrapper<WrkDetl>().eq(WrkDetl::getBatch, decrees));
        HashMap<String, Object> map = new HashMap<>();
        if(list.isEmpty() && wrkDetls.isEmpty()){
            map.put("status", 1);//可正常入库
        } else if (!wrkDetls.isEmpty()) {
            map.put("status", 3);//存在工作档，拒绝入库
        } else {
            //获取库存最少的一条记录
            Double anfme = 999999999D;
            LocDetl miniLocDetl = null;
            for (LocDetl locDetl : list) {
                if (locDetl.getAnfme() < anfme) {
                    anfme = locDetl.getAnfme();
                    miniLocDetl = locDetl;
                }
            }

            map.put("status", 2);//库存包含相同制令货物，是否进行补货
            map.put("data", miniLocDetl);//库存信息
        }
        return R.ok().add(map);
    }

    /**
@@ -375,6 +420,7 @@
            matParam.setOrderNo(orderDetl.getOrderNo());
            matParam.setOrderId(orderDetl.getOrderId());
            matParam.setCount(count);
            matParam.setUseCount(0D);
            maps.add(matParam);
        }
        return R.ok().add(maps);
@@ -480,7 +526,7 @@
            }

            //更新订单工作数量
            orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount());
            orderDetlService.increaseWorkQtyByOrderNo(matParam.getOrderNo(), matParam.getMatnr(), matParam.getBatch(), matParam.getUseCount(), getHostId());
        }
        // 修改库位状态:   F.在库 ====>>> R.出库预约/P.拣料/盘点/并板出库中
        locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, param.getLocNo()).eq(LocMast::getHostId, getHostId()));