From 2e2be15548552e9d7ecac1489a86060108f073a5 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期一, 21 四月 2025 16:49:50 +0800 Subject: [PATCH] 1 --- src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 70 ++++++++++++++++++++++++++-------- 1 files changed, 53 insertions(+), 17 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 778daaf..01c6e7e 100644 --- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java @@ -33,8 +33,38 @@ } @Override + public List<Integer> getCrnAvailableOutSite(Integer typeNo) { + return this.baseMapper.getCrnAvailableOutSite(typeNo); + } + + @Override + public List<Integer> getShuttleAvailableOutSite(Integer typeNo) { + return this.baseMapper.getShuttleAvailableOutSite(typeNo); + } + + @Override + public List<Integer> getCtuAvailableOutSite(Integer typeNo) { + return this.baseMapper.getCtuAvailableOutSite(typeNo); + } + + @Override public List<Integer> getAvailableEmptyOutSite() { return this.baseMapper.getAvailableOutSite(110); + } + + @Override + public List<Integer> getCrnAvailableEmptyOutSite() { + return this.baseMapper.getCrnAvailableOutSite(110); + } + + @Override + public List<Integer> getShuttleAvailableEmptyOutSite() { + return this.baseMapper.getShuttleAvailableOutSite(110); + } + + @Override + public List<Integer> getCtuAvailableEmptyOutSite() { + return this.baseMapper.getCtuAvailableOutSite(110); } @Override @@ -43,26 +73,32 @@ } @Override - public BasDevp checkSiteStatus(Integer devpNo, boolean put) { + public BasDevp checkSiteStatus(Integer devpNo, boolean pakin) { BasDevp station = selectById(devpNo); - if (station == null){ - throw new CoolException(devpNo+"绔欑偣涓嶅瓨鍦�"); + if (station == null) { + throw new CoolException(devpNo + "绔欑偣涓嶅瓨鍦�"); } - if (put) { - if(station.getAutoing()==null || !station.getAutoing().equals("Y")) { - throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��"); + if (pakin) { + if (devpNo < 1100) { +// if (station.getWrkNo() != null && station.getWrkNo() > 0 && station.getWrkNo() < 9990) { +// throw new CoolException(devpNo + "绔欑偣宸叉湁宸ヤ綔鍙�"); +// } +// if (!station.getInEnable().equals("Y")) { +// throw new CoolException(devpNo + "绔欑偣涓嶆槸鍙叆鐘舵��"); +// } + if (!station.getCanining().equals("Y")) { + throw new CoolException(devpNo + "绔欑偣涓嶆槸鑳藉叆鐘舵��"); + } + } 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.getLoading()==null || !station.getLoading().equals("Y")) { - throw new CoolException(devpNo+"绔欑偣鏃犵墿"); - } - if(station.getWrkNo()!=null && station.getWrkNo()>0) { - throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�"); - } -// if(!station.getInEnable().equals("Y")) { -// throw new CoolException(devpNo+"绔欑偣涓嶆槸鍙叆鐘舵��"); -// } - if(wrkMastService.getWorkingMast(devpNo)>0){ - throw new CoolException(devpNo+"绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�"); + if (wrkMastService.getWorkingMast(devpNo) > 0) { + throw new CoolException(devpNo + "绔欑偣涓嶈兘鍚屾椂鐢熸垚涓ょ瑪鍏ュ簱宸ヤ綔妗�"); } } return station; -- Gitblit v1.9.1