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) {