From 95374c1a4b9901f8bfdc9b55ebbbd8aa2c859fb3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 14:30:34 +0800
Subject: [PATCH] #v2.0
---
src/main/java/com/zy/common/service/CommonService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index a45668c..8f9dec7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -85,6 +85,7 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
+ * @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
@@ -133,7 +134,6 @@
}
}
-
// 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
@@ -162,7 +162,7 @@
}
BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
- if (staNo.getInEnable().equals("Y") && staNo.getAutoing().equals("Y") && inQty<2) {
+ if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
if (locMast == null) {
locMast = locMastService.queryFreeLocMast(curRow);
--
Gitblit v1.9.1