kelvin/wms-dj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

重命名函数

Browse Source
This commit is contained in:
刘名喜 2024-12-17 10:16:27 +08:00
parent 2e2ff79029
commit 5358dcca31
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-mes/src/main/java/com/ktg/mes/md/mapper/BaseKnifeMapper.java
View File

@ -122,5 +122,5 @@ public interface BaseKnifeMapper {
List<BaseKnife> selectBaseKnifeNotValidList(BaseKnife baseKnifeWrapper); List<BaseKnife> selectBaseKnifeNotValidList(BaseKnife baseKnifeWrapper);
List<String> selectAreaCodeList(); List<String> selectNotEmptyAreaCodeList();
} }

4
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java
View File

@ -160,7 +160,7 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService {
if (wmStorageLocationByCode == null) throw new RuntimeException("自动获取库位失败，该库区不存在"); if (wmStorageLocationByCode == null) throw new RuntimeException("自动获取库位失败，该库区不存在");
// 获取台账中已经使用的库位编码 // 获取台账中已经使用的库位编码
List<String> selectAreaCodeList = this.baseKnifeMapper.selectAreaCodeList(); List<String> selectNotEmptyAreaCodeList = this.baseKnifeMapper.selectNotEmptyAreaCodeList();
// 获取库位列表 // 获取库位列表
WmStorageArea wmStorageAreaQuery = new WmStorageArea(); WmStorageArea wmStorageAreaQuery = new WmStorageArea();
@ -168,7 +168,7 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService {
if (isBig) wmStorageAreaQuery.setAttr3(1L); if (isBig) wmStorageAreaQuery.setAttr3(1L);
List<WmStorageArea> wmStorageAreaList = this.wmStorageAreaMapper.selectWmStorageAreaList(wmStorageAreaQuery).stream() List<WmStorageArea> wmStorageAreaList = this.wmStorageAreaMapper.selectWmStorageAreaList(wmStorageAreaQuery).stream()
// 过滤掉全部存在物品的库位 // 过滤掉全部存在物品的库位
.filter(it -> !selectAreaCodeList.contains(it.getAreaCode())) .filter(it -> !selectNotEmptyAreaCodeList.contains(it.getAreaCode()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (wmStorageAreaList.isEmpty()) throw new RuntimeException("自动获取库位失败，无可用库位"); if (wmStorageAreaList.isEmpty()) throw new RuntimeException("自动获取库位失败，无可用库位");

2
ktg-mes/src/main/resources/mapper/md/BaseKnifeMapper.xml
View File

@ -613,7 +613,7 @@
WHERE RFID = #{value} WHERE RFID = #{value}
</select> </select>
<select id="selectAreaCodeList" resultType="java.lang.String"> <select id="selectNotEmptyAreaCodeList" resultType="java.lang.String">
SELECT AREA_CODE SELECT AREA_CODE
FROM BASE_KNIFE FROM BASE_KNIFE
WHERE KNIFE_FINE_STATE == 1 WHERE KNIFE_FINE_STATE == 1