From 297a14c95ff91c1955765e0cd6f21cc1beb8a542 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Sat, 30 Nov 2024 11:05:58 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E5=A4=8Dfifo=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E6=B5=85=E4=BD=8D=E4=BC=98=E5=85=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/decisioner/impl/base/FIFORuleHandler.java           | 2 +-
 .../handler/decisioner/impl/base/NearbyRuleHandler.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
index 30df1d99..d64df52e 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
@@ -61,7 +61,7 @@ public class FIFORuleHandler extends Decisioner<StructattrVechielDto, JSONObject
                 , "stor_code", param.getString("stor_code")
                 , "plan_qty", plan_qty
                 , "is_lock", "false"
-                , "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc")
+                , "order_by","block_num asc,ABS(qty-#{plan_qty}) asc,update_time asc")
         );
         int finalPlan_qty = 0;
 //        vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty)));
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/NearbyRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/NearbyRuleHandler.java
index 08e7f73e..c33be072 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/NearbyRuleHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/NearbyRuleHandler.java
@@ -54,7 +54,7 @@ public class NearbyRuleHandler extends Decisioner<StIvtStructattr, JSONObject> {
         }
         List<StIvtStructattr> before = list.subList(0, list.size()>10?10:list.size());
         log.info("就近分配前:"+ before);
-        list.sort(Comparator.comparingInt(i -> i.getRow_num()+i.getCol_num()+i.getLayer_num()+i.getBlock_num()));
+        list.sort(Comparator.comparingInt(i -> i.getRow_num()+i.getCol_num()+i.getLayer_num()));
         //就近分配区分出库还是入库策略
         List<StIvtStructattr> subList = list.subList(0, list.size()>10?10:list.size());
         log.info("就近分配结果:"+ subList);