From 5f848a655b92175406d34176e79d69dbb1fb5412 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 11:00:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 51545f9..d1d6a72 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -87,9 +87,9 @@
return workNo;
}
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
LocTypeDto oldLocType = locTypeDto.clone();
- return getLocNo(whsType, staDescId, sourceStaNo, emptyMk, matNos, locTypeDto, oldLocType, times);
+ return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
}
/**
@@ -100,7 +100,7 @@
* @param matNos 鐗╂枡鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
if (sourceStaNo == 100) { // 杞昏揣淇″彿
whsType = 1; // 1 - 11 宸�
@@ -143,7 +143,7 @@
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- if (emptyMk) {
+ if (staDescId == 10) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
@@ -265,7 +265,7 @@
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
if (times < rowCount) {
times = times + 1;
- return getLocNo(whsType, staDescId, sourceStaNo, emptyMk, matNos, locTypeDto, oldLocType, times);
+ return getLocNo(whsType, staDescId, sourceStaNo, matNos, locTypeDto, oldLocType, times);
}
// // 璐х墿妫�绱綆搴撲綅浠撳け璐ワ紝鍏煎楂樺簱浣嶄粨鍚庣户缁墽琛�
// if (locTypeDto.getLocType1() == 1) {
--
Gitblit v1.9.1