From 59f80df1e377e8775969ca4acadfa2eadd6e37ae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 04 十一月 2024 19:01:38 +0800
Subject: [PATCH] excel导出优化
---
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 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 8bf09f4..297e517 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
@@ -18,27 +19,59 @@
private WrkMastService wrkMastService;
@Override
- public List<Integer> getAvailableDevp() {
- return this.baseMapper.getAvailableDevp();
+ public List<Integer> getAvailableInSite() {
+ return this.baseMapper.getAvailableInSite(1);
}
@Override
- public void checkSiteStatus(Integer devpNo) {
+ public List<Integer> getAvailableEmptyInSite() {
+ return this.baseMapper.getAvailableInSite(10);
+ }
+
+ @Override
+ public List<Integer> getAvailableOutSite(Integer typeNo) {
+ return this.baseMapper.getAvailableOutSite(typeNo);
+ }
+
+ @Override
+ public List<Integer> getAvailableEmptyOutSite() {
+ return this.baseMapper.getAvailableOutSite(110);
+ }
+
+ @Override
+ public BasDevp checkSiteStatus(Integer devpNo) {
+ return checkSiteStatus(devpNo, false);
+ }
+
+ @Override
+ public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) {
BasDevp station = selectById(devpNo);
if (station == null){
- throw new CoolException("绔欑偣涓嶅瓨鍦�");
+ throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�");
}
- if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣涓嶆槸鑷姩鐘舵��");
+ if (pakin) {
+ 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) {
+ WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo());
+ if (wrkMast != null) {
+ if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
+ }
+ }
+ }
+// if(!station.getInEnable().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��");
+// }
+ if(wrkMastService.getWorkingMast(devpNo) > 0){
+ throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
+ }
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException("鍏ュ簱绔欑偣鏃犵墿");
- }
- if(station.getWrkNo()>0) {
- throw new CoolException("鍏ュ簱绔欑偣宸叉湁宸ヤ綔鍙�");
- }
- if(wrkMastService.getWorkingMast(devpNo)>0){
- throw new CoolException("鍚屼竴绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�");
- }
+ return station;
}
}
--
Gitblit v1.9.1