MES.Service/MES.Service.csproj
@@ -23,4 +23,10 @@ </Reference> </ItemGroup> <ItemGroup> <Folder Include="Dto\webApi\TestReport\" /> <Folder Include="Modes\TestReport\" /> <Folder Include="service\TestReport\" /> </ItemGroup> </Project> MES.Service/bin/Debug/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.dllBinary files differ
MES.Service/bin/Release/net8.0/MES.Service.pdbBinary files differ
MES.Service/service/PLM/WarehouseDownloadDoc.cs
@@ -20,7 +20,7 @@ string ret = (new StreamReader(resp.GetResponseStream(), Encoding.UTF8)).ReadToEnd(); var result = JObject.Parse(ret)["Context"]; string token = result["UserToken"].ToString(); var warehouseCtx = string.Format("LoginUrl={0}/&UserToken={1}", _cloudUrl, token); var warehouseCtx = string.Format("LoginUrl={0}&KDServiceSessionId={1}", _cloudUrl, JObject.Parse(ret)["KDSVCSessionId"].ToString());//安全新方式 return Convert.ToBase64String(Encoding.UTF8.GetBytes(warehouseCtx)); } } MES.Service/service/SentLaboratory/SaveLaboratoryManager.cs
@@ -27,6 +27,7 @@ public DateTime? CompleteDate { get; set; } public string? REMARKS { get; set; } public string? SIM_REQ { get; set; } public string? Test_REQ { get; set; } //磁铁拉力 public decimal? Check01 { get; set; } @@ -118,6 +119,8 @@ DEPARTMENTCODE=mainTable.DEPARTMENTCODE, REMARKS = mainTable.REMARKS, SIM_REQ = mainTable.SimReq, CompleteDate=mainTable.CompleteDate, Test_REQ=mainTable.TestReq, Check01 = mainTable.Check01, Check02 = mainTable.Check02, Check03 = mainTable.Check03, @@ -376,16 +379,20 @@ var updateResult = db.Updateable(updateMesQmsSample).ExecuteCommand(); var mapping = db.Queryable<UpdateMesQmsSamplePjt>() .Where(t => t.RELEASE_NO == updateMesQmsSample.JYDH && t.SJ_NO == updateMesQmsSample.ReleaseNo) .Where(t => t.RELEASE_NO == updateMesQmsSample.JYDH && t.PID == updateMesQmsSample.Id) .Select(t => new UpdateMesQmsSamplePjt { PID=t.PID }) .ToList(); Debug.WriteLine(updateMesQmsSample.JYDH); if (mapping.Any()) { updateResult = db.Updateable<UpdateMesQmsSamplePjt>() .SetColumns(t => new UpdateMesQmsSamplePjt .SetColumns(t => new UpdateMesQmsSamplePjt { SJ_NO = updateMesQmsSample.ReleaseNo, RELEASE_NO = updateMesQmsSample.JYDH, @@ -396,7 +403,7 @@ ITEM_ID = getLaboratoryDetails.ITEM_ID, SUPP_NAME = getLaboratoryDetails.SUPP_NAME }) .Where(t => t.PID == updateMesQmsSample.Id) // 显式指定更新条件 .Where(t => t.RELEASE_NO == updateMesQmsSample.JYDH && t.PID == updateMesQmsSample.Id) // 显式指定更新条件 .ExecuteCommand(); } MESApplication/MESApplication.csproj
@@ -34,4 +34,8 @@ <ProjectReference Include="..\MES.Service\MES.Service.csproj" /> </ItemGroup> <ItemGroup> <Folder Include="Controllers\TestReport\" /> </ItemGroup> </Project> MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@ <Project> <PropertyGroup> <_PublishTargetUrl>D:\VISUAL STUDIOS JOB\YC\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl> <History>True|2025-04-10T08:29:29.4614826Z||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History> <History>True|2025-04-14T18:22:50.8483367Z||;True|2025-04-14T17:01:19.3567029+08:00||;True|2025-04-10T16:29:29.4614826+08:00||;True|2025-04-03T12:04:01.6354165+08:00||;True|2025-03-28T14:28:57.3291596+08:00||;True|2025-03-25T17:51:51.1941007+08:00||;True|2025-03-25T17:28:17.3219786+08:00||;True|2025-03-25T15:25:43.0061330+08:00||;True|2025-03-24T17:58:37.6820871+08:00||;True|2024-10-28T11:56:24.2694762+08:00||;True|2024-10-28T11:40:56.4512491+08:00||;True|2024-10-28T11:28:42.4509497+08:00||;True|2024-10-28T11:11:11.1286907+08:00||;True|2024-10-28T10:09:42.4378313+08:00||;True|2024-10-28T09:57:51.0792947+08:00||;True|2024-10-23T17:07:23.7741858+08:00||;True|2024-10-22T14:34:55.4526970+08:00||;True|2024-10-17T16:37:53.4763504+08:00||;True|2024-10-13T14:04:45.3666662+08:00||;True|2024-10-13T12:30:16.7294894+08:00||;True|2024-10-13T12:22:13.5740642+08:00||;True|2024-09-26T17:43:56.9592414+08:00||;True|2024-09-25T09:56:59.0722612+08:00||;True|2024-09-20T16:35:40.9416105+08:00||;True|2024-09-13T15:42:08.2824743+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> MESApplication/bin/Debug/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Debug/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Debug/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/MESApplication.xml
@@ -716,7 +716,19 @@ </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.GetList"> <summary> 获取所有 获取送检单号 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.SaveLaboratoryDetails(MES.Service.Modes.SentLaboratory.GetLaboratoryDetails)"> <summary> 保存或提交送检单数据 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.DeleteLaboratoryDetails(System.String)"> <summary> 撤回送检单 </summary> <returns></returns> </member> MESApplication/bin/Release/net8.0/publish/MES.Service.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MES.Service.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.dllBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.exeBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.pdbBinary files differ
MESApplication/bin/Release/net8.0/publish/MESApplication.xml
@@ -716,7 +716,19 @@ </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.GetList"> <summary> 获取所有 获取送检单号 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.SaveLaboratoryDetails(MES.Service.Modes.SentLaboratory.GetLaboratoryDetails)"> <summary> 保存或提交送检单数据 </summary> <returns></returns> </member> <member name="M:MESApplication.Controllers.BasicData.SentLaboratoryTestingItemsControllor.DeleteLaboratoryDetails(System.String)"> <summary> 撤回送检单 </summary> <returns></returns> </member>
