From 62ea41137b3f2e1d0bd3a0dacd8383758874e280 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 22:36:57 +0800
Subject: [PATCH] 22

---
 PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
index d2f6d29..d192e56 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
@@ -252,14 +252,7 @@
             else
             {
 
-                //TODO:鏆傛椂鐢熸垚浜у搧ID
-                var productID = DateTime.Now.ToString("yyyyMMddHHmmssfff");
-                //var productID = new_workPlanList.Last().PipeSpecCode;
-                Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
-                    {
-                        { "鎵撶爜_ProductID", productID},
-                    };
-                var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
+
 
                 var myTaskNo = plcTaskNo.Content.Value.SafeString().ToString();
                 CallMaterialOrder callMaterialOrder = null;
@@ -274,6 +267,15 @@
                     //鏍规嵁鍘熸枡鏍囪瘑瀵绘壘 浣滀笟璁″垝
                     var workPlanList = await workPlanAppService.FindByDataIdentifierAsync(callMaterialOrder.DataIdentifier);
                     if (workPlanList?.Count == 0) return;//缁撴潫
+
+                    //TODO:鏆傛椂鐢熸垚浜у搧ID
+                    //var productID = DateTime.Now.ToString("yyyyMMddHHmmssfff");
+                    var productID = workPlanList.First().PipeSpecCode;
+                    Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
+                    {
+                        { "鎵撶爜_ProductID", productID},
+                    };
+                    var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
 
                     //鏇存柊涓虹敓浜т腑 
                     foreach (var item in workPlanList)
@@ -307,6 +309,8 @@
                         { "鎵撶爜宸ヤ欢1",code1},
                         { "鎵撶爜宸ヤ欢2", code2},
                         { "鎵撶爜宸ヤ欢3", code3 },
+                        { "鎵撶爜绠℃缂栫爜", new_workPlanList.First().PipeSpecCode },
+                        { "鎵撶爜绠℃鍚嶇О", new_workPlanList.First().PipeSectionName },
                         { "鎵撶爜鍘熸枡绠″瀷鍙�", new_workPlanList.First().MaterialMode },
                         { "鎵撶爜鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier }
                     };

--
Gitblit v1.9.3