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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/DevopsController.java b/src/main/java/com/zy/asrs/controller/DevopsController.java
index 0af0a64..9c22537 100644
--- a/src/main/java/com/zy/asrs/controller/DevopsController.java
+++ b/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);
--
Gitblit v1.9.1