diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailRespVO.java index ed89a24..7524495 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailRespVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailRespVO.java @@ -49,4 +49,10 @@ public class UserMachineDetailRespVO { @ExcelProperty("机台id") private Integer machineId; + + private Integer lineId; + private String proLineCd; + private String proLineName; + + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailSaveReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailSaveReqVO.java index c5aaa07..7bd58b7 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailSaveReqVO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/usermachine/vo/UserMachineDetailSaveReqVO.java @@ -28,4 +28,6 @@ public class UserMachineDetailSaveReqVO { @Schema(description = "机台id", example = "9668") private Integer machineId; + private Integer lineId; + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/usermachine/UserMachineDetailDO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/usermachine/UserMachineDetailDO.java index 2feabad..fd8d98b 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/usermachine/UserMachineDetailDO.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/usermachine/UserMachineDetailDO.java @@ -51,4 +51,8 @@ public class UserMachineDetailDO extends BaseDO { */ private Integer machineId; + private Integer lineId; + private String proLineCd; + private String proLineName; + } diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineDetailServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineDetailServiceImpl.java index 740e2f9..12305ad 100644 --- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineDetailServiceImpl.java +++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/usermachine/UserMachineDetailServiceImpl.java @@ -3,8 +3,10 @@ package com.ningxia.yunxi.chemmes.module.biz.service.usermachine; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import com.ningxia.yunxi.chemmes.module.biz.controller.admin.usermachine.vo.UserMachineDetailSaveReqVO; +import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.proline.ProLineDO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.usermachine.UserMachineDetailDO; import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.usermachine.UserMachineDetailMapper; +import com.ningxia.yunxi.chemmes.module.biz.service.proline.ProLineService; import com.ningxia.yunxi.chemmes.module.system.dal.dataobject.user.AdminUserDO; import com.ningxia.yunxi.chemmes.module.system.service.user.AdminUserService; import org.springframework.stereotype.Service; @@ -31,6 +33,9 @@ public class UserMachineDetailServiceImpl implements UserMachineDetailService { @Resource private AdminUserService userService; + @Resource + private ProLineService proLineService; + @Override public void saveMachineDetails(Integer userMachId, List machineList) { @@ -46,6 +51,13 @@ public class UserMachineDetailServiceImpl implements UserMachineDetailService { detailEntity.setMachineId(form.getMachineId()); detailEntity.setMachineName(form.getMachineName()); detailEntity.setEnabledStatus(0); + // 根据机台ID，查询机台信息 + ProLineDO machineEntity = proLineService.getProLine(form.getLineId()); + if (machineEntity != null) { + detailEntity.setLineId(form.getLineId()); + detailEntity.setProLineCd(machineEntity.getProLineCd()); + detailEntity.setProLineName(machineEntity.getProLineName()); + } return detailEntity; }) .collect(Collectors.toList()); diff --git a/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts b/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts index 66aeaec..f525c74 100644 --- a/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts +++ b/mes-ui/mes-ui-admin-vue3/src/types/auto-imports.d.ts @@ -7,8 +7,6 @@ export {} declare global { const DICT_TYPE: typeof import('@/utils/dict')['DICT_TYPE'] const EffectScope: typeof import('vue')['EffectScope'] - const ElMessage: typeof import('element-plus/es')['ElMessage'] - const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const computed: typeof import('vue')['computed'] const createApp: typeof import('vue')['createApp'] const customRef: typeof import('vue')['customRef'] diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/UserMachineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/UserMachineForm.vue index a90f1c4..cc0bbbb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/UserMachineForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/UserMachineForm.vue @@ -104,6 +104,7 @@ const formData = ref({ userName: undefined, userNo: undefined, classGroup: '', + lineId: undefined, }) const formRules = reactive({ userNo: [{ required: true, message: '请选择人员', trigger: 'change' }], @@ -128,7 +129,11 @@ const open = async (type: string, id?: number) => { try { const data = await UserMachineApi.getUserMachine(id) formData.value = data - machineList.value = data.machineList || [] + // 确保 lineId 字段存在 + machineList.value = (data.machineList || []).map(item => ({ + ...item, + lineId: item.lineId || item.belgLineId, + })) } finally { formLoading.value = false } @@ -172,6 +177,7 @@ const confirmMachine = (machines: any[]) => { machineName: item.machineName, creator: item.creator, createTime: item.createTime, + lineId: item.belgLineId || item.lineId, // 支持两种字段名 }) } }) @@ -203,6 +209,7 @@ const submitForm = async () => { machineId: m.machineId, machineCd: m.machineCd, machineName: m.machineName, + lineId: m.lineId, })), } as unknown as UserMachineApi.UserMachineVO if (formType.value === 'create') { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/index.vue index 437f815..f705dc1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/usermachine/index.vue @@ -81,7 +81,7 @@ -