修复bug

schangxiang@126.com

2025-05-21 fa365d77dfa1d6619774a790e424e98dac849457

 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