From 48b9209fd1d95aa9cb6b38c23c1ce27440873ead Mon Sep 17 00:00:00 2001
From: guojunyun <tingyu130@aliyun.com>
Date: Wed, 5 Nov 2025 14:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4erp=E6=9A=82=E6=97=B6?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=88=90=E5=8A=9F=E3=80=81=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/contract/ContractService.java     | 24 ++++++++++++++-
 .../service/contract/ContractServiceImpl.java | 30 +++----------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
index 7e1899f..ef487e5 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractService.java
@@ -203,10 +203,32 @@ public interface ContractService {
      */
     Boolean complete(List<Long> ids);
 
-
+    /**
+     * 合同映射数据提交到erp
+     *
+     * @param erpContractVO 合同映射数据
+     * @return 提交结果
+     */
     JSONObject sendToErp(ErpContractSaveReqVO erpContractVO);
 
+    /**
+     * 生成合同映射数据
+     *
+     * @param contractMainDO 合同主信息
+     * @return 合同映射信息
+     */
     ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO);
 
+    /**
+     * 生成系统合同编号
+     *
+     * 单据号生成规则说明
+     * 单据名称（拼音）-类型-公司编码-年月日-六位编号
+     * 如请款单: QKD-ZGQK-3000-20250915-00001
+     *
+     * @param category 合同类别
+     *
+     * @return 系统合同编号
+     */
     String generateSystemContractNumber(String category);
 }
diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
index c8700ae..3f6f68d 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/contract/ContractServiceImpl.java
@@ -60,7 +60,6 @@ import java.io.ByteArrayOutputStream;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -1603,24 +1602,20 @@ public class ContractServiceImpl implements ContractService {
         return true;
     }
 
-    /**
-     * 合同映射数据提交到erp
-     *
-     * @param erpContractVO 合同映射数据
-     * @return 提交结果
-     */
     @Override
     public JSONObject sendToErp(ErpContractSaveReqVO erpContractVO) {
         JSONObject erpResult = new JSONObject();
 
-        HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
+        // TODO 暂时返回成功
+        erpResult.putOnce("success", true);
+        /*HashMap<String, String> result = erpContractService.submitErp(erpContractVO);
         if ("E".equals(result.get("flag"))) {
             erpResult.putOnce("success", false);
             erpResult.putOnce("errMsg", result.get("resStr")+":"+result.get("E_RESP"));
         } else {
             erpResult.putOnce("success", true);
             erpResult.putOnce("data", result);
-        }
+        }*/
 
         return erpResult;
     }
@@ -1671,12 +1666,6 @@ public class ContractServiceImpl implements ContractService {
         return operationId;
     }
 
-    /**
-     * 生成合同映射数据
-     *
-     * @param contractMainDO 合同主信息
-     * @return 合同映射信息
-     */
     @Override
     public ErpContractSaveReqVO getErpContract(ContractMainDO contractMainDO) {
 
@@ -1985,17 +1974,6 @@ public class ContractServiceImpl implements ContractService {
         }
     }
 
-    /**
-     * 生成系统合同编号
-     *
-     * 单据号生成规则说明
-     * 单据名称（拼音）-类型-公司编码-年月日-六位编号
-     * 如请款单: QKD-ZGQK-3000-20250915-00001
-     *
-     * @param category 合同类别
-     *
-     * @return 系统合同编号
-     */
     @Override
     public String generateSystemContractNumber(String category) {