wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

组织管理，新增设备与工位绑定、解绑功能

Browse Source
This commit is contained in:
DEVICE8\12494
2023-04-26 17:58:53 +08:00
parent 631bb0c0e8
commit 6118106b72
9 changed files with 84 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
visualdev/Tnb.VisualDev.Entitys/Dto/VisualDevModelData/VisualDevModelListQueryInput.cs
View File

@@ -1,4 +1,5 @@
using JNPF.Common.Filter;
using System.DirectoryServices.Protocols;
using JNPF.Common.Filter;
namespace JNPF.VisualDev.Entitys.Dto.VisualDevModelData;
@@ -26,4 +27,12 @@ public class VisualDevModelListQueryInput : PageInputBase
/// 高级查询.
/// </summary>
public virtual string superQueryJson { get; set; }
/// <summary>
/// 工位编码
/// </summary>
public string station_code { get; set; }
/// <summary>
/// 工序编码
/// </summary>
public string process_code { get; set; }
}

7
visualdev/Tnb.VisualDev/RunService.cs
View File

@@ -175,7 +175,14 @@ public class RunService : IRunService, ITransient
input.queryJson = GetQueryJson(input.queryJson, _userManager.UserOrigin == "pc" ? templateInfo.ColumnData : templateInfo.AppColumnData).ToJsonString();
input.superQueryJson = GetSuperQueryJson(input.superQueryJson).ToJsonString();
//modified by ly on 20230426
if (!input.station_code.IsNullOrWhiteSpace())
{
sql += $" where station_code='{input.station_code}' or station_code=''";
}
realList = _databaseService.GetInterFaceData(link, sql, input, templateInfo.ColumnData.Adapt<MainBeltViceQueryModel>(), new List<IConditionalModel>(), tableFieldKeyValue);
// 显示列有子表字段
if ((templateInfo.ColumnData.type != 4 || _userManager.UserOrigin.Equals("app")) && templateInfo.ColumnData.columnList.Any(x => templateInfo.ChildTableFields.ContainsKey(x.__vModel__)) && realList.list.Any())