From 0bc6c523adf1d514d4da9ff4c000f871b0de3f39 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 九月 2024 13:13:22 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/agvDetail/AgvDetailCreate.jsx | 4
zy-acs-flow/src/page/host/HostCreate.jsx | 4
zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx | 4
zy-acs-flow/src/page/jam/JamCreate.jsx | 4
zy-acs-flow/src/page/sta/StaCreate.jsx | 4
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java | 6 ++
zy-acs-flow/src/page/staSts/StaStsCreate.jsx | 4
zy-acs-flow/src/page/busSts/BusStsCreate.jsx | 4
zy-acs-flow/src/page/taskSts/TaskStsCreate.jsx | 4
zy-acs-flow/src/page/bus/BusCreate.jsx | 6 -
zy-acs-flow/src/page/codeGap/CodeGapCreate.jsx | 4
zy-acs-flow/src/page/task/TaskCreate.jsx | 4
zy-acs-flow/src/page/route/RouteCreate.jsx | 4
zy-acs-flow/src/page/vehFaultRec/VehFaultRecCreate.jsx | 4
zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx | 4
zy-acs-flow/src/page/actionType/ActionTypeCreate.jsx | 4
zy-acs-flow/src/page/loc/LocCreate.jsx | 4
zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx | 4
zy-acs-flow/src/page/locType/LocTypeCreate.jsx | 4
zy-acs-flow/src/page/role/RoleCreate.jsx | 4
zy-acs-flow/src/page/config/ConfigCreate.jsx | 4
zy-acs-flow/src/page/segment/SegmentCreate.jsx | 4
zy-acs-flow/src/page/staType/StaTypeCreate.jsx | 4
zy-acs-flow/src/page/zone/ZoneCreate.jsx | 4
zy-acs-flow/src/page/agv/AgvCreate.jsx | 4
zy-acs-flow/src/page/user/UserCreate.jsx | 4
zy-acs-flow/src/page/taskType/TaskTypeCreate.jsx | 4
zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx | 4
zy-acs-flow/src/page/code/CodeCreate.jsx | 4
zy-acs-flow/src/page/locSts/LocStsCreate.jsx | 4
zy-acs-flow/src/page/action/ActionCreate.jsx | 4
zy-acs-flow/src/page/tenant/TenantCreate.jsx | 4
zy-acs-flow/src/page/actionSts/ActionStsCreate.jsx | 4
zy-acs-flow/src/page/travel/TravelCreate.jsx | 4
34 files changed, 72 insertions(+), 68 deletions(-)
diff --git a/zy-acs-flow/src/page/action/ActionCreate.jsx b/zy-acs-flow/src/page/action/ActionCreate.jsx
index fcdd286..8ddc67b 100644
--- a/zy-acs-flow/src/page/action/ActionCreate.jsx
+++ b/zy-acs-flow/src/page/action/ActionCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/actionSts/ActionStsCreate.jsx b/zy-acs-flow/src/page/actionSts/ActionStsCreate.jsx
index de831d4..2f2a902 100644
--- a/zy-acs-flow/src/page/actionSts/ActionStsCreate.jsx
+++ b/zy-acs-flow/src/page/actionSts/ActionStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/actionType/ActionTypeCreate.jsx b/zy-acs-flow/src/page/actionType/ActionTypeCreate.jsx
index 298e1e5..4b8a04d 100644
--- a/zy-acs-flow/src/page/actionType/ActionTypeCreate.jsx
+++ b/zy-acs-flow/src/page/actionType/ActionTypeCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/agv/AgvCreate.jsx b/zy-acs-flow/src/page/agv/AgvCreate.jsx
index bc7aad1..267ade4 100644
--- a/zy-acs-flow/src/page/agv/AgvCreate.jsx
+++ b/zy-acs-flow/src/page/agv/AgvCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/agvDetail/AgvDetailCreate.jsx b/zy-acs-flow/src/page/agvDetail/AgvDetailCreate.jsx
index 2908707..43783bb 100644
--- a/zy-acs-flow/src/page/agvDetail/AgvDetailCreate.jsx
+++ b/zy-acs-flow/src/page/agvDetail/AgvDetailCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
index 8455651..365b716 100644
--- a/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
+++ b/zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx b/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx
index fd85fd8..1d1d66f 100644
--- a/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx
+++ b/zy-acs-flow/src/page/agvSts/AgvStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/bus/BusCreate.jsx b/zy-acs-flow/src/page/bus/BusCreate.jsx
index 60ded48..8243565 100644
--- a/zy-acs-flow/src/page/bus/BusCreate.jsx
+++ b/zy-acs-flow/src/page/bus/BusCreate.jsx
@@ -68,8 +68,6 @@
})
}
if (open) {
- console.log(1);
-
queryLocStsByStock();
queryLocStsByIdle();
}
@@ -86,8 +84,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/busSts/BusStsCreate.jsx b/zy-acs-flow/src/page/busSts/BusStsCreate.jsx
index 15b110f..56c822b 100644
--- a/zy-acs-flow/src/page/busSts/BusStsCreate.jsx
+++ b/zy-acs-flow/src/page/busSts/BusStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/code/CodeCreate.jsx b/zy-acs-flow/src/page/code/CodeCreate.jsx
index 393662e..29a1b42 100644
--- a/zy-acs-flow/src/page/code/CodeCreate.jsx
+++ b/zy-acs-flow/src/page/code/CodeCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/codeGap/CodeGapCreate.jsx b/zy-acs-flow/src/page/codeGap/CodeGapCreate.jsx
index 06bd1f0..ae1f8fe 100644
--- a/zy-acs-flow/src/page/codeGap/CodeGapCreate.jsx
+++ b/zy-acs-flow/src/page/codeGap/CodeGapCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/config/ConfigCreate.jsx b/zy-acs-flow/src/page/config/ConfigCreate.jsx
index 90b5b4f..a3fe657 100644
--- a/zy-acs-flow/src/page/config/ConfigCreate.jsx
+++ b/zy-acs-flow/src/page/config/ConfigCreate.jsx
@@ -45,8 +45,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx b/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
index 170c63d..cf0bd49 100644
--- a/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
+++ b/zy-acs-flow/src/page/funcSta/FuncStaCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/host/HostCreate.jsx b/zy-acs-flow/src/page/host/HostCreate.jsx
index d77ddd4..dbf0182 100644
--- a/zy-acs-flow/src/page/host/HostCreate.jsx
+++ b/zy-acs-flow/src/page/host/HostCreate.jsx
@@ -45,8 +45,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/jam/JamCreate.jsx b/zy-acs-flow/src/page/jam/JamCreate.jsx
index 4032715..6a90b12 100644
--- a/zy-acs-flow/src/page/jam/JamCreate.jsx
+++ b/zy-acs-flow/src/page/jam/JamCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/loc/LocCreate.jsx b/zy-acs-flow/src/page/loc/LocCreate.jsx
index 2b7e046..3270d8b 100644
--- a/zy-acs-flow/src/page/loc/LocCreate.jsx
+++ b/zy-acs-flow/src/page/loc/LocCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/locSts/LocStsCreate.jsx b/zy-acs-flow/src/page/locSts/LocStsCreate.jsx
index b3d4542..823d29c 100644
--- a/zy-acs-flow/src/page/locSts/LocStsCreate.jsx
+++ b/zy-acs-flow/src/page/locSts/LocStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/locType/LocTypeCreate.jsx b/zy-acs-flow/src/page/locType/LocTypeCreate.jsx
index 5f1f657..56da8ec 100644
--- a/zy-acs-flow/src/page/locType/LocTypeCreate.jsx
+++ b/zy-acs-flow/src/page/locType/LocTypeCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/role/RoleCreate.jsx b/zy-acs-flow/src/page/role/RoleCreate.jsx
index 382e932..dd2bce1 100644
--- a/zy-acs-flow/src/page/role/RoleCreate.jsx
+++ b/zy-acs-flow/src/page/role/RoleCreate.jsx
@@ -45,8 +45,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/route/RouteCreate.jsx b/zy-acs-flow/src/page/route/RouteCreate.jsx
index 6ab8a91..d87aa86 100644
--- a/zy-acs-flow/src/page/route/RouteCreate.jsx
+++ b/zy-acs-flow/src/page/route/RouteCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/segment/SegmentCreate.jsx b/zy-acs-flow/src/page/segment/SegmentCreate.jsx
index 167f7de..6f926e2 100644
--- a/zy-acs-flow/src/page/segment/SegmentCreate.jsx
+++ b/zy-acs-flow/src/page/segment/SegmentCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/sta/StaCreate.jsx b/zy-acs-flow/src/page/sta/StaCreate.jsx
index e0fca1f..6343689 100644
--- a/zy-acs-flow/src/page/sta/StaCreate.jsx
+++ b/zy-acs-flow/src/page/sta/StaCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/staSts/StaStsCreate.jsx b/zy-acs-flow/src/page/staSts/StaStsCreate.jsx
index 9286293..eeed991 100644
--- a/zy-acs-flow/src/page/staSts/StaStsCreate.jsx
+++ b/zy-acs-flow/src/page/staSts/StaStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/staType/StaTypeCreate.jsx b/zy-acs-flow/src/page/staType/StaTypeCreate.jsx
index fb6a788..a9d6758 100644
--- a/zy-acs-flow/src/page/staType/StaTypeCreate.jsx
+++ b/zy-acs-flow/src/page/staType/StaTypeCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/task/TaskCreate.jsx b/zy-acs-flow/src/page/task/TaskCreate.jsx
index 362fcce..d6221df 100644
--- a/zy-acs-flow/src/page/task/TaskCreate.jsx
+++ b/zy-acs-flow/src/page/task/TaskCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/taskSts/TaskStsCreate.jsx b/zy-acs-flow/src/page/taskSts/TaskStsCreate.jsx
index 1fb0a1f..a53f1ec 100644
--- a/zy-acs-flow/src/page/taskSts/TaskStsCreate.jsx
+++ b/zy-acs-flow/src/page/taskSts/TaskStsCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/taskType/TaskTypeCreate.jsx b/zy-acs-flow/src/page/taskType/TaskTypeCreate.jsx
index ebb5355..3c2c2da 100644
--- a/zy-acs-flow/src/page/taskType/TaskTypeCreate.jsx
+++ b/zy-acs-flow/src/page/taskType/TaskTypeCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/tenant/TenantCreate.jsx b/zy-acs-flow/src/page/tenant/TenantCreate.jsx
index 27137b7..94dfa50 100644
--- a/zy-acs-flow/src/page/tenant/TenantCreate.jsx
+++ b/zy-acs-flow/src/page/tenant/TenantCreate.jsx
@@ -45,8 +45,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/travel/TravelCreate.jsx b/zy-acs-flow/src/page/travel/TravelCreate.jsx
index 54213b5..787308f 100644
--- a/zy-acs-flow/src/page/travel/TravelCreate.jsx
+++ b/zy-acs-flow/src/page/travel/TravelCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/user/UserCreate.jsx b/zy-acs-flow/src/page/user/UserCreate.jsx
index 94be17b..5a129ed 100644
--- a/zy-acs-flow/src/page/user/UserCreate.jsx
+++ b/zy-acs-flow/src/page/user/UserCreate.jsx
@@ -51,8 +51,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx b/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
index aa31e84..7bd23f1 100644
--- a/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
+++ b/zy-acs-flow/src/page/userLogin/UserLoginCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/vehFaultRec/VehFaultRecCreate.jsx b/zy-acs-flow/src/page/vehFaultRec/VehFaultRecCreate.jsx
index 16e4d90..5a50a17 100644
--- a/zy-acs-flow/src/page/vehFaultRec/VehFaultRecCreate.jsx
+++ b/zy-acs-flow/src/page/vehFaultRec/VehFaultRecCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-flow/src/page/zone/ZoneCreate.jsx b/zy-acs-flow/src/page/zone/ZoneCreate.jsx
index 2b54ea0..d346c94 100644
--- a/zy-acs-flow/src/page/zone/ZoneCreate.jsx
+++ b/zy-acs-flow/src/page/zone/ZoneCreate.jsx
@@ -48,8 +48,8 @@
notify('common.response.success');
};
- const handleError = async (data) => {
- notify('common.response.fail');
+ const handleError = async (error) => {
+ notify(error.message || 'common.response.fail', { type: 'error', messageArgs: { _: error.message } });
};
return (
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
index 9c324c2..c667477 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/BusServiceImpl.java
@@ -48,6 +48,9 @@
if (!Cools.isEmpty(dto.getOriSta()) && !Cools.isEmpty(dto.getOriLoc())) {
return "OriSta and OriLoc cannot exist at the same time!";
}
+ if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) {
+ return "OriSta and OriLoc must have one!";
+ }
if (!Cools.isEmpty(dto.getOriSta())) {
if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
return "Destination cannot be empty!";
@@ -67,6 +70,9 @@
if (!Cools.isEmpty(dto.getDestSta()) && !Cools.isEmpty(dto.getDestLoc())) {
return "DestSta and DestLoc cannot exist at the same time!";
}
+ if (Cools.isEmpty(dto.getDestSta()) && Cools.isEmpty(dto.getDestLoc())) {
+ return "DestSta and DestLoc must have one!";
+ }
if (!Cools.isEmpty(dto.getDestSta())) {
if (Cools.isEmpty(dto.getOriSta()) && Cools.isEmpty(dto.getOriLoc())) {
return "Origin cannot be empty!";
--
Gitblit v1.9.1