修改扫码

main
ljh 2024-07-16 23:23:00 +08:00
parent 8a5779d01d
commit 410b27a45d
5 changed files with 30 additions and 2 deletions

View File

@ -128,6 +128,12 @@ public class PrintCodeDetailBaseInput
/// </summary> /// </summary>
public virtual bool IsDelete { get; set; } public virtual bool IsDelete { get; set; }
/// <summary>
/// 状态
/// </summary>
public int? State { get; set; }
} }
/// <summary> /// <summary>

View File

@ -132,6 +132,10 @@ public class PrintCodeDetailOutput
/// </summary> /// </summary>
public bool IsDelete { get; set; } public bool IsDelete { get; set; }
} /// <summary>
/// 生产状态
/// </summary>
public long? State { get; set; }
}

View File

@ -62,4 +62,9 @@ public class PrintCodeTreeData
public List<PrintCodeTreeData> Children { get; set; } public List<PrintCodeTreeData> Children { get; set; }
public bool HasChildren { get; set; } = true; public bool HasChildren { get; set; } = true;
/// <summary>
/// 生产状态
/// </summary>
public long? State { get; set; }
} }

View File

@ -130,6 +130,7 @@ public class ReportTableOutput
/// </summary> /// </summary>
public bool IsDelete { get; set; } public bool IsDelete { get; set; }
} }

View File

@ -424,6 +424,18 @@ public class ReportTableService : IDynamicApiController, ITransient
{ {
var treeData4 = dt4.Adapt<PrintCodeTreeData>(); var treeData4 = dt4.Adapt<PrintCodeTreeData>();
treeData3.Children.Add(treeData4); treeData3.Children.Add(treeData4);
var list4 = printDetails.FindAll(a => a.FatherId == dt4.Id);
foreach (var dt5 in list4)
{
var treeData5 = dt5.Adapt<PrintCodeTreeData>();
if (list4.Count > 0)
{
treeData4.Children = new List<PrintCodeTreeData>();
treeData4.HasChildren = false;
}
treeData4.Children.Add(treeData5);
}
} }
} }
treeData2.Children.Add(treeData3); treeData2.Children.Add(treeData3);