From 252edd99e9094bc8cd1c08be71e6f93e49dfce94 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周五, 16 5月 2025 11:05:05 +0800 Subject: [PATCH] 2222 --- PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs index 9755550..81e821c 100644 --- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs +++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs @@ -332,7 +332,7 @@ //鏍规嵁鍘熸枡鏍囪瘑瀵绘壘 浣滀笟璁″垝 - var workPlanList = await workPlanAppService.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier); + var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier); if (workPlanList?.Count == 0) return;//缁撴潫 ////TODO:鏆傛椂鐢熸垚浜у搧ID @@ -377,6 +377,7 @@ pipeSpecCode3 = new_workPlanList[i].PipeSpecCode; } } + Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?> { { "鎵撶爜宸ヤ欢1",code1}, @@ -388,7 +389,8 @@ { "鎵撶爜绠℃缂栫爜", new_workPlanList.First().PipeSpecCode }, { "鎵撶爜绠℃鍚嶇О", new_workPlanList.First().PipeSectionName }, { "鎵撶爜鍘熸枡绠″瀷鍙�", new_workPlanList.First().MaterialMode }, - { "鎵撶爜鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier } + { "鎵撶爜鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier }, + { "鎵撶爜鍘熸枡绠℃壒娆�", callMaterialOrder.MaterialBatch },//鎵规 }; _variableService.WriteValueAsync(keyValuePairs); @@ -450,7 +452,7 @@ //鏍规嵁鍘熸枡鏍囪瘑瀵绘壘 浣滀笟璁″垝 - var workPlanList = await workPlanAppService.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier); + var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier); if (workPlanList?.Count == 0) return;//缁撴潫 //TODO:鏆傛椂鐢熸垚浜у搧ID @@ -603,7 +605,7 @@ //鏍规嵁鍘熸枡鏍囪瘑瀵绘壘 浣滀笟璁″垝 - var workPlanList = await workPlanAppService.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier); + var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier); if (workPlanList?.Count == 0) return;//缁撴潫 ////TODO:鏆傛椂鐢熸垚浜у搧ID @@ -659,7 +661,8 @@ { "鍒囧壊绠℃缂栫爜", new_workPlanList.First().PipeSpecCode }, { "鍒囧壊绠℃鍚嶇О", new_workPlanList.First().PipeSectionName }, { "鍒囧壊鍘熸枡绠″瀷鍙�", new_workPlanList.First().MaterialMode }, - { "鍒囧壊鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier } + { "鍒囧壊鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier }, + { "鍒囧壊鍘熸枡绠℃壒娆�", callMaterialOrder.MaterialBatch },//鎵规 }; _variableService.WriteValueAsync(keyValuePairs); @@ -721,7 +724,7 @@ //鏍规嵁鍘熸枡鏍囪瘑瀵绘壘 浣滀笟璁″垝 - var workPlanList = await workPlanAppService.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier); + var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier); if (workPlanList?.Count == 0) return;//缁撴潫 //TODO:鏆傛椂鐢熸垚浜у搧ID -- Gitblit v1.9.3