From c8daee5975e5a6f5c844e1fceb65a3a682253c0e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 06 三月 2024 11:51:23 +0800
Subject: [PATCH] #四项库拣料回库时合并wrkdetl到locdetl
---
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 fd21de8..d39cf02 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -38,7 +38,8 @@
if (row == 31 || row == 32) {
crnNo = 3;
}
- return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
+ return this.baseMapper.queryOutStation();
+ //return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
}
@Override
@@ -57,13 +58,13 @@
public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", stnNo);
+ //.eq("crn_no", crnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", typeNo)
- .eq("crn_no", crnNo);
+ .eq("type_no", typeNo);
+ //.eq("crn_no", crnNo);
List<StaDesc> staDescs = this.selectList(wrapper);
if (Cools.isEmpty(staDescs)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
--
Gitblit v1.9.1