refactor: 重构工艺工序相关命名与数据模型
1. 全局替换"工序"为"工艺"统一术语,包括页面文案、枚举、注释
2. 重构工单与工件工艺数据模型:
- 新增工艺组合表flow_material作为备料/齐套唯一源头
- 新增工位状态表station_state支持自主停单/恢复接单
- 移除station_process派工表,改用工单工艺组合作为路线唯一源头
- 替换processCode为flowId作为工艺关联标识
- 重构工件当前进度字段为currentStationNo
3. 删除冗余的静态备份资源文件
4. 调整物料选择组件默认启用仅显示激活物料
5. 优化工单创建/编辑逻辑,新增工艺组合校验与保存
This commit is contained in:
@@ -23,8 +23,8 @@ type Workpiece struct {
|
||||
OrderNo string `json:"orderNo,omitempty"`
|
||||
// 工单ID
|
||||
WorkOrderId int `json:"workOrderId,omitempty"`
|
||||
// 当前进行到的工序码
|
||||
CurrentProcess int `json:"currentProcess,omitempty"`
|
||||
// 最后完成报工的工位号(0=未报任何工艺;下一道=工艺组合中工位号更大的下一条)
|
||||
CurrentStationNo int `json:"currentStationNo,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
Status string `json:"status,omitempty"`
|
||||
// 进线时间
|
||||
@@ -43,7 +43,7 @@ func (*Workpiece) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case workpiece.FieldID, workpiece.FieldWorkOrderId, workpiece.FieldCurrentProcess:
|
||||
case workpiece.FieldID, workpiece.FieldWorkOrderId, workpiece.FieldCurrentStationNo:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case workpiece.FieldSn, workpiece.FieldOrderNo, workpiece.FieldStatus:
|
||||
values[i] = new(sql.NullString)
|
||||
@@ -88,11 +88,11 @@ func (_m *Workpiece) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.WorkOrderId = int(value.Int64)
|
||||
}
|
||||
case workpiece.FieldCurrentProcess:
|
||||
case workpiece.FieldCurrentStationNo:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field currentProcess", values[i])
|
||||
return fmt.Errorf("unexpected type %T for field currentStationNo", values[i])
|
||||
} else if value.Valid {
|
||||
_m.CurrentProcess = int(value.Int64)
|
||||
_m.CurrentStationNo = int(value.Int64)
|
||||
}
|
||||
case workpiece.FieldStatus:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
@@ -172,8 +172,8 @@ func (_m *Workpiece) String() string {
|
||||
builder.WriteString("workOrderId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.WorkOrderId))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("currentProcess=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.CurrentProcess))
|
||||
builder.WriteString("currentStationNo=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.CurrentStationNo))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("status=")
|
||||
builder.WriteString(_m.Status)
|
||||
|
||||
Reference in New Issue
Block a user