From f5432e77f687c1efb8c1f488c9032f73616efb23 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 15 5月 2025 09:02:56 +0800
Subject: [PATCH] 2
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 79 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 21 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
index acd549a..5b134ea 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -48,13 +48,13 @@
var materialProvider = _serviceProvider.GetRequiredService<IMaterialProvider>();
var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
- Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
- {
- { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
- { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
- { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
- };
- _variableService.WriteValueAsync(keyValuePairs);
+ //Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
+ // {
+ // { "鍒嗘嫞鎵樼洏鍙�","鎵樼洏1"},
+ // { "鍒嗘嫞鏂瑰悜", "鐭瑁呴厤"},
+ // { "鍒嗘嫞浜�", myCurrentUser.UserAccount }
+ // };
+ //_variableService.WriteValueAsync(keyValuePairs);
//鏍规嵁宸ュ簭鍚嶈幏鍙栧伐搴忓璞�
var workSection = await _workSectionManager.GetByNameAsync("鍒嗘嫞宸ュ簭");
@@ -92,23 +92,60 @@
var rawPipe_DataIdentifier = await materialProvider.FindByNameAsync("鍒嗘嫞鍘熸枡绠℃爣璇�");
var rawPipe_MaterialMode = await materialProvider.FindByNameAsync("鍒嗘嫞鍘熸枡绠″瀷鍙�");
List<TraceMaterialModel> _MaterialParams = new List<TraceMaterialModel>();
- _MaterialParams.Add(new TraceMaterialModel()
+ foreach (var item in workSection.MaterialParameters)
{
- Key = "鍒嗘嫞鍘熸枡绠℃爣璇�",
- Quantity = 1,
- MaterialId = rawPipe_DataIdentifier.MaterialId,
- MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
- Value = firstWorkPlan.DataIdentifier,
+ if (item.Name == "鍒嗘嫞鍘熸枡绠″瀷鍙�")
+ {
+ _MaterialParams.Add(new TraceMaterialModel()
+ {
+ Key = item.Key,
+ Quantity = 1,
+ MaterialId = rawPipe_MaterialMode.MaterialId,
+ MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
+ Value = firstWorkPlan.MaterialMode
- });
- _MaterialParams.Add(new TraceMaterialModel()
+ });
+ }
+ if (item.Name == "鍒嗘嫞鍘熸枡绠℃爣璇�")
+ {
+ _MaterialParams.Add(new TraceMaterialModel()
+ {
+ Key = item.Key,
+ Quantity = 1,
+ MaterialId = rawPipe_DataIdentifier.MaterialId,
+ MaterialDetailId = rawPipe_DataIdentifier.MaterialDetails.First().Id,
+ Value = firstWorkPlan.DataIdentifier,
+
+ });
+ }
+ };
+
+ //閰嶇疆杩囩▼鍙傛暟(閲囬泦鍙傛暟銆侀厤鏂瑰弬鏁�)
+ traceModel.Params = new List<TraceParamModel>();
+ foreach (var item in workSection.ProcessParameters)
{
- Key = "鍒嗘嫞鍘熸枡绠″瀷鍙�",
- Quantity = 1,
- MaterialId = rawPipe_MaterialMode.MaterialId,
- MaterialDetailId = rawPipe_MaterialMode.MaterialDetails.First().Id,
- Value = firstWorkPlan.MaterialMode
- });
+ string _value = "";
+ if (item.Name == "鍒嗘嫞鏂瑰悜")
+ {
+ _value = "鐭瑁呴厤";
+ }
+ if (item.Name == "鍒嗘嫞鎵樼洏鍙�")
+ {
+ _value = input.ContinerNo;
+ }
+ if (item.Name == "鍒嗘嫞浜�")
+ {
+ _value = myCurrentUser.UserAccount;
+ }
+ //item.Key
+ TraceParamModel traceParamModel = new TraceParamModel()
+ {
+ Key = item.Key,
+ Value = _value
+ };
+ traceModel.Params.Add(traceParamModel);
+ };
+
traceModel.MaterialParams = _MaterialParams;
await traceProvider.CreateTraceAsync(traceModel);
--
Gitblit v1.9.3