feat: 新增产品工艺管理与工序审核功能
- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
This commit is contained in:
@@ -46,6 +46,8 @@ type WorkOrder struct {
|
||||
DueDate *time.Time `json:"dueDate,omitempty"`
|
||||
// 工艺组合 [{flowId,stationNo}] 按工位号升序
|
||||
FlowCombination []map[string]int `json:"flowCombination,omitempty"`
|
||||
// 来源产品工艺ID(0=无来源)
|
||||
ProductProcessId int `json:"productProcessId,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
Status string `json:"status,omitempty"`
|
||||
// 计划开始
|
||||
@@ -70,7 +72,7 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) {
|
||||
switch columns[i] {
|
||||
case workorder.FieldFlowCombination, 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.FieldProductProcessId:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus:
|
||||
values[i] = new(sql.NullString)
|
||||
@@ -184,6 +186,12 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error {
|
||||
return fmt.Errorf("unmarshal field flowCombination: %w", err)
|
||||
}
|
||||
}
|
||||
case workorder.FieldProductProcessId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field productProcessId", values[i])
|
||||
} else if value.Valid {
|
||||
_m.ProductProcessId = int(value.Int64)
|
||||
}
|
||||
case workorder.FieldStatus:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field status", values[i])
|
||||
@@ -312,6 +320,9 @@ func (_m *WorkOrder) String() string {
|
||||
builder.WriteString("flowCombination=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.FlowCombination))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("productProcessId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.ProductProcessId))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("status=")
|
||||
builder.WriteString(_m.Status)
|
||||
builder.WriteString(", ")
|
||||
|
||||
Reference in New Issue
Block a user