From 3f60a027369d83648b7f531fc69dca6140ffdae8 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 4 Aug 2026 17:40:20 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StructattrServiceImpl.java | 4 ++- .../impl/diy/UnpackingRuleHandler.java | 28 ++++++++++++++----- .../src/views/wms/sch/region/index.vue | 3 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java index 17a9f20..435d46f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java @@ -423,7 +423,9 @@ public class StructattrServiceImpl extends ServiceImpl w.isNull("storagevehicle_code") + .or() + .eq("storagevehicle_code", "")); List list = this.list(query); for (String decisionerType : strategy) { Decisioner decisioner = decisionerMap.get(decisionerType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/UnpackingRuleHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/UnpackingRuleHandler.java index ad14b6e..dc0196d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/UnpackingRuleHandler.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/UnpackingRuleHandler.java @@ -60,8 +60,12 @@ public class UnpackingRuleHandler extends Decisioner { .eq(Structattr::getLock_type, "0") .eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getStor_code, param.getString("stor_code")) - .isNull(Structattr::getStoragevehicle_code) - .isNull(Structattr::getTask_code)); + .and(w -> w.isNull(Structattr::getStoragevehicle_code) + .or() + .eq(Structattr::getStoragevehicle_code, "")) + .and(w -> w.isNull(Structattr::getTask_code) + .or() + .eq(Structattr::getTask_code, ""))); if (outPoints.size() == 0) { throw new BadRequestException("当前出库策略：余料入库，库存分配失败，失败原因：料桶缓存库无空位！"); } @@ -74,8 +78,12 @@ public class UnpackingRuleHandler extends Decisioner { .eq(Structattr::getLock_type, "0") .eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getStor_code, param.getString("stor_code")) - .isNull(Structattr::getStoragevehicle_code) - .isNull(Structattr::getTask_code)); + .and(w -> w.isNull(Structattr::getStoragevehicle_code) + .or() + .eq(Structattr::getStoragevehicle_code, "")) + .and(w -> w.isNull(Structattr::getTask_code) + .or() + .eq(Structattr::getTask_code, ""))); if (outPoints.size() == 0) { throw new BadRequestException("当前出库策略：空桶入库，库存分配失败，失败原因：料桶缓存库无空位！"); } @@ -92,7 +100,9 @@ public class UnpackingRuleHandler extends Decisioner { .eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getStor_id, param.getString("stor_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) { throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空桶！"); } @@ -104,8 +114,12 @@ public class UnpackingRuleHandler extends Decisioner { .eq(Structattr::getLock_type, "0") .eq(Structattr::getSect_code, param.getString("sect_code")) .eq(Structattr::getStor_id, param.getString("stor_code")) - .isNull(Structattr::getStoragevehicle_code) - .isNull(Structattr::getTask_code)); + .and(w -> w.isNull(Structattr::getStoragevehicle_code) + .or() + .eq(Structattr::getStoragevehicle_code, "")) + .and(w -> w.isNull(Structattr::getTask_code) + .or() + .eq(Structattr::getTask_code, ""))); if (outPoints.size() == 0) { throw new BadRequestException("当前出库策略：解包入库，库存分配失败，失败原因：料桶缓存库无空位！"); } diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue index 3f48e4f..c51a15c 100644 --- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue @@ -172,7 +172,8 @@ export default { rules: { }, workShopList: [ - { 'name': '第一车间', 'code': 'A1' } + { 'name': '超细', 'code': 'CX' }, + { 'name': '中粗', 'code': 'ZC' } ] } },