HIA24016N_PipeLineDemo.git

			@@ -22,6 +22,9 @@
			using System.Collections.Generic;
			using CMS.Framework.AspNetCore.Users;
			using NPOI.SS.Formula.Functions;
			using CMS.Plugin.PipeLineLems.Application.Implements;
			using CmsQueryExtensions.Entitys;
			using CMS.Plugin.PipeLineLems.Domain.WorkTask;

			namespace CMS.Plugin.PipeLineLems.ProjectService
			{
			@@ -33,7 +36,6 @@
			private IServiceProvider _serviceProvider;
			private readonly ILogger<PipeLineLemsProjectService> _logger;
			private readonly IVariableDataCache _variableDataCache;


			/// <summary>
			/// 变量服务
			@@ -90,6 +92,10 @@
			{ "请求生成打码产品码信号", "请求生成打码产品码信号(描述)" },
			{ "请求生成切割产品码信号", "请求生成切割产品码信号(描述)" },
			{ "切割进站信号", "切割进站信号(描述)" },

			{ "装配完工信号", "装配完工信号(描述)" },
			{ "焊接完工信号", "焊接完工信号(描述)" },
			{ "法兰冲码完工信号", "法兰冲码完工信号(描述)" },
			};

			// 创建通道监听
			@@ -253,6 +259,61 @@
			_ = Task.Run(async () =>
			{
			await HanlderForCutByCreateProductWhenFlaseAsync();
			});
			}
			}


			if (changed.Name == "装配完工信号")
			{
			if (changed.New?.Value.SafeString().ToBool() == true)
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor装配完工信号Async();
			});
			}
			else
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor完工信号WhenFalseAsync("装配");
			});
			}
			}

			if (changed.Name == "焊接完工信号")
			{
			if (changed.New?.Value.SafeString().ToBool() == true)
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor焊接完工信号Async();
			});
			}
			else
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor完工信号WhenFalseAsync("焊接");
			});
			}
			}

			if (changed.Name == "法兰冲码完工信号")
			{
			if (changed.New?.Value.SafeString().ToBool() == true)
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor法兰冲码完工信号Async();
			});
			}
			else
			{
			_ = Task.Run(async () =>
			{
			await HanlderFor完工信号WhenFalseAsync("法兰冲码");
			});
			}
			}
			@@ -423,7 +484,9 @@
			{

			var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
			var workTaskAppService = _serviceProvider.GetRequiredService<IWorkTaskAppService>();
			var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
			var workTaskRepository = _serviceProvider.GetRequiredService<IWorkTaskRepository>();
			var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();

			using var scope = _serviceProvider.CreateScope();
			@@ -450,6 +513,10 @@
			if (callMaterialOrder == null) return;//结束


			//根据原料标识寻找作业计划
			var workTaskList = await workTaskAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
			if (workTaskList?.Count == 0) return;//结束
			//更新为生产中

			//根据原料标识寻找作业计划
			var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
			@@ -465,6 +532,13 @@
			};
			var ret = _variableService.WriteValueAsync(keyValuePairs_productID);

			//更新任务为生产中
			var new_workTaskList = workTaskList.Where(x => x.ProcessRouteNumber == "切割").ToList();
			foreach (var item in new_workTaskList)
			{
			item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.生产中;
			}
			await workTaskRepository.UpdateManyAsync(new_workTaskList);

			//更新为生产中
			var new_workPlanList = workPlanList.Where(x => x.ProcessRouteNumber == "切割").ToList();
			@@ -695,7 +769,9 @@
			{

			var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
			var workTaskAppService = _serviceProvider.GetRequiredService<IWorkTaskAppService>();
			var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
			var workTaskRepository = _serviceProvider.GetRequiredService<IWorkTaskRepository>();
			var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();

			using var scope = _serviceProvider.CreateScope();
			@@ -721,7 +797,26 @@
			callMaterialOrder = await callMaterialOrderAppService.GetSingleByFilterAsync(x => x.WmsTaskNo == myTaskNo);
			if (callMaterialOrder == null) return;//结束

			//根据原料标识寻找作业计划
			var workTaskList = await workTaskAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
			if (workTaskList?.Count == 0) return;//结束

			var new_workTaskList = workTaskList.Where(x => x.ProcessName == "切割工序").ToList();
			//更新为生产中
			foreach (var item in new_workTaskList)
			{
			item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.生产中;
			item.Remark = "更新生产中";
			}
			await workTaskRepository.UpdateManyAsync(new_workTaskList);

			var new_workTaskList_printCode = workTaskList.Where(x => x.ProcessName == "打码工序").ToList();
			foreach (var item in new_workTaskList_printCode)
			{
			item.WorkPlanStatus = Domain.Shared.Enums.WorkPlanStatusEnum.已完成;
			item.Remark = "更新已完成";
			}
			await workTaskRepository.UpdateManyAsync(new_workTaskList_printCode);

			//根据原料标识寻找作业计划
			var workPlanList = await workPlanAppService.GetListByFilterAsync(x => x.DataIdentifier == callMaterialOrder.DataIdentifier);
			@@ -736,6 +831,8 @@
			{ "CMS反馈请求生成切割产品码信号结果", true},
			};
			var ret = _variableService.WriteValueAsync(keyValuePairs_productID);



			var new_workPlanList = workPlanList.Where(x => x.ProcessRouteNumber == "装配").ToList();
			//更新为生产中
			@@ -778,5 +875,150 @@
			};
			var ret = _variableService.WriteValueAsync(keyValuePairs_productID);
			}



			/// <summary>
			/// 装配完工信号=true时
			/// </summary>
			/// <returns></returns>
			private async Task HanlderFor装配完工信号Async()
			{

			var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
			var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
			var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();

			var pipeSpecCode = await _variableService.ReadValueAsync("装配管段编码");

			if (string.IsNullOrEmpty(pipeSpecCode?.Content?.Value.SafeString().ToString()))
			{

			}
			else
			{



			var myPipeSpecCode = pipeSpecCode.Content.Value.SafeString().ToString();
			CallMaterialOrder callMaterialOrder = null;
			try
			{
			var sharedService = _serviceProvider.GetRequiredService<SharedService>();
			var userName = await _variableService.ReadValueAsync("装配人");
			MyCurrentUser myCurrentUser = new MyCurrentUser()
			{
			UserAccount = userName.Content.Value.SafeString().ToString()
			};
			await sharedService.CompleteAssemblyProcess(_serviceProvider, new Application.Contracts.Dtos.WorkPlan.CompleteAssemblyProcessInput() { PipeSpecCode = myPipeSpecCode, ProcessName = "装配工序" }, myCurrentUser);

			}
			catch (Exception ex)
			{
			_logger.LogException(ex, LogLevel.Error);
			}
			}
			}

			/// <summary>
			/// 焊接完工信号=true时
			/// </summary>
			/// <returns></returns>
			private async Task HanlderFor焊接完工信号Async()
			{

			var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
			var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
			var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();

			var pipeSpecCode = await _variableService.ReadValueAsync("焊接管段编码");

			if (string.IsNullOrEmpty(pipeSpecCode?.Content?.Value.SafeString().ToString()))
			{

			}
			else
			{



			var myPipeSpecCode = pipeSpecCode.Content.Value.SafeString().ToString();
			CallMaterialOrder callMaterialOrder = null;
			try
			{
			var sharedService = _serviceProvider.GetRequiredService<SharedService>();
			var userName = await _variableService.ReadValueAsync("焊接人");
			MyCurrentUser myCurrentUser = new MyCurrentUser()
			{
			UserAccount = userName.Content.Value.SafeString().ToString()
			};
			await sharedService.CompleteAssemblyProcess(_serviceProvider, new Application.Contracts.Dtos.WorkPlan.CompleteAssemblyProcessInput() { PipeSpecCode = myPipeSpecCode, ProcessName = "焊接工序" }, myCurrentUser);

			}
			catch (Exception ex)
			{
			_logger.LogException(ex, LogLevel.Error);
			}
			}
			}

			/// <summary>
			/// 法兰冲码完工信号=true时
			/// </summary>
			/// <returns></returns>
			private async Task HanlderFor法兰冲码完工信号Async()
			{

			var txt = "法兰冲码";
			var workPlanAppService = _serviceProvider.GetRequiredService<IWorkPlanAppService>();
			var workPlanRepository = _serviceProvider.GetRequiredService<IWorkPlanRepository>();
			var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();

			var pipeSpecCode = await _variableService.ReadValueAsync($"{txt}管段编码");

			if (string.IsNullOrEmpty(pipeSpecCode?.Content?.Value.SafeString().ToString()))
			{

			}
			else
			{
			var myPipeSpecCode = pipeSpecCode.Content.Value.SafeString().ToString();
			CallMaterialOrder callMaterialOrder = null;
			try
			{
			var sharedService = _serviceProvider.GetRequiredService<SharedService>();
			var userName = await _variableService.ReadValueAsync($"{txt}人");
			MyCurrentUser myCurrentUser = new MyCurrentUser()
			{
			UserAccount = userName.Content.Value.SafeString().ToString()
			};
			await sharedService.SendFlangeCode_CompleteAssemblyProcess(_serviceProvider, new Application.Contracts.Dtos.WorkPlan.CompleteAssemblyProcessInput()
			{ PipeSpecCode = myPipeSpecCode, ProcessName = $"{txt}工序" }, myCurrentUser);

			}
			catch (Exception ex)
			{
			_logger.LogException(ex, LogLevel.Error);
			}
			}
			}

			/// <summary>
			/// 完工信号=false时
			/// </summary>
			/// <returns></returns>
			private async Task HanlderFor完工信号WhenFalseAsync(string processName)
			{
			try
			{
			var sharedService = _serviceProvider.GetRequiredService<SharedService>();
			await sharedService.CompleteHandleOutStoreFinish(_serviceProvider, processName, false);
			}
			catch (Exception)
			{


			}
			}
			}
			}