From f465076b186e7b815b596d12a7dfa219c68e1c85 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 08 七月 2020 13:47:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 8e1074e..2697b95 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -80,10 +80,11 @@
/**
* 妫�绱㈠簱浣嶅彿
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer sourceStaNo) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo) {
StartupDto startupDto = new StartupDto();
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -109,16 +110,10 @@
break;
}
}
- BasCrnp crnp = basCrnpService.selectById(crnNo);
- if (Cools.isEmpty(crnp)) {
- throw new CoolException("鍫嗗灈鏈虹紪鍙烽敊璇�");
- }
- if (!"Y".equals(crnp.getInEnable())) {
- throw new CoolException("褰撳墠鍫嗗灈鏈烘棤娉曞叆搴�");
- }
+ basCrnpService.checkSiteStatus(crnNo);
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", 1)
+ .eq("type_no", staDescId)
.eq("stn_no", sourceStaNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
--
Gitblit v1.9.1