From 4d7047f93580a2a7dd36b915ef05a2ea292e8108 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期四, 20 三月 2025 20:20:56 +0800 Subject: [PATCH] 异常处置单 --- MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll | 0 MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll | 0 MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs | 40 + MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0 MESApplication/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll | 0 MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll | 0 MES.Service/bin/Debug/net8.0/Aliyun.Credentials.dll | 0 MESApplication/bin/Debug/net8.0/MES.Service.dll | 0 MES.Service/Modes/QcIssueResult/QcIssueResults.cs | 29 + MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll | 0 MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0 MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll | 0 MESApplication/bin/Debug/net8.0/MESApplication.deps.json | 201 ++++++++ MES.Service/Modes/QcIssueResult/DingNameCode.cs | 21 MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll | 0 MES.Service/Modes/QcIssueResult/GetReleaseNoDetail.cs | 22 MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll | 0 MES.Service/Dto/webApi/QcIssueResult/QcIssueResult.cs | 12 MESApplication/bin/Debug/net8.0/Tea.dll | 0 MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll | 0 MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0 MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll | 0 MES.Service/Dto/webApi/QcIssueResult/ErpQcIssueResult.cs | 10 MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll | 0 MES.Service/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll | 0 MESApplication/bin/Debug/net8.0/MESApplication.dll | 0 MESApplication/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll | 0 MES.Service/bin/Debug/net8.0/MES.Service.dll | 0 MESApplication/Controllers/BasicData/ProductionOrderController.cs | 34 + MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs | 105 ++++ MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll | 0 MESApplication/bin/Debug/net8.0/MES.Service.deps.json | 201 ++++++++ MES.Service/service/QcIssueResult/QcIssueResultManager.cs | 401 +++++++++++++++++ MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll | 0 MES.Service/MES.Service.csproj | 1 MES.Service/bin/Debug/net8.0/MES.Service.deps.json | 201 ++++++++ MES.Service/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll | 0 MESApplication/bin/Debug/net8.0/MESApplication.exe | 0 MES.Service/bin/Debug/net8.0/Tea.dll | 0 MES.Service/service/BasicData/ProductionOrderManager.cs | 88 +++ MESApplication/bin/Debug/net8.0/Aliyun.Credentials.dll | 0 41 files changed, 1,365 insertions(+), 1 deletions(-) diff --git a/MES.Service/Dto/webApi/QcIssueResult/ErpQcIssueResult.cs b/MES.Service/Dto/webApi/QcIssueResult/ErpQcIssueResult.cs new file mode 100644 index 0000000..24938b6 --- /dev/null +++ b/MES.Service/Dto/webApi/QcIssueResult/ErpQcIssueResult.cs @@ -0,0 +1,10 @@ +锘縩amespace MES.Service.Dto.webApi.QcIssueResult; + +public class ErpQcIssueResult +{ + //public string? Id { get; set; } + + //public string? ReleaseNo { get; set; } + public string? ProcessNo { get; set; } + public string? FReview { get; set; } +} diff --git a/MES.Service/Dto/webApi/QcIssueResult/QcIssueResult.cs b/MES.Service/Dto/webApi/QcIssueResult/QcIssueResult.cs new file mode 100644 index 0000000..6ce15a0 --- /dev/null +++ b/MES.Service/Dto/webApi/QcIssueResult/QcIssueResult.cs @@ -0,0 +1,12 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MES.Service.Dto.webApi.QcIssueResult; + +public class QcIssueResult +{ + public ErpQcIssueResult ErpQcIssueResult { get; set; } +} diff --git a/MES.Service/MES.Service.csproj b/MES.Service/MES.Service.csproj index d56a256..1f802a3 100644 --- a/MES.Service/MES.Service.csproj +++ b/MES.Service/MES.Service.csproj @@ -7,6 +7,7 @@ </PropertyGroup> <ItemGroup> + <PackageReference Include="AlibabaCloud.SDK.Dingtalk" Version="2.1.93" /> <PackageReference Include="Masuit.Tools.Core" Version="2024.3.4" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="9.0.1" /> diff --git a/MES.Service/Modes/QcIssueResult/DingNameCode.cs b/MES.Service/Modes/QcIssueResult/DingNameCode.cs new file mode 100644 index 0000000..a2b7663 --- /dev/null +++ b/MES.Service/Modes/QcIssueResult/DingNameCode.cs @@ -0,0 +1,21 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MES.Service.Modes.QcIssueResult; + +//閽夐拤鐢ㄦ埛鍐呯爜瀵瑰簲琛� +[SugarTable("MES_DINGDING_NAME_CODE")] +internal class DingNameCode +{ + //閽夐拤鐢ㄦ埛鍐呯爜 + [SugarColumn(ColumnName = "DINGDINGCODE")] + public string? DingDingCode { get; set; } + + //閽夐拤鐢ㄦ埛鍚嶇О + [SugarColumn(ColumnName = "DINGDINGNAME")] + public string? DingDingName { get; set; } +} diff --git a/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs b/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs new file mode 100644 index 0000000..c218ec8 --- /dev/null +++ b/MES.Service/Modes/QcIssueResult/GetQcIssueResultDetail.cs @@ -0,0 +1,40 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MES.Service.Modes.QcIssueResult; + +public class GetQcIssueResultDetail +{ + //鏁伴噺 + [SugarColumn(ColumnName = "FBATCH_QTY")] + public string? FbatchQty { get; set; } + + //浜у搧鍚嶇О + [SugarColumn(ColumnName = "ITEM_NAME")] + public string? ItemName { get; set; } + + //瑙勬牸鍨嬪彿 + [SugarColumn(ColumnName = "ITEM_MODEL")] + public string? ItemModel { get; set; } + + //閫佹鍗曚綅 + [SugarColumn(ColumnName = "SUPP_NAME")] + public string? SuppName { get; set; } + + ////璁㈠崟鍙�(閲囪喘鍗曞彿) + //public string? SuppName { get; set; } + + //瀵逛笉鍚堟牸鎴栨綔鍦ㄤ笉鍚堟牸鐨勬弿杩� + public string? remark { get; set; } + + //妫�楠屽崟鍙� + public string? ReleaseNo { get; set; } + + //鐢ㄦ埛鍚嶇О + public string? Fname { get; set; } + +} diff --git a/MES.Service/Modes/QcIssueResult/GetReleaseNoDetail.cs b/MES.Service/Modes/QcIssueResult/GetReleaseNoDetail.cs new file mode 100644 index 0000000..326684f --- /dev/null +++ b/MES.Service/Modes/QcIssueResult/GetReleaseNoDetail.cs @@ -0,0 +1,22 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MES.Service.Modes.QcIssueResult; + +[SugarTable("MES_DINGDING_NAME_CODE")] +public class GetReleaseNoDetail +{ + + //閫佽揣鍗曞彿 + [SugarColumn(ColumnName = "DINGDINGCODE")] + public string? DingDingCode { get; set; } + + //渚涘簲鍟� + [SugarColumn(ColumnName = "DINGDINGNAME")] + public string? DingDingName { get; set; } + +} diff --git a/MES.Service/Modes/QcIssueResult/QcIssueResults.cs b/MES.Service/Modes/QcIssueResult/QcIssueResults.cs new file mode 100644 index 0000000..b050e25 --- /dev/null +++ b/MES.Service/Modes/QcIssueResult/QcIssueResults.cs @@ -0,0 +1,29 @@ +锘縰sing SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MES.Service.Modes.QcIssueResult; + +//寮傚父澶勭疆鍗曠粨鏋滆〃 +[SugarTable("MES_QCISSUE_RESULT")] +public class QcIssueResults +{ + //SEQ_MES_SCZZD + [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_QCISSUE_RESULT")] + public decimal Id { get; set; } + + //閫佽揣鍗曞彿 + [SugarColumn(ColumnName = "RELEASE_NO")] + public string? ReleaseNo { get; set; } + + //閫佽揣鍗曞彿 + [SugarColumn(ColumnName = "PROCESSNO")] + public string? ProcessNo { get; set; } + + //渚涘簲鍟� + [SugarColumn(ColumnName = "FREVIEW")] + public string? FReview { get; set; } +} diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll new file mode 100644 index 0000000..02c9b1c --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll new file mode 100644 index 0000000..c64f88d --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll new file mode 100644 index 0000000..c7c3e36 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll new file mode 100644 index 0000000..e6ec429 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll new file mode 100644 index 0000000..aa8bda1 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll new file mode 100644 index 0000000..831d14d --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll new file mode 100644 index 0000000..ea6fdd7 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll b/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll new file mode 100644 index 0000000..0924c08 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/Aliyun.Credentials.dll b/MES.Service/bin/Debug/net8.0/Aliyun.Credentials.dll new file mode 100644 index 0000000..6902ebd --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/Aliyun.Credentials.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.deps.json b/MES.Service/bin/Debug/net8.0/MES.Service.deps.json index 94c51bd..2ce22a0 100644 --- a/MES.Service/bin/Debug/net8.0/MES.Service.deps.json +++ b/MES.Service/bin/Debug/net8.0/MES.Service.deps.json @@ -8,6 +8,7 @@ ".NETCoreApp,Version=v8.0": { "MES.Service/1.0.0": { "dependencies": { + "AlibabaCloud.SDK.Dingtalk": "2.1.93", "Masuit.Tools.Core": "2024.3.4", "Microsoft.Extensions.Configuration": "9.0.1", "Microsoft.Extensions.Configuration.FileExtensions": "9.0.1", @@ -19,6 +20,125 @@ }, "runtime": { "MES.Service.dll": {} + } + }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.EndpointUtil.dll": { + "assemblyVersion": "0.1.1.0", + "fileVersion": "0.1.1.0" + } + } + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewayDingTalk.dll": { + "assemblyVersion": "1.0.2.0", + "fileVersion": "1.0.2.0" + } + } + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "dependencies": { + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewaySpi.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "AlibabaCloud.TeaXML": "0.0.5", + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiClient.dll": { + "assemblyVersion": "0.1.11.0", + "fileVersion": "0.1.11.0" + } + } + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiUtil.dll": { + "assemblyVersion": "1.1.2.0", + "fileVersion": "1.1.2.0" + } + } + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "dependencies": { + "AlibabaCloud.EndpointUtil": "0.1.1", + "AlibabaCloud.GatewayDingTalk": "1.0.2", + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiClient": "0.1.12", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.SDK.Dingtalk.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaUtil.dll": { + "assemblyVersion": "0.1.14.0", + "fileVersion": "0.1.14.0" + } + } + }, + "AlibabaCloud.TeaXML/0.0.5": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaXML.dll": { + "assemblyVersion": "0.0.5.0", + "fileVersion": "0.0.5.0" + } + } + }, + "Aliyun.Credentials/1.4.2": { + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/Aliyun.Credentials.dll": { + "assemblyVersion": "1.4.2.0", + "fileVersion": "1.4.2.0" + } } }, "AngleSharp/1.1.2": { @@ -1351,6 +1471,17 @@ } } }, + "Tea/1.1.3": { + "dependencies": { + "Newtonsoft.Json": "13.0.3" + }, + "runtime": { + "lib/netstandard2.0/Tea.dll": { + "assemblyVersion": "1.1.3.0", + "fileVersion": "1.1.3.0" + } + } + }, "ZstdSharp.Port/0.8.0": { "runtime": { "lib/net8.0/ZstdSharp.dll": { @@ -1374,6 +1505,69 @@ "type": "project", "serviceable": false, "sha512": "" + }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-p/vsdJoVIfc1QREW4JX1tpzKdZZcFdw6/qfrylfcFXc0e2BDMQ2kPrv3nkyr2u+p4BF0PmOYl4EDqRtqLiBc+g==", + "path": "alibabacloud.endpointutil/0.1.1", + "hashPath": "alibabacloud.endpointutil.0.1.1.nupkg.sha512" + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uyNU0IJ1Ei/yz6oYuI0SsSwu0+syFV2wz7vH9zlx5WGccpKK+82lep7pMjHmDV82WOmDdAq2M+pqPLcjf/Spdw==", + "path": "alibabacloud.gatewaydingtalk/1.0.2", + "hashPath": "alibabacloud.gatewaydingtalk.1.0.2.nupkg.sha512" + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vvmA5BrM8rpOZoXwFl/ZWHYLFnZ8EwPp+07z3Eeg9okLv58QJ8+KGWVovTr8tJpuDgPFG1SVdHXRi04A62ehdA==", + "path": "alibabacloud.gatewayspi/0.0.3", + "hashPath": "alibabacloud.gatewayspi.0.0.3.nupkg.sha512" + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3UepgR9UQUZXg8mnDqA1kUZfIKY/tLA7G+Z/Ij/hPx9krV2JR9AlxXOqMeky31N6J1Mx7Jr/nyHgGWpWJdYD7g==", + "path": "alibabacloud.openapiclient/0.1.12", + "hashPath": "alibabacloud.openapiclient.0.1.12.nupkg.sha512" + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0Zd2UHm5gUND+7xNma2SAZEqm2Uy8dvAknLvCx72uDUCbOnfHWh+TsnUnNGMKUvmG3s/ZqxUA1UYIdp5BFCn5Q==", + "path": "alibabacloud.openapiutil/1.1.2", + "hashPath": "alibabacloud.openapiutil.1.1.2.nupkg.sha512" + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "type": "package", + "serviceable": true, + "sha512": "sha512-m5aTuiU+kR/1An1BnAeMuRwv3GkPUOG0Q1KuG4Yuikz9tDSODqye+XXOCSduzKdQSVEAWQEms2gIyRN1ybUV0Q==", + "path": "alibabacloud.sdk.dingtalk/2.1.93", + "hashPath": "alibabacloud.sdk.dingtalk.2.1.93.nupkg.sha512" + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gjPboQEC3rSuS/8Ohk4VAw42W54h9NfIZxn4JIuWfoIF3k3mZxVdMJdKKOgIkNrx8YaLOthPSM3Pfb1zfOyFcw==", + "path": "alibabacloud.teautil/0.1.19", + "hashPath": "alibabacloud.teautil.0.1.19.nupkg.sha512" + }, + "AlibabaCloud.TeaXML/0.0.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mHxE6H3eq4jaeqn3hryIYTI0k8quvPZfZdEE+PdU8rw+NGRvev68D8Aei6xjwW/pArZaTG6yPawYu5c0EaZkfw==", + "path": "alibabacloud.teaxml/0.0.5", + "hashPath": "alibabacloud.teaxml.0.0.5.nupkg.sha512" + }, + "Aliyun.Credentials/1.4.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-GYyMZVqLCX0StNV/0Yv+C1M1rmWf1Lvkybt/Fwol+kLZtt9WC7RWN5cV5zB7IejTbRUfaXCSV9Mf8pZeYbpnKg==", + "path": "aliyun.credentials/1.4.2", + "hashPath": "aliyun.credentials.1.4.2.nupkg.sha512" }, "AngleSharp/1.1.2": { "type": "package", @@ -2054,6 +2248,13 @@ "path": "system.windows.extensions/6.0.0", "hashPath": "system.windows.extensions.6.0.0.nupkg.sha512" }, + "Tea/1.1.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vwpYRSIcbNeRDrrRp6eG1rB2rAE5vOZyrQAjMPCxDTisptsIq4ApdmFc9jvthCIgOeBwTyOe4Y/TYTD88Zq+Yw==", + "path": "tea/1.1.3", + "hashPath": "tea.1.1.3.nupkg.sha512" + }, "ZstdSharp.Port/0.8.0": { "type": "package", "serviceable": true, diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll index bb7c9f5..21ee047 100644 --- a/MES.Service/bin/Debug/net8.0/MES.Service.dll +++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb index ed9d4b2..05cd36a 100644 --- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb +++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb Binary files differ diff --git a/MES.Service/bin/Debug/net8.0/Tea.dll b/MES.Service/bin/Debug/net8.0/Tea.dll new file mode 100644 index 0000000..fd21293 --- /dev/null +++ b/MES.Service/bin/Debug/net8.0/Tea.dll Binary files differ diff --git a/MES.Service/service/BasicData/ProductionOrderManager.cs b/MES.Service/service/BasicData/ProductionOrderManager.cs index da712d9..da236d8 100644 --- a/MES.Service/service/BasicData/ProductionOrderManager.cs +++ b/MES.Service/service/BasicData/ProductionOrderManager.cs @@ -1,4 +1,6 @@ -锘縰sing MES.Service.DB; +锘縰sing AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models; +using AlibabaCloud.TeaUtil.Models; +using MES.Service.DB; using MES.Service.Dto.webApi; using MES.Service.Dto.webApi.DeliveryNote; using MES.Service.Modes; @@ -7,9 +9,93 @@ using System; using System.Collections.Generic; using System.Linq; +using Tea; public class ProductionOrderManager : Repository<ProductionOrders> { + + public static AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client CreateClient1() + { + AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); + config.Protocol = "https"; + config.RegionId = "central"; + return new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client(config); + } + + /** + * 鑾峰彇閽夐拤鐨� Access Token + * @return string 杩斿洖鑾峰彇鍒扮殑 Access Token + */ + public string GetToken() + { + AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client client = CreateClient1(); + AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest getAccessTokenRequest = new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest + { + AppKey = "dingyzos0r1bizj7g6lr", + AppSecret = "-HP4RvK2OUbqhG3iBUpd_TPe5MZRj8cfLc0b8Skt8rhC3I38kVLY9SS8P3kLWFcH", + }; + + try + { + var response = client.GetAccessToken(getAccessTokenRequest); + return response.Body.AccessToken; // 杩斿洖鑾峰彇鍒扮殑 Access Token + } + catch (TeaException err) + { + Console.WriteLine($"TeaException: Code={err.Code}, Message={err.Message}"); + return null; + } + catch (Exception _err) + { + Console.WriteLine($"Exception: {_err.Message}"); + return null; + } + } + + public static AlibabaCloud.SDK.Dingtalkyida_1_0.Client CreateClient() + { + AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); + config.Protocol = "https"; + config.RegionId = "central"; + return new AlibabaCloud.SDK.Dingtalkyida_1_0.Client(config); + } + + public string GetFileUrl() + { + + string accessToken = GetToken(); + if (string.IsNullOrEmpty(accessToken)) + { + return "鑾峰彇 Access Token 澶辫触"; + } + AlibabaCloud.SDK.Dingtalkyida_1_0.Client client = CreateClient(); + AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlHeaders getOpenUrlHeaders = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlHeaders(); + getOpenUrlHeaders.XAcsDingtalkAccessToken = accessToken; + AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlRequest getOpenUrlRequest = new AlibabaCloud.SDK.Dingtalkyida_1_0.Models.GetOpenUrlRequest + { + SystemToken = "54A66HC1YDSSO9DP61Y93CWQ2W9B36IZZOY6MC81", + UserId = "923188102", + Language = "zh_CN", + FileUrl = "https://cfw1x5.aliwork.com/inst/filePreview?appType=APP_Q7PLYKXMKFUJ5HY6DMWR&fileName=APP_Q7PLYKXMKFUJ5HY6DMWR_MDcxODM5NTEyMDMyNjgzODgzX09WOTY2V0ExN1lUVFRDS0Q3WjFYTTlQNUw5MVIzTTNaQ1hHOE1SOQ$$.xls", + Timeout = 3600000, + }; + try + { + + var response = client.GetOpenUrlWithOptions("APP_Q7PLYKXMKFUJ5HY6DMWR", getOpenUrlRequest, getOpenUrlHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); + return (Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)); + } + catch (TeaException err) + { + return $"TeaException: Code={err.Code}, Message={err.Message}"; + } + catch (Exception _err) + { + return $"Exception: {_err.Message}"; + } + } + + public dynamic Save(ErpProductionOrder erpProductionOrder) { //var erpProductionOrder = productionOrder.erpProductionOrder; diff --git a/MES.Service/service/QcIssueResult/QcIssueResultManager.cs b/MES.Service/service/QcIssueResult/QcIssueResultManager.cs new file mode 100644 index 0000000..9427856 --- /dev/null +++ b/MES.Service/service/QcIssueResult/QcIssueResultManager.cs @@ -0,0 +1,401 @@ +锘縰sing System; +using System.Collections.Generic; +using AlibabaCloud.OpenApiClient.Models; +using AlibabaCloud.SDK.Dingtalkworkflow_1_0; +using AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models; +using AlibabaCloud.SDK.Dingtalkoauth2_1_0; +using AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models; +using AlibabaCloud.TeaUtil.Models; +using Tea; +using System.Diagnostics; +using MES.Service.Dto.webApi; +using MES.Service.Modes; +using SqlSugar; +using MES.Service.DB; +using MES.Service.Modes.QcIssueResult; +using MES.Service.Dto.webApi.QcIssueResult; +using MES.Service.Dto.webApi.DeliveryNote; +using MES.Service.Modes.DeliveryNote; + +namespace MES.Service.service.QcIssueResult; + +//寮傚父澶勭疆鍗曠粨鏋滆〃 +[SugarTable("MES_QCISSUE_RESULT")] +public class QcIssueResultManager: Repository<QcIssueResults> +{ + /** + * 浣跨敤 Token 鍒濆鍖栬处鍙稢lient + * @return Client + * @throws Exception + */ + public static AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client CreateClient() + { + AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); + config.Protocol = "https"; + config.RegionId = "central"; + return new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client(config); + } + + public static AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client CreateClient1() + { + AlibabaCloud.OpenApiClient.Models.Config config = new AlibabaCloud.OpenApiClient.Models.Config(); + config.Protocol = "https"; + config.RegionId = "central"; + return new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client(config); + } + + /** + * 鑾峰彇閽夐拤鐨� Access Token + * @return string 杩斿洖鑾峰彇鍒扮殑 Access Token + */ + public string GetToken() + { + AlibabaCloud.SDK.Dingtalkoauth2_1_0.Client client = CreateClient1(); + AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest getAccessTokenRequest = new AlibabaCloud.SDK.Dingtalkoauth2_1_0.Models.GetAccessTokenRequest + { + AppKey = "dingyzos0r1bizj7g6lr", + AppSecret = "-HP4RvK2OUbqhG3iBUpd_TPe5MZRj8cfLc0b8Skt8rhC3I38kVLY9SS8P3kLWFcH", + }; + + try + { + var response = client.GetAccessToken(getAccessTokenRequest); + return response.Body.AccessToken; // 杩斿洖鑾峰彇鍒扮殑 Access Token + } + catch (TeaException err) + { + Console.WriteLine($"TeaException: Code={err.Code}, Message={err.Message}"); + return null; + } + catch (Exception _err) + { + Console.WriteLine($"Exception: {_err.Message}"); + return null; + } + } + + /** + * 鏌ョ湅鏈夋棤鑷�夊鎵硅妭鐐� + * @return string 杩斿洖鍚姩缁撴灉 + */ + public string GetForecast() + { + // 鑾峰彇 Access Token + string accessToken = GetToken(); + if (string.IsNullOrEmpty(accessToken)) + { + return "鑾峰彇 Access Token 澶辫触"; + } + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient(); + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastHeaders processForecastHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastHeaders(); + processForecastHeaders.XAcsDingtalkAccessToken = accessToken; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastRequest.ProcessForecastRequestFormComponentValues formComponentValues0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastRequest.ProcessForecastRequestFormComponentValues + { + Name = "PhoneField", + Value = "123xxxxxxxx", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastRequest processForecastRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastRequest + { + ProcessCode = "PROC-BBA5632D-DC7C-4267-A3E2-757E2B7023BC", + DeptId = 1, + UserId = "923188102", + FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.ProcessForecastRequest.ProcessForecastRequestFormComponentValues> + { + formComponentValues0 + }, + }; + try + { + var response = client.ProcessForecastWithOptions(processForecastRequest, processForecastHeaders, new AlibabaCloud.TeaUtil.Models.RuntimeOptions()); + return $"閽夐拤宸ヤ綔娴佸疄渚嬪惎鍔ㄦ垚鍔�: {Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)}"; + } + catch (TeaException err) + { + + return $"TeaException: Code={err.Code}, Message={err.Message}"; + + } + catch (Exception _err) + { + return $"Exception: {_err.Message}"; + } + } + + + /** + * 鍚姩閽夐拤宸ヤ綔娴佸疄渚� + * @return string 杩斿洖鍚姩缁撴灉 + */ + + public string GetProcessNo(GetQcIssueResultDetail getQcIssueResultDetail) + { + + var db = SqlSugarHelper.GetInstance(); + var mapping = db.Queryable<DingNameCode>() + .Where(t => t.DingDingName == getQcIssueResultDetail.Fname) + .Select(t => new DingNameCode + { + DingDingCode=t.DingDingCode, + }) + .ToList(); + string UserId = mapping.FirstOrDefault().DingDingCode; + + + + Debug.WriteLine(UserId); + + // 鑾峰彇 Access Token + string accessToken = GetToken(); + if (string.IsNullOrEmpty(accessToken)) + { + return "鑾峰彇 Access Token 澶辫触"; + } + + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Client client = CreateClient(); + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders startProcessInstanceHeaders = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceHeaders(); + Debug.WriteLine(accessToken); + startProcessInstanceHeaders.XAcsDingtalkAccessToken = accessToken; // 浣跨敤鑾峰彇鍒扮殑 Access Token + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues1 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextField-K2AD4O5B", + Value = "浜у搧鍚嶇О", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues2 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextField_DYFD1EESLVC0", + Value = "瑙勬牸鍨嬪彿", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues3 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextField_1AVN2BNVY1OG0", + Value = "鏁伴噺", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues4 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextField_1DKEMESOOGSG0", + Value = "閫佹鍗曚綅", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues5 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "DDDateField_20LKOACGMLXC0", + Value = DateTime.Now.ToString("yyyy-MM-dd"), + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues6 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextField_WBNBWGFHR000", + Value = "璁㈠崟鍙�", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues7 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextareaField_1ZP3BDPMYY800", + Value = "瀵逛笉鍚堟牸鎴栨綔鍦ㄤ笉鍚堟牸鐨勬弿杩�:", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues8 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "SignatureField_SKF9Q82DZUO0", + Value = getQcIssueResultDetail.Fname, + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues9 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "DDSelectField_1AK82Q8A2NB40", + Value = "閫�璐�", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues10 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextareaField_1LM82CPPR35S0", + Value = "鎸戦�夊唴瀹�", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues11 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextareaField_AK4JLDDNS2O0", + Value = "璁╂鎺ユ敹鍐呭", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues12 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextareaField_K69R6770WLS0", + Value = "閫�璐у娉�", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues13 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "TextareaField_194UFGLMI02O0", + Value = "鎶ュ簾澶囨敞", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues14 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "DDSelectField_1RN2L4RWQ0AO0", + Value = "鍚�", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues15 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "InnerContactField_WNG7AU9R2AO0", + Value = "鍔犵", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues formComponentValues16 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues + { + Name = "DDAttachment_23VB5MMC1R1C0", + Value = "闄勪欢", + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners targetSelectActioners0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners + { + ActionerKey = "null", + ActionerUserIds = new List<string> + { + UserId + }, + }; + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers approvers0 = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers + { + ActionType = "OR", + UserIds = new List<string> + { + UserId + }, + }; + + + AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest startProcessInstanceRequest = new AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest + { + OriginatorUserId = UserId, + ProcessCode = "PROC-BBA5632D-DC7C-4267-A3E2-757E2B7023BC", + DeptId = 1, + FormComponentValues = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestFormComponentValues> + { + formComponentValues1,formComponentValues2,formComponentValues3, formComponentValues4, formComponentValues5, formComponentValues6, formComponentValues7, formComponentValues8, + formComponentValues9,formComponentValues10, formComponentValues11, formComponentValues12, formComponentValues13, formComponentValues14 + }, + TargetSelectActioners = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestTargetSelectActioners> + { + targetSelectActioners0 + }, + Approvers = new List<AlibabaCloud.SDK.Dingtalkworkflow_1_0.Models.StartProcessInstanceRequest.StartProcessInstanceRequestApprovers> + { + approvers0 + }, + CcList = new List<string> + { + UserId + }, + CcPosition = "START", + + }; + return "1"; + //try + //{ + // string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); + // Debug.WriteLine("startProcessInstanceRequest鍐呭锛�"); + // Debug.WriteLine(requestContent); + // var response = client.StartProcessInstanceWithOptions(startProcessInstanceRequest, startProcessInstanceHeaders, new RuntimeOptions()); + // return $"閽夐拤宸ヤ綔娴佸疄渚嬪惎鍔ㄦ垚鍔�: {Newtonsoft.Json.JsonConvert.SerializeObject(response.Body)}"; + //} + //catch (TeaException err) + //{ + // string requestContent = Newtonsoft.Json.JsonConvert.SerializeObject(startProcessInstanceRequest); + // Debug.WriteLine("startProcessInstanceRequest鍐呭锛�"); + // Debug.WriteLine(startProcessInstanceRequest); + // return $"TeaException: Code={err.Code}, Message={err.Message}"; + //} + //catch (Exception _err) + //{ + // return $"Exception: {_err.Message}"; + //} + } + + + /** + * 灏嗗甫鏈夋祦绋嬪彿鍜屾楠屽崟鍙风殑鏂拌褰曟彃鍏ヨ〃涓� + */ + public dynamic SaveProcessNo(string ReleaseNo,string ProcessNo) + { + + var QcIssueResults = GetQcIssueResults(ReleaseNo, ProcessNo); + + return UseTransaction(db => + { + return SaveOrUpdateData(db, QcIssueResults) ? 1 : 0; + }) > 0; + } + + public QcIssueResults GetQcIssueResults(string ReleaseNo, string ProcessNo) + { + var QcIssueResults = new QcIssueResults + { + ProcessNo = ProcessNo, + ReleaseNo = ReleaseNo + }; + + return QcIssueResults; + } + + /** + * 鏍规嵁娴佺▼鍙锋洿鏂拌〃鐨勮褰� + */ + public dynamic Save(ErpQcIssueResult erpQcIssueResult) + { + + var mesQcIssueResults = GetMesQcIssueResults(erpQcIssueResult); + + return UseTransaction(db => + { + return SaveOrUpdateData(db, mesQcIssueResults) ? 1 : 0; + }) > 0; + } + + public QcIssueResults GetMesQcIssueResults(ErpQcIssueResult erpQcIssueResult) + { + var mesQcIssueResults = new QcIssueResults + { + ProcessNo = erpQcIssueResult.ProcessNo, + FReview = erpQcIssueResult.FReview + }; + + return mesQcIssueResults; + } + + /** + * 鎻掑叆鍜屾洿鏂版暟鎹簱琛� + */ + private bool SaveOrUpdateData(SqlSugarScope db, QcIssueResults qcIssueResults) + { + + // 妫�鏌rocessNo鏄惁宸茬粡瀛樺湪浜庢暟鎹簱涓� + var existingRecord = db.Queryable<QcIssueResults>() + .Where(it => it.ProcessNo == qcIssueResults.ProcessNo) + .First(); // 浣跨敤FirstOrDefault鏇夸唬 + + if (existingRecord != null) + { + // 濡傛灉瀛樺湪锛屾洿鏂拌褰� + existingRecord.ProcessNo = qcIssueResults.ProcessNo; // 鍋囪Data鏄渶瑕佹洿鏂扮殑瀛楁 + existingRecord.FReview = qcIssueResults.FReview; // 鏇存柊鍏朵粬瀛楁 + // ... 鏇存柊鍏朵粬闇�瑕佹洿鏂扮殑瀛楁 + + // 鎵ц鏇存柊鎿嶄綔 + var updateResult = db.Updateable(existingRecord).ExecuteCommand(); + return updateResult > 0; // 濡傛灉鏇存柊鎴愬姛锛岃繑鍥瀟rue + } + else + { + var orUpdate = base.Insert(qcIssueResults); + if (orUpdate) return true; + throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�"); + } + + } + + ///** + // * 灏嗗甫鏈夋祦绋嬪彿鍜屾楠屽崟鍙风殑鏂拌褰曟彃鍏ヨ〃涓� + // */ + //public dynamic GetDingUserId() + //{ + + // return UseTransaction(db => + // { + // return SaveOrUpdateData(db) ? 1 : 0; + // }) > 0; + //} + + //public string FindDingUserId(SqlSugarScope db,DingNameCode dingNameCode) + //{ + + //} +} \ No newline at end of file diff --git a/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/MESApplication/Controllers/BasicData/ProductionOrderController.cs index c3d65cf..ead2d1d 100644 --- a/MESApplication/Controllers/BasicData/ProductionOrderController.cs +++ b/MESApplication/Controllers/BasicData/ProductionOrderController.cs @@ -1,10 +1,13 @@ 锘縰sing MES.Service.Dto.webApi; using MES.Service.Dto.webApi.DeliveryNote; using MES.Service.Modes; +using MES.Service.Modes.QcIssueResult; using MES.Service.service; using MES.Service.util; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System.Diagnostics; using System.Dynamic; namespace MESApplication.Controllers.BasicData; @@ -131,5 +134,36 @@ return ResponseResult.ResponseError(ex); } } + + [HttpPost("GetFileUrl")] + public IActionResult StartGetUrl() { + + try + { + // 璋冪敤 QcIssueResultManager 涓殑 GetProcessNo 鏂规硶鏉ュ惎鍔ㄩ拤閽夊伐浣滄祦瀹炰緥 + string result = m.GetFileUrl(); + + //string jsonPart = result.Substring(result.IndexOf("{")); + //Debug.WriteLine(jsonPart); + //JObject jsonObject = JObject.Parse(jsonPart); + + //// 鎻愬彇instanceId鐨勫�� + //string instanceId = jsonObject["InstanceId"].ToString(); + + //dynamic resultInfos = new ExpandoObject(); + //string ProcessNo = instanceId; + ////var save = m.SaveProcessNo(ReleaseNo, instanceId); + ////resultInfos.tbBillList = save; + + return Ok(result); + } + catch (Exception ex) + { + // 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭� + return StatusCode(500, $"鍚姩閽夐拤宸ヤ綔娴佸疄渚嬪け璐�: {ex.Message}"); + } + + } + } diff --git a/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs new file mode 100644 index 0000000..82ac388 --- /dev/null +++ b/MESApplication/Controllers/QcIssueResult/QcIssueResultController.cs @@ -0,0 +1,105 @@ +锘縰sing MES.Service.Dto.webApi; +using MES.Service.Dto.webApi.QcIssueResult; +using MES.Service.Modes; +using MES.Service.Modes.QcIssueResult; +using MES.Service.service; +using MES.Service.service.QcIssueResult; +using MES.Service.util; +using Microsoft.AspNetCore.Mvc; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using System.Diagnostics; +using System.Dynamic; + +namespace MESApplication.Controllers.QcIssueResult; + +[ApiController] +[Route("api/QcIssueResult")] +public class QcIssueResultController : ControllerBase +{ + private readonly MessageCenterManager _manager = new(); + private readonly QcIssueResultManager m = new(); + + private readonly string METHOD = "POST"; + + private readonly string TableName = "MES_QCISSUE_RESULT"; + + private readonly string URL = "http://localhost:10054/api/QcIssueResult/"; + + + [HttpPost("GetProcessNo")] + public IActionResult StartDingtalkProcess([FromBody] GetQcIssueResultDetail getQcIssueResultDetail) + { + + try + { + // 璋冪敤 QcIssueResultManager 涓殑 GetProcessNo 鏂规硶鏉ュ惎鍔ㄩ拤閽夊伐浣滄祦瀹炰緥 + string result = m.GetProcessNo(getQcIssueResultDetail); + + string jsonPart = result.Substring(result.IndexOf("{")); + Debug.WriteLine(jsonPart); + JObject jsonObject = JObject.Parse(jsonPart); + + // 鎻愬彇instanceId鐨勫�� + string instanceId = jsonObject["InstanceId"].ToString(); + + dynamic resultInfos = new ExpandoObject(); + string ProcessNo = instanceId; + //var save = m.SaveProcessNo(ReleaseNo, instanceId); + //resultInfos.tbBillList = save; + + return Ok(result); + } + catch (Exception ex) + { + // 鎹曡幏寮傚父骞惰繑鍥為敊璇俊鎭� + return StatusCode(500, $"鍚姩閽夐拤宸ヤ綔娴佸疄渚嬪け璐�: {ex.Message}"); + } + } + + + [HttpPost("Save")] + public ResponseResult Save(ErpQcIssueResult erpQcIssueResult) + { + var entity = new MessageCenter(); + entity.TableName = TableName; + entity.Url = URL + "Save"; + entity.Method = METHOD; + entity.Data = JsonConvert.SerializeObject(erpQcIssueResult); + entity.Status = 1; + entity.CreateBy = "PL017"; + try + { + dynamic resultInfos = new ExpandoObject(); + var save = m.Save(erpQcIssueResult); + resultInfos.tbBillList = save; + + entity.Result = 0; + if (save) entity.Result = 1; + + entity.DealWith = 1; + _manager.save(entity); + + return new ResponseResult + { + status = 0, + message = "OK", + data = resultInfos + }; + } + catch (Exception ex) + { + entity.Result = 0; + + entity.DealWith = 0; + + entity.ResultData = ex.Message; + + _manager.save(entity); + + return ResponseResult.ResponseError(ex); + } + } + +} + diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll new file mode 100644 index 0000000..02c9b1c --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.EndpointUtil.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll new file mode 100644 index 0000000..c64f88d --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewayDingTalk.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll new file mode 100644 index 0000000..c7c3e36 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.GatewaySpi.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll new file mode 100644 index 0000000..e6ec429 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiClient.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll new file mode 100644 index 0000000..aa8bda1 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.OpenApiUtil.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll new file mode 100644 index 0000000..831d14d --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.SDK.Dingtalk.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll new file mode 100644 index 0000000..ea6fdd7 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaUtil.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll b/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll new file mode 100644 index 0000000..0924c08 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/AlibabaCloud.TeaXML.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/Aliyun.Credentials.dll b/MESApplication/bin/Debug/net8.0/Aliyun.Credentials.dll new file mode 100644 index 0000000..6902ebd --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/Aliyun.Credentials.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.deps.json b/MESApplication/bin/Debug/net8.0/MES.Service.deps.json index 94c51bd..2ce22a0 100644 --- a/MESApplication/bin/Debug/net8.0/MES.Service.deps.json +++ b/MESApplication/bin/Debug/net8.0/MES.Service.deps.json @@ -8,6 +8,7 @@ ".NETCoreApp,Version=v8.0": { "MES.Service/1.0.0": { "dependencies": { + "AlibabaCloud.SDK.Dingtalk": "2.1.93", "Masuit.Tools.Core": "2024.3.4", "Microsoft.Extensions.Configuration": "9.0.1", "Microsoft.Extensions.Configuration.FileExtensions": "9.0.1", @@ -19,6 +20,125 @@ }, "runtime": { "MES.Service.dll": {} + } + }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.EndpointUtil.dll": { + "assemblyVersion": "0.1.1.0", + "fileVersion": "0.1.1.0" + } + } + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewayDingTalk.dll": { + "assemblyVersion": "1.0.2.0", + "fileVersion": "1.0.2.0" + } + } + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "dependencies": { + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewaySpi.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "AlibabaCloud.TeaXML": "0.0.5", + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiClient.dll": { + "assemblyVersion": "0.1.11.0", + "fileVersion": "0.1.11.0" + } + } + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiUtil.dll": { + "assemblyVersion": "1.1.2.0", + "fileVersion": "1.1.2.0" + } + } + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "dependencies": { + "AlibabaCloud.EndpointUtil": "0.1.1", + "AlibabaCloud.GatewayDingTalk": "1.0.2", + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiClient": "0.1.12", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.SDK.Dingtalk.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaUtil.dll": { + "assemblyVersion": "0.1.14.0", + "fileVersion": "0.1.14.0" + } + } + }, + "AlibabaCloud.TeaXML/0.0.5": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaXML.dll": { + "assemblyVersion": "0.0.5.0", + "fileVersion": "0.0.5.0" + } + } + }, + "Aliyun.Credentials/1.4.2": { + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/Aliyun.Credentials.dll": { + "assemblyVersion": "1.4.2.0", + "fileVersion": "1.4.2.0" + } } }, "AngleSharp/1.1.2": { @@ -1351,6 +1471,17 @@ } } }, + "Tea/1.1.3": { + "dependencies": { + "Newtonsoft.Json": "13.0.3" + }, + "runtime": { + "lib/netstandard2.0/Tea.dll": { + "assemblyVersion": "1.1.3.0", + "fileVersion": "1.1.3.0" + } + } + }, "ZstdSharp.Port/0.8.0": { "runtime": { "lib/net8.0/ZstdSharp.dll": { @@ -1374,6 +1505,69 @@ "type": "project", "serviceable": false, "sha512": "" + }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-p/vsdJoVIfc1QREW4JX1tpzKdZZcFdw6/qfrylfcFXc0e2BDMQ2kPrv3nkyr2u+p4BF0PmOYl4EDqRtqLiBc+g==", + "path": "alibabacloud.endpointutil/0.1.1", + "hashPath": "alibabacloud.endpointutil.0.1.1.nupkg.sha512" + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uyNU0IJ1Ei/yz6oYuI0SsSwu0+syFV2wz7vH9zlx5WGccpKK+82lep7pMjHmDV82WOmDdAq2M+pqPLcjf/Spdw==", + "path": "alibabacloud.gatewaydingtalk/1.0.2", + "hashPath": "alibabacloud.gatewaydingtalk.1.0.2.nupkg.sha512" + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vvmA5BrM8rpOZoXwFl/ZWHYLFnZ8EwPp+07z3Eeg9okLv58QJ8+KGWVovTr8tJpuDgPFG1SVdHXRi04A62ehdA==", + "path": "alibabacloud.gatewayspi/0.0.3", + "hashPath": "alibabacloud.gatewayspi.0.0.3.nupkg.sha512" + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3UepgR9UQUZXg8mnDqA1kUZfIKY/tLA7G+Z/Ij/hPx9krV2JR9AlxXOqMeky31N6J1Mx7Jr/nyHgGWpWJdYD7g==", + "path": "alibabacloud.openapiclient/0.1.12", + "hashPath": "alibabacloud.openapiclient.0.1.12.nupkg.sha512" + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0Zd2UHm5gUND+7xNma2SAZEqm2Uy8dvAknLvCx72uDUCbOnfHWh+TsnUnNGMKUvmG3s/ZqxUA1UYIdp5BFCn5Q==", + "path": "alibabacloud.openapiutil/1.1.2", + "hashPath": "alibabacloud.openapiutil.1.1.2.nupkg.sha512" + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "type": "package", + "serviceable": true, + "sha512": "sha512-m5aTuiU+kR/1An1BnAeMuRwv3GkPUOG0Q1KuG4Yuikz9tDSODqye+XXOCSduzKdQSVEAWQEms2gIyRN1ybUV0Q==", + "path": "alibabacloud.sdk.dingtalk/2.1.93", + "hashPath": "alibabacloud.sdk.dingtalk.2.1.93.nupkg.sha512" + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gjPboQEC3rSuS/8Ohk4VAw42W54h9NfIZxn4JIuWfoIF3k3mZxVdMJdKKOgIkNrx8YaLOthPSM3Pfb1zfOyFcw==", + "path": "alibabacloud.teautil/0.1.19", + "hashPath": "alibabacloud.teautil.0.1.19.nupkg.sha512" + }, + "AlibabaCloud.TeaXML/0.0.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mHxE6H3eq4jaeqn3hryIYTI0k8quvPZfZdEE+PdU8rw+NGRvev68D8Aei6xjwW/pArZaTG6yPawYu5c0EaZkfw==", + "path": "alibabacloud.teaxml/0.0.5", + "hashPath": "alibabacloud.teaxml.0.0.5.nupkg.sha512" + }, + "Aliyun.Credentials/1.4.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-GYyMZVqLCX0StNV/0Yv+C1M1rmWf1Lvkybt/Fwol+kLZtt9WC7RWN5cV5zB7IejTbRUfaXCSV9Mf8pZeYbpnKg==", + "path": "aliyun.credentials/1.4.2", + "hashPath": "aliyun.credentials.1.4.2.nupkg.sha512" }, "AngleSharp/1.1.2": { "type": "package", @@ -2054,6 +2248,13 @@ "path": "system.windows.extensions/6.0.0", "hashPath": "system.windows.extensions.6.0.0.nupkg.sha512" }, + "Tea/1.1.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vwpYRSIcbNeRDrrRp6eG1rB2rAE5vOZyrQAjMPCxDTisptsIq4ApdmFc9jvthCIgOeBwTyOe4Y/TYTD88Zq+Yw==", + "path": "tea/1.1.3", + "hashPath": "tea.1.1.3.nupkg.sha512" + }, "ZstdSharp.Port/0.8.0": { "type": "package", "serviceable": true, diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll index bb7c9f5..21ee047 100644 --- a/MESApplication/bin/Debug/net8.0/MES.Service.dll +++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb index ed9d4b2..05cd36a 100644 --- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb +++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json index ea21a39..7dc1086 100644 --- a/MESApplication/bin/Debug/net8.0/MESApplication.deps.json +++ b/MESApplication/bin/Debug/net8.0/MESApplication.deps.json @@ -19,6 +19,125 @@ "MESApplication.dll": {} } }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.EndpointUtil.dll": { + "assemblyVersion": "0.1.1.0", + "fileVersion": "0.1.1.0" + } + } + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewayDingTalk.dll": { + "assemblyVersion": "1.0.2.0", + "fileVersion": "1.0.2.0" + } + } + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "dependencies": { + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.GatewaySpi.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "dependencies": { + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "AlibabaCloud.TeaXML": "0.0.5", + "Aliyun.Credentials": "1.4.2", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiClient.dll": { + "assemblyVersion": "0.1.11.0", + "fileVersion": "0.1.11.0" + } + } + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.OpenApiUtil.dll": { + "assemblyVersion": "1.1.2.0", + "fileVersion": "1.1.2.0" + } + } + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "dependencies": { + "AlibabaCloud.EndpointUtil": "0.1.1", + "AlibabaCloud.GatewayDingTalk": "1.0.2", + "AlibabaCloud.GatewaySpi": "0.0.3", + "AlibabaCloud.OpenApiClient": "0.1.12", + "AlibabaCloud.OpenApiUtil": "1.1.2", + "AlibabaCloud.TeaUtil": "0.1.19", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.SDK.Dingtalk.dll": { + "assemblyVersion": "0.0.1.0", + "fileVersion": "0.0.1.0" + } + } + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaUtil.dll": { + "assemblyVersion": "0.1.14.0", + "fileVersion": "0.1.14.0" + } + } + }, + "AlibabaCloud.TeaXML/0.0.5": { + "dependencies": { + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/AlibabaCloud.TeaXML.dll": { + "assemblyVersion": "0.0.5.0", + "fileVersion": "0.0.5.0" + } + } + }, + "Aliyun.Credentials/1.4.2": { + "dependencies": { + "Microsoft.CSharp": "4.7.0", + "Newtonsoft.Json": "13.0.3", + "Tea": "1.1.3" + }, + "runtime": { + "lib/netstandard2.0/Aliyun.Credentials.dll": { + "assemblyVersion": "1.4.2.0", + "fileVersion": "1.4.2.0" + } + } + }, "AngleSharp/1.1.2": { "dependencies": { "System.Text.Encoding.CodePages": "8.0.0" @@ -1737,6 +1856,17 @@ } } }, + "Tea/1.1.3": { + "dependencies": { + "Newtonsoft.Json": "13.0.3" + }, + "runtime": { + "lib/netstandard2.0/Tea.dll": { + "assemblyVersion": "1.1.3.0", + "fileVersion": "1.1.3.0" + } + } + }, "ZstdSharp.Port/0.8.0": { "runtime": { "lib/net8.0/ZstdSharp.dll": { @@ -1747,6 +1877,7 @@ }, "MES.Service/1.0.0": { "dependencies": { + "AlibabaCloud.SDK.Dingtalk": "2.1.93", "Masuit.Tools.Core": "2024.3.4", "Microsoft.Extensions.Configuration": "9.0.1", "Microsoft.Extensions.Configuration.FileExtensions": "9.0.1", @@ -1777,6 +1908,69 @@ "type": "project", "serviceable": false, "sha512": "" + }, + "AlibabaCloud.EndpointUtil/0.1.1": { + "type": "package", + "serviceable": true, + "sha512": "sha512-p/vsdJoVIfc1QREW4JX1tpzKdZZcFdw6/qfrylfcFXc0e2BDMQ2kPrv3nkyr2u+p4BF0PmOYl4EDqRtqLiBc+g==", + "path": "alibabacloud.endpointutil/0.1.1", + "hashPath": "alibabacloud.endpointutil.0.1.1.nupkg.sha512" + }, + "AlibabaCloud.GatewayDingTalk/1.0.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-uyNU0IJ1Ei/yz6oYuI0SsSwu0+syFV2wz7vH9zlx5WGccpKK+82lep7pMjHmDV82WOmDdAq2M+pqPLcjf/Spdw==", + "path": "alibabacloud.gatewaydingtalk/1.0.2", + "hashPath": "alibabacloud.gatewaydingtalk.1.0.2.nupkg.sha512" + }, + "AlibabaCloud.GatewaySpi/0.0.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vvmA5BrM8rpOZoXwFl/ZWHYLFnZ8EwPp+07z3Eeg9okLv58QJ8+KGWVovTr8tJpuDgPFG1SVdHXRi04A62ehdA==", + "path": "alibabacloud.gatewayspi/0.0.3", + "hashPath": "alibabacloud.gatewayspi.0.0.3.nupkg.sha512" + }, + "AlibabaCloud.OpenApiClient/0.1.12": { + "type": "package", + "serviceable": true, + "sha512": "sha512-3UepgR9UQUZXg8mnDqA1kUZfIKY/tLA7G+Z/Ij/hPx9krV2JR9AlxXOqMeky31N6J1Mx7Jr/nyHgGWpWJdYD7g==", + "path": "alibabacloud.openapiclient/0.1.12", + "hashPath": "alibabacloud.openapiclient.0.1.12.nupkg.sha512" + }, + "AlibabaCloud.OpenApiUtil/1.1.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-0Zd2UHm5gUND+7xNma2SAZEqm2Uy8dvAknLvCx72uDUCbOnfHWh+TsnUnNGMKUvmG3s/ZqxUA1UYIdp5BFCn5Q==", + "path": "alibabacloud.openapiutil/1.1.2", + "hashPath": "alibabacloud.openapiutil.1.1.2.nupkg.sha512" + }, + "AlibabaCloud.SDK.Dingtalk/2.1.93": { + "type": "package", + "serviceable": true, + "sha512": "sha512-m5aTuiU+kR/1An1BnAeMuRwv3GkPUOG0Q1KuG4Yuikz9tDSODqye+XXOCSduzKdQSVEAWQEms2gIyRN1ybUV0Q==", + "path": "alibabacloud.sdk.dingtalk/2.1.93", + "hashPath": "alibabacloud.sdk.dingtalk.2.1.93.nupkg.sha512" + }, + "AlibabaCloud.TeaUtil/0.1.19": { + "type": "package", + "serviceable": true, + "sha512": "sha512-gjPboQEC3rSuS/8Ohk4VAw42W54h9NfIZxn4JIuWfoIF3k3mZxVdMJdKKOgIkNrx8YaLOthPSM3Pfb1zfOyFcw==", + "path": "alibabacloud.teautil/0.1.19", + "hashPath": "alibabacloud.teautil.0.1.19.nupkg.sha512" + }, + "AlibabaCloud.TeaXML/0.0.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-mHxE6H3eq4jaeqn3hryIYTI0k8quvPZfZdEE+PdU8rw+NGRvev68D8Aei6xjwW/pArZaTG6yPawYu5c0EaZkfw==", + "path": "alibabacloud.teaxml/0.0.5", + "hashPath": "alibabacloud.teaxml.0.0.5.nupkg.sha512" + }, + "Aliyun.Credentials/1.4.2": { + "type": "package", + "serviceable": true, + "sha512": "sha512-GYyMZVqLCX0StNV/0Yv+C1M1rmWf1Lvkybt/Fwol+kLZtt9WC7RWN5cV5zB7IejTbRUfaXCSV9Mf8pZeYbpnKg==", + "path": "aliyun.credentials/1.4.2", + "hashPath": "aliyun.credentials.1.4.2.nupkg.sha512" }, "AngleSharp/1.1.2": { "type": "package", @@ -2660,6 +2854,13 @@ "path": "system.windows.extensions/6.0.0", "hashPath": "system.windows.extensions.6.0.0.nupkg.sha512" }, + "Tea/1.1.3": { + "type": "package", + "serviceable": true, + "sha512": "sha512-vwpYRSIcbNeRDrrRp6eG1rB2rAE5vOZyrQAjMPCxDTisptsIq4ApdmFc9jvthCIgOeBwTyOe4Y/TYTD88Zq+Yw==", + "path": "tea/1.1.3", + "hashPath": "tea.1.1.3.nupkg.sha512" + }, "ZstdSharp.Port/0.8.0": { "type": "package", "serviceable": true, diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll index 52cf42d..a78a4c8 100644 --- a/MESApplication/bin/Debug/net8.0/MESApplication.dll +++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe index b910c46..71943f9 100644 --- a/MESApplication/bin/Debug/net8.0/MESApplication.exe +++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb index 51a78f0..5174f8b 100644 --- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb +++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb Binary files differ diff --git a/MESApplication/bin/Debug/net8.0/Tea.dll b/MESApplication/bin/Debug/net8.0/Tea.dll new file mode 100644 index 0000000..fd21293 --- /dev/null +++ b/MESApplication/bin/Debug/net8.0/Tea.dll Binary files differ -- Gitblit v1.9.3