From f1958b404d6d9cba6c551484108e0100ef9da49f Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 31 Jul 2024 16:30:22 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E5=85=A5=E5=BA=93=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/chainer/impl/ExecuteDecisionChainer.java | 2 +- .../handler/decisioner/impl/diy/DepthPriorityHandler.java | 2 +- .../decisioner/impl/{base => diy}/InventoryRuleHandler.java | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/{base => diy}/InventoryRuleHandler.java (95%) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/ExecuteDecisionChainer.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/ExecuteDecisionChainer.java index 7e86e5af..c1881195 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/ExecuteDecisionChainer.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/chainer/impl/ExecuteDecisionChainer.java @@ -33,7 +33,7 @@ public class ExecuteDecisionChainer extends DecisionerChain { List list = transfers; for (String decisionerType : decisionerTypes) { Decisioner decisioner = decisionerMap.get(decisionerType); - list = decisioner.handler(transfers, startPatam); + list = decisioner.handler(list, startPatam); if (CollectionUtils.isEmpty(list)){ throw new BadRequestException("当前策略"+decisioner.strategyConfig.getStrategy_name()+"无可用货位,分配前数量:"+transfers.size()); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java index ee44ff8c..70f0c285 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/DepthPriorityHandler.java @@ -13,7 +13,7 @@ import java.util.stream.Collectors; * @author ZZQ * @Date 2024/7/31 15:19 */ -//@Service("depthPriority") +@Service("depthPriority") public class DepthPriorityHandler extends Decisioner { //现场1/4排深位 @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/InventoryRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/InventoryRuleHandler.java similarity index 95% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/InventoryRuleHandler.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/InventoryRuleHandler.java index cf0dd406..a8283a3d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/InventoryRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/diy/InventoryRuleHandler.java @@ -1,4 +1,4 @@ -package org.nl.wms.decision_manage.handler.decisioner.impl.base; +package org.nl.wms.decision_manage.handler.decisioner.impl.diy; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -79,7 +79,6 @@ public class InventoryRuleHandler extends Decisioner i.getRow_num() + i.getCol_num() + i.getLayer_num() + i.getBlock_num())); return list; }