From 02c2a94170a00c413dc48a1f4a8d995f14b7c633 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 06 九月 2022 13:46:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6 ++++--
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 2 +-
src/main/java/com/zy/asrs/service/LocMastService.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 6db87eb..2e3abcf 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -13,7 +13,7 @@
@Repository
public interface LocMastMapper extends BaseMapper<LocMast> {
- List<LocMast> queryFreeLocMast(@Param("row") Integer row, @Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
+ List<LocMast> queryFreeLocMast(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index c134e40..24f65ad 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -11,7 +11,7 @@
/**
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
- LocMast queryFreeLocMast(Integer row, List<Integer> rows, Integer rowsLen, Short locType1);
+ LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 05c53ac..06a94c9 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -23,8 +23,8 @@
private RowLastnoService rowLastnoService;
@Override
- public LocMast queryFreeLocMast(Integer row, List<Integer> rows, Integer rowsLen, Short locType1) {
- List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(row, rows, rowsLen, locType1);
+ public LocMast queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
+ List<LocMast> locMasts = this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
if (Cools.isEmpty(locMasts)) {
return null;
}
@@ -97,6 +97,8 @@
LocMast locMast = this.selectById(outerLocNo);
}
+
+
}
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index c9d468a..deebcfe 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -269,7 +269,7 @@
if (locMast == null) {
List<Integer> rows = Utils.getGroupLoc(curRow);
- locMast = locMastService.queryFreeLocMast(null, rows, rows.size(), locTypeDto.getLocType1());
+ locMast = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
// if (!locMastService.checkEmptyCount(locMast)) {
// locMast = null;
--
Gitblit v1.9.1