From e596214d84efa77d0cf316563548f1b1d7643a37 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 08:40:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java b/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java
index a6ff8d5..775fa7d 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java
@@ -2,6 +2,8 @@
 
 import lombok.Data;
 
+import java.util.regex.Pattern;
+
 /*
  *  Created by Monkey D. Luffy on 2025.09.09
  * */
@@ -14,13 +16,16 @@
     private int total_num;//棰勬湡闇�瑕佸畬鎴愮殑鏁伴噺
     private String staNo;
     private String orderNo;
-    private String sku;
+//    private String sku;
+    private String matnr;
+    private Long bindingTags;
 
     public void OrderIdTwo(String sign_order,String sign_sku){
-        String[] split = order_id.split(sign_order);
+        String[] split = order_id.split(Pattern.quote(sign_order));
         staNo = split[1];
-        String[] split1 = split[0].split(sign_sku);
-        orderNo = split1[1];
-        sku = split1[0];
+        String[] split1 = split[0].split(Pattern.quote(sign_sku));
+        orderNo = split1[2];
+        matnr = split1[0];
+        bindingTags = Long.parseLong(split1[1]);
     }
 }

--
Gitblit v1.9.1