From 4d0d963bb19c7eb5860257eddd112e2592e983aa Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 10 五月 2025 17:02:21 +0800
Subject: [PATCH] 单据对接

---
 src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index d01e15d..4fa99bf 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -10,7 +10,9 @@
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.service.ReportToThirdService;
+import com.zy.common.utils.Synchro;
 import com.zy.nc.SendUtil;
+import com.zy.nc.entity.NccSaleXsfhmxWms;
 import com.zy.nc.util.NcResultMessage;
 import com.zy.nc.vo.SaleOutBodyVO;
 import com.zy.nc.vo.SaleOutHeadVO;
@@ -19,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -49,23 +52,38 @@
         NcResultMessage response = null;
         try {
             switch (order.getDocType().toString()) {
-                case "閿�鍞彂璐�":
+                case "35":
                     //缁勮瀵硅薄鏁版嵁
                     Map<String, Object> data = new HashMap<String, Object>();
                     SaleOutHeadVO saleOutHeadVO = new SaleOutHeadVO();
                     saleOutHeadVO.setPk_org("FYT");
                     saleOutHeadVO.setCwarehouseid("6101");
                     SaleOutBodyVO saleOutBodyVO = null;
+                    List<SaleOutBodyVO> saleOutBodyVOList = new ArrayList<>();
                     for (OrderDetl orderDetl : orderDetls) {
                         saleOutBodyVO = new SaleOutBodyVO();
-                        saleOutBodyVO.setCsourcebillhid("1001A1100000027XNSH2");
-                        saleOutBodyVO.setCsourcebillbid("1001A1100000027YFC8U");
-                        saleOutBodyVO.setCsourcetype("4331-01");
+                        String remark = orderDetl.getRemark();
+                        if (!Cools.isEmpty(remark)) {
+                            NccSaleXsfhmxWms nccSaleXsfhmxWms = JSONObject.parseObject(remark, NccSaleXsfhmxWms.class);
+                            Synchro.Copy(nccSaleXsfhmxWms, saleOutBodyVO);
+                            saleOutBodyVO.setCsourcetype("4331-01");
+                            saleOutBodyVO.setCsourcebillbid(nccSaleXsfhmxWms.getCdeliverybid());
+                            saleOutBodyVO.setCsourcebillhid(nccSaleXsfhmxWms.getCdeliveryid());
+                        }
+                        saleOutBodyVO.setNnum(orderDetl.getQty());
+                        saleOutBodyVOList.add(saleOutBodyVO);
                     }
-                    data.put("saleOutHeadVO", saleOutHeadVO);
-                    data.put("saleOutBodyVO", saleOutBodyVO);
+                    saleOutHeadVO.setVdef2("");
+                    saleOutHeadVO.setVdef3("");
+                    saleOutHeadVO.setVdef4("");
+                    saleOutHeadVO.setVdef7("");
+                    saleOutHeadVO.setVdef8("");
+                    saleOutHeadVO.setVdef13("");
+                    saleOutHeadVO.setVdef14("");
+                    data.put("SaleOutHeadVO", saleOutHeadVO);
+                    data.put("SaleOutBodyVO", saleOutBodyVOList);
                     //鍙戦�佽姹�
-                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + port, saveRefDelivery, JSONObject.toJSONString(data));
+                    response = SendUtil.sendDataToNc(SendUtil.token, nyncIp + ":" + port, saveRefDelivery, JSONObject.toJSONString(data));
                     if (!Cools.isEmpty(response) && response.isSuccess()) {
                         log.info("response:{}", response);
                         http = true;
@@ -91,6 +109,7 @@
                 }
             }
         } catch (Exception e) {
+            e.printStackTrace();
             throw new CoolException("璋冪敤鎺ュ彛鎶ラ敊锛岃鑱旂郴绠$悊鍛�");
         } finally {
             reportApiLog(response, order.getDocType$(), nyncIp, saveRefDelivery);

--
Gitblit v1.9.1