Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Web/src/api/wcs/wcsPosition.ts | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Web/src/views/wcs/wcsPosition/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
@@ -8,9 +8,11 @@ public class WcsPositionService : IDynamicApiController, ITransient { private readonly SqlSugarRepository<WcsPosition> _WcsPositionRep; public WcsPositionService(SqlSugarRepository<WcsPosition> WcsPositionRep) private readonly SqlSugarRepository<WcsPlc> _wcsPlcRep; public WcsPositionService(SqlSugarRepository<WcsPosition> WcsPositionRep, SqlSugarRepository<WcsPlc> wcsPlcRep) { _WcsPositionRep = WcsPositionRep; _wcsPlcRep = wcsPlcRep; } /// <summary> @@ -145,7 +147,22 @@ ).ToListAsync(); } /// <summary> /// 获取设备ID列表 /// </summary> /// <returns></returns> [ApiDescriptionSettings(Name = "WcsPlcIdDropdown"), HttpGet] [DisplayName("获取设备ID列表")] public async Task<dynamic> WcsPlcIdDropdown() { return await _wcsPlcRep.Context.Queryable<WcsPlc>() .Select(u => new { Label = u.Text, Value = u.Id } ).ToListAsync(); } } Web/src/api/wcs/wcsPosition.ts
@@ -6,6 +6,7 @@ PageWcsPosition = '/api/wcsPosition/page', DetailWcsPosition = '/api/wcsPosition/detail', GetWcsDeviceDeviceIdDropdown = '/api/wcsPosition/WcsDeviceDeviceIdDropdown', GetWcsPlcIdDropdown = '/api/wcsPosition/WcsPlcIdDropdown', } // 增加设备工位 @@ -54,3 +55,8 @@ method: 'get' }); export const GetWcsPlcIdDropdown = () => request({ url: Api.GetWcsPlcIdDropdown, method: 'get' }); Web/src/views/wcs/wcsPosition/index.vue
@@ -9,9 +9,20 @@ </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="PLC"> <el-select clearable="" filterable="" v-model="queryParams.plcId" placeholder="请选择PLC"> <el-option v-for="(item, index) in wcsPLCList" :key="index" :value="item.value" :label="item.label" /> </el-select> </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="设备ID"> <el-select clearable="" filterable="" v-model="queryParams.deviceId" placeholder="请选择设备ID"> <el-form-item label="设备"> <el-select clearable="" filterable="" v-model="queryParams.deviceId" placeholder="请选择设备"> <el-option v-for="(item, index) in wcsDeviceDeviceIdDropdownList" :key="index" :value="item.value" :label="item.label" /> @@ -104,7 +115,7 @@ import ModifyRecord from '/@/components/table/modifyRecord.vue'; import printDialog from '/@/views/system/print/component/hiprint/preview.vue' import editDialog from '/@/views/wcs/wcsPosition/component/editDialog.vue' import { pageWcsPosition, deleteWcsPosition } from '/@/api/wcs/wcsPosition'; import { pageWcsPosition, deleteWcsPosition,GetWcsPlcIdDropdown } from '/@/api/wcs/wcsPosition'; import { getWcsDeviceDeviceIdDropdown } from '/@/api/wcs/wcsPosition'; const showAdvanceQueryUI = ref(false); @@ -194,6 +205,13 @@ }; getWcsDeviceDeviceIdDropdownList(); const wcsPLCList = ref<any>([]); const getwcsPLCList = async () => { let list = await GetWcsPlcIdDropdown(); wcsPLCList.value = list.data.result ?? []; }; getwcsPLCList(); handleQuery(); </script> <style scoped>