更新

李天宇

2024-09-12 7b1849b87705bbcedbe6808842c8a2405fa94e60

更新

 src/main/java/com/zy/asrs/entity/BasDevp.java

@@ -81,7 +81,7 @@
    @ApiModelProperty(value= "能出")
    private String canouting;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "满板")
    private String fronting;

    @ApiModelProperty(value= "")

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -374,7 +374,7 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setFullPlt(sourceStaNo.getFronting()); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板
@@ -418,8 +418,15 @@
            throw new CoolException("站点不存在");
        }
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
            int workNo=9992;
//            if(param.getOutSite()==114||param.getOutSite()==103){
//                // 获取工作号
//                workNo = commonService.getWorkNo(WorkNoType.OTHER.type);
//            }else {
//                // 获取工作号
//                workNo = commonService.getWorkNo(WorkNoType.PAKOUT.type);
//            }

            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
            if (Cools.isEmpty(locMast)) {
@@ -447,7 +454,7 @@
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceLocNo(locNo); // 源库位
            wrkMast.setFullPlt("N"); // 满板：Y
            wrkMast.setFullPlt(locMast.getFullPlt()); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("Y"); // 空板
@@ -481,7 +488,7 @@
        }
        for (String locNo : param.getLocNos()) {
            // 获取工作号
            int workNo = commonService.getWorkNo(0);
//            int workNo = commonService.getWorkNo(0);
            // 获取库位
            LocMast locMast = locMastService.selectById(locNo);
            if (Cools.isEmpty(locMast)) {
@@ -500,7 +507,7 @@
            Date now = new Date();
            // 保存工作档

            wrkMast.setWrkNo(workNo);
            wrkMast.setWrkNo(9992);
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
@@ -509,7 +516,7 @@
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceLocNo(locNo); // 源库位
            wrkMast.setFullPlt("N"); // 满板：Y
            wrkMast.setFullPlt(locMast.getFullPlt()); // 满板：Y
            wrkMast.setPicking("N"); // 拣料
            wrkMast.setExitMk("N"); // 退出
            wrkMast.setEmptyMk("Y"); // 空板

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -70,6 +70,7 @@
                        locMast.setLocSts("D");
                        locMast.setIoTime(now);
                        locMast.setModiTime(now);
                        locMast.setFullPlt(wrkMast.getFullPlt());
                        if (!locMastService.updateById(locMast)) {
//                            exceptionHandle("空板入库 ===>> 修改库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

 src/main/java/com/zy/common/service/CommonService.java

@@ -172,7 +172,9 @@

                    int row = Integer.parseInt(loc.getLocNo().substring(0, 2));
                    String shallowLocNo = "";
                    if (row == 1 || row == 2) continue;
                    if (row == 1 || row == 2) {
                        continue;
                    }
                    LocMast trgerLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + loc.getLocNo().substring(2));
                    if (!trgerLoc.getLocSts().equals("O")) {
                        continue;

 src/main/java/com/zy/common/web/AuthController.java

@@ -479,34 +479,19 @@
    @ManagerAuth
    public R menuPda(@RequestBody HashMap<String,String> params){
        Long userId = getUserId();
        String level = params.get("level");
        Long id = Long.valueOf(params.get("id"));
        List<RolePdaResource> rolePdaResources;
        List<RolePermission> rolePermissions;
        if (userId == 9527L) {
            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<>());
            rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
        } else {
            Long roleId = getUser().getRoleId();
            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
            rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
        }
        if (Cools.isEmpty(rolePdaResources)) {
        if (Cools.isEmpty(rolePermissions)) {
            return R.ok();
        }
        List<Long> collect = rolePdaResources.stream().map(RolePdaResource::getResourceId).distinct().collect(Collectors.toList());
        List<PdaResource> pdaResources = pdaResourceService.selectBatchIds(collect);
        List<PdaResource> results = new ArrayList<>();

        for (PdaResource pdaResource : pdaResources) {
            if (Integer.parseInt(level) == 1) {
                if (pdaResource.getLevel().equals(Short.valueOf(level))) {
                    results.add(pdaResource);
                }
            } else {
                if (pdaResource.getLevel().equals(Short.valueOf(level)) && pdaResource.getResourceId().equals(id)) {
                    results.add(pdaResource);
                }
            }
        }
        return R.ok().add(results);
        List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
        List<Permission> permissions = permissionService.selectBatchIds(collect);
        return R.ok().add(permissions);
    }

}

 src/main/java/com/zy/common/web/WcsController.java

@@ -99,7 +99,7 @@
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode(),param.isFull());
                break;
            default:
                break;
@@ -247,7 +247,7 @@
    }

    @Transactional
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
    public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode,boolean isFull) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        int rowCount = rowLastnoService.selectCount(null);
@@ -275,7 +275,8 @@
        wrkMast.setSourceStaNo(dto.getSourceStaNo());
        wrkMast.setStaNo(dto.getStaNo());
        wrkMast.setLocNo(dto.getLocNo());
        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setFullPlt(isFull?"Y":"N"); // 满板
////        wrkMast.setFullPlt("N"); // 满板
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("Y"); // 空板

 src/main/java/com/zy/common/web/param/SearchLocParam.java

@@ -16,5 +16,6 @@

    // 库位规格（ 0:未知, 1:低库位, 2:高库位）
    private Short locType1;
    private boolean isFull;

}

 src/main/resources/application.yml

@@ -11,7 +11,9 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=flsbasrs
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=flsbasrs
    url: jdbc:sqlserver://10.10.10.200:1433;databasename=flsbasrs

    username: sa
    password: sa@123
  mvc: