From a2448a582f2baeabf32c4f8dd8ab447feb2538e6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 10:25:21 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs | 88 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
index ed7599c..d3e1b4e 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems/ProjectService/PipeLineLemsProjectService.cs
@@ -21,6 +21,7 @@
using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
using System.Collections.Generic;
using CMS.Framework.AspNetCore.Users;
+using NPOI.SS.Formula.Functions;
namespace CMS.Plugin.PipeLineLems.ProjectService
{
@@ -146,7 +147,7 @@
_logger.LogInformation($"{changed.Name} 鍙橀噺鍊煎彂鐢熷彉鍖栵紝鏃у�納oldValue}=鏂板�納newValue}锛孴raceId={traceId}");
- if (changed.Name == "璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�" && changed.New?.Value.SafeString().ToBool() == true)
+ if (changed.Name == "璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�")
{
// TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
@@ -159,15 +160,21 @@
锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
- _ = Task.Run(async () =>
+ if (changed.New?.Value.SafeString().ToBool() == true)
{
- await HanlderForPringBarCodeByCreateProductAsync();
- // 渚�1锛氬悓姝ュ鐞�
- //await ProcessAsync();
+ _ = Task.Run(async () =>
+ {
+ await HanlderForPringBarCodeByCreateProductAsync();
+ });
+ }
+ else
+ {
- // 渚�2锛氳皟鐢ㄥ閮ˋPI
- //await ExecuteExternalApiAsync();
- });
+ _ = Task.Run(async () =>
+ {
+ await HanlderForPringBarCodeByCreateProductWhenFalseAsync();
+ });
+ }
}
if (changed.Name == "鎵撶爜杩涚珯淇″彿" && changed.New?.Value.SafeString().ToBool() == true)
@@ -221,7 +228,7 @@
}
- if (changed.Name == "璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙�" && changed.New?.Value.SafeString().ToBool() == true)
+ if (changed.Name == "璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙�")
{
// TODO: 澶勭悊鍙橀噺鍊煎彉鍖�
@@ -234,15 +241,20 @@
锛�4锛夊苟鍙戠鐞嗭細 濡傛灉涓氬姟灞傚苟鍙戦噺澶э紝蹇呴』浼樺寲浠ｇ爜璁捐鍜屽疄鏂斤紝浠ュ噺灏戝湪楂樺苟鍙戞儏鍐典笅鐨勭郴缁熻祫婧愭秷鑰楋紝闃叉绯荤粺鎬ц兘闂銆�
锛�5锛変唬鐮佸畨鍏細 瀹夎骞朵娇鐢� CMS.CodeAnalysis 鍒嗘瀽鍣ㄦ潵鍒嗘瀽 IVariableDataCache.TagChanged 鐨勪娇鐢ㄦ儏鍐点�傝宸ュ叿鑳藉湪浣跨敤涓嶅綋鏃舵彁渚涚紪璇戦敊璇紝甯姪鎮ㄦ彁楂樹唬鐮佽川閲忋��*/
- _ = Task.Run(async () =>
+ if (changed.New?.Value.SafeString().ToBool() == true)
{
- await HanlderForCutByCreateProductAsync();
- // 渚�1锛氬悓姝ュ鐞�
- //await ProcessAsync();
-
- // 渚�2锛氳皟鐢ㄥ閮ˋPI
- //await ExecuteExternalApiAsync();
- });
+ _ = Task.Run(async () =>
+ {
+ await HanlderForCutByCreateProductAsync();
+ });
+ }
+ else
+ {
+ _ = Task.Run(async () =>
+ {
+ await HanlderForCutByCreateProductWhenFlaseAsync();
+ });
+ }
}
}
}
@@ -320,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
@@ -365,6 +377,8 @@
pipeSpecCode3 = new_workPlanList[i].PipeSpecCode;
}
}
+ //鑾峰彇 鎵规
+ await callMaterialOrderAppService.wh
Dictionary<string, object?> keyValuePairs = new Dictionary<string, object?>
{
{ "鎵撶爜宸ヤ欢1",code1},
@@ -376,7 +390,8 @@
{ "鎵撶爜绠℃缂栫爜", new_workPlanList.First().PipeSpecCode },
{ "鎵撶爜绠℃鍚嶇О", new_workPlanList.First().PipeSectionName },
{ "鎵撶爜鍘熸枡绠″瀷鍙�", new_workPlanList.First().MaterialMode },
- { "鎵撶爜鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier }
+ { "鎵撶爜鍘熸枡鏍囪瘑", new_workPlanList.First().DataIdentifier },
+ { "鎵撶爜鍘熸枡绠℃壒娆�", new_workPlanList.First() },
};
_variableService.WriteValueAsync(keyValuePairs);
@@ -438,7 +453,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
@@ -447,6 +462,7 @@
Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
{
{ "鎵撶爜_ProductID", productID},
+ { "CMS鍙嶉璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙风粨鏋�", true},
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
@@ -468,6 +484,19 @@
throw;
}
}
+ }
+
+ /// <summary>
+ /// 璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙�(鍊间负false鐨勬椂鍊�)
+ /// </summary>
+ /// <returns></returns>
+ private async Task HanlderForPringBarCodeByCreateProductWhenFalseAsync()
+ {
+ Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
+ {
+ { "CMS鍙嶉璇锋眰鐢熸垚鎵撶爜浜у搧鐮佷俊鍙风粨鏋�", false},
+ };
+ var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
}
@@ -577,7 +606,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
@@ -695,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
@@ -704,6 +733,7 @@
Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
{
{ "鍒囧壊_ProductID", productID},
+ { "CMS鍙嶉璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙风粨鏋�", true},
};
var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
@@ -734,5 +764,19 @@
}
}
}
+
+ /// <summary>
+ /// 璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙凤紙鍊间负false鐨勬椂鍊欙級
+ /// </summary>
+ /// <returns></returns>
+ private async Task HanlderForCutByCreateProductWhenFlaseAsync()
+ {
+
+ Dictionary<string, object?> keyValuePairs_productID = new Dictionary<string, object?>
+ {
+ { "CMS鍙嶉璇锋眰鐢熸垚鍒囧壊浜у搧鐮佷俊鍙风粨鏋�", false},
+ };
+ var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
+ }
}
}
--
Gitblit v1.9.3