From 29dfa9eb927f21dc1ba8ca50f5e889def9a67845 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 28 Aug 2023 14:19:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E6=8B=89=E5=8F=96=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E5=8D=95=E5=8E=BB=E6=8E=89=E6=8B=AC=E5=8F=B7=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/pzh/PzhzdClient.java   | 20 +++++++++++++++++++
 .../glxp/mipsdl/http/UCloudHttpClient.java    |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java
index 512436e..0a48735 100644
--- a/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/pzh/PzhzdClient.java
@@ -282,6 +282,12 @@ public class PzhzdClient implements BaseHttpClient {
                     UdiwmsInvProductResponse invProductResponse = new UdiwmsInvProductResponse();
                     invProductResponse.setName(onhandQueryResponse.getCinventory_name());
                     invProductResponse.setBatchNo(onhandQueryResponse.getVbatchcode());
+//                    if (StrUtil.isNotEmpty(onhandQueryResponse.getVbatchcode())) {
+//                        String str = onhandQueryResponse.getVbatchcode();
+//                        String regex = "\\(.*?\\)";
+//                        str = str.replaceAll(regex, "");
+//                        invProductResponse.setBatchNo(str);
+//                    }
                     invProductResponse.setCode(onhandQueryResponse.getCinventory_code());
                     invProductResponse.setCount(onhandQueryResponse.getNnum());
                     invProductResponse.setSpec(onhandQueryResponse.getInvspec());
@@ -532,6 +538,12 @@ public class PzhzdClient implements BaseHttpClient {
                             subErpOrder.setCount(childrenvoBean.getNinnum());
                             subErpOrder.setReCount(childrenvoBean.getNshouldinnum());
                             subErpOrder.setBatchNo(childrenvoBean.getVbatchcode());
+                            if (StrUtil.isNotEmpty(childrenvoBean.getVbatchcode())) {
+                                String str = childrenvoBean.getVbatchcode();
+                                String regex = "\\(.*?\\)";
+                                str = str.replaceAll(regex, "");
+                                subErpOrder.setBatchNo(str);
+                            }
                             subErpOrder.setPrice(BigDecimal.valueOf(childrenvoBean.getNprice()));
                             subErpOrder.setExpireDate(childrenvoBean.getDvalidate());
                             subPurchases.add(subErpOrder);
@@ -588,6 +600,14 @@ public class PzhzdClient implements BaseHttpClient {
                             subPurchase.setReCount(childrenvoBean.getNshouldoutnum());
                             subPurchase.setCount(childrenvoBean.getNoutnum());
                             subPurchase.setBatchNo(childrenvoBean.getVbatchcode());
+
+                            if (StrUtil.isNotEmpty(childrenvoBean.getVbatchcode())) {
+                                String str = childrenvoBean.getVbatchcode();
+                                String regex = "\\(.*?\\)";
+                                str = str.replaceAll(regex, "");
+                                subPurchase.setBatchNo(str);
+                            }
+
                             subPurchase.setPrice(BigDecimal.valueOf(childrenvoBean.getNsaleprice()));
                             subPurchases.add(subPurchase);
                         }
diff --git a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java
index c584d71..a1b6b5a 100644
--- a/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java
+++ b/src/main/java/com/glxp/mipsdl/http/UCloudHttpClient.java
@@ -99,7 +99,7 @@ public class UCloudHttpClient {
      * @param uSaleoutQueryRequest
      * @return
      */
-    public UBaseResponse saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) {
+    public UBaseResponse  saleoutQuery(USaleoutQueryRequest uSaleoutQueryRequest) {
         //请求开始时间
         Date date = new Date();