From bf780b6c83012b5beb3d7515b8fb61753c5fb736 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期四, 26 六月 2025 08:48:37 +0800
Subject: [PATCH] 采购承诺交期改string类型
---
MES.Service/service/ProductionOrder/ProductionOrderManager.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/MES.Service/service/ProductionOrder/ProductionOrderManager.cs b/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
index f7cab5a..b48989a 100644
--- a/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
+++ b/MES.Service/service/ProductionOrder/ProductionOrderManager.cs
@@ -98,8 +98,8 @@
// 瑙ｆ瀽 JSON 瀛楃涓蹭负鍔ㄦ�佸璞�
dynamic responseObj = Newtonsoft.Json.JsonConvert.DeserializeObject(responseJson);
-
+ string fileName = null;
// 鏌ユ壘 "鐢熶骇鍒堕�犲崟" 瀵瑰簲鐨� Value
string fileId = null;
foreach (var formValue in responseObj.Result.FormComponentValues)
@@ -111,6 +111,10 @@
if (fileInfoArray != null && fileInfoArray.Count > 0)
{
+
+ // 鑾峰彇绗竴涓枃浠剁殑鏂囦欢鍚�
+ fileName = fileInfoArray[0].fileName;
+
fileId = fileInfoArray[0].fileId; // 鎻愬彇绗竴涓枃浠剁殑 fileId
break;
@@ -121,8 +125,15 @@
Debug.WriteLine(fileId);
var result = GetDownloadUrl(fileId, InstanceId);
+ // 鍦ㄦ偍鐨勪唬鐮佷腑澶勭悊
+ var combinedResult = new CombinedResult
+ {
+ FileName = fileName,
+ DownloadInfo = Newtonsoft.Json.JsonConvert.DeserializeObject(result)
+ };
- return (Newtonsoft.Json.JsonConvert.SerializeObject(result));
+ return Newtonsoft.Json.JsonConvert.SerializeObject(combinedResult);
+
}
catch (TeaException err)
{
@@ -239,7 +250,7 @@
var mesProductionOrders = new ProductionOrders
{
ImageUrl = erpProductionOrder.ImageUrl,
- SalesOrder = erpProductionOrder.SalesOrderNo
+ SalesOrder = erpProductionOrder.SaleOrderNo
};
return mesProductionOrders;
--
Gitblit v1.9.3