From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
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..52ed886 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,36 @@
}
@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 = 204;
+ switch (stnNo){
+ case 100:
+ case 114:
+ sourceStaNo = 104;
+ break;
+ case 200:
+ case 214:
+ 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("鍑哄簱璺緞涓嶅瓨鍦�");
}
--
Gitblit v1.9.1