105040 Fix 电机信息为空时的异常处理
This commit is contained in:
parent
ce5201606a
commit
172ddbf5ea
|
|
@ -428,8 +428,8 @@ public class LectotypeViewModel(string docId) : INotifyPropertyChanged
|
||||||
//2 合并同轴号的第一条数据
|
//2 合并同轴号的第一条数据
|
||||||
cables.Where(it => it.CurrentLine == 1).ForEach(it =>
|
cables.Where(it => it.CurrentLine == 1).ForEach(it =>
|
||||||
{
|
{
|
||||||
var brandData = Brands.GetBrandData(it.Motor.Brand);
|
var brandData = Brands.GetBrandData(it.Motor?.Brand);
|
||||||
if (brandData.ComplexLine)
|
if (brandData?.ComplexLine ?? false)
|
||||||
{
|
{
|
||||||
|
|
||||||
var existLine = datas.FirstOrDefault(data => data.AxisNo == it.AxisNo && data.CurrentLine == 1);
|
var existLine = datas.FirstOrDefault(data => data.AxisNo == it.AxisNo && data.CurrentLine == 1);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue