自动化立体仓库 - WMS系统
zhangc
2025-01-08 e8031f041ad3c5d77986b025a79db0d4e2059496
优化异常信息及版本更新
10个文件已修改
45 ■■■■ 已修改文件
pom.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/AgvLocMastController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocMastController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/PackController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/OutLocDto.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/model/TaskDto.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -15,7 +15,7 @@
    <properties>
        <java.version>1.8</java.version>
        <cool.version>3.4.0</cool.version>
        <cool.version>3.4.1</cool.version>
        <mysql-driver.version>5.1.47</mysql-driver.version>
        <mybatis-plus.version>2.3.2</mybatis-plus.version>
        <fastjson.version>1.2.58</fastjson.version>
src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -122,11 +122,11 @@
                    adjDetl.setAppeTime(now);
                    adjDetl.setAppeUser(getUserId());
                    if (!adjDetlService.insert(adjDetl)) {
                        throw new CoolException("服务器错误,请联系管理员");
                        throw new CoolException("库位修改失败");
                    }
                }
                if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误,请联系管理员");
                    throw new CoolException("库位明细删除失败");
                }
                if (locMast.getLocSts().equals("O")) {
                    locMast.setBarcode("");
@@ -136,7 +136,7 @@
        locMast.setModiUser(getUserId());
        locMast.setModiTime(now);
        if(!agvLockMastService.updateById(locMast)) {
            throw new CoolException("服务器错误,请联系管理员");
            throw new CoolException("主库位修改失败");
        }
        return R.ok();
    }
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -136,18 +136,18 @@
                    adjDetl.setAppeTime(now);
                    adjDetl.setAppeUser(getUserId());
                    if (!adjDetlService.insert(adjDetl)) {
                        throw new CoolException("服务器错误,请联系管理员");
                        throw new CoolException("调整记录修改失败");
                    }
                }
                if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误,请联系管理员");
                    throw new CoolException("库位明细修改失败");
                }
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(now);
        if(!locMastService.updateById(locMast)) {
            throw new CoolException("服务器错误,请联系管理员");
            throw new CoolException("库位状态修改失败");
        }
        return R.ok();
    }
src/main/java/com/zy/asrs/controller/PackController.java
@@ -79,7 +79,7 @@
        pack.setCreateBy(getUserId());
        pack.setCreateTime(now);
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误,请联系管理员");
            throw new CoolException("数据添加失败");
        }
        Mat mat = new Mat();
        mat.setTagId(tagService.getTop().getId());
@@ -90,7 +90,7 @@
        mat.setUpdateTime(now);
        mat.setMemo("打包上线");
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误,请联系管理员");
            throw new CoolException("打包上线失败");
        }
        return R.ok();
    }
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -645,8 +645,7 @@
        }
        if (Cools.isEmpty(agvLocMast)) {
            log.info("暂无当前出库站点类型的空货架!");
            return;
            throw new CoolException("暂无当前出库站点类型的空货架!");
        }
        //生成工作档
        createWrkMast(110, 21L, agvLocMast.getLocNo(), agvBasDevp.getDevNo(), agvLocMast.getBarcode(), now, userId, containerType, agvLocMast.getPltType());
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -55,7 +55,7 @@
            top.setUpdateTime(new Date());
            Integer insert = this.baseMapper.insert(top);
            if (insert == 0) {
                throw new CoolException("服务器异常");
                throw new CoolException("获取分类失败");
            }
        }
        return top;
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -251,7 +251,7 @@
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误,请联系管理员");
                        throw new CoolException("订单状态修改(4-6)失败");
                    }
                }
            }
@@ -270,7 +270,7 @@
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误,请联系管理员");
                    throw new CoolException("订单状态修改(4-6)失败");
                }
            }
        }
@@ -460,7 +460,7 @@
                if (order.getSettle() == 4L) {
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误,请联系管理员");
                        throw new CoolException("订单状态修改(4-6)失败");
                    }
                }
            }
@@ -479,7 +479,7 @@
                }
                // 修改订单状态 4.完成 ===>> 6.已上报
                if (!orderService.updateSettle(order.getId(), 6L, null)) {
                    throw new CoolException("服务器内部错误,请联系管理员");
                    throw new CoolException("订单状态修改(4-6)失败");
                }
            }
        }
@@ -516,7 +516,7 @@
                null    // 备注
        );
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误,请联系管理员");
            throw new CoolException("打包失败");
        }
        Mat mat = matService.selectByMatnr(analyse.getMatnr());
@@ -552,7 +552,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(priTag) == 0) {
                        throw new CoolException("服务器内部错误,请联系管理员");
                        throw new CoolException("分类添加失败");
                    }
                }
                // 二级分类
@@ -581,7 +581,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误,请联系管理员");
                        throw new CoolException("分类添加失败");
                    }
                }
                tagId = secTag.getId();
@@ -597,7 +597,7 @@
            mat.setCreateTime(now);
            mat.setUpdateTime(now);
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误,请联系管理员");
                throw new CoolException("物料添加失败");
            } else {
                log.info("打包上线添加新物料[物料号:{}]", mat.getMatnr());
            }
src/main/java/com/zy/asrs/service/impl/TagServiceImpl.java
@@ -23,7 +23,7 @@
            top.setSort(0);
            Integer insert = this.baseMapper.insert(top);
            if (insert == 0) {
                throw new CoolException("服务器异常");
                throw new CoolException("类别添加失败");
            }
        }
        return top;
src/main/java/com/zy/common/model/OutLocDto.java
@@ -57,7 +57,7 @@
                    continue;
                }
                if (next.getCount() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                    throw new CoolException("数量超过库存数量");
                }
                if (next.getCount().equals(locDetl.getAnfme())) {
                    sameNumber++;
src/main/java/com/zy/common/model/TaskDto.java
@@ -139,7 +139,7 @@
//                    }
//                }
                if (dto.getAnfme() > locDetl.getAnfme()) {
                    throw new CoolException("服务器内部错误");
                    throw new CoolException("数量超过,请检查库存");
                }
                if (dto.getAnfme().equals(locDetl.getAnfme())) {
                    sameNumber++;