feat&refactor: 完成多模块功能迭代与配置优化
本次提交覆盖多个业务模块的功能完善与体验优化:
1. **鉴权与配置调整**:
- 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
- 工位配置放开1~12限制,改为仅校验大于0
2. **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3. **功能新增**:
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**:
- 调整BOM物料删除校验逻辑,优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**:
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
This commit is contained in:
@@ -0,0 +1,436 @@
|
||||
// Code generated by ent, DO NOT EDIT.
|
||||
|
||||
package ent
|
||||
|
||||
import (
|
||||
"bj_power_mes/ent/plcmovecmd"
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
)
|
||||
|
||||
// PlcMoveCmdCreate is the builder for creating a PlcMoveCmd entity.
|
||||
type PlcMoveCmdCreate struct {
|
||||
config
|
||||
mutation *PlcMoveCmdMutation
|
||||
hooks []Hook
|
||||
}
|
||||
|
||||
// SetCmdNo sets the "cmdNo" field.
|
||||
func (_c *PlcMoveCmdCreate) SetCmdNo(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetCmdNo(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetSn sets the "sn" field.
|
||||
func (_c *PlcMoveCmdCreate) SetSn(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetSn(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetOrderNo sets the "orderNo" field.
|
||||
func (_c *PlcMoveCmdCreate) SetOrderNo(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetOrderNo(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableOrderNo sets the "orderNo" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableOrderNo(v *string) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetOrderNo(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetFromPoint sets the "fromPoint" field.
|
||||
func (_c *PlcMoveCmdCreate) SetFromPoint(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetFromPoint(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetToPoint sets the "toPoint" field.
|
||||
func (_c *PlcMoveCmdCreate) SetToPoint(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetToPoint(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetStatus sets the "status" field.
|
||||
func (_c *PlcMoveCmdCreate) SetStatus(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetStatus(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableStatus sets the "status" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableStatus(v *string) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetStatus(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetOperator sets the "operator" field.
|
||||
func (_c *PlcMoveCmdCreate) SetOperator(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetOperator(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableOperator sets the "operator" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableOperator(v *string) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetOperator(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetMessage sets the "message" field.
|
||||
func (_c *PlcMoveCmdCreate) SetMessage(v string) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetMessage(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableMessage sets the "message" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableMessage(v *string) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetMessage(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetCreatedAt sets the "createdAt" field.
|
||||
func (_c *PlcMoveCmdCreate) SetCreatedAt(v time.Time) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetCreatedAt(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableCreatedAt sets the "createdAt" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableCreatedAt(v *time.Time) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetCreatedAt(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetUpdatedAt sets the "updatedAt" field.
|
||||
func (_c *PlcMoveCmdCreate) SetUpdatedAt(v time.Time) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetUpdatedAt(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetNillableUpdatedAt sets the "updatedAt" field if the given value is not nil.
|
||||
func (_c *PlcMoveCmdCreate) SetNillableUpdatedAt(v *time.Time) *PlcMoveCmdCreate {
|
||||
if v != nil {
|
||||
_c.SetUpdatedAt(*v)
|
||||
}
|
||||
return _c
|
||||
}
|
||||
|
||||
// SetID sets the "id" field.
|
||||
func (_c *PlcMoveCmdCreate) SetID(v int) *PlcMoveCmdCreate {
|
||||
_c.mutation.SetID(v)
|
||||
return _c
|
||||
}
|
||||
|
||||
// Mutation returns the PlcMoveCmdMutation object of the builder.
|
||||
func (_c *PlcMoveCmdCreate) Mutation() *PlcMoveCmdMutation {
|
||||
return _c.mutation
|
||||
}
|
||||
|
||||
// Save creates the PlcMoveCmd in the database.
|
||||
func (_c *PlcMoveCmdCreate) Save(ctx context.Context) (*PlcMoveCmd, error) {
|
||||
_c.defaults()
|
||||
return withHooks(ctx, _c.sqlSave, _c.mutation, _c.hooks)
|
||||
}
|
||||
|
||||
// SaveX calls Save and panics if Save returns an error.
|
||||
func (_c *PlcMoveCmdCreate) SaveX(ctx context.Context) *PlcMoveCmd {
|
||||
v, err := _c.Save(ctx)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// Exec executes the query.
|
||||
func (_c *PlcMoveCmdCreate) Exec(ctx context.Context) error {
|
||||
_, err := _c.Save(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
// ExecX is like Exec, but panics if an error occurs.
|
||||
func (_c *PlcMoveCmdCreate) ExecX(ctx context.Context) {
|
||||
if err := _c.Exec(ctx); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
|
||||
// defaults sets the default values of the builder before save.
|
||||
func (_c *PlcMoveCmdCreate) defaults() {
|
||||
if _, ok := _c.mutation.OrderNo(); !ok {
|
||||
v := plcmovecmd.DefaultOrderNo
|
||||
_c.mutation.SetOrderNo(v)
|
||||
}
|
||||
if _, ok := _c.mutation.Status(); !ok {
|
||||
v := plcmovecmd.DefaultStatus
|
||||
_c.mutation.SetStatus(v)
|
||||
}
|
||||
if _, ok := _c.mutation.Operator(); !ok {
|
||||
v := plcmovecmd.DefaultOperator
|
||||
_c.mutation.SetOperator(v)
|
||||
}
|
||||
if _, ok := _c.mutation.Message(); !ok {
|
||||
v := plcmovecmd.DefaultMessage
|
||||
_c.mutation.SetMessage(v)
|
||||
}
|
||||
if _, ok := _c.mutation.CreatedAt(); !ok {
|
||||
v := plcmovecmd.DefaultCreatedAt()
|
||||
_c.mutation.SetCreatedAt(v)
|
||||
}
|
||||
if _, ok := _c.mutation.UpdatedAt(); !ok {
|
||||
v := plcmovecmd.DefaultUpdatedAt()
|
||||
_c.mutation.SetUpdatedAt(v)
|
||||
}
|
||||
}
|
||||
|
||||
// check runs all checks and user-defined validators on the builder.
|
||||
func (_c *PlcMoveCmdCreate) check() error {
|
||||
if _, ok := _c.mutation.CmdNo(); !ok {
|
||||
return &ValidationError{Name: "cmdNo", err: errors.New(`ent: missing required field "PlcMoveCmd.cmdNo"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.CmdNo(); ok {
|
||||
if err := plcmovecmd.CmdNoValidator(v); err != nil {
|
||||
return &ValidationError{Name: "cmdNo", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.cmdNo": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.Sn(); !ok {
|
||||
return &ValidationError{Name: "sn", err: errors.New(`ent: missing required field "PlcMoveCmd.sn"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.Sn(); ok {
|
||||
if err := plcmovecmd.SnValidator(v); err != nil {
|
||||
return &ValidationError{Name: "sn", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.sn": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.OrderNo(); !ok {
|
||||
return &ValidationError{Name: "orderNo", err: errors.New(`ent: missing required field "PlcMoveCmd.orderNo"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.OrderNo(); ok {
|
||||
if err := plcmovecmd.OrderNoValidator(v); err != nil {
|
||||
return &ValidationError{Name: "orderNo", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.orderNo": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.FromPoint(); !ok {
|
||||
return &ValidationError{Name: "fromPoint", err: errors.New(`ent: missing required field "PlcMoveCmd.fromPoint"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.FromPoint(); ok {
|
||||
if err := plcmovecmd.FromPointValidator(v); err != nil {
|
||||
return &ValidationError{Name: "fromPoint", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.fromPoint": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.ToPoint(); !ok {
|
||||
return &ValidationError{Name: "toPoint", err: errors.New(`ent: missing required field "PlcMoveCmd.toPoint"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.ToPoint(); ok {
|
||||
if err := plcmovecmd.ToPointValidator(v); err != nil {
|
||||
return &ValidationError{Name: "toPoint", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.toPoint": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.Status(); !ok {
|
||||
return &ValidationError{Name: "status", err: errors.New(`ent: missing required field "PlcMoveCmd.status"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.Status(); ok {
|
||||
if err := plcmovecmd.StatusValidator(v); err != nil {
|
||||
return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.status": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.Operator(); !ok {
|
||||
return &ValidationError{Name: "operator", err: errors.New(`ent: missing required field "PlcMoveCmd.operator"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.Operator(); ok {
|
||||
if err := plcmovecmd.OperatorValidator(v); err != nil {
|
||||
return &ValidationError{Name: "operator", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.operator": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.Message(); !ok {
|
||||
return &ValidationError{Name: "message", err: errors.New(`ent: missing required field "PlcMoveCmd.message"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.Message(); ok {
|
||||
if err := plcmovecmd.MessageValidator(v); err != nil {
|
||||
return &ValidationError{Name: "message", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.message": %w`, err)}
|
||||
}
|
||||
}
|
||||
if _, ok := _c.mutation.CreatedAt(); !ok {
|
||||
return &ValidationError{Name: "createdAt", err: errors.New(`ent: missing required field "PlcMoveCmd.createdAt"`)}
|
||||
}
|
||||
if _, ok := _c.mutation.UpdatedAt(); !ok {
|
||||
return &ValidationError{Name: "updatedAt", err: errors.New(`ent: missing required field "PlcMoveCmd.updatedAt"`)}
|
||||
}
|
||||
if v, ok := _c.mutation.ID(); ok {
|
||||
if err := plcmovecmd.IDValidator(v); err != nil {
|
||||
return &ValidationError{Name: "id", err: fmt.Errorf(`ent: validator failed for field "PlcMoveCmd.id": %w`, err)}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (_c *PlcMoveCmdCreate) sqlSave(ctx context.Context) (*PlcMoveCmd, error) {
|
||||
if err := _c.check(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
_node, _spec := _c.createSpec()
|
||||
if err := sqlgraph.CreateNode(ctx, _c.driver, _spec); err != nil {
|
||||
if sqlgraph.IsConstraintError(err) {
|
||||
err = &ConstraintError{msg: err.Error(), wrap: err}
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
if _spec.ID.Value != _node.ID {
|
||||
id := _spec.ID.Value.(int64)
|
||||
_node.ID = int(id)
|
||||
}
|
||||
_c.mutation.id = &_node.ID
|
||||
_c.mutation.done = true
|
||||
return _node, nil
|
||||
}
|
||||
|
||||
func (_c *PlcMoveCmdCreate) createSpec() (*PlcMoveCmd, *sqlgraph.CreateSpec) {
|
||||
var (
|
||||
_node = &PlcMoveCmd{config: _c.config}
|
||||
_spec = sqlgraph.NewCreateSpec(plcmovecmd.Table, sqlgraph.NewFieldSpec(plcmovecmd.FieldID, field.TypeInt))
|
||||
)
|
||||
if id, ok := _c.mutation.ID(); ok {
|
||||
_node.ID = id
|
||||
_spec.ID.Value = id
|
||||
}
|
||||
if value, ok := _c.mutation.CmdNo(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldCmdNo, field.TypeString, value)
|
||||
_node.CmdNo = value
|
||||
}
|
||||
if value, ok := _c.mutation.Sn(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldSn, field.TypeString, value)
|
||||
_node.Sn = value
|
||||
}
|
||||
if value, ok := _c.mutation.OrderNo(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldOrderNo, field.TypeString, value)
|
||||
_node.OrderNo = value
|
||||
}
|
||||
if value, ok := _c.mutation.FromPoint(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldFromPoint, field.TypeString, value)
|
||||
_node.FromPoint = value
|
||||
}
|
||||
if value, ok := _c.mutation.ToPoint(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldToPoint, field.TypeString, value)
|
||||
_node.ToPoint = value
|
||||
}
|
||||
if value, ok := _c.mutation.Status(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldStatus, field.TypeString, value)
|
||||
_node.Status = value
|
||||
}
|
||||
if value, ok := _c.mutation.Operator(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldOperator, field.TypeString, value)
|
||||
_node.Operator = value
|
||||
}
|
||||
if value, ok := _c.mutation.Message(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldMessage, field.TypeString, value)
|
||||
_node.Message = value
|
||||
}
|
||||
if value, ok := _c.mutation.CreatedAt(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldCreatedAt, field.TypeTime, value)
|
||||
_node.CreatedAt = value
|
||||
}
|
||||
if value, ok := _c.mutation.UpdatedAt(); ok {
|
||||
_spec.SetField(plcmovecmd.FieldUpdatedAt, field.TypeTime, value)
|
||||
_node.UpdatedAt = value
|
||||
}
|
||||
return _node, _spec
|
||||
}
|
||||
|
||||
// PlcMoveCmdCreateBulk is the builder for creating many PlcMoveCmd entities in bulk.
|
||||
type PlcMoveCmdCreateBulk struct {
|
||||
config
|
||||
err error
|
||||
builders []*PlcMoveCmdCreate
|
||||
}
|
||||
|
||||
// Save creates the PlcMoveCmd entities in the database.
|
||||
func (_c *PlcMoveCmdCreateBulk) Save(ctx context.Context) ([]*PlcMoveCmd, error) {
|
||||
if _c.err != nil {
|
||||
return nil, _c.err
|
||||
}
|
||||
specs := make([]*sqlgraph.CreateSpec, len(_c.builders))
|
||||
nodes := make([]*PlcMoveCmd, len(_c.builders))
|
||||
mutators := make([]Mutator, len(_c.builders))
|
||||
for i := range _c.builders {
|
||||
func(i int, root context.Context) {
|
||||
builder := _c.builders[i]
|
||||
builder.defaults()
|
||||
var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) {
|
||||
mutation, ok := m.(*PlcMoveCmdMutation)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("unexpected mutation type %T", m)
|
||||
}
|
||||
if err := builder.check(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
builder.mutation = mutation
|
||||
var err error
|
||||
nodes[i], specs[i] = builder.createSpec()
|
||||
if i < len(mutators)-1 {
|
||||
_, err = mutators[i+1].Mutate(root, _c.builders[i+1].mutation)
|
||||
} else {
|
||||
spec := &sqlgraph.BatchCreateSpec{Nodes: specs}
|
||||
// Invoke the actual operation on the latest mutation in the chain.
|
||||
if err = sqlgraph.BatchCreate(ctx, _c.driver, spec); err != nil {
|
||||
if sqlgraph.IsConstraintError(err) {
|
||||
err = &ConstraintError{msg: err.Error(), wrap: err}
|
||||
}
|
||||
}
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
mutation.id = &nodes[i].ID
|
||||
if specs[i].ID.Value != nil && nodes[i].ID == 0 {
|
||||
id := specs[i].ID.Value.(int64)
|
||||
nodes[i].ID = int(id)
|
||||
}
|
||||
mutation.done = true
|
||||
return nodes[i], nil
|
||||
})
|
||||
for i := len(builder.hooks) - 1; i >= 0; i-- {
|
||||
mut = builder.hooks[i](mut)
|
||||
}
|
||||
mutators[i] = mut
|
||||
}(i, ctx)
|
||||
}
|
||||
if len(mutators) > 0 {
|
||||
if _, err := mutators[0].Mutate(ctx, _c.builders[0].mutation); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return nodes, nil
|
||||
}
|
||||
|
||||
// SaveX is like Save, but panics if an error occurs.
|
||||
func (_c *PlcMoveCmdCreateBulk) SaveX(ctx context.Context) []*PlcMoveCmd {
|
||||
v, err := _c.Save(ctx)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
return v
|
||||
}
|
||||
|
||||
// Exec executes the query.
|
||||
func (_c *PlcMoveCmdCreateBulk) Exec(ctx context.Context) error {
|
||||
_, err := _c.Save(ctx)
|
||||
return err
|
||||
}
|
||||
|
||||
// ExecX is like Exec, but panics if an error occurs.
|
||||
func (_c *PlcMoveCmdCreateBulk) ExecX(ctx context.Context) {
|
||||
if err := _c.Exec(ctx); err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user