From 3f82d3788f6b1a7cac7bec59c09e8cf421c37ac6 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期六, 10 五月 2025 15:13:33 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/controller/DevopsController.java | 6 ++++++ src/main/java/com/zy/asrs/domain/devops/ErrorType.java | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java index 6a9cb42..9c22537 100644 --- a/src/main/java/com/zy/asrs/controller/DevopsController.java +++ b/src/main/java/com/zy/asrs/controller/DevopsController.java @@ -248,6 +248,9 @@ if (devp.getWrkNo() != null && devp.getWrkNo() > 0) { types.add(ErrorType.GONGZUOHAO); } + if (devp.getCanouting().equalsIgnoreCase("N")) { + types.add(ErrorType.CANOUTING); + } // 鐩爣绔欑偣 //TODO // if (devp.getStaNo() == null) { @@ -267,6 +270,9 @@ 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); diff --git a/src/main/java/com/zy/asrs/domain/devops/ErrorType.java b/src/main/java/com/zy/asrs/domain/devops/ErrorType.java index 6630750..cd9b525 100644 --- a/src/main/java/com/zy/asrs/domain/devops/ErrorType.java +++ b/src/main/java/com/zy/asrs/domain/devops/ErrorType.java @@ -10,6 +10,8 @@ STANO(10003, "鐩爣绔欑偣瀛樺湪绔欑偣鍙�", "缂哄皯鐩爣绔欑偣"), FEIZIDONG(10004, "鐩爣绔欑偣闈炶嚜鍔�", "绔欑偣闈炶嚜鍔ㄧ姸鎬侊紝璇峰垏鎹�"), GONGZUOHAO(10005, "鐩爣绔欑偣瀛樺湪宸ヤ綔鍙�", "鐩爣绔欑偣瀛樺湪宸ヤ綔鍙凤紝璇锋鏌�"), + CANINING(10006, "绔欑偣涓嶈兘鍏�", "绔欑偣涓嶈兘鍏ワ紝璇锋鏌ラ厤缃�"), + CANOUTING(10007, "绔欑偣涓嶈兘鍑�", "绔欑偣涓嶈兘鍑猴紝璇锋鏌ラ厤缃�"), WORKING(11001, "鍫嗗灈鏈哄伐浣滀腑", "鍫嗗灈鏈轰笂瀛樺湪宸ヤ綔鍙�"), -- Gitblit v1.9.1