refactor: 重构工艺工序相关命名与数据模型
1. 全局替换"工序"为"工艺"统一术语,包括页面文案、枚举、注释
2. 重构工单与工件工艺数据模型:
- 新增工艺组合表flow_material作为备料/齐套唯一源头
- 新增工位状态表station_state支持自主停单/恢复接单
- 移除station_process派工表,改用工单工艺组合作为路线唯一源头
- 替换processCode为flowId作为工艺关联标识
- 重构工件当前进度字段为currentStationNo
3. 删除冗余的静态备份资源文件
4. 调整物料选择组件默认启用仅显示激活物料
5. 优化工单创建/编辑逻辑,新增工艺组合校验与保存
This commit is contained in:
@@ -19,8 +19,8 @@ type WorkpieceProcess struct {
|
||||
ID int `json:"id,omitempty"`
|
||||
// 工件SN
|
||||
Sn string `json:"sn,omitempty"`
|
||||
// 工序代码
|
||||
ProcessCode int `json:"processCode,omitempty"`
|
||||
// 完成的工艺ID
|
||||
FlowId int `json:"flowId,omitempty"`
|
||||
// 工位号
|
||||
StationNo string `json:"stationNo,omitempty"`
|
||||
// OrderNo holds the value of the "orderNo" field.
|
||||
@@ -51,7 +51,7 @@ func (*WorkpieceProcess) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case workpieceprocess.FieldID, workpieceprocess.FieldProcessCode, workpieceprocess.FieldDurationSec:
|
||||
case workpieceprocess.FieldID, workpieceprocess.FieldFlowId, workpieceprocess.FieldDurationSec:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case workpieceprocess.FieldSn, workpieceprocess.FieldStationNo, workpieceprocess.FieldOrderNo, workpieceprocess.FieldProcessName, workpieceprocess.FieldStatus, workpieceprocess.FieldOperator, workpieceprocess.FieldResult, workpieceprocess.FieldRemark:
|
||||
values[i] = new(sql.NullString)
|
||||
@@ -84,11 +84,11 @@ func (_m *WorkpieceProcess) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.Sn = value.String
|
||||
}
|
||||
case workpieceprocess.FieldProcessCode:
|
||||
case workpieceprocess.FieldFlowId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field processCode", values[i])
|
||||
return fmt.Errorf("unexpected type %T for field flowId", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ProcessCode = int(value.Int64)
|
||||
_m.FlowId = int(value.Int64)
|
||||
}
|
||||
case workpieceprocess.FieldStationNo:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
@@ -197,8 +197,8 @@ func (_m *WorkpieceProcess) String() string {
|
||||
builder.WriteString("sn=")
|
||||
builder.WriteString(_m.Sn)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("processCode=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.ProcessCode))
|
||||
builder.WriteString("flowId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.FlowId))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("stationNo=")
|
||||
builder.WriteString(_m.StationNo)
|
||||
|
||||
Reference in New Issue
Block a user