From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs | 65 +++++++++++++++-----------------
1 files changed, 30 insertions(+), 35 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 e1754ac..de0504a 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/SharedService.cs
@@ -18,6 +18,7 @@
using CMS.Plugin.ProductManagement.Abstractions;
using CMS.Plugin.TraceManagement.Abstractions;
using CMS.Plugin.TraceManagement.Abstractions.Models.Traces;
+using CMS.Unit.RuntimeValue.Models;
using CmsQueryExtensions;
using CmsQueryExtensions.Entitys;
using CmsQueryExtensions.Extension;
@@ -711,15 +712,16 @@
var callMaterialOrderAppService = _serviceProvider.GetRequiredService<ICallMaterialOrderAppService>();
// 鏌ユ壘鏁版嵁
- var workTask = await workTaskRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode);
- if (workTask == null)
- {
- throw new UserFriendlyException($"鎵句笉鍒颁綔涓氳鍒�");
- }
+
var workPlan = await workPlanRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode);
if (workPlan == null)
{
throw new UserFriendlyException($"鎵句笉鍒颁綔涓氳鍒�");
+ }
+ var workTask = await workTaskRepository.GetSingleByFilterAsync(x => x.TaskCode == input.TaskCode && x.ProcessName == workPlan.ProcessName);
+ if (workTask == null)
+ {
+ throw new UserFriendlyException($"鎵句笉鍒颁綔涓氫换鍔�");
}
if (workPlan.ProcessName == "瑁呴厤宸ュ簭")
{
@@ -997,21 +999,20 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1034,22 +1035,19 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
- }
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
-
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
_value = "15mm";
@@ -1071,7 +1069,7 @@
await traceProvider.CreateTraceAsync(traceModel);
-
+
#endregion
@@ -1413,21 +1411,20 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1450,26 +1447,24 @@
string _value = "";
//閲囬泦鍙傛暟
+ ReadWriteResult<IVariableValue?>? _getValue = null;
if (item.Name == $"{processName}鍘嬪姏")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍘嬪姏");
}
if (item.Name == $"{processName}浣嶇疆")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}浣嶇疆");
}
if (item.Name == $"{processName}閫熷害")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}閫熷害");
}
if (item.Name == $"{processName}鍐呭")
{
- var _getValue = await _variableService.ReadValueAsync($"{processName}鍐呭");
- _value = _getValue.Content.Value.SafeString().ToString();
+ _getValue = await _variableService.ReadValueAsync($"{processName}鍐呭");
}
+ _value = _getValue?.Content?.Value?.SafeString().ToString();
if (item.Name == $"{processName}闂撮殭")
{
@@ -1492,7 +1487,7 @@
await traceProvider.CreateTraceAsync(traceModel);
-
+
#endregion
--
Gitblit v1.9.3