From 7883316c61d4f8fa70fe6cde0c0f53e9e3d8d1d0 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期四, 15 五月 2025 14:22:40 +0800
Subject: [PATCH] 1.OA->MES审批接口开发。 2.OA->MES退回接口开发。 3.MES->OA由同步调整为异步。
---
service/Warehouse/MesXkyService.cs | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/service/Warehouse/MesXkyService.cs b/service/Warehouse/MesXkyService.cs
index ae09d2c..e14486b 100644
--- a/service/Warehouse/MesXkyService.cs
+++ b/service/Warehouse/MesXkyService.cs
@@ -5,6 +5,7 @@
using NewPdaSqlServer.DB;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
+using NewPdaSqlServer.service.@base;
using NewPdaSqlServer.util;
using Newtonsoft.Json;
using SqlSugar;
@@ -15,25 +16,29 @@
using System.Security.Cryptography;
using System.Text;
using static Azure.Core.HttpHeader;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
+using static NewPdaSqlServer.Controllers.Warehouse.MesXkyController;
namespace NewPdaSqlServer.service.QC;
public class MesXkyService : RepositoryNoEntity
{
- public bool XKY_GET_DHD(dynamic entity)
+ public dynamic XKY_GET_DHD(XKYGetDhdRequest entity)
{
- string ErrorMsg = "";
- ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
try
{
- string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}";
+ string ErrorMsg = "";
+ ApiCommonParam Apiparam = ApiCommonParam.NewApiCommon();
+
+ //string data_inserted = "{\r\n \"startDate\": 1746759300000,\r\n \"endDate\": 1746762300000,\r\n \"erpCode\": \"GXF001\"\r\n}";
+ string sendJson = JsonConvert.SerializeObject(entity);
ArrayList SQLStringList = new ArrayList();
// var client = new HttpClient();
var url = "https://openapi.xiekeyun.com/delivery/getNoList.json";
HttpClient httpClient = new HttpClient();
httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
- string json = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + data_inserted + "}";
+ string json = "{\"commonParam\":" + JsonConvert.SerializeObject(Apiparam) + ",\"body\":" + sendJson + "}";
byte[] postData = Encoding.UTF8.GetBytes(json);
// 鍒涘缓璇锋眰瀵硅薄
@@ -56,20 +61,34 @@
string result2 = reader.ReadToEnd();
responseJson = JsonConvert.DeserializeObject(result2);
-
}
+
+ if (responseJson.result != 1)
+ throw new ApplicationException(responseJson.errorMsg);
+
+ // 鏂板鏁版嵁瀛樺偍閫昏緫锛屽偍瀛樹富琛ㄩ�昏緫
+ var result = 0;
+ List<DeliveryNotice> noticeList = JsonConvert.DeserializeObject<List<DeliveryNotice>>(responseJson.dataList.ToString());
+ noticeList.ForEach(n => n.Id = Guid.NewGuid()); // 鏂板GUID璧嬪��
+ Db.Ado.UseTran(() =>
+ {
+ result = Db.Insertable(noticeList).ExecuteCommand();
+ }, ex =>
+ {
+ throw new Exception($"鏁版嵁搴撴彃鍏ュけ璐ワ細{ex.Message}\n{ex.InnerException?.Message}");
+ });
+
+ return responseJson;
}
- catch (Exception ex)
+ catch (Exception e)
{
- ErrorMsg = ex.Message;
- return false;
+ throw new Exception(e.Message);
}
- return true;
}
- public dynamic GetXkyDHD(dynamic entity)
+ public dynamic GetXkyDHD(XKYGetDhdRequest entity)
{
return XKY_GET_DHD(entity);
--
Gitblit v1.9.3