From 752332b433e6ddd72f8e4dd551a0eeb2e3c0939b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 07 六月 2021 11:10:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index df975a3..9816f12 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.mapper.BasDevpMapper;
@@ -54,18 +55,25 @@
throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
if (put) {
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+ // 灏忚溅宸ヤ綔鍖�
+ if (!Cools.isEmpty(station.getFronting()) && station.getFronting().equals("Y")) {
+
+ // 甯歌绔欑偣
+ } else {
+ if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
+ throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
+ }
+ if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+ throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+ }
+ if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
+ throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+ }
+ if(wrkMastService.getWorkingMast(devpNo)>0){
+ throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ }
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
- }
- if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
- throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
- }
+
}
return station;
}
--
Gitblit v1.9.1