Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Web/src/views/wcs/wcsDevice/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceInput.cs
@@ -127,6 +127,11 @@ public long? PlcId { get; set; } /// <summary> /// 工位号 /// </summary> public string? StationNum { get; set; } /// <summary> /// 描述 /// </summary> public string? Text { get; set; } Admin.NET/WCS.Application/Service/WcsDevice/WcsDeviceService.cs
@@ -40,8 +40,10 @@ var query = _wcsDeviceRep.AsQueryable() .WhereIF(!string.IsNullOrEmpty(input.SearchKey), u => u.Text.Contains(input.SearchKey) || u.StationNum.Contains(input.SearchKey) ) .WhereIF(input.PlcId > 0, u => u.PlcId == input.PlcId) .WhereIF(!string.IsNullOrWhiteSpace(input.StationNum), u => u.StationNum.Contains(input.StationNum.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.Text), u => u.Text.Contains(input.Text.Trim())) //处理外键和TreeSelector相关字段的连接 .LeftJoin<WcsPlc>((u, plcid) => u.PlcId == plcid.Id) Web/src/views/wcs/wcsDevice/index.vue
@@ -20,6 +20,12 @@ </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI"> <el-form-item label="工位号"> <el-input v-model="queryParams.stationNum" clearable="" placeholder="请输入工位号" /> </el-form-item> </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI"> <el-form-item label="描述"> <el-input v-model="queryParams.text" clearable="" placeholder="请输入描述" />