From 5099dfcf8e015c35a2f81986101e08e93a7d7944 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期一, 13 十月 2025 17:09:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/ToSortLineUtils.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
index 19ee586..7195635 100644
--- a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
+++ b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
@@ -36,8 +36,7 @@
return sku+sign_F+po+sign_F+upc;
}
- public static OrderToLine GetOrderToLine(List<GroupedLockerOptimizerUtils.Item> items,OrderToLine orderToLine){
- Long bindingTag = System.currentTimeMillis();//娣锋惌鏍囪
+ public static OrderToLine GetOrderToLineGro(List<GroupedLockerOptimizerUtils.Item> items,OrderToLine orderToLine){
List<OrderToLine.MatList> matLists = new ArrayList<>();
// 浣跨敤鍒嗙粍浼樺厛绠楁硶
GroupedLockerOptimizerUtils.PackingSolution solution = GroupedLockerOptimizerUtils.packItemsWithGrouping(items);
@@ -52,11 +51,34 @@
split[2], //barcode -> upc -> s2
1,
null, //origin -> supplier 璐ф簮
- bindingTag
+ locker.bindingTags
);
matLists.add(mat);
}
- bindingTag++;
+ }
+ orderToLine.setMatList(matLists);
+ return orderToLine;
+ }
+
+ public static OrderToLine GetOrderToLineOpt(List<OptimizedLockerPackingUtils.Item> items,OrderToLine orderToLine){
+ List<OrderToLine.MatList> matLists = new ArrayList<>();
+ // 浣跨敤鍒嗙粍浼樺厛绠楁硶
+ OptimizedLockerPackingUtils.PackingSolution packingSolution = OptimizedLockerPackingUtils.optimizedPacking(items);
+ for (OptimizedLockerPackingUtils.Locker locker:packingSolution.lockers) {
+ for (String mantnr : locker.contents.keySet()){
+ System.out.println(mantnr+"<===>"+locker.contents.get(mantnr));
+ String[] split = mantnr.split(Pattern.quote(sign_F));
+ OrderToLine.MatList mat = new OrderToLine.MatList(
+ split[0], // matnr -> sku
+ split[1], // supp -> po -> s1
+ locker.contents.get(mantnr).doubleValue(), //鏁存枡
+ split[2], //barcode -> upc -> s2
+ 1,
+ null, //origin -> supplier 璐ф簮
+ locker.bindingTags
+ );
+ matLists.add(mat);
+ }
}
orderToLine.setMatList(matLists);
return orderToLine;
--
Gitblit v1.9.1