diff --git a/src/api/mes/md/item/batchConfig/index.ts b/src/api/mes/md/item/batchConfig/index.ts
index 8a36e96bd..ddf7d3f5b 100644
--- a/src/api/mes/md/item/batchConfig/index.ts
+++ b/src/api/mes/md/item/batchConfig/index.ts
@@ -13,7 +13,7 @@ export interface MdItemBatchConfigVO {
purchaseOrderCodeFlag: boolean // 批次属性-采购订单编号
workorderFlag: boolean // 批次属性-生产工单
taskFlag: boolean // 批次属性-生产任务
- workstationFlag: boolean // 批次属性-工位
+ workstationFlag: boolean // 批次属性-工作站
toolFlag: boolean // 批次属性-工具
moldFlag: boolean // 批次属性-模具
lotNumberFlag: boolean // 批次属性-生产批号
diff --git a/src/api/mes/md/workstation/index.ts b/src/api/mes/md/workstation/index.ts
index b826bdb47..f102b49c2 100644
--- a/src/api/mes/md/workstation/index.ts
+++ b/src/api/mes/md/workstation/index.ts
@@ -1,13 +1,13 @@
import request from '@/config/axios'
-// TODO @AI：【遵守我说的！】是不是每个 VO 独立文件；例如说 tool/ 、worker/、machine/ 等等
+// DONE @AI：【遵守我说的！】是不是每个 VO 独立文件；例如说 tool/ 、worker/、machine/ 等等
-// MES 工位 VO
+// MES 工作站 VO
export interface MdWorkstationVO {
- id: number // 工位编号
- code: string // 工位编码
- name: string // 工位名称
- address: string // 工位地点
+ id: number // 工作站编号
+ code: string // 工作站编码
+ name: string // 工作站名称
+ address: string // 工作站地点
workshopId: number // 所在车间 ID
workshopName: string // 所在车间名称
processId: number // 工序 ID
@@ -22,135 +22,40 @@ export interface MdWorkstationVO {
attribute4: number
}
-// MES 工位设备 VO
-export interface MdWorkstationMachineVO {
- id: number
- workstationId: number // 工位 ID
- machineryId: number // 设备 ID
- machineryName: string // 设备名称
- machineryCode: string // 设备编码
- quantity: number // 数量
- remark: string // 备注
-}
-
-// MES 工位工具 VO
-export interface MdWorkstationToolVO {
- id: number
- workstationId: number // 工位 ID
- toolTypeId: number // 工具类型 ID
- toolTypeName: string // 工具类型名称
- quantity: number // 数量
- remark: string // 备注
-}
-
-// MES 工位人员 VO
-export interface MdWorkstationWorkerVO {
- id: number
- workstationId: number // 工位 ID
- postId: number // 岗位 ID
- postName: string // 岗位名称
- quantity: number // 数量
- remark: string // 备注
-}
-
-// MES 工位 API
+// MES 工作站 API
export const MdWorkstationApi = {
- // 查询工位分页
+ // 查询工作站分页
getWorkstationPage: async (params: any) => {
return await request.get({ url: `/mes/md-workstation/page`, params })
},
- // 查询工位精简列表
+ // 查询工作站精简列表
getWorkstationSimpleList: async () => {
return await request.get({ url: `/mes/md-workstation/simple-list` })
},
- // 查询工位详情
+ // 查询工作站详情
getWorkstation: async (id: number) => {
return await request.get({ url: `/mes/md-workstation/get?id=` + id })
},
- // 新增工位
+ // 新增工作站
createWorkstation: async (data: MdWorkstationVO) => {
return await request.post({ url: `/mes/md-workstation/create`, data })
},
- // 修改工位
+ // 修改工作站
updateWorkstation: async (data: MdWorkstationVO) => {
return await request.put({ url: `/mes/md-workstation/update`, data })
},
- // 删除工位
+ // 删除工作站
deleteWorkstation: async (id: number) => {
return await request.delete({ url: `/mes/md-workstation/delete?id=` + id })
},
- // 导出工位 Excel
+ // 导出工作站 Excel
exportWorkstation: async (params: any) => {
return await request.download({ url: `/mes/md-workstation/export-excel`, params })
}
}
-
-// MES 工位设备 API
-export const MdWorkstationMachineApi = {
- // 查询工位设备列表
- getWorkstationMachineList: async (workstationId: number) => {
- return await request.get({ url: `/mes/md-workstation-machine/list-by-workstation?workstationId=` + workstationId })
- },
-
- // 新增工位设备
- createWorkstationMachine: async (data: MdWorkstationMachineVO) => {
- return await request.post({ url: `/mes/md-workstation-machine/create`, data })
- },
-
- // 删除工位设备
- deleteWorkstationMachine: async (id: number) => {
- return await request.delete({ url: `/mes/md-workstation-machine/delete?id=` + id })
- }
-}
-
-// MES 工位工具 API
-export const MdWorkstationToolApi = {
- // 查询工位工具列表
- getWorkstationToolList: async (workstationId: number) => {
- return await request.get({ url: `/mes/md-workstation-tool/list-by-workstation?workstationId=` + workstationId })
- },
-
- // 新增工位工具
- createWorkstationTool: async (data: MdWorkstationToolVO) => {
- return await request.post({ url: `/mes/md-workstation-tool/create`, data })
- },
-
- // 修改工位工具
- updateWorkstationTool: async (data: MdWorkstationToolVO) => {
- return await request.put({ url: `/mes/md-workstation-tool/update`, data })
- },
-
- // 删除工位工具
- deleteWorkstationTool: async (id: number) => {
- return await request.delete({ url: `/mes/md-workstation-tool/delete?id=` + id })
- }
-}
-
-// MES 工位人员 API
-export const MdWorkstationWorkerApi = {
- // 查询工位人员列表
- getWorkstationWorkerList: async (workstationId: number) => {
- return await request.get({ url: `/mes/md-workstation-worker/list-by-workstation?workstationId=` + workstationId })
- },
-
- // 新增工位人员
- createWorkstationWorker: async (data: MdWorkstationWorkerVO) => {
- return await request.post({ url: `/mes/md-workstation-worker/create`, data })
- },
-
- // 修改工位人员
- updateWorkstationWorker: async (data: MdWorkstationWorkerVO) => {
- return await request.put({ url: `/mes/md-workstation-worker/update`, data })
- },
-
- // 删除工位人员
- deleteWorkstationWorker: async (id: number) => {
- return await request.delete({ url: `/mes/md-workstation-worker/delete?id=` + id })
- }
-}
diff --git a/src/api/mes/md/workstation/machine/index.ts b/src/api/mes/md/workstation/machine/index.ts
new file mode 100644
index 000000000..f931a2d0a
--- /dev/null
+++ b/src/api/mes/md/workstation/machine/index.ts
@@ -0,0 +1,30 @@
+import request from '@/config/axios'
+
+// MES 设备资源 VO
+export interface MdWorkstationMachineVO {
+ id: number
+ workstationId: number // 工作站 ID
+ machineryId: number // 设备 ID
+ machineryName: string // 设备名称
+ machineryCode: string // 设备编码
+ quantity: number // 数量
+ remark: string // 备注
+}
+
+// MES 设备资源 API
+export const MdWorkstationMachineApi = {
+ // 查询设备资源列表
+ getWorkstationMachineList: async (workstationId: number) => {
+ return await request.get({ url: `/mes/md-workstation-machine/list-by-workstation?workstationId=` + workstationId })
+ },
+
+ // 新增设备资源
+ createWorkstationMachine: async (data: MdWorkstationMachineVO) => {
+ return await request.post({ url: `/mes/md-workstation-machine/create`, data })
+ },
+
+ // 删除设备资源
+ deleteWorkstationMachine: async (id: number) => {
+ return await request.delete({ url: `/mes/md-workstation-machine/delete?id=` + id })
+ }
+}
diff --git a/src/api/mes/md/workstation/tool/index.ts b/src/api/mes/md/workstation/tool/index.ts
new file mode 100644
index 000000000..bfa98b8db
--- /dev/null
+++ b/src/api/mes/md/workstation/tool/index.ts
@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+// MES 工装夹具资源 VO
+export interface MdWorkstationToolVO {
+ id: number
+ workstationId: number // 工作站 ID
+ toolTypeId: number // 工具类型 ID
+ toolTypeName: string // 工具类型名称
+ quantity: number // 数量
+ remark: string // 备注
+}
+
+// MES 工装夹具资源 API
+export const MdWorkstationToolApi = {
+ // 查询工装夹具资源列表
+ getWorkstationToolList: async (workstationId: number) => {
+ return await request.get({ url: `/mes/md-workstation-tool/list-by-workstation?workstationId=` + workstationId })
+ },
+
+ // 新增工装夹具资源
+ createWorkstationTool: async (data: MdWorkstationToolVO) => {
+ return await request.post({ url: `/mes/md-workstation-tool/create`, data })
+ },
+
+ // 修改工装夹具资源
+ updateWorkstationTool: async (data: MdWorkstationToolVO) => {
+ return await request.put({ url: `/mes/md-workstation-tool/update`, data })
+ },
+
+ // 删除工装夹具资源
+ deleteWorkstationTool: async (id: number) => {
+ return await request.delete({ url: `/mes/md-workstation-tool/delete?id=` + id })
+ }
+}
diff --git a/src/api/mes/md/workstation/worker/index.ts b/src/api/mes/md/workstation/worker/index.ts
new file mode 100644
index 000000000..e9ca54263
--- /dev/null
+++ b/src/api/mes/md/workstation/worker/index.ts
@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+// MES 人力资源 VO
+export interface MdWorkstationWorkerVO {
+ id: number
+ workstationId: number // 工作站 ID
+ postId: number // 岗位 ID
+ postName: string // 岗位名称
+ quantity: number // 数量
+ remark: string // 备注
+}
+
+// MES 人力资源 API
+export const MdWorkstationWorkerApi = {
+ // 查询人力资源列表
+ getWorkstationWorkerList: async (workstationId: number) => {
+ return await request.get({ url: `/mes/md-workstation-worker/list-by-workstation?workstationId=` + workstationId })
+ },
+
+ // 新增人力资源
+ createWorkstationWorker: async (data: MdWorkstationWorkerVO) => {
+ return await request.post({ url: `/mes/md-workstation-worker/create`, data })
+ },
+
+ // 修改人力资源
+ updateWorkstationWorker: async (data: MdWorkstationWorkerVO) => {
+ return await request.put({ url: `/mes/md-workstation-worker/update`, data })
+ },
+
+ // 删除人力资源
+ deleteWorkstationWorker: async (id: number) => {
+ return await request.delete({ url: `/mes/md-workstation-worker/delete?id=` + id })
+ }
+}
diff --git a/src/api/mes/md/workstation/workshop.ts b/src/api/mes/md/workstation/workshop/index.ts
similarity index 100%
rename from src/api/mes/md/workstation/workshop.ts
rename to src/api/mes/md/workstation/workshop/index.ts
diff --git a/src/views/mes/md/item/MdItemBatchConfigForm.vue b/src/views/mes/md/item/MdItemBatchConfigForm.vue
index f534374e0..a8ee9aebf 100644
--- a/src/views/mes/md/item/MdItemBatchConfigForm.vue
+++ b/src/views/mes/md/item/MdItemBatchConfigForm.vue
@@ -24,7 +24,7 @@
销售订单编号
生产工单
生产任务
- 工位
+ 工作站
工具
模具
diff --git a/src/views/mes/md/item/MdProductBomForm.vue b/src/views/mes/md/item/MdProductBomForm.vue
index 3fbf5edb2..ba186d604 100644
--- a/src/views/mes/md/item/MdProductBomForm.vue
+++ b/src/views/mes/md/item/MdProductBomForm.vue
@@ -89,7 +89,6 @@