123

ZY

2025-05-10 3f82d3788f6b1a7cac7bec59c09e8cf421c37ac6

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

@@ -241,16 +241,15 @@
    private List<ErrorType> isOutStaError(BasDevp devp) {
        List<ErrorType> types = new ArrayList<>();
        // 自动
        if (devp.getAutoing().equalsIgnoreCase("Y")) {
        if (!devp.getAutoing().equalsIgnoreCase("Y")) {
            types.add(ErrorType.FEIZIDONG);
        }

        // 有物
        if (devp.getLoading().equalsIgnoreCase("Y")) {
            types.add(ErrorType.YOUWU);
        } // 工作号是否为0
        if (devp.getWrkNo() != null) {
        // 工作号是否为0
        if (devp.getWrkNo() != null && devp.getWrkNo() > 0) {
            types.add(ErrorType.GONGZUOHAO);
        }
        if (devp.getCanouting().equalsIgnoreCase("N")) {
            types.add(ErrorType.CANOUTING);
        }
        // 目标站点
        //TODO
@@ -263,16 +262,17 @@

    private List<ErrorType> isInStaError(BasDevp devp) {
        List<ErrorType> types = new ArrayList<>();

        // 自动
        if (devp.getAutoing().equalsIgnoreCase("Y")) {
        if (!devp.getAutoing().equalsIgnoreCase("Y")) {
            types.add(ErrorType.FEIZIDONG);
        }

        // 工作号是否为0
        if (devp.getWrkNo() != null) {
        if (devp.getWrkNo() != null && devp.getWrkNo() > 0) {
            types.add(ErrorType.GONGZUOHAO);
        }
        if (devp.getCanining().equalsIgnoreCase("N")) {
            types.add(ErrorType.CANINING);
        }
        // 目标站点
//        if (staProtocol.getStaNo() == null) {
//            types.add(ErrorType.STANO);