From 9489adc8642aa0d5fd321754e1eff72af3508dba Mon Sep 17 00:00:00 2001 From: SunYF <123@hard_man.com> Date: Sat, 10 Oct 2026 18:44:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20MES=20=E7=BC=96=E8=AF=91=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D=20+=20=E5=BA=8F=E5=88=97=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=88=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - workorder.go:374 ListProcessCards 返回 int64,q.Count 返回 int,补 int64(total) 转换,修复 MES go build 失败 - ProductType.vue:200 启用校验提示仍残留『是否有序列号』,统一为『请选择序列号(是=逐件录SN / 否=按数量(不录SN))』 --- bj_power_mes/frontend/src/pages/ProductType.vue | 2 +- bj_power_mes/internal/logic/workorder.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bj_power_mes/frontend/src/pages/ProductType.vue b/bj_power_mes/frontend/src/pages/ProductType.vue index 18919d5..a1ed604 100644 --- a/bj_power_mes/frontend/src/pages/ProductType.vue +++ b/bj_power_mes/frontend/src/pages/ProductType.vue @@ -197,7 +197,7 @@ async function save() { if (!trim(dialog.unit)) return ElMessage.warning('单位为必填项') if (!dialog.id && !trim(dialog.code)) return ElMessage.warning('图号为必填项(创建后不可改)') if (![1, 2, 3].includes(dialog.manageMode)) return ElMessage.warning('请选择类型') - if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择是否有序列号(序列号=是 / 序列号=否)') + if (dialog.snMode !== 1 && dialog.snMode !== 2) return ElMessage.warning('请选择序列号(是=逐件录SN / 否=按数量(不录SN))') const body = { name: trim(dialog.name), spec: trim(dialog.spec), unit: trim(dialog.unit), description: dialog.description, manageMode: dialog.manageMode, snMode: dialog.snMode, isActive: dialog.isActive diff --git a/bj_power_mes/internal/logic/workorder.go b/bj_power_mes/internal/logic/workorder.go index 1d0dc6f..cd5db43 100644 --- a/bj_power_mes/internal/logic/workorder.go +++ b/bj_power_mes/internal/logic/workorder.go @@ -371,7 +371,7 @@ func (s *Service) ListProcessCards(ctx context.Context, page, pageSize int, orde if err != nil { return 0, nil, err } - return total, list, nil + return int64(total), list, nil } func (s *Service) GetWorkOrder(ctx context.Context, id int) (*ent.WorkOrder, error) {