feat&refactor: 完成多模块功能迭代与配置优化
本次提交覆盖多个业务模块的功能完善与体验优化：
1. **鉴权与配置调整**：
- 统一JWT滑动续签逻辑，简化Token存储，移除RefreshToken相关冗余代码
- 调整多项目配置文件中JWT过期时间为3600秒，统一会话闲置窗口
- 工位配置放开1~12限制，改为仅校验大于0
2. **术语统一替换**：全链路将"精密件"替换为"电气件"，修正物料管理描述
3. **功能新增**：
- 新增工位类型、工艺路线与产线点位台账模块
- 添加工艺PDF预览面板、工位终端代理转发接口
- 新增操作日志按操作人列表筛选、工位登出日志记录
- 新增PLC移料指令与产线点位状态管理
4. **业务流程优化**：
- 调整BOM物料删除校验逻辑，优化工单备料计算
- 补充物料图号、检测单号等追溯字段
- 完善工艺流程图与工位绑定关系说明
- 优化前端页面文案与交互细节
5. **代码规范与维护**：
- 新增通用工具函数与前端静态资源
- 整理路由权限与中间件逻辑
- 修复部分接口与配置的不兼容问题
This commit is contained in:
SunYF
@@ -0,0 +1,177 @@
|
||||
// Code generated by ent, DO NOT EDIT.
|
||||
|
||||
package ent
|
||||
|
||||
import (
|
||||
"bj_power_mes/ent/routesegment"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
)
|
||||
|
||||
// RouteSegment is the model entity for the RouteSegment schema.
|
||||
type RouteSegment struct {
|
||||
config `json:"-"`
|
||||
// ID of the ent.
|
||||
ID int `json:"id,omitempty"`
|
||||
// 所属工艺路线ID
|
||||
RouteId int `json:"routeId,omitempty"`
|
||||
// 段序号（从 0 开始，按序执行）
|
||||
Seq int `json:"seq,omitempty"`
|
||||
// 该段对应的工艺流程图ID
|
||||
FlowId int `json:"flowId,omitempty"`
|
||||
// 本段并行工位号列表
|
||||
Stations []int `json:"stations,omitempty"`
|
||||
// 段类型 LINE/OFFLINE
|
||||
SegmentType string `json:"segmentType,omitempty"`
|
||||
// Remark holds the value of the "remark" field.
|
||||
Remark string `json:"remark,omitempty"`
|
||||
// CreatedAt holds the value of the "createdAt" field.
|
||||
CreatedAt time.Time `json:"createdAt,omitempty"`
|
||||
selectValues sql.SelectValues
|
||||
}
|
||||
|
||||
// scanValues returns the types for scanning values from sql.Rows.
|
||||
func (*RouteSegment) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case routesegment.FieldStations:
|
||||
values[i] = new([]byte)
|
||||
case routesegment.FieldID, routesegment.FieldRouteId, routesegment.FieldSeq, routesegment.FieldFlowId:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case routesegment.FieldSegmentType, routesegment.FieldRemark:
|
||||
values[i] = new(sql.NullString)
|
||||
case routesegment.FieldCreatedAt:
|
||||
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 RouteSegment fields.
|
||||
func (_m *RouteSegment) 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 routesegment.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 routesegment.FieldRouteId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field routeId", values[i])
|
||||
} else if value.Valid {
|
||||
_m.RouteId = int(value.Int64)
|
||||
}
|
||||
case routesegment.FieldSeq:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field seq", values[i])
|
||||
} else if value.Valid {
|
||||
_m.Seq = int(value.Int64)
|
||||
}
|
||||
case routesegment.FieldFlowId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field flowId", values[i])
|
||||
} else if value.Valid {
|
||||
_m.FlowId = int(value.Int64)
|
||||
}
|
||||
case routesegment.FieldStations:
|
||||
if value, ok := values[i].(*[]byte); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field stations", values[i])
|
||||
} else if value != nil && len(*value) > 0 {
|
||||
if err := json.Unmarshal(*value, &_m.Stations); err != nil {
|
||||
return fmt.Errorf("unmarshal field stations: %w", err)
|
||||
}
|
||||
}
|
||||
case routesegment.FieldSegmentType:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field segmentType", values[i])
|
||||
} else if value.Valid {
|
||||
_m.SegmentType = value.String
|
||||
}
|
||||
case routesegment.FieldRemark:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field remark", values[i])
|
||||
} else if value.Valid {
|
||||
_m.Remark = value.String
|
||||
}
|
||||
case routesegment.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
|
||||
}
|
||||
default:
|
||||
_m.selectValues.Set(columns[i], values[i])
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Value returns the ent.Value that was dynamically selected and assigned to the RouteSegment.
|
||||
// This includes values selected through modifiers, order, etc.
|
||||
func (_m *RouteSegment) Value(name string) (ent.Value, error) {
|
||||
return _m.selectValues.Get(name)
|
||||
}
|
||||
|
||||
// Update returns a builder for updating this RouteSegment.
|
||||
// Note that you need to call RouteSegment.Unwrap() before calling this method if this RouteSegment
|
||||
// was returned from a transaction, and the transaction was committed or rolled back.
|
||||
func (_m *RouteSegment) Update() *RouteSegmentUpdateOne {
|
||||
return NewRouteSegmentClient(_m.config).UpdateOne(_m)
|
||||
}
|
||||
|
||||
// Unwrap unwraps the RouteSegment 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 *RouteSegment) Unwrap() *RouteSegment {
|
||||
_tx, ok := _m.config.driver.(*txDriver)
|
||||
if !ok {
|
||||
panic("ent: RouteSegment is not a transactional entity")
|
||||
}
|
||||
_m.config.driver = _tx.drv
|
||||
return _m
|
||||
}
|
||||
|
||||
// String implements the fmt.Stringer.
|
||||
func (_m *RouteSegment) String() string {
|
||||
var builder strings.Builder
|
||||
builder.WriteString("RouteSegment(")
|
||||
builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID))
|
||||
builder.WriteString("routeId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.RouteId))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("seq=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.Seq))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("flowId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.FlowId))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("stations=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.Stations))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("segmentType=")
|
||||
builder.WriteString(_m.SegmentType)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("remark=")
|
||||
builder.WriteString(_m.Remark)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("createdAt=")
|
||||
builder.WriteString(_m.CreatedAt.Format(time.ANSIC))
|
||||
builder.WriteByte(')')
|
||||
return builder.String()
|
||||
}
|
||||
|
||||
// RouteSegments is a parsable slice of RouteSegment.
|
||||
type RouteSegments []*RouteSegment
|
||||
Reference in New Issue
Block a user