From 71a1eeb4deca8f3cbdd35be4e8a645ad1e369ba3 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 11 九月 2024 16:49:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs | 21 +++++++++-
Web/src/api/wcs/wcsPosition.ts | 62 +++++++++++++++++--------------
Web/src/views/wcs/wcsPosition/index.vue | 24 ++++++++++-
3 files changed, 74 insertions(+), 33 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs b/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
index 0491508..8c1f777 100644
--- a/Admin.NET/WCS.Application/Service/WcsPosition/WcsPositionService.cs
+++ b/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();
+ }
}
diff --git a/Web/src/api/wcs/wcsPosition.ts b/Web/src/api/wcs/wcsPosition.ts
index 4dda87d..3a58648 100644
--- a/Web/src/api/wcs/wcsPosition.ts
+++ b/Web/src/api/wcs/wcsPosition.ts
@@ -1,11 +1,12 @@
锘縤mport request from '/@/utils/request';
enum Api {
- AddWcsPosition = '/api/wcsPosition/add',
- DeleteWcsPosition = '/api/wcsPosition/delete',
- UpdateWcsPosition = '/api/wcsPosition/update',
- PageWcsPosition = '/api/wcsPosition/page',
- DetailWcsPosition = '/api/wcsPosition/detail',
- GetWcsDeviceDeviceIdDropdown = '/api/wcsPosition/WcsDeviceDeviceIdDropdown',
+ AddWcsPosition = '/api/wcsPosition/add',
+ DeleteWcsPosition = '/api/wcsPosition/delete',
+ UpdateWcsPosition = '/api/wcsPosition/update',
+ PageWcsPosition = '/api/wcsPosition/page',
+ DetailWcsPosition = '/api/wcsPosition/detail',
+ GetWcsDeviceDeviceIdDropdown = '/api/wcsPosition/WcsDeviceDeviceIdDropdown',
+ GetWcsPlcIdDropdown = '/api/wcsPosition/WcsPlcIdDropdown',
}
// 澧炲姞璁惧宸ヤ綅
@@ -17,40 +18,45 @@
});
// 鍒犻櫎璁惧宸ヤ綅
-export const deleteWcsPosition = (params?: any) =>
+export const deleteWcsPosition = (params?: any) =>
request({
- url: Api.DeleteWcsPosition,
- method: 'post',
- data: params,
- });
+ url: Api.DeleteWcsPosition,
+ method: 'post',
+ data: params,
+ });
// 缂栬緫璁惧宸ヤ綅
-export const updateWcsPosition = (params?: any) =>
+export const updateWcsPosition = (params?: any) =>
request({
- url: Api.UpdateWcsPosition,
- method: 'post',
- data: params,
- });
+ url: Api.UpdateWcsPosition,
+ method: 'post',
+ data: params,
+ });
// 鍒嗛〉鏌ヨ璁惧宸ヤ綅
-export const pageWcsPosition = (params?: any) =>
+export const pageWcsPosition = (params?: any) =>
request({
- url: Api.PageWcsPosition,
- method: 'post',
- data: params,
- });
+ url: Api.PageWcsPosition,
+ method: 'post',
+ data: params,
+ });
// 璇︽儏璁惧宸ヤ綅
-export const detailWcsPosition = (id: any) =>
+export const detailWcsPosition = (id: any) =>
request({
- url: Api.DetailWcsPosition,
- method: 'get',
- data: { id },
- });
+ url: Api.DetailWcsPosition,
+ method: 'get',
+ data: { id },
+ });
export const getWcsDeviceDeviceIdDropdown = () =>
- request({
+ request({
url: Api.GetWcsDeviceDeviceIdDropdown,
method: 'get'
- });
+ });
+export const GetWcsPlcIdDropdown = () =>
+ request({
+ url: Api.GetWcsPlcIdDropdown,
+ method: 'get'
+ });
\ No newline at end of file
diff --git a/Web/src/views/wcs/wcsPosition/index.vue b/Web/src/views/wcs/wcsPosition/index.vue
index a589b8c..50f0698 100644
--- a/Web/src/views/wcs/wcsPosition/index.vue
+++ b/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>
--
Gitblit v1.8.0