From 52ef10033d82393443d8b73faa88a863834a4c8f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 aaecd46..775fa7d 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderArmEndParam.java
@@ -16,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(Pattern.quote(sign_order));
         staNo = split[1];
         String[] split1 = split[0].split(Pattern.quote(sign_sku));
-        orderNo = split1[1];
-        sku = split1[0];
+        orderNo = split1[2];
+        matnr = split1[0];
+        bindingTags = Long.parseLong(split1[1]);
     }
 }

--
Gitblit v1.9.1