root/zhuzhouzhongwu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:更新

Browse Source
This commit is contained in:
gengby
2026-08-04 17:40:20 +08:00
parent 55bc3b18c0
commit 3f60a02736
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
View File

@@ -423,7 +423,9 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
.eq("is_used", true) .eq("is_used", true)
.eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定")) .eq("lock_type", IOSEnum.LOCK_TYPE.code("未锁定"))
.eq("sect_code", param.getSect_code()) .eq("sect_code", param.getSect_code())
.isNull("storagevehicle_code"); .and(w -> w.isNull("storagevehicle_code")
.or()
.eq("storagevehicle_code", ""));
List<Structattr> list = this.list(query); List<Structattr> list = this.list(query);
for (String decisionerType : strategy) { for (String decisionerType : strategy) {
Decisioner decisioner = decisionerMap.get(decisionerType); Decisioner decisioner = decisionerMap.get(decisionerType);

28
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/UnpackingRuleHandler.java
View File

@@ -60,8 +60,12 @@ public class UnpackingRuleHandler extends Decisioner<Structattr, JSONObject> {
.eq(Structattr::getLock_type, "0") .eq(Structattr::getLock_type, "0")
.eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getSect_code, param.getString("sect_code"))
.eq(Structattr::getStor_code, param.getString("stor_code")) .eq(Structattr::getStor_code, param.getString("stor_code"))
.isNull(Structattr::getStoragevehicle_code) .and(w -> w.isNull(Structattr::getStoragevehicle_code)
.isNull(Structattr::getTask_code)); .or()
.eq(Structattr::getStoragevehicle_code, ""))
.and(w -> w.isNull(Structattr::getTask_code)
.or()
.eq(Structattr::getTask_code, "")));
if (outPoints.size() == 0) { if (outPoints.size() == 0) {
throw new BadRequestException("当前出库策略：余料入库，库存分配失败，失败原因：料桶缓存库无空位！"); throw new BadRequestException("当前出库策略：余料入库，库存分配失败，失败原因：料桶缓存库无空位！");
} }
@@ -74,8 +78,12 @@ public class UnpackingRuleHandler extends Decisioner<Structattr, JSONObject> {
.eq(Structattr::getLock_type, "0") .eq(Structattr::getLock_type, "0")
.eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getSect_code, param.getString("sect_code"))
.eq(Structattr::getStor_code, param.getString("stor_code")) .eq(Structattr::getStor_code, param.getString("stor_code"))
.isNull(Structattr::getStoragevehicle_code) .and(w -> w.isNull(Structattr::getStoragevehicle_code)
.isNull(Structattr::getTask_code)); .or()
.eq(Structattr::getStoragevehicle_code, ""))
.and(w -> w.isNull(Structattr::getTask_code)
.or()
.eq(Structattr::getTask_code, "")));
if (outPoints.size() == 0) { if (outPoints.size() == 0) {
throw new BadRequestException("当前出库策略：空桶入库，库存分配失败，失败原因：料桶缓存库无空位！"); throw new BadRequestException("当前出库策略：空桶入库，库存分配失败，失败原因：料桶缓存库无空位！");
} }
@@ -92,7 +100,9 @@ public class UnpackingRuleHandler extends Decisioner<Structattr, JSONObject> {
.eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getSect_code, param.getString("sect_code"))
.eq(Structattr::getStor_id, param.getString("stor_code")) .eq(Structattr::getStor_id, param.getString("stor_code"))
.isNotNull(Structattr::getStoragevehicle_code) .isNotNull(Structattr::getStoragevehicle_code)
.isNull(Structattr::getTask_code)); .and(w -> w.isNull(Structattr::getTask_code)
.or()
.eq(Structattr::getTask_code, "")));
if (outPoints.size() == 0) { if (outPoints.size() == 0) {
throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空桶！"); throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空桶！");
} }
@@ -104,8 +114,12 @@ public class UnpackingRuleHandler extends Decisioner<Structattr, JSONObject> {
.eq(Structattr::getLock_type, "0") .eq(Structattr::getLock_type, "0")
.eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getSect_code, param.getString("sect_code"))
.eq(Structattr::getStor_id, param.getString("stor_code")) .eq(Structattr::getStor_id, param.getString("stor_code"))
.isNull(Structattr::getStoragevehicle_code) .and(w -> w.isNull(Structattr::getStoragevehicle_code)
.isNull(Structattr::getTask_code)); .or()
.eq(Structattr::getStoragevehicle_code, ""))
.and(w -> w.isNull(Structattr::getTask_code)
.or()
.eq(Structattr::getTask_code, "")));
if (outPoints.size() == 0) { if (outPoints.size() == 0) {
throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空位！"); throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空位！");
} }

3
lms/nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -172,7 +172,8 @@ export default {
rules: { rules: {
}, },
workShopList: [ workShopList: [
{ 'name': '第一车间', 'code': 'A1' } { 'name': '超细', 'code': 'CX' },
{ 'name': '中粗', 'code': 'ZC' }
] ]
} }
}, },