From 17491a6e7ab23c9616ca514a85859564de2b8c0f Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 25 Jan 2024 14:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E9=9B=86=E9=87=87=E9=9D=9E?=
 =?UTF-8?q?=E9=9B=86=E9=87=87=E6=8B=86=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 28a0ca2..206208a 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -28,7 +28,6 @@ import com.glxp.mipsdl.dao.thrsys.ThrProductsDao;
 import com.glxp.mipsdl.dao.thrsys.ThrSystemBusApiDao;
 import com.glxp.mipsdl.entity.auth.AuthUserEntity;
 import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
-import com.glxp.mipsdl.entity.auth.AuthWarehouseUser;
 import com.glxp.mipsdl.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.mipsdl.entity.basic.BasicCorpEntity;
 import com.glxp.mipsdl.entity.basic.BasicProductsEntity;
@@ -38,7 +37,6 @@ import com.glxp.mipsdl.entity.ctqyy.MaterialDictEntity;
 import com.glxp.mipsdl.entity.ctqyy.PriceClassEntity;
 import com.glxp.mipsdl.entity.ctqyy.ThrHslbEntity;
 import com.glxp.mipsdl.entity.inout.*;
-import com.glxp.mipsdl.entity.thrsys.ThrCorpEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrProductsEntity;
 import com.glxp.mipsdl.entity.thrsys.ThrSystemBusApiEntity;
@@ -70,8 +68,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -548,6 +545,7 @@ public class CtqyyClient extends CommonHttpClient {
             return ResultVOUtils.error(500, "产品信息对照异常，无法上传");
         }
 
+
         for (UdiwmsOrderDetailRequest i : items) {
             String fphm = "";
             String fprq = null;
@@ -565,6 +563,8 @@ public class CtqyyClient extends CommonHttpClient {
             i.setSecSalesInvNo(fphm);
             i.setInvoiceDate(fprq);
         }
+
+
         //构造诏安接口参数
         ZzzyyRequest zaZyRequest = new ZzzyyRequest();
 
@@ -579,9 +579,26 @@ public class CtqyyClient extends CommonHttpClient {
 //                zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
 //                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
 //            }
-            zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
-            zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
-            return submitOrder(orderEntity, zaZyRequest);
+            Map<String, List<UdiwmsOrderDetailRequest>> splitMap = items.stream()
+                    .collect(Collectors.groupingBy(UdiwmsOrderDetailRequest::getFirstSalesInvNo));
+            BaseResponse baseResponse = null;
+            int index = 1;
+            if (splitMap.size() > 1) {
+                for (List<UdiwmsOrderDetailRequest> splitItems : splitMap.values()) {
+                    zaxzyyOrderRequest.setItem(splitItems);
+                    zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+                    zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+                    orderEntity.setBillNo(orderEntity.getBillNo() + "-" + index);
+                    baseResponse = submitOrder(orderEntity, zaZyRequest);
+                }
+                return baseResponse;
+            } else {
+                zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+                return submitOrder(orderEntity, zaZyRequest);
+            }
+
+
         } else if (thrSystemBusApiEntity.getUrl().equals("saveMaterialHight")) {
 
             // 1.先提交到物资