From e2e642848e9a75cd5915cf349453d71d31838b68 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 十一月 2025 13:40:53 +0800
Subject: [PATCH] *分拣流程orderNo由唯一降级为不唯一

---
 src/main/java/com/zy/asrs/utils/ToSortLineUtils.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
index b4d5ad4..bfc3316 100644
--- a/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
+++ b/src/main/java/com/zy/asrs/utils/ToSortLineUtils.java
@@ -32,8 +32,8 @@
         System.out.println("\n" + solution);
     }
 
-    public static String MergerParameter(String sku,String po,String upc){
-        return sku+sign_F+po+sign_F+upc;
+    public static String MergerParameter(String item,String sku,String po,String upc){
+        return item+sign_F+sku+sign_F+po+sign_F+upc;
     }
 
     public static OrderToLine GetOrderToLine(List<ItemUtilParam.Item> items, OrderToLine orderToLine,String sign){
@@ -62,14 +62,14 @@
         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));
+                String[] split = mantnr.split(Pattern.quote(sign_F),-1);
                 OrderToLine.MatList mat = new OrderToLine.MatList(
-                        split[0],  // matnr -> sku
-                        split[1],  //  supp -> po -> s1
+                        split[0],  // matnr -> matnr -> item
+                        split[1],  // sku -> sku
+                        split[2],  //  standby1 -> po -> s1
                         locker.contents.get(mantnr).doubleValue(),   //鏁存枡
-                        split[2],   //barcode -> upc -> s2
+                        split[3],   //standby2 -> upc -> s2
                         1,
-                        null,   //origin -> supplier 璐ф簮
                         locker.bindingTags
                 );
                 matLists.add(mat);
@@ -89,12 +89,12 @@
 //                System.out.println(mantnr+"<===>"+locker.contents.get(mantnr));
                 String[] split = mantnr.split(Pattern.quote(sign_F),-1);
                 OrderToLine.MatList mat = new OrderToLine.MatList(
-                        split[0],  // matnr -> sku
-                        split[1],  //  supp -> po -> s1
+                        split[0],  // matnr -> item -> matnr
+                        split[1],  //  standby3 -> sku -> standby3
+                        split[2],  //  standby1 -> po -> standby1
                         locker.contents.get(mantnr).doubleValue(),   //鏁存枡
-                        split[2],   //barcode -> upc -> s2
+                        split[3],   //standby2 -> upc -> standby2
                         1,
-                        null,   //origin -> supplier 璐ф簮
                         locker.bindingTags
                 );
                 matLists.add(mat);

--
Gitblit v1.9.1