本次提交覆盖多个业务模块的功能完善与体验优化:
1. **鉴权与配置调整**:
- 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
- 工位配置放开1~12限制,改为仅校验大于0
2. **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3. **功能新增**:
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**:
- 调整BOM物料删除校验逻辑,优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**:
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
206 lines
6.7 KiB
Go
206 lines
6.7 KiB
Go
// Code generated by ent, DO NOT EDIT.
|
|
|
|
package ent
|
|
|
|
import (
|
|
"bj_power_mes/ent/plcmovecmd"
|
|
"fmt"
|
|
"strings"
|
|
"time"
|
|
|
|
"entgo.io/ent"
|
|
"entgo.io/ent/dialect/sql"
|
|
)
|
|
|
|
// PlcMoveCmd is the model entity for the PlcMoveCmd schema.
|
|
type PlcMoveCmd struct {
|
|
config `json:"-"`
|
|
// ID of the ent.
|
|
ID int `json:"id,omitempty"`
|
|
// 指令号(幂等去重)
|
|
CmdNo string `json:"cmdNo,omitempty"`
|
|
// 被移工件SN
|
|
Sn string `json:"sn,omitempty"`
|
|
// 所属工单号
|
|
OrderNo string `json:"orderNo,omitempty"`
|
|
// 起点位编号
|
|
FromPoint string `json:"fromPoint,omitempty"`
|
|
// 目标点位编号
|
|
ToPoint string `json:"toPoint,omitempty"`
|
|
// ISSUED/ACK/ARRIVED/CLOSED/FAILED
|
|
Status string `json:"status,omitempty"`
|
|
// 下发人(SYSTEM=自动)
|
|
Operator string `json:"operator,omitempty"`
|
|
// 异常/备注
|
|
Message string `json:"message,omitempty"`
|
|
// CreatedAt holds the value of the "createdAt" field.
|
|
CreatedAt time.Time `json:"createdAt,omitempty"`
|
|
// UpdatedAt holds the value of the "updatedAt" field.
|
|
UpdatedAt time.Time `json:"updatedAt,omitempty"`
|
|
selectValues sql.SelectValues
|
|
}
|
|
|
|
// scanValues returns the types for scanning values from sql.Rows.
|
|
func (*PlcMoveCmd) scanValues(columns []string) ([]any, error) {
|
|
values := make([]any, len(columns))
|
|
for i := range columns {
|
|
switch columns[i] {
|
|
case plcmovecmd.FieldID:
|
|
values[i] = new(sql.NullInt64)
|
|
case plcmovecmd.FieldCmdNo, plcmovecmd.FieldSn, plcmovecmd.FieldOrderNo, plcmovecmd.FieldFromPoint, plcmovecmd.FieldToPoint, plcmovecmd.FieldStatus, plcmovecmd.FieldOperator, plcmovecmd.FieldMessage:
|
|
values[i] = new(sql.NullString)
|
|
case plcmovecmd.FieldCreatedAt, plcmovecmd.FieldUpdatedAt:
|
|
values[i] = new(sql.NullTime)
|
|
default:
|
|
values[i] = new(sql.UnknownType)
|
|
}
|
|
}
|
|
return values, nil
|
|
}
|
|
|
|
// assignValues assigns the values that were returned from sql.Rows (after scanning)
|
|
// to the PlcMoveCmd fields.
|
|
func (_m *PlcMoveCmd) assignValues(columns []string, values []any) error {
|
|
if m, n := len(values), len(columns); m < n {
|
|
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
|
|
}
|
|
for i := range columns {
|
|
switch columns[i] {
|
|
case plcmovecmd.FieldID:
|
|
value, ok := values[i].(*sql.NullInt64)
|
|
if !ok {
|
|
return fmt.Errorf("unexpected type %T for field id", value)
|
|
}
|
|
_m.ID = int(value.Int64)
|
|
case plcmovecmd.FieldCmdNo:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field cmdNo", values[i])
|
|
} else if value.Valid {
|
|
_m.CmdNo = value.String
|
|
}
|
|
case plcmovecmd.FieldSn:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field sn", values[i])
|
|
} else if value.Valid {
|
|
_m.Sn = value.String
|
|
}
|
|
case plcmovecmd.FieldOrderNo:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field orderNo", values[i])
|
|
} else if value.Valid {
|
|
_m.OrderNo = value.String
|
|
}
|
|
case plcmovecmd.FieldFromPoint:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field fromPoint", values[i])
|
|
} else if value.Valid {
|
|
_m.FromPoint = value.String
|
|
}
|
|
case plcmovecmd.FieldToPoint:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field toPoint", values[i])
|
|
} else if value.Valid {
|
|
_m.ToPoint = value.String
|
|
}
|
|
case plcmovecmd.FieldStatus:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field status", values[i])
|
|
} else if value.Valid {
|
|
_m.Status = value.String
|
|
}
|
|
case plcmovecmd.FieldOperator:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field operator", values[i])
|
|
} else if value.Valid {
|
|
_m.Operator = value.String
|
|
}
|
|
case plcmovecmd.FieldMessage:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field message", values[i])
|
|
} else if value.Valid {
|
|
_m.Message = value.String
|
|
}
|
|
case plcmovecmd.FieldCreatedAt:
|
|
if value, ok := values[i].(*sql.NullTime); !ok {
|
|
return fmt.Errorf("unexpected type %T for field createdAt", values[i])
|
|
} else if value.Valid {
|
|
_m.CreatedAt = value.Time
|
|
}
|
|
case plcmovecmd.FieldUpdatedAt:
|
|
if value, ok := values[i].(*sql.NullTime); !ok {
|
|
return fmt.Errorf("unexpected type %T for field updatedAt", values[i])
|
|
} else if value.Valid {
|
|
_m.UpdatedAt = value.Time
|
|
}
|
|
default:
|
|
_m.selectValues.Set(columns[i], values[i])
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Value returns the ent.Value that was dynamically selected and assigned to the PlcMoveCmd.
|
|
// This includes values selected through modifiers, order, etc.
|
|
func (_m *PlcMoveCmd) Value(name string) (ent.Value, error) {
|
|
return _m.selectValues.Get(name)
|
|
}
|
|
|
|
// Update returns a builder for updating this PlcMoveCmd.
|
|
// Note that you need to call PlcMoveCmd.Unwrap() before calling this method if this PlcMoveCmd
|
|
// was returned from a transaction, and the transaction was committed or rolled back.
|
|
func (_m *PlcMoveCmd) Update() *PlcMoveCmdUpdateOne {
|
|
return NewPlcMoveCmdClient(_m.config).UpdateOne(_m)
|
|
}
|
|
|
|
// Unwrap unwraps the PlcMoveCmd entity that was returned from a transaction after it was closed,
|
|
// so that all future queries will be executed through the driver which created the transaction.
|
|
func (_m *PlcMoveCmd) Unwrap() *PlcMoveCmd {
|
|
_tx, ok := _m.config.driver.(*txDriver)
|
|
if !ok {
|
|
panic("ent: PlcMoveCmd is not a transactional entity")
|
|
}
|
|
_m.config.driver = _tx.drv
|
|
return _m
|
|
}
|
|
|
|
// String implements the fmt.Stringer.
|
|
func (_m *PlcMoveCmd) String() string {
|
|
var builder strings.Builder
|
|
builder.WriteString("PlcMoveCmd(")
|
|
builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID))
|
|
builder.WriteString("cmdNo=")
|
|
builder.WriteString(_m.CmdNo)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("sn=")
|
|
builder.WriteString(_m.Sn)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("orderNo=")
|
|
builder.WriteString(_m.OrderNo)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("fromPoint=")
|
|
builder.WriteString(_m.FromPoint)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("toPoint=")
|
|
builder.WriteString(_m.ToPoint)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("status=")
|
|
builder.WriteString(_m.Status)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("operator=")
|
|
builder.WriteString(_m.Operator)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("message=")
|
|
builder.WriteString(_m.Message)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("createdAt=")
|
|
builder.WriteString(_m.CreatedAt.Format(time.ANSIC))
|
|
builder.WriteString(", ")
|
|
builder.WriteString("updatedAt=")
|
|
builder.WriteString(_m.UpdatedAt.Format(time.ANSIC))
|
|
builder.WriteByte(')')
|
|
return builder.String()
|
|
}
|
|
|
|
// PlcMoveCmds is a parsable slice of PlcMoveCmd.
|
|
type PlcMoveCmds []*PlcMoveCmd
|