From 392aebed0af81c8369a3f07dfdc53cad1b59f6b4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 09 三月 2023 16:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++++-
src/main/java/com/zy/asrs/service/StaDescService.java | 2 +-
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 34 ++++++++++++++++++++++++++++------
3 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
index 13d18b8..c3ab691 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -9,7 +9,7 @@
List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo);
- StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
+ StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo, Integer row1);
StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 1b995a3..6534ba4 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -21,12 +21,34 @@
}
@Override
- public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
- StaDesc staDesc = this.selectOne(wrapper);
+ public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo, Integer row1) {
+ StaDesc staDesc = null;
+ if(crnNo==2){
+ Integer sourceStaNo = 0;
+ switch (stnNo){
+ case 100:
+ sourceStaNo = 104;
+ break;
+ case 200:
+ sourceStaNo = 204;
+ break;
+ case 300:
+ sourceStaNo = row1 < 12 ? 104 : 204;
+ break;
+ }
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo)
+ .eq("crn_stn", sourceStaNo);
+ staDesc = this.selectOne(wrapper);
+ } else {
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", typeNo)
+ .eq("stn_no", stnNo)
+ .eq("crn_no", crnNo);
+ staDesc = this.selectOne(wrapper);
+ }
if (staDesc == null) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 61d8631..650eb6a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -230,7 +230,11 @@
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
// 鑾峰彇璺緞
- StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo());
+ StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), staNo.getDevNo(), locMast.getRow1());
+ if(staDesc == null){
+ throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
+ }
+
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
// 鐢熸垚宸ヤ綔妗�
--
Gitblit v1.9.1