feat&refactor: 完成多模块功能迭代与配置优化

本次提交覆盖多个业务模块的功能完善与体验优化:
1.  **鉴权与配置调整**:
    - 统一JWT滑动续签逻辑,简化Token存储,移除RefreshToken相关冗余代码
    - 调整多项目配置文件中JWT过期时间为3600秒,统一会话闲置窗口
    - 工位配置放开1~12限制,改为仅校验大于0
2.  **术语统一替换**:全链路将"精密件"替换为"电气件",修正物料管理描述
3.  **功能新增**:
    - 新增工位类型、工艺路线与产线点位台账模块
    - 添加工艺PDF预览面板、工位终端代理转发接口
    - 新增操作日志按操作人列表筛选、工位登出日志记录
    - 新增PLC移料指令与产线点位状态管理
4.  **业务流程优化**:
    - 调整BOM物料删除校验逻辑,优化工单备料计算
    - 补充物料图号、检测单号等追溯字段
    - 完善工艺流程图与工位绑定关系说明
    - 优化前端页面文案与交互细节
5.  **代码规范与维护**:
    - 新增通用工具函数与前端静态资源
    - 整理路由权限与中间件逻辑
    - 修复部分接口与配置的不兼容问题
This commit is contained in:
SunYF
2026-09-10 16:59:15 +08:00
parent 6d8bb75696
commit 0ab21b1234
202 changed files with 21397 additions and 3172 deletions
+28 -15
View File
@@ -24,8 +24,6 @@ type WorkOrder struct {
ProductTypeId int `json:"productTypeId,omitempty"`
// 产品编码
ProductCode string `json:"productCode,omitempty"`
// 建单时选定的BOM名称(该型号下多份BOM之一,备料按此计算)
BomName string `json:"bomName,omitempty"`
// ProductName holds the value of the "productName" field.
ProductName string `json:"productName,omitempty"`
// 工件数量
@@ -34,8 +32,12 @@ type WorkOrder struct {
FinishedNum int `json:"finishedNum,omitempty"`
// NG数量
FailNum int `json:"failNum,omitempty"`
// 工组合,如 135
// 工组合,如 1,3,5(本工单要经过的工位,按序执行)
ProcessSeq string `json:"processSeq,omitempty"`
// 关联工艺路线ID
RouteId int `json:"routeId,omitempty"`
// 工艺路线段快照,工单落地时固化路线段JSON数组
RouteSnapshot []map[string]interface{} `json:"routeSnapshot,omitempty"`
// Status holds the value of the "status" field.
Status string `json:"status,omitempty"`
// 计划开始
@@ -58,11 +60,11 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) {
values := make([]any, len(columns))
for i := range columns {
switch columns[i] {
case workorder.FieldContext:
case workorder.FieldRouteSnapshot, workorder.FieldContext:
values[i] = new([]byte)
case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum:
case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum, workorder.FieldRouteId:
values[i] = new(sql.NullInt64)
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldBomName, workorder.FieldProductName, workorder.FieldProcessSeq, workorder.FieldStatus:
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldProcessSeq, workorder.FieldStatus:
values[i] = new(sql.NullString)
case workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldCreatedAt, workorder.FieldUpdatedAt:
values[i] = new(sql.NullTime)
@@ -105,12 +107,6 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.ProductCode = value.String
}
case workorder.FieldBomName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field bomName", values[i])
} else if value.Valid {
_m.BomName = value.String
}
case workorder.FieldProductName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field productName", values[i])
@@ -141,6 +137,20 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error {
} else if value.Valid {
_m.ProcessSeq = value.String
}
case workorder.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 workorder.FieldRouteSnapshot:
if value, ok := values[i].(*[]byte); !ok {
return fmt.Errorf("unexpected type %T for field routeSnapshot", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &_m.RouteSnapshot); err != nil {
return fmt.Errorf("unmarshal field routeSnapshot: %w", err)
}
}
case workorder.FieldStatus:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field status", values[i])
@@ -234,9 +244,6 @@ func (_m *WorkOrder) String() string {
builder.WriteString("productCode=")
builder.WriteString(_m.ProductCode)
builder.WriteString(", ")
builder.WriteString("bomName=")
builder.WriteString(_m.BomName)
builder.WriteString(", ")
builder.WriteString("productName=")
builder.WriteString(_m.ProductName)
builder.WriteString(", ")
@@ -252,6 +259,12 @@ func (_m *WorkOrder) String() string {
builder.WriteString("processSeq=")
builder.WriteString(_m.ProcessSeq)
builder.WriteString(", ")
builder.WriteString("routeId=")
builder.WriteString(fmt.Sprintf("%v", _m.RouteId))
builder.WriteString(", ")
builder.WriteString("routeSnapshot=")
builder.WriteString(fmt.Sprintf("%v", _m.RouteSnapshot))
builder.WriteString(", ")
builder.WriteString("status=")
builder.WriteString(_m.Status)
builder.WriteString(", ")