From 9587527d9a96e149cc9e6cf5b99a9a18aaa6e363 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 3 Jul 2024 17:03:03 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E8=A7=84=E5=88=99=EF=BC=9A=E6=95=B4=E5=87=BA=E4=BC=98?= =?UTF-8?q?=E5=85=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/decisioner/impl/base/FIFORuleHandler.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 856f7d1c..17f50d52 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 @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; @@ -54,8 +55,11 @@ public class FIFORuleHandler extends Decisioner vechielDtos = iStIvtStructattrService.collectVechicle(MapOf.of("material_id", param.getString("material_id") , "pcsn", param.getString("pcsn") , "stor_code", param.getString("stor_code") - , "order_by", "update_time asc") + , "plan_qty", plan_qty + , "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc") ); + int finalPlan_qty = plan_qty; + vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty))); List need = list.stream().map(StructattrVechielDto::getVehicle_code).collect(Collectors.toList()); List disList = new ArrayList<>();