diff --git a/bj_power_mes/ent/flowmaterial.go b/bj_power_mes/ent/flowmaterial.go index 7b0bc0b..8baa5c7 100644 --- a/bj_power_mes/ent/flowmaterial.go +++ b/bj_power_mes/ent/flowmaterial.go @@ -27,8 +27,8 @@ type FlowMaterial struct { Spec string `json:"spec,omitempty"` // Unit holds the value of the "unit" field. Unit string `json:"unit,omitempty"` - // ManageMode holds the value of the "manageMode" field. - ManageMode string `json:"manageMode,omitempty"` + // SnMode holds the value of the "snMode" field. + SnMode int `json:"snMode,omitempty"` // 单台用量 UnitQty float64 `json:"unitQty,omitempty"` // 损耗率% @@ -45,9 +45,9 @@ func (*FlowMaterial) scanValues(columns []string) ([]any, error) { switch columns[i] { case flowmaterial.FieldUnitQty, flowmaterial.FieldLossRate: values[i] = new(sql.NullFloat64) - case flowmaterial.FieldID, flowmaterial.FieldFlowId: + case flowmaterial.FieldID, flowmaterial.FieldFlowId, flowmaterial.FieldSnMode: values[i] = new(sql.NullInt64) - case flowmaterial.FieldMaterialCode, flowmaterial.FieldMaterialName, flowmaterial.FieldSpec, flowmaterial.FieldUnit, flowmaterial.FieldManageMode: + case flowmaterial.FieldMaterialCode, flowmaterial.FieldMaterialName, flowmaterial.FieldSpec, flowmaterial.FieldUnit: values[i] = new(sql.NullString) case flowmaterial.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -102,11 +102,11 @@ func (_m *FlowMaterial) assignValues(columns []string, values []any) error { } else if value.Valid { _m.Unit = value.String } - case flowmaterial.FieldManageMode: - if value, ok := values[i].(*sql.NullString); !ok { - return fmt.Errorf("unexpected type %T for field manageMode", values[i]) + case flowmaterial.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field snMode", values[i]) } else if value.Valid { - _m.ManageMode = value.String + _m.SnMode = int(value.Int64) } case flowmaterial.FieldUnitQty: if value, ok := values[i].(*sql.NullFloat64); !ok { @@ -177,8 +177,8 @@ func (_m *FlowMaterial) String() string { builder.WriteString("unit=") builder.WriteString(_m.Unit) builder.WriteString(", ") - builder.WriteString("manageMode=") - builder.WriteString(_m.ManageMode) + builder.WriteString("snMode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) builder.WriteString(", ") builder.WriteString("unitQty=") builder.WriteString(fmt.Sprintf("%v", _m.UnitQty)) diff --git a/bj_power_mes/ent/flowmaterial/flowmaterial.go b/bj_power_mes/ent/flowmaterial/flowmaterial.go index c64fd23..fffa8ba 100644 --- a/bj_power_mes/ent/flowmaterial/flowmaterial.go +++ b/bj_power_mes/ent/flowmaterial/flowmaterial.go @@ -23,8 +23,8 @@ const ( FieldSpec = "spec" // FieldUnit holds the string denoting the unit field in the database. FieldUnit = "unit" - // FieldManageMode holds the string denoting the managemode field in the database. - FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the snmode field in the database. + FieldSnMode = "sn_mode" // FieldUnitQty holds the string denoting the unitqty field in the database. FieldUnitQty = "unit_qty" // FieldLossRate holds the string denoting the lossrate field in the database. @@ -43,7 +43,7 @@ var Columns = []string{ FieldMaterialName, FieldSpec, FieldUnit, - FieldManageMode, + FieldSnMode, FieldUnitQty, FieldLossRate, FieldCreatedAt, @@ -74,10 +74,8 @@ var ( DefaultUnit string // UnitValidator is a validator for the "unit" field. It is called by the builders before save. UnitValidator func(string) error - // DefaultManageMode holds the default value on creation for the "manageMode" field. - DefaultManageMode string - // ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - ManageModeValidator func(string) error + // DefaultSnMode holds the default value on creation for the "snMode" field. + DefaultSnMode int // DefaultUnitQty holds the default value on creation for the "unitQty" field. DefaultUnitQty float64 // DefaultLossRate holds the default value on creation for the "lossRate" field. @@ -121,9 +119,9 @@ func ByUnit(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldUnit, opts...).ToFunc() } -// ByManageMode orders the results by the manageMode field. -func ByManageMode(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldManageMode, opts...).ToFunc() +// BySnMode orders the results by the snMode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() } // ByUnitQty orders the results by the unitQty field. diff --git a/bj_power_mes/ent/flowmaterial/where.go b/bj_power_mes/ent/flowmaterial/where.go index d437ccc..fc8d147 100644 --- a/bj_power_mes/ent/flowmaterial/where.go +++ b/bj_power_mes/ent/flowmaterial/where.go @@ -79,9 +79,9 @@ func Unit(v string) predicate.FlowMaterial { return predicate.FlowMaterial(sql.FieldEQ(FieldUnit, v)) } -// ManageMode applies equality check predicate on the "manageMode" field. It's identical to ManageModeEQ. -func ManageMode(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldEQ(FieldManageMode, v)) +// SnMode applies equality check predicate on the "snMode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldEQ(FieldSnMode, v)) } // UnitQty applies equality check predicate on the "unitQty" field. It's identical to UnitQtyEQ. @@ -399,69 +399,44 @@ func UnitContainsFold(v string) predicate.FlowMaterial { return predicate.FlowMaterial(sql.FieldContainsFold(FieldUnit, v)) } -// ManageModeEQ applies the EQ predicate on the "manageMode" field. -func ManageModeEQ(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldEQ(FieldManageMode, v)) +// SnModeEQ applies the EQ predicate on the "snMode" field. +func SnModeEQ(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldEQ(FieldSnMode, v)) } -// ManageModeNEQ applies the NEQ predicate on the "manageMode" field. -func ManageModeNEQ(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldNEQ(FieldManageMode, v)) +// SnModeNEQ applies the NEQ predicate on the "snMode" field. +func SnModeNEQ(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldNEQ(FieldSnMode, v)) } -// ManageModeIn applies the In predicate on the "manageMode" field. -func ManageModeIn(vs ...string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldIn(FieldManageMode, vs...)) +// SnModeIn applies the In predicate on the "snMode" field. +func SnModeIn(vs ...int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldIn(FieldSnMode, vs...)) } -// ManageModeNotIn applies the NotIn predicate on the "manageMode" field. -func ManageModeNotIn(vs ...string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldNotIn(FieldManageMode, vs...)) +// SnModeNotIn applies the NotIn predicate on the "snMode" field. +func SnModeNotIn(vs ...int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldNotIn(FieldSnMode, vs...)) } -// ManageModeGT applies the GT predicate on the "manageMode" field. -func ManageModeGT(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldGT(FieldManageMode, v)) +// SnModeGT applies the GT predicate on the "snMode" field. +func SnModeGT(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldGT(FieldSnMode, v)) } -// ManageModeGTE applies the GTE predicate on the "manageMode" field. -func ManageModeGTE(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldGTE(FieldManageMode, v)) +// SnModeGTE applies the GTE predicate on the "snMode" field. +func SnModeGTE(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldGTE(FieldSnMode, v)) } -// ManageModeLT applies the LT predicate on the "manageMode" field. -func ManageModeLT(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldLT(FieldManageMode, v)) +// SnModeLT applies the LT predicate on the "snMode" field. +func SnModeLT(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldLT(FieldSnMode, v)) } -// ManageModeLTE applies the LTE predicate on the "manageMode" field. -func ManageModeLTE(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldLTE(FieldManageMode, v)) -} - -// ManageModeContains applies the Contains predicate on the "manageMode" field. -func ManageModeContains(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldContains(FieldManageMode, v)) -} - -// ManageModeHasPrefix applies the HasPrefix predicate on the "manageMode" field. -func ManageModeHasPrefix(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldHasPrefix(FieldManageMode, v)) -} - -// ManageModeHasSuffix applies the HasSuffix predicate on the "manageMode" field. -func ManageModeHasSuffix(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldHasSuffix(FieldManageMode, v)) -} - -// ManageModeEqualFold applies the EqualFold predicate on the "manageMode" field. -func ManageModeEqualFold(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldEqualFold(FieldManageMode, v)) -} - -// ManageModeContainsFold applies the ContainsFold predicate on the "manageMode" field. -func ManageModeContainsFold(v string) predicate.FlowMaterial { - return predicate.FlowMaterial(sql.FieldContainsFold(FieldManageMode, v)) +// SnModeLTE applies the LTE predicate on the "snMode" field. +func SnModeLTE(v int) predicate.FlowMaterial { + return predicate.FlowMaterial(sql.FieldLTE(FieldSnMode, v)) } // UnitQtyEQ applies the EQ predicate on the "unitQty" field. diff --git a/bj_power_mes/ent/flowmaterial_create.go b/bj_power_mes/ent/flowmaterial_create.go index 1cec5ae..cab7e45 100644 --- a/bj_power_mes/ent/flowmaterial_create.go +++ b/bj_power_mes/ent/flowmaterial_create.go @@ -74,16 +74,16 @@ func (_c *FlowMaterialCreate) SetNillableUnit(v *string) *FlowMaterialCreate { return _c } -// SetManageMode sets the "manageMode" field. -func (_c *FlowMaterialCreate) SetManageMode(v string) *FlowMaterialCreate { - _c.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_c *FlowMaterialCreate) SetSnMode(v int) *FlowMaterialCreate { + _c.mutation.SetSnMode(v) return _c } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_c *FlowMaterialCreate) SetNillableManageMode(v *string) *FlowMaterialCreate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_c *FlowMaterialCreate) SetNillableSnMode(v *int) *FlowMaterialCreate { if v != nil { - _c.SetManageMode(*v) + _c.SetSnMode(*v) } return _c } @@ -183,9 +183,9 @@ func (_c *FlowMaterialCreate) defaults() { v := flowmaterial.DefaultUnit _c.mutation.SetUnit(v) } - if _, ok := _c.mutation.ManageMode(); !ok { - v := flowmaterial.DefaultManageMode - _c.mutation.SetManageMode(v) + if _, ok := _c.mutation.SnMode(); !ok { + v := flowmaterial.DefaultSnMode + _c.mutation.SetSnMode(v) } if _, ok := _c.mutation.UnitQty(); !ok { v := flowmaterial.DefaultUnitQty @@ -238,13 +238,8 @@ func (_c *FlowMaterialCreate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.unit": %w`, err)} } } - if _, ok := _c.mutation.ManageMode(); !ok { - return &ValidationError{Name: "manageMode", err: errors.New(`ent: missing required field "FlowMaterial.manageMode"`)} - } - if v, ok := _c.mutation.ManageMode(); ok { - if err := flowmaterial.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.manageMode": %w`, err)} - } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "snMode", err: errors.New(`ent: missing required field "FlowMaterial.snMode"`)} } if _, ok := _c.mutation.UnitQty(); !ok { return &ValidationError{Name: "unitQty", err: errors.New(`ent: missing required field "FlowMaterial.unitQty"`)} @@ -312,9 +307,9 @@ func (_c *FlowMaterialCreate) createSpec() (*FlowMaterial, *sqlgraph.CreateSpec) _spec.SetField(flowmaterial.FieldUnit, field.TypeString, value) _node.Unit = value } - if value, ok := _c.mutation.ManageMode(); ok { - _spec.SetField(flowmaterial.FieldManageMode, field.TypeString, value) - _node.ManageMode = value + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(flowmaterial.FieldSnMode, field.TypeInt, value) + _node.SnMode = value } if value, ok := _c.mutation.UnitQty(); ok { _spec.SetField(flowmaterial.FieldUnitQty, field.TypeFloat64, value) diff --git a/bj_power_mes/ent/flowmaterial_update.go b/bj_power_mes/ent/flowmaterial_update.go index bf05c9a..e3a1183 100644 --- a/bj_power_mes/ent/flowmaterial_update.go +++ b/bj_power_mes/ent/flowmaterial_update.go @@ -105,20 +105,27 @@ func (_u *FlowMaterialUpdate) SetNillableUnit(v *string) *FlowMaterialUpdate { return _u } -// SetManageMode sets the "manageMode" field. -func (_u *FlowMaterialUpdate) SetManageMode(v string) *FlowMaterialUpdate { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *FlowMaterialUpdate) SetSnMode(v int) *FlowMaterialUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *FlowMaterialUpdate) SetNillableManageMode(v *string) *FlowMaterialUpdate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *FlowMaterialUpdate) SetNillableSnMode(v *int) *FlowMaterialUpdate { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *FlowMaterialUpdate) AddSnMode(v int) *FlowMaterialUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetUnitQty sets the "unitQty" field. func (_u *FlowMaterialUpdate) SetUnitQty(v float64) *FlowMaterialUpdate { _u.mutation.ResetUnitQty() @@ -215,11 +222,6 @@ func (_u *FlowMaterialUpdate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := flowmaterial.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.manageMode": %w`, err)} - } - } return nil } @@ -259,8 +261,11 @@ func (_u *FlowMaterialUpdate) sqlSave(ctx context.Context) (_node int, err error if value, ok := _u.mutation.Unit(); ok { _spec.SetField(flowmaterial.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(flowmaterial.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(flowmaterial.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(flowmaterial.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.UnitQty(); ok { _spec.SetField(flowmaterial.FieldUnitQty, field.TypeFloat64, value) @@ -373,20 +378,27 @@ func (_u *FlowMaterialUpdateOne) SetNillableUnit(v *string) *FlowMaterialUpdateO return _u } -// SetManageMode sets the "manageMode" field. -func (_u *FlowMaterialUpdateOne) SetManageMode(v string) *FlowMaterialUpdateOne { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *FlowMaterialUpdateOne) SetSnMode(v int) *FlowMaterialUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *FlowMaterialUpdateOne) SetNillableManageMode(v *string) *FlowMaterialUpdateOne { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *FlowMaterialUpdateOne) SetNillableSnMode(v *int) *FlowMaterialUpdateOne { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *FlowMaterialUpdateOne) AddSnMode(v int) *FlowMaterialUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetUnitQty sets the "unitQty" field. func (_u *FlowMaterialUpdateOne) SetUnitQty(v float64) *FlowMaterialUpdateOne { _u.mutation.ResetUnitQty() @@ -496,11 +508,6 @@ func (_u *FlowMaterialUpdateOne) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := flowmaterial.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "FlowMaterial.manageMode": %w`, err)} - } - } return nil } @@ -557,8 +564,11 @@ func (_u *FlowMaterialUpdateOne) sqlSave(ctx context.Context) (_node *FlowMateri if value, ok := _u.mutation.Unit(); ok { _spec.SetField(flowmaterial.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(flowmaterial.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(flowmaterial.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(flowmaterial.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.UnitQty(); ok { _spec.SetField(flowmaterial.FieldUnitQty, field.TypeFloat64, value) diff --git a/bj_power_mes/ent/inspectionrecord.go b/bj_power_mes/ent/inspectionrecord.go index 0c74d28..9bcbfdf 100644 --- a/bj_power_mes/ent/inspectionrecord.go +++ b/bj_power_mes/ent/inspectionrecord.go @@ -62,7 +62,7 @@ type InspectionRecord struct { DisposalType string `json:"disposalType,omitempty"` // 处置说明 DisposalRemark string `json:"disposalRemark,omitempty"` - // 批次号/SN(联动 WMS 在库处置:电气件=SN 结构件=批次) + // 批次号/SN(联动 WMS 在库处置:序列号件=SN 批次件=批次) BatchSn string `json:"batchSn,omitempty"` // CreatedAt holds the value of the "createdAt" field. CreatedAt time.Time `json:"createdAt,omitempty"` diff --git a/bj_power_mes/ent/material.go b/bj_power_mes/ent/material.go index 8db3263..60da3ba 100644 --- a/bj_power_mes/ent/material.go +++ b/bj_power_mes/ent/material.go @@ -29,8 +29,10 @@ type Material struct { Description string `json:"description,omitempty"` // 品类 1原材料/3成品/4其他(半成品不是物料品类) ItemType int `json:"itemType,omitempty"` - // 管理粒度 1批次(结构件)/2序列号(电气件)/3其他 + // 类型 1结构件/2电气件/3其他(仅分类,不决定SN行为) ManageMode int `json:"manageMode,omitempty"` + // 是否逐件SN管理 0未选择(必填)/1序列号件(录SN)/2批次件(不录SN) + SnMode int `json:"snMode,omitempty"` // 模板编码 TemplateCode string `json:"templateCode,omitempty"` // 安全库存(低于触发缺货预警) @@ -53,7 +55,7 @@ func (*Material) scanValues(columns []string) ([]any, error) { switch columns[i] { case material.FieldIsActive, material.FieldSyncPending: values[i] = new(sql.NullBool) - case material.FieldID, material.FieldItemType, material.FieldManageMode, material.FieldSafetyStock: + case material.FieldID, material.FieldItemType, material.FieldManageMode, material.FieldSnMode, material.FieldSafetyStock: values[i] = new(sql.NullInt64) case material.FieldCode, material.FieldName, material.FieldSpec, material.FieldUnit, material.FieldDescription, material.FieldTemplateCode: values[i] = new(sql.NullString) @@ -122,6 +124,12 @@ func (_m *Material) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ManageMode = int(value.Int64) } + case material.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field snMode", values[i]) + } else if value.Valid { + _m.SnMode = int(value.Int64) + } case material.FieldTemplateCode: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field templateCode", values[i]) @@ -215,6 +223,9 @@ func (_m *Material) String() string { builder.WriteString("manageMode=") builder.WriteString(fmt.Sprintf("%v", _m.ManageMode)) builder.WriteString(", ") + builder.WriteString("snMode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) + builder.WriteString(", ") builder.WriteString("templateCode=") builder.WriteString(_m.TemplateCode) builder.WriteString(", ") diff --git a/bj_power_mes/ent/material/material.go b/bj_power_mes/ent/material/material.go index 3dca9da..9d5aa8f 100644 --- a/bj_power_mes/ent/material/material.go +++ b/bj_power_mes/ent/material/material.go @@ -27,6 +27,8 @@ const ( FieldItemType = "item_type" // FieldManageMode holds the string denoting the managemode field in the database. FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the snmode field in the database. + FieldSnMode = "sn_mode" // FieldTemplateCode holds the string denoting the templatecode field in the database. FieldTemplateCode = "template_code" // FieldSafetyStock holds the string denoting the safetystock field in the database. @@ -53,6 +55,7 @@ var Columns = []string{ FieldDescription, FieldItemType, FieldManageMode, + FieldSnMode, FieldTemplateCode, FieldSafetyStock, FieldIsActive, @@ -92,6 +95,8 @@ var ( DefaultItemType int // DefaultManageMode holds the default value on creation for the "manageMode" field. DefaultManageMode int + // DefaultSnMode holds the default value on creation for the "snMode" field. + DefaultSnMode int // DefaultTemplateCode holds the default value on creation for the "templateCode" field. DefaultTemplateCode string // TemplateCodeValidator is a validator for the "templateCode" field. It is called by the builders before save. @@ -153,6 +158,11 @@ func ByManageMode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldManageMode, opts...).ToFunc() } +// BySnMode orders the results by the snMode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() +} + // ByTemplateCode orders the results by the templateCode field. func ByTemplateCode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldTemplateCode, opts...).ToFunc() diff --git a/bj_power_mes/ent/material/where.go b/bj_power_mes/ent/material/where.go index 6c49b7b..3cccdd9 100644 --- a/bj_power_mes/ent/material/where.go +++ b/bj_power_mes/ent/material/where.go @@ -89,6 +89,11 @@ func ManageMode(v int) predicate.Material { return predicate.Material(sql.FieldEQ(FieldManageMode, v)) } +// SnMode applies equality check predicate on the "snMode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.Material { + return predicate.Material(sql.FieldEQ(FieldSnMode, v)) +} + // TemplateCode applies equality check predicate on the "templateCode" field. It's identical to TemplateCodeEQ. func TemplateCode(v string) predicate.Material { return predicate.Material(sql.FieldEQ(FieldTemplateCode, v)) @@ -524,6 +529,46 @@ func ManageModeLTE(v int) predicate.Material { return predicate.Material(sql.FieldLTE(FieldManageMode, v)) } +// SnModeEQ applies the EQ predicate on the "snMode" field. +func SnModeEQ(v int) predicate.Material { + return predicate.Material(sql.FieldEQ(FieldSnMode, v)) +} + +// SnModeNEQ applies the NEQ predicate on the "snMode" field. +func SnModeNEQ(v int) predicate.Material { + return predicate.Material(sql.FieldNEQ(FieldSnMode, v)) +} + +// SnModeIn applies the In predicate on the "snMode" field. +func SnModeIn(vs ...int) predicate.Material { + return predicate.Material(sql.FieldIn(FieldSnMode, vs...)) +} + +// SnModeNotIn applies the NotIn predicate on the "snMode" field. +func SnModeNotIn(vs ...int) predicate.Material { + return predicate.Material(sql.FieldNotIn(FieldSnMode, vs...)) +} + +// SnModeGT applies the GT predicate on the "snMode" field. +func SnModeGT(v int) predicate.Material { + return predicate.Material(sql.FieldGT(FieldSnMode, v)) +} + +// SnModeGTE applies the GTE predicate on the "snMode" field. +func SnModeGTE(v int) predicate.Material { + return predicate.Material(sql.FieldGTE(FieldSnMode, v)) +} + +// SnModeLT applies the LT predicate on the "snMode" field. +func SnModeLT(v int) predicate.Material { + return predicate.Material(sql.FieldLT(FieldSnMode, v)) +} + +// SnModeLTE applies the LTE predicate on the "snMode" field. +func SnModeLTE(v int) predicate.Material { + return predicate.Material(sql.FieldLTE(FieldSnMode, v)) +} + // TemplateCodeEQ applies the EQ predicate on the "templateCode" field. func TemplateCodeEQ(v string) predicate.Material { return predicate.Material(sql.FieldEQ(FieldTemplateCode, v)) diff --git a/bj_power_mes/ent/material_create.go b/bj_power_mes/ent/material_create.go index 8e36db2..ffd6b64 100644 --- a/bj_power_mes/ent/material_create.go +++ b/bj_power_mes/ent/material_create.go @@ -102,6 +102,20 @@ func (_c *MaterialCreate) SetNillableManageMode(v *int) *MaterialCreate { return _c } +// SetSnMode sets the "snMode" field. +func (_c *MaterialCreate) SetSnMode(v int) *MaterialCreate { + _c.mutation.SetSnMode(v) + return _c +} + +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_c *MaterialCreate) SetNillableSnMode(v *int) *MaterialCreate { + if v != nil { + _c.SetSnMode(*v) + } + return _c +} + // SetTemplateCode sets the "templateCode" field. func (_c *MaterialCreate) SetTemplateCode(v string) *MaterialCreate { _c.mutation.SetTemplateCode(v) @@ -241,6 +255,10 @@ func (_c *MaterialCreate) defaults() { v := material.DefaultManageMode _c.mutation.SetManageMode(v) } + if _, ok := _c.mutation.SnMode(); !ok { + v := material.DefaultSnMode + _c.mutation.SetSnMode(v) + } if _, ok := _c.mutation.TemplateCode(); !ok { v := material.DefaultTemplateCode _c.mutation.SetTemplateCode(v) @@ -315,6 +333,9 @@ func (_c *MaterialCreate) check() error { if _, ok := _c.mutation.ManageMode(); !ok { return &ValidationError{Name: "manageMode", err: errors.New(`ent: missing required field "Material.manageMode"`)} } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "snMode", err: errors.New(`ent: missing required field "Material.snMode"`)} + } if _, ok := _c.mutation.TemplateCode(); !ok { return &ValidationError{Name: "templateCode", err: errors.New(`ent: missing required field "Material.templateCode"`)} } @@ -392,6 +413,10 @@ func (_c *MaterialCreate) createSpec() (*Material, *sqlgraph.CreateSpec) { _spec.SetField(material.FieldManageMode, field.TypeInt, value) _node.ManageMode = value } + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + _node.SnMode = value + } if value, ok := _c.mutation.TemplateCode(); ok { _spec.SetField(material.FieldTemplateCode, field.TypeString, value) _node.TemplateCode = value diff --git a/bj_power_mes/ent/material_update.go b/bj_power_mes/ent/material_update.go index 3d8bc7e..032a35f 100644 --- a/bj_power_mes/ent/material_update.go +++ b/bj_power_mes/ent/material_update.go @@ -141,6 +141,27 @@ func (_u *MaterialUpdate) AddManageMode(v int) *MaterialUpdate { return _u } +// SetSnMode sets the "snMode" field. +func (_u *MaterialUpdate) SetSnMode(v int) *MaterialUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *MaterialUpdate) SetNillableSnMode(v *int) *MaterialUpdate { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "snMode" field. +func (_u *MaterialUpdate) AddSnMode(v int) *MaterialUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetTemplateCode sets the "templateCode" field. func (_u *MaterialUpdate) SetTemplateCode(v string) *MaterialUpdate { _u.mutation.SetTemplateCode(v) @@ -331,6 +352,12 @@ func (_u *MaterialUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(material.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(material.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.TemplateCode(); ok { _spec.SetField(material.FieldTemplateCode, field.TypeString, value) } @@ -483,6 +510,27 @@ func (_u *MaterialUpdateOne) AddManageMode(v int) *MaterialUpdateOne { return _u } +// SetSnMode sets the "snMode" field. +func (_u *MaterialUpdateOne) SetSnMode(v int) *MaterialUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *MaterialUpdateOne) SetNillableSnMode(v *int) *MaterialUpdateOne { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "snMode" field. +func (_u *MaterialUpdateOne) AddSnMode(v int) *MaterialUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetTemplateCode sets the "templateCode" field. func (_u *MaterialUpdateOne) SetTemplateCode(v string) *MaterialUpdateOne { _u.mutation.SetTemplateCode(v) @@ -703,6 +751,12 @@ func (_u *MaterialUpdateOne) sqlSave(ctx context.Context) (_node *Material, err if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(material.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(material.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.TemplateCode(); ok { _spec.SetField(material.FieldTemplateCode, field.TypeString, value) } diff --git a/bj_power_mes/ent/materialrequest.go b/bj_power_mes/ent/materialrequest.go index f378878..ae5b786 100644 --- a/bj_power_mes/ent/materialrequest.go +++ b/bj_power_mes/ent/materialrequest.go @@ -29,8 +29,8 @@ type MaterialRequest struct { MaterialName string `json:"materialName,omitempty"` // Unit holds the value of the "unit" field. Unit string `json:"unit,omitempty"` - // ManageMode holds the value of the "manageMode" field. - ManageMode string `json:"manageMode,omitempty"` + // SnMode holds the value of the "snMode" field. + SnMode int `json:"snMode,omitempty"` // 需备数量 ReqQty float64 `json:"reqQty,omitempty"` // Status holds the value of the "status" field. @@ -79,9 +79,9 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) { values[i] = new(sql.NullBool) case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReceivedQty, materialrequest.FieldOverQty: values[i] = new(sql.NullFloat64) - case materialrequest.FieldID, materialrequest.FieldStationNo, materialrequest.FieldFlowId, materialrequest.FieldReceivedAt: + case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo, materialrequest.FieldFlowId, materialrequest.FieldReceivedAt: values[i] = new(sql.NullInt64) - case materialrequest.FieldRequestNo, materialrequest.FieldOrderNo, materialrequest.FieldPlanDate, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldManageMode, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldReceiveBy, materialrequest.FieldSource, materialrequest.FieldOverReason, materialrequest.FieldRefReportNo, materialrequest.FieldBatchNo, materialrequest.FieldOperator: + case materialrequest.FieldRequestNo, materialrequest.FieldOrderNo, materialrequest.FieldPlanDate, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldReceiveBy, materialrequest.FieldSource, materialrequest.FieldOverReason, materialrequest.FieldRefReportNo, materialrequest.FieldBatchNo, materialrequest.FieldOperator: values[i] = new(sql.NullString) case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt: values[i] = new(sql.NullTime) @@ -142,11 +142,11 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error { } else if value.Valid { _m.Unit = value.String } - case materialrequest.FieldManageMode: - if value, ok := values[i].(*sql.NullString); !ok { - return fmt.Errorf("unexpected type %T for field manageMode", values[i]) + case materialrequest.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field snMode", values[i]) } else if value.Valid { - _m.ManageMode = value.String + _m.SnMode = int(value.Int64) } case materialrequest.FieldReqQty: if value, ok := values[i].(*sql.NullFloat64); !ok { @@ -311,8 +311,8 @@ func (_m *MaterialRequest) String() string { builder.WriteString("unit=") builder.WriteString(_m.Unit) builder.WriteString(", ") - builder.WriteString("manageMode=") - builder.WriteString(_m.ManageMode) + builder.WriteString("snMode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) builder.WriteString(", ") builder.WriteString("reqQty=") builder.WriteString(fmt.Sprintf("%v", _m.ReqQty)) diff --git a/bj_power_mes/ent/materialrequest/materialrequest.go b/bj_power_mes/ent/materialrequest/materialrequest.go index 38e9650..2b4213e 100644 --- a/bj_power_mes/ent/materialrequest/materialrequest.go +++ b/bj_power_mes/ent/materialrequest/materialrequest.go @@ -25,8 +25,8 @@ const ( FieldMaterialName = "material_name" // FieldUnit holds the string denoting the unit field in the database. FieldUnit = "unit" - // FieldManageMode holds the string denoting the managemode field in the database. - FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the snmode field in the database. + FieldSnMode = "sn_mode" // FieldReqQty holds the string denoting the reqqty field in the database. FieldReqQty = "req_qty" // FieldStatus holds the string denoting the status field in the database. @@ -76,7 +76,7 @@ var Columns = []string{ FieldMaterialCode, FieldMaterialName, FieldUnit, - FieldManageMode, + FieldSnMode, FieldReqQty, FieldStatus, FieldTargetDock, @@ -124,10 +124,8 @@ var ( DefaultUnit string // UnitValidator is a validator for the "unit" field. It is called by the builders before save. UnitValidator func(string) error - // DefaultManageMode holds the default value on creation for the "manageMode" field. - DefaultManageMode string - // ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - ManageModeValidator func(string) error + // DefaultSnMode holds the default value on creation for the "snMode" field. + DefaultSnMode int // DefaultReqQty holds the default value on creation for the "reqQty" field. DefaultReqQty float64 // DefaultStatus holds the default value on creation for the "status" field. @@ -224,9 +222,9 @@ func ByUnit(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldUnit, opts...).ToFunc() } -// ByManageMode orders the results by the manageMode field. -func ByManageMode(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldManageMode, opts...).ToFunc() +// BySnMode orders the results by the snMode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() } // ByReqQty orders the results by the reqQty field. diff --git a/bj_power_mes/ent/materialrequest/where.go b/bj_power_mes/ent/materialrequest/where.go index a9370bf..df6c929 100644 --- a/bj_power_mes/ent/materialrequest/where.go +++ b/bj_power_mes/ent/materialrequest/where.go @@ -84,9 +84,9 @@ func Unit(v string) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldEQ(FieldUnit, v)) } -// ManageMode applies equality check predicate on the "manageMode" field. It's identical to ManageModeEQ. -func ManageMode(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldEQ(FieldManageMode, v)) +// SnMode applies equality check predicate on the "snMode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldSnMode, v)) } // ReqQty applies equality check predicate on the "reqQty" field. It's identical to ReqQtyEQ. @@ -569,69 +569,44 @@ func UnitContainsFold(v string) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldContainsFold(FieldUnit, v)) } -// ManageModeEQ applies the EQ predicate on the "manageMode" field. -func ManageModeEQ(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldEQ(FieldManageMode, v)) +// SnModeEQ applies the EQ predicate on the "snMode" field. +func SnModeEQ(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldSnMode, v)) } -// ManageModeNEQ applies the NEQ predicate on the "manageMode" field. -func ManageModeNEQ(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldNEQ(FieldManageMode, v)) +// SnModeNEQ applies the NEQ predicate on the "snMode" field. +func SnModeNEQ(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldSnMode, v)) } -// ManageModeIn applies the In predicate on the "manageMode" field. -func ManageModeIn(vs ...string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldIn(FieldManageMode, vs...)) +// SnModeIn applies the In predicate on the "snMode" field. +func SnModeIn(vs ...int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldSnMode, vs...)) } -// ManageModeNotIn applies the NotIn predicate on the "manageMode" field. -func ManageModeNotIn(vs ...string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldNotIn(FieldManageMode, vs...)) +// SnModeNotIn applies the NotIn predicate on the "snMode" field. +func SnModeNotIn(vs ...int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldSnMode, vs...)) } -// ManageModeGT applies the GT predicate on the "manageMode" field. -func ManageModeGT(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldGT(FieldManageMode, v)) +// SnModeGT applies the GT predicate on the "snMode" field. +func SnModeGT(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldSnMode, v)) } -// ManageModeGTE applies the GTE predicate on the "manageMode" field. -func ManageModeGTE(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldGTE(FieldManageMode, v)) +// SnModeGTE applies the GTE predicate on the "snMode" field. +func SnModeGTE(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldSnMode, v)) } -// ManageModeLT applies the LT predicate on the "manageMode" field. -func ManageModeLT(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldLT(FieldManageMode, v)) +// SnModeLT applies the LT predicate on the "snMode" field. +func SnModeLT(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldSnMode, v)) } -// ManageModeLTE applies the LTE predicate on the "manageMode" field. -func ManageModeLTE(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldLTE(FieldManageMode, v)) -} - -// ManageModeContains applies the Contains predicate on the "manageMode" field. -func ManageModeContains(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldContains(FieldManageMode, v)) -} - -// ManageModeHasPrefix applies the HasPrefix predicate on the "manageMode" field. -func ManageModeHasPrefix(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldHasPrefix(FieldManageMode, v)) -} - -// ManageModeHasSuffix applies the HasSuffix predicate on the "manageMode" field. -func ManageModeHasSuffix(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldHasSuffix(FieldManageMode, v)) -} - -// ManageModeEqualFold applies the EqualFold predicate on the "manageMode" field. -func ManageModeEqualFold(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldEqualFold(FieldManageMode, v)) -} - -// ManageModeContainsFold applies the ContainsFold predicate on the "manageMode" field. -func ManageModeContainsFold(v string) predicate.MaterialRequest { - return predicate.MaterialRequest(sql.FieldContainsFold(FieldManageMode, v)) +// SnModeLTE applies the LTE predicate on the "snMode" field. +func SnModeLTE(v int) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldSnMode, v)) } // ReqQtyEQ applies the EQ predicate on the "reqQty" field. diff --git a/bj_power_mes/ent/materialrequest_create.go b/bj_power_mes/ent/materialrequest_create.go index fbde7c7..aa434ee 100644 --- a/bj_power_mes/ent/materialrequest_create.go +++ b/bj_power_mes/ent/materialrequest_create.go @@ -72,16 +72,16 @@ func (_c *MaterialRequestCreate) SetNillableUnit(v *string) *MaterialRequestCrea return _c } -// SetManageMode sets the "manageMode" field. -func (_c *MaterialRequestCreate) SetManageMode(v string) *MaterialRequestCreate { - _c.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_c *MaterialRequestCreate) SetSnMode(v int) *MaterialRequestCreate { + _c.mutation.SetSnMode(v) return _c } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_c *MaterialRequestCreate) SetNillableManageMode(v *string) *MaterialRequestCreate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableSnMode(v *int) *MaterialRequestCreate { if v != nil { - _c.SetManageMode(*v) + _c.SetSnMode(*v) } return _c } @@ -387,9 +387,9 @@ func (_c *MaterialRequestCreate) defaults() { v := materialrequest.DefaultUnit _c.mutation.SetUnit(v) } - if _, ok := _c.mutation.ManageMode(); !ok { - v := materialrequest.DefaultManageMode - _c.mutation.SetManageMode(v) + if _, ok := _c.mutation.SnMode(); !ok { + v := materialrequest.DefaultSnMode + _c.mutation.SetSnMode(v) } if _, ok := _c.mutation.ReqQty(); !ok { v := materialrequest.DefaultReqQty @@ -515,13 +515,8 @@ func (_c *MaterialRequestCreate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.unit": %w`, err)} } } - if _, ok := _c.mutation.ManageMode(); !ok { - return &ValidationError{Name: "manageMode", err: errors.New(`ent: missing required field "MaterialRequest.manageMode"`)} - } - if v, ok := _c.mutation.ManageMode(); ok { - if err := materialrequest.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.manageMode": %w`, err)} - } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "snMode", err: errors.New(`ent: missing required field "MaterialRequest.snMode"`)} } if _, ok := _c.mutation.ReqQty(); !ok { return &ValidationError{Name: "reqQty", err: errors.New(`ent: missing required field "MaterialRequest.reqQty"`)} @@ -675,9 +670,9 @@ func (_c *MaterialRequestCreate) createSpec() (*MaterialRequest, *sqlgraph.Creat _spec.SetField(materialrequest.FieldUnit, field.TypeString, value) _node.Unit = value } - if value, ok := _c.mutation.ManageMode(); ok { - _spec.SetField(materialrequest.FieldManageMode, field.TypeString, value) - _node.ManageMode = value + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(materialrequest.FieldSnMode, field.TypeInt, value) + _node.SnMode = value } if value, ok := _c.mutation.ReqQty(); ok { _spec.SetField(materialrequest.FieldReqQty, field.TypeFloat64, value) diff --git a/bj_power_mes/ent/materialrequest_update.go b/bj_power_mes/ent/materialrequest_update.go index 5881f5f..806928f 100644 --- a/bj_power_mes/ent/materialrequest_update.go +++ b/bj_power_mes/ent/materialrequest_update.go @@ -113,20 +113,27 @@ func (_u *MaterialRequestUpdate) SetNillableUnit(v *string) *MaterialRequestUpda return _u } -// SetManageMode sets the "manageMode" field. -func (_u *MaterialRequestUpdate) SetManageMode(v string) *MaterialRequestUpdate { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *MaterialRequestUpdate) SetSnMode(v int) *MaterialRequestUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *MaterialRequestUpdate) SetNillableManageMode(v *string) *MaterialRequestUpdate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableSnMode(v *int) *MaterialRequestUpdate { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *MaterialRequestUpdate) AddSnMode(v int) *MaterialRequestUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetReqQty sets the "reqQty" field. func (_u *MaterialRequestUpdate) SetReqQty(v float64) *MaterialRequestUpdate { _u.mutation.ResetReqQty() @@ -485,11 +492,6 @@ func (_u *MaterialRequestUpdate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := materialrequest.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.manageMode": %w`, err)} - } - } if v, ok := _u.mutation.Status(); ok { if err := materialrequest.StatusValidator(v); err != nil { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.status": %w`, err)} @@ -569,8 +571,11 @@ func (_u *MaterialRequestUpdate) sqlSave(ctx context.Context) (_node int, err er if value, ok := _u.mutation.Unit(); ok { _spec.SetField(materialrequest.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(materialrequest.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(materialrequest.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(materialrequest.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.ReqQty(); ok { _spec.SetField(materialrequest.FieldReqQty, field.TypeFloat64, value) @@ -753,20 +758,27 @@ func (_u *MaterialRequestUpdateOne) SetNillableUnit(v *string) *MaterialRequestU return _u } -// SetManageMode sets the "manageMode" field. -func (_u *MaterialRequestUpdateOne) SetManageMode(v string) *MaterialRequestUpdateOne { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *MaterialRequestUpdateOne) SetSnMode(v int) *MaterialRequestUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *MaterialRequestUpdateOne) SetNillableManageMode(v *string) *MaterialRequestUpdateOne { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableSnMode(v *int) *MaterialRequestUpdateOne { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *MaterialRequestUpdateOne) AddSnMode(v int) *MaterialRequestUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetReqQty sets the "reqQty" field. func (_u *MaterialRequestUpdateOne) SetReqQty(v float64) *MaterialRequestUpdateOne { _u.mutation.ResetReqQty() @@ -1138,11 +1150,6 @@ func (_u *MaterialRequestUpdateOne) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := materialrequest.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.manageMode": %w`, err)} - } - } if v, ok := _u.mutation.Status(); ok { if err := materialrequest.StatusValidator(v); err != nil { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.status": %w`, err)} @@ -1239,8 +1246,11 @@ func (_u *MaterialRequestUpdateOne) sqlSave(ctx context.Context) (_node *Materia if value, ok := _u.mutation.Unit(); ok { _spec.SetField(materialrequest.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(materialrequest.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(materialrequest.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(materialrequest.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.ReqQty(); ok { _spec.SetField(materialrequest.FieldReqQty, field.TypeFloat64, value) diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index 2be19a3..024520b 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -261,7 +261,7 @@ var ( {Name: "material_name", Type: field.TypeString, Size: 128, Default: ""}, {Name: "spec", Type: field.TypeString, Size: 128, Default: ""}, {Name: "unit", Type: field.TypeString, Size: 16, Default: ""}, - {Name: "manage_mode", Type: field.TypeString, Size: 10, Default: "2"}, + {Name: "sn_mode", Type: field.TypeInt, Default: 2}, {Name: "unit_qty", Type: field.TypeFloat64, Default: 0}, {Name: "loss_rate", Type: field.TypeFloat64, Default: 0}, {Name: "created_at", Type: field.TypeTime}, @@ -376,6 +376,7 @@ var ( {Name: "description", Type: field.TypeString, Size: 255, Default: ""}, {Name: "item_type", Type: field.TypeInt, Default: 1}, {Name: "manage_mode", Type: field.TypeInt, Default: 1}, + {Name: "sn_mode", Type: field.TypeInt, Default: 0}, {Name: "template_code", Type: field.TypeString, Size: 64, Default: ""}, {Name: "safety_stock", Type: field.TypeInt, Default: 0}, {Name: "is_active", Type: field.TypeBool, Default: true}, @@ -460,7 +461,7 @@ var ( {Name: "material_code", Type: field.TypeString, Size: 64}, {Name: "material_name", Type: field.TypeString, Size: 128, Default: ""}, {Name: "unit", Type: field.TypeString, Size: 16, Default: ""}, - {Name: "manage_mode", Type: field.TypeString, Size: 10, Default: "2"}, + {Name: "sn_mode", Type: field.TypeInt, Default: 2}, {Name: "req_qty", Type: field.TypeFloat64, Default: 0}, {Name: "status", Type: field.TypeString, Size: 20, Default: "PENDING"}, {Name: "target_dock", Type: field.TypeString, Size: 20, Default: ""}, @@ -987,6 +988,7 @@ var ( {Name: "finished_num", Type: field.TypeInt, Default: 0}, {Name: "fail_num", Type: field.TypeInt, Default: 0}, {Name: "contract_no", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "ownership_type", Type: field.TypeString, Size: 20, Default: ""}, {Name: "project_no", Type: field.TypeString, Size: 64, Default: ""}, {Name: "product_serial", Type: field.TypeString, Size: 64, Default: ""}, {Name: "created_by", Type: field.TypeString, Size: 64, Default: ""}, @@ -1014,7 +1016,7 @@ var ( { Name: "workorder_status", Unique: false, - Columns: []*schema.Column{WorkOrderColumns[14]}, + Columns: []*schema.Column{WorkOrderColumns[15]}, }, { Name: "workorder_product_type_id", @@ -1070,7 +1072,7 @@ var ( {Name: "material_name", Type: field.TypeString, Size: 128, Default: ""}, {Name: "spec", Type: field.TypeString, Size: 128, Default: ""}, {Name: "unit", Type: field.TypeString, Size: 16, Default: ""}, - {Name: "manage_mode", Type: field.TypeString, Size: 10, Default: "2"}, + {Name: "sn_mode", Type: field.TypeInt, Default: 2}, {Name: "bind_value", Type: field.TypeString, Size: 128}, {Name: "bind_type", Type: field.TypeString, Size: 10, Default: "SN"}, {Name: "operator", Type: field.TypeString, Size: 64, Default: ""}, diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index eabff44..4d00ed0 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -5992,7 +5992,8 @@ type FlowMaterialMutation struct { materialName *string spec *string unit *string - manageMode *string + snMode *int + addsnMode *int unitQty *float64 addunitQty *float64 lossRate *float64 @@ -6308,40 +6309,60 @@ func (m *FlowMaterialMutation) ResetUnit() { m.unit = nil } -// SetManageMode sets the "manageMode" field. -func (m *FlowMaterialMutation) SetManageMode(s string) { - m.manageMode = &s +// SetSnMode sets the "snMode" field. +func (m *FlowMaterialMutation) SetSnMode(i int) { + m.snMode = &i + m.addsnMode = nil } -// ManageMode returns the value of the "manageMode" field in the mutation. -func (m *FlowMaterialMutation) ManageMode() (r string, exists bool) { - v := m.manageMode +// SnMode returns the value of the "snMode" field in the mutation. +func (m *FlowMaterialMutation) SnMode() (r int, exists bool) { + v := m.snMode if v == nil { return } return *v, true } -// OldManageMode returns the old "manageMode" field's value of the FlowMaterial entity. +// OldSnMode returns the old "snMode" field's value of the FlowMaterial entity. // If the FlowMaterial object wasn't provided to the builder, the object is fetched from the database. // An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *FlowMaterialMutation) OldManageMode(ctx context.Context) (v string, err error) { +func (m *FlowMaterialMutation) OldSnMode(ctx context.Context) (v int, err error) { if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldManageMode is only allowed on UpdateOne operations") + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") } if m.id == nil || m.oldValue == nil { - return v, errors.New("OldManageMode requires an ID field in the mutation") + return v, errors.New("OldSnMode requires an ID field in the mutation") } oldValue, err := m.oldValue(ctx) if err != nil { - return v, fmt.Errorf("querying old value for OldManageMode: %w", err) + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) } - return oldValue.ManageMode, nil + return oldValue.SnMode, nil } -// ResetManageMode resets all changes to the "manageMode" field. -func (m *FlowMaterialMutation) ResetManageMode() { - m.manageMode = nil +// AddSnMode adds i to the "snMode" field. +func (m *FlowMaterialMutation) AddSnMode(i int) { + if m.addsnMode != nil { + *m.addsnMode += i + } else { + m.addsnMode = &i + } +} + +// AddedSnMode returns the value that was added to the "snMode" field in this mutation. +func (m *FlowMaterialMutation) AddedSnMode() (r int, exists bool) { + v := m.addsnMode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "snMode" field. +func (m *FlowMaterialMutation) ResetSnMode() { + m.snMode = nil + m.addsnMode = nil } // SetUnitQty sets the "unitQty" field. @@ -6542,8 +6563,8 @@ func (m *FlowMaterialMutation) Fields() []string { if m.unit != nil { fields = append(fields, flowmaterial.FieldUnit) } - if m.manageMode != nil { - fields = append(fields, flowmaterial.FieldManageMode) + if m.snMode != nil { + fields = append(fields, flowmaterial.FieldSnMode) } if m.unitQty != nil { fields = append(fields, flowmaterial.FieldUnitQty) @@ -6572,8 +6593,8 @@ func (m *FlowMaterialMutation) Field(name string) (ent.Value, bool) { return m.Spec() case flowmaterial.FieldUnit: return m.Unit() - case flowmaterial.FieldManageMode: - return m.ManageMode() + case flowmaterial.FieldSnMode: + return m.SnMode() case flowmaterial.FieldUnitQty: return m.UnitQty() case flowmaterial.FieldLossRate: @@ -6599,8 +6620,8 @@ func (m *FlowMaterialMutation) OldField(ctx context.Context, name string) (ent.V return m.OldSpec(ctx) case flowmaterial.FieldUnit: return m.OldUnit(ctx) - case flowmaterial.FieldManageMode: - return m.OldManageMode(ctx) + case flowmaterial.FieldSnMode: + return m.OldSnMode(ctx) case flowmaterial.FieldUnitQty: return m.OldUnitQty(ctx) case flowmaterial.FieldLossRate: @@ -6651,12 +6672,12 @@ func (m *FlowMaterialMutation) SetField(name string, value ent.Value) error { } m.SetUnit(v) return nil - case flowmaterial.FieldManageMode: - v, ok := value.(string) + case flowmaterial.FieldSnMode: + v, ok := value.(int) if !ok { return fmt.Errorf("unexpected type %T for field %s", value, name) } - m.SetManageMode(v) + m.SetSnMode(v) return nil case flowmaterial.FieldUnitQty: v, ok := value.(float64) @@ -6690,6 +6711,9 @@ func (m *FlowMaterialMutation) AddedFields() []string { if m.addflowId != nil { fields = append(fields, flowmaterial.FieldFlowId) } + if m.addsnMode != nil { + fields = append(fields, flowmaterial.FieldSnMode) + } if m.addunitQty != nil { fields = append(fields, flowmaterial.FieldUnitQty) } @@ -6706,6 +6730,8 @@ func (m *FlowMaterialMutation) AddedField(name string) (ent.Value, bool) { switch name { case flowmaterial.FieldFlowId: return m.AddedFlowId() + case flowmaterial.FieldSnMode: + return m.AddedSnMode() case flowmaterial.FieldUnitQty: return m.AddedUnitQty() case flowmaterial.FieldLossRate: @@ -6726,6 +6752,13 @@ func (m *FlowMaterialMutation) AddField(name string, value ent.Value) error { } m.AddFlowId(v) return nil + case flowmaterial.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case flowmaterial.FieldUnitQty: v, ok := value.(float64) if !ok { @@ -6782,8 +6815,8 @@ func (m *FlowMaterialMutation) ResetField(name string) error { case flowmaterial.FieldUnit: m.ResetUnit() return nil - case flowmaterial.FieldManageMode: - m.ResetManageMode() + case flowmaterial.FieldSnMode: + m.ResetSnMode() return nil case flowmaterial.FieldUnitQty: m.ResetUnitQty() @@ -9395,6 +9428,8 @@ type MaterialMutation struct { additemType *int manageMode *int addmanageMode *int + snMode *int + addsnMode *int templateCode *string safetyStock *int addsafetyStock *int @@ -9798,6 +9833,62 @@ func (m *MaterialMutation) ResetManageMode() { m.addmanageMode = nil } +// SetSnMode sets the "snMode" field. +func (m *MaterialMutation) SetSnMode(i int) { + m.snMode = &i + m.addsnMode = nil +} + +// SnMode returns the value of the "snMode" field in the mutation. +func (m *MaterialMutation) SnMode() (r int, exists bool) { + v := m.snMode + if v == nil { + return + } + return *v, true +} + +// OldSnMode returns the old "snMode" field's value of the Material entity. +// If the Material object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *MaterialMutation) OldSnMode(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSnMode requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) + } + return oldValue.SnMode, nil +} + +// AddSnMode adds i to the "snMode" field. +func (m *MaterialMutation) AddSnMode(i int) { + if m.addsnMode != nil { + *m.addsnMode += i + } else { + m.addsnMode = &i + } +} + +// AddedSnMode returns the value that was added to the "snMode" field in this mutation. +func (m *MaterialMutation) AddedSnMode() (r int, exists bool) { + v := m.addsnMode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "snMode" field. +func (m *MaterialMutation) ResetSnMode() { + m.snMode = nil + m.addsnMode = nil +} + // SetTemplateCode sets the "templateCode" field. func (m *MaterialMutation) SetTemplateCode(s string) { m.templateCode = &s @@ -10068,7 +10159,7 @@ func (m *MaterialMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *MaterialMutation) Fields() []string { - fields := make([]string, 0, 13) + fields := make([]string, 0, 14) if m.code != nil { fields = append(fields, material.FieldCode) } @@ -10090,6 +10181,9 @@ func (m *MaterialMutation) Fields() []string { if m.manageMode != nil { fields = append(fields, material.FieldManageMode) } + if m.snMode != nil { + fields = append(fields, material.FieldSnMode) + } if m.templateCode != nil { fields = append(fields, material.FieldTemplateCode) } @@ -10130,6 +10224,8 @@ func (m *MaterialMutation) Field(name string) (ent.Value, bool) { return m.ItemType() case material.FieldManageMode: return m.ManageMode() + case material.FieldSnMode: + return m.SnMode() case material.FieldTemplateCode: return m.TemplateCode() case material.FieldSafetyStock: @@ -10165,6 +10261,8 @@ func (m *MaterialMutation) OldField(ctx context.Context, name string) (ent.Value return m.OldItemType(ctx) case material.FieldManageMode: return m.OldManageMode(ctx) + case material.FieldSnMode: + return m.OldSnMode(ctx) case material.FieldTemplateCode: return m.OldTemplateCode(ctx) case material.FieldSafetyStock: @@ -10235,6 +10333,13 @@ func (m *MaterialMutation) SetField(name string, value ent.Value) error { } m.SetManageMode(v) return nil + case material.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSnMode(v) + return nil case material.FieldTemplateCode: v, ok := value.(string) if !ok { @@ -10291,6 +10396,9 @@ func (m *MaterialMutation) AddedFields() []string { if m.addmanageMode != nil { fields = append(fields, material.FieldManageMode) } + if m.addsnMode != nil { + fields = append(fields, material.FieldSnMode) + } if m.addsafetyStock != nil { fields = append(fields, material.FieldSafetyStock) } @@ -10306,6 +10414,8 @@ func (m *MaterialMutation) AddedField(name string) (ent.Value, bool) { return m.AddedItemType() case material.FieldManageMode: return m.AddedManageMode() + case material.FieldSnMode: + return m.AddedSnMode() case material.FieldSafetyStock: return m.AddedSafetyStock() } @@ -10331,6 +10441,13 @@ func (m *MaterialMutation) AddField(name string, value ent.Value) error { } m.AddManageMode(v) return nil + case material.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case material.FieldSafetyStock: v, ok := value.(int) if !ok { @@ -10386,6 +10503,9 @@ func (m *MaterialMutation) ResetField(name string) error { case material.FieldManageMode: m.ResetManageMode() return nil + case material.FieldSnMode: + m.ResetSnMode() + return nil case material.FieldTemplateCode: m.ResetTemplateCode() return nil @@ -11908,7 +12028,8 @@ type MaterialRequestMutation struct { materialCode *string materialName *string unit *string - manageMode *string + snMode *int + addsnMode *int reqQty *float64 addreqQty *float64 status *string @@ -12260,40 +12381,60 @@ func (m *MaterialRequestMutation) ResetUnit() { m.unit = nil } -// SetManageMode sets the "manageMode" field. -func (m *MaterialRequestMutation) SetManageMode(s string) { - m.manageMode = &s +// SetSnMode sets the "snMode" field. +func (m *MaterialRequestMutation) SetSnMode(i int) { + m.snMode = &i + m.addsnMode = nil } -// ManageMode returns the value of the "manageMode" field in the mutation. -func (m *MaterialRequestMutation) ManageMode() (r string, exists bool) { - v := m.manageMode +// SnMode returns the value of the "snMode" field in the mutation. +func (m *MaterialRequestMutation) SnMode() (r int, exists bool) { + v := m.snMode if v == nil { return } return *v, true } -// OldManageMode returns the old "manageMode" field's value of the MaterialRequest entity. +// OldSnMode returns the old "snMode" field's value of the MaterialRequest entity. // If the MaterialRequest object wasn't provided to the builder, the object is fetched from the database. // An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *MaterialRequestMutation) OldManageMode(ctx context.Context) (v string, err error) { +func (m *MaterialRequestMutation) OldSnMode(ctx context.Context) (v int, err error) { if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldManageMode is only allowed on UpdateOne operations") + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") } if m.id == nil || m.oldValue == nil { - return v, errors.New("OldManageMode requires an ID field in the mutation") + return v, errors.New("OldSnMode requires an ID field in the mutation") } oldValue, err := m.oldValue(ctx) if err != nil { - return v, fmt.Errorf("querying old value for OldManageMode: %w", err) + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) } - return oldValue.ManageMode, nil + return oldValue.SnMode, nil } -// ResetManageMode resets all changes to the "manageMode" field. -func (m *MaterialRequestMutation) ResetManageMode() { - m.manageMode = nil +// AddSnMode adds i to the "snMode" field. +func (m *MaterialRequestMutation) AddSnMode(i int) { + if m.addsnMode != nil { + *m.addsnMode += i + } else { + m.addsnMode = &i + } +} + +// AddedSnMode returns the value that was added to the "snMode" field in this mutation. +func (m *MaterialRequestMutation) AddedSnMode() (r int, exists bool) { + v := m.addsnMode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "snMode" field. +func (m *MaterialRequestMutation) ResetSnMode() { + m.snMode = nil + m.addsnMode = nil } // SetReqQty sets the "reqQty" field. @@ -13150,8 +13291,8 @@ func (m *MaterialRequestMutation) Fields() []string { if m.unit != nil { fields = append(fields, materialrequest.FieldUnit) } - if m.manageMode != nil { - fields = append(fields, materialrequest.FieldManageMode) + if m.snMode != nil { + fields = append(fields, materialrequest.FieldSnMode) } if m.reqQty != nil { fields = append(fields, materialrequest.FieldReqQty) @@ -13227,8 +13368,8 @@ func (m *MaterialRequestMutation) Field(name string) (ent.Value, bool) { return m.MaterialName() case materialrequest.FieldUnit: return m.Unit() - case materialrequest.FieldManageMode: - return m.ManageMode() + case materialrequest.FieldSnMode: + return m.SnMode() case materialrequest.FieldReqQty: return m.ReqQty() case materialrequest.FieldStatus: @@ -13286,8 +13427,8 @@ func (m *MaterialRequestMutation) OldField(ctx context.Context, name string) (en return m.OldMaterialName(ctx) case materialrequest.FieldUnit: return m.OldUnit(ctx) - case materialrequest.FieldManageMode: - return m.OldManageMode(ctx) + case materialrequest.FieldSnMode: + return m.OldSnMode(ctx) case materialrequest.FieldReqQty: return m.OldReqQty(ctx) case materialrequest.FieldStatus: @@ -13375,12 +13516,12 @@ func (m *MaterialRequestMutation) SetField(name string, value ent.Value) error { } m.SetUnit(v) return nil - case materialrequest.FieldManageMode: - v, ok := value.(string) + case materialrequest.FieldSnMode: + v, ok := value.(int) if !ok { return fmt.Errorf("unexpected type %T for field %s", value, name) } - m.SetManageMode(v) + m.SetSnMode(v) return nil case materialrequest.FieldReqQty: v, ok := value.(float64) @@ -13516,6 +13657,9 @@ func (m *MaterialRequestMutation) SetField(name string, value ent.Value) error { // this mutation. func (m *MaterialRequestMutation) AddedFields() []string { var fields []string + if m.addsnMode != nil { + fields = append(fields, materialrequest.FieldSnMode) + } if m.addreqQty != nil { fields = append(fields, materialrequest.FieldReqQty) } @@ -13545,6 +13689,8 @@ func (m *MaterialRequestMutation) AddedFields() []string { // was not set, or was not defined in the schema. func (m *MaterialRequestMutation) AddedField(name string) (ent.Value, bool) { switch name { + case materialrequest.FieldSnMode: + return m.AddedSnMode() case materialrequest.FieldReqQty: return m.AddedReqQty() case materialrequest.FieldStationNo: @@ -13568,6 +13714,13 @@ func (m *MaterialRequestMutation) AddedField(name string) (ent.Value, bool) { // type. func (m *MaterialRequestMutation) AddField(name string, value ent.Value) error { switch name { + case materialrequest.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case materialrequest.FieldReqQty: v, ok := value.(float64) if !ok { @@ -13671,8 +13824,8 @@ func (m *MaterialRequestMutation) ResetField(name string) error { case materialrequest.FieldUnit: m.ResetUnit() return nil - case materialrequest.FieldManageMode: - m.ResetManageMode() + case materialrequest.FieldSnMode: + m.ResetSnMode() return nil case materialrequest.FieldReqQty: m.ResetReqQty() @@ -26785,6 +26938,7 @@ type WorkOrderMutation struct { failNum *int addfailNum *int contractNo *string + ownershipType *string projectNo *string productSerial *string createdBy *string @@ -27276,6 +27430,42 @@ func (m *WorkOrderMutation) ResetContractNo() { m.contractNo = nil } +// SetOwnershipType sets the "ownershipType" field. +func (m *WorkOrderMutation) SetOwnershipType(s string) { + m.ownershipType = &s +} + +// OwnershipType returns the value of the "ownershipType" field in the mutation. +func (m *WorkOrderMutation) OwnershipType() (r string, exists bool) { + v := m.ownershipType + if v == nil { + return + } + return *v, true +} + +// OldOwnershipType returns the old "ownershipType" field's value of the WorkOrder entity. +// If the WorkOrder object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *WorkOrderMutation) OldOwnershipType(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldOwnershipType is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldOwnershipType requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldOwnershipType: %w", err) + } + return oldValue.OwnershipType, nil +} + +// ResetOwnershipType resets all changes to the "ownershipType" field. +func (m *WorkOrderMutation) ResetOwnershipType() { + m.ownershipType = nil +} + // SetProjectNo sets the "projectNo" field. func (m *WorkOrderMutation) SetProjectNo(s string) { m.projectNo = &s @@ -27849,7 +28039,7 @@ func (m *WorkOrderMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *WorkOrderMutation) Fields() []string { - fields := make([]string, 0, 20) + fields := make([]string, 0, 21) if m.workOrderNo != nil { fields = append(fields, workorder.FieldWorkOrderNo) } @@ -27874,6 +28064,9 @@ func (m *WorkOrderMutation) Fields() []string { if m.contractNo != nil { fields = append(fields, workorder.FieldContractNo) } + if m.ownershipType != nil { + fields = append(fields, workorder.FieldOwnershipType) + } if m.projectNo != nil { fields = append(fields, workorder.FieldProjectNo) } @@ -27934,6 +28127,8 @@ func (m *WorkOrderMutation) Field(name string) (ent.Value, bool) { return m.FailNum() case workorder.FieldContractNo: return m.ContractNo() + case workorder.FieldOwnershipType: + return m.OwnershipType() case workorder.FieldProjectNo: return m.ProjectNo() case workorder.FieldProductSerial: @@ -27983,6 +28178,8 @@ func (m *WorkOrderMutation) OldField(ctx context.Context, name string) (ent.Valu return m.OldFailNum(ctx) case workorder.FieldContractNo: return m.OldContractNo(ctx) + case workorder.FieldOwnershipType: + return m.OldOwnershipType(ctx) case workorder.FieldProjectNo: return m.OldProjectNo(ctx) case workorder.FieldProductSerial: @@ -28072,6 +28269,13 @@ func (m *WorkOrderMutation) SetField(name string, value ent.Value) error { } m.SetContractNo(v) return nil + case workorder.FieldOwnershipType: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetOwnershipType(v) + return nil case workorder.FieldProjectNo: v, ok := value.(string) if !ok { @@ -28325,6 +28529,9 @@ func (m *WorkOrderMutation) ResetField(name string) error { case workorder.FieldContractNo: m.ResetContractNo() return nil + case workorder.FieldOwnershipType: + m.ResetOwnershipType() + return nil case workorder.FieldProjectNo: m.ResetProjectNo() return nil @@ -29361,7 +29568,8 @@ type WorkpieceBindMutation struct { materialName *string spec *string unit *string - manageMode *string + snMode *int + addsnMode *int bindValue *string bindType *string operator *string @@ -29784,40 +29992,60 @@ func (m *WorkpieceBindMutation) ResetUnit() { m.unit = nil } -// SetManageMode sets the "manageMode" field. -func (m *WorkpieceBindMutation) SetManageMode(s string) { - m.manageMode = &s +// SetSnMode sets the "snMode" field. +func (m *WorkpieceBindMutation) SetSnMode(i int) { + m.snMode = &i + m.addsnMode = nil } -// ManageMode returns the value of the "manageMode" field in the mutation. -func (m *WorkpieceBindMutation) ManageMode() (r string, exists bool) { - v := m.manageMode +// SnMode returns the value of the "snMode" field in the mutation. +func (m *WorkpieceBindMutation) SnMode() (r int, exists bool) { + v := m.snMode if v == nil { return } return *v, true } -// OldManageMode returns the old "manageMode" field's value of the WorkpieceBind entity. +// OldSnMode returns the old "snMode" field's value of the WorkpieceBind entity. // If the WorkpieceBind object wasn't provided to the builder, the object is fetched from the database. // An error is returned if the mutation operation is not UpdateOne, or the database query fails. -func (m *WorkpieceBindMutation) OldManageMode(ctx context.Context) (v string, err error) { +func (m *WorkpieceBindMutation) OldSnMode(ctx context.Context) (v int, err error) { if !m.op.Is(OpUpdateOne) { - return v, errors.New("OldManageMode is only allowed on UpdateOne operations") + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") } if m.id == nil || m.oldValue == nil { - return v, errors.New("OldManageMode requires an ID field in the mutation") + return v, errors.New("OldSnMode requires an ID field in the mutation") } oldValue, err := m.oldValue(ctx) if err != nil { - return v, fmt.Errorf("querying old value for OldManageMode: %w", err) + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) } - return oldValue.ManageMode, nil + return oldValue.SnMode, nil } -// ResetManageMode resets all changes to the "manageMode" field. -func (m *WorkpieceBindMutation) ResetManageMode() { - m.manageMode = nil +// AddSnMode adds i to the "snMode" field. +func (m *WorkpieceBindMutation) AddSnMode(i int) { + if m.addsnMode != nil { + *m.addsnMode += i + } else { + m.addsnMode = &i + } +} + +// AddedSnMode returns the value that was added to the "snMode" field in this mutation. +func (m *WorkpieceBindMutation) AddedSnMode() (r int, exists bool) { + v := m.addsnMode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "snMode" field. +func (m *WorkpieceBindMutation) ResetSnMode() { + m.snMode = nil + m.addsnMode = nil } // SetBindValue sets the "bindValue" field. @@ -30023,8 +30251,8 @@ func (m *WorkpieceBindMutation) Fields() []string { if m.unit != nil { fields = append(fields, workpiecebind.FieldUnit) } - if m.manageMode != nil { - fields = append(fields, workpiecebind.FieldManageMode) + if m.snMode != nil { + fields = append(fields, workpiecebind.FieldSnMode) } if m.bindValue != nil { fields = append(fields, workpiecebind.FieldBindValue) @@ -30062,8 +30290,8 @@ func (m *WorkpieceBindMutation) Field(name string) (ent.Value, bool) { return m.Spec() case workpiecebind.FieldUnit: return m.Unit() - case workpiecebind.FieldManageMode: - return m.ManageMode() + case workpiecebind.FieldSnMode: + return m.SnMode() case workpiecebind.FieldBindValue: return m.BindValue() case workpiecebind.FieldBindType: @@ -30097,8 +30325,8 @@ func (m *WorkpieceBindMutation) OldField(ctx context.Context, name string) (ent. return m.OldSpec(ctx) case workpiecebind.FieldUnit: return m.OldUnit(ctx) - case workpiecebind.FieldManageMode: - return m.OldManageMode(ctx) + case workpiecebind.FieldSnMode: + return m.OldSnMode(ctx) case workpiecebind.FieldBindValue: return m.OldBindValue(ctx) case workpiecebind.FieldBindType: @@ -30172,12 +30400,12 @@ func (m *WorkpieceBindMutation) SetField(name string, value ent.Value) error { } m.SetUnit(v) return nil - case workpiecebind.FieldManageMode: - v, ok := value.(string) + case workpiecebind.FieldSnMode: + v, ok := value.(int) if !ok { return fmt.Errorf("unexpected type %T for field %s", value, name) } - m.SetManageMode(v) + m.SetSnMode(v) return nil case workpiecebind.FieldBindValue: v, ok := value.(string) @@ -30218,6 +30446,9 @@ func (m *WorkpieceBindMutation) AddedFields() []string { if m.addflowId != nil { fields = append(fields, workpiecebind.FieldFlowId) } + if m.addsnMode != nil { + fields = append(fields, workpiecebind.FieldSnMode) + } return fields } @@ -30228,6 +30459,8 @@ func (m *WorkpieceBindMutation) AddedField(name string) (ent.Value, bool) { switch name { case workpiecebind.FieldFlowId: return m.AddedFlowId() + case workpiecebind.FieldSnMode: + return m.AddedSnMode() } return nil, false } @@ -30244,6 +30477,13 @@ func (m *WorkpieceBindMutation) AddField(name string, value ent.Value) error { } m.AddFlowId(v) return nil + case workpiecebind.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil } return fmt.Errorf("unknown WorkpieceBind numeric field %s", name) } @@ -30295,8 +30535,8 @@ func (m *WorkpieceBindMutation) ResetField(name string) error { case workpiecebind.FieldUnit: m.ResetUnit() return nil - case workpiecebind.FieldManageMode: - m.ResetManageMode() + case workpiecebind.FieldSnMode: + m.ResetSnMode() return nil case workpiecebind.FieldBindValue: m.ResetBindValue() diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index 1e8155b..4d82fef 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -406,12 +406,10 @@ func init() { flowmaterial.DefaultUnit = flowmaterialDescUnit.Default.(string) // flowmaterial.UnitValidator is a validator for the "unit" field. It is called by the builders before save. flowmaterial.UnitValidator = flowmaterialDescUnit.Validators[0].(func(string) error) - // flowmaterialDescManageMode is the schema descriptor for manageMode field. - flowmaterialDescManageMode := flowmaterialFields[6].Descriptor() - // flowmaterial.DefaultManageMode holds the default value on creation for the manageMode field. - flowmaterial.DefaultManageMode = flowmaterialDescManageMode.Default.(string) - // flowmaterial.ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - flowmaterial.ManageModeValidator = flowmaterialDescManageMode.Validators[0].(func(string) error) + // flowmaterialDescSnMode is the schema descriptor for snMode field. + flowmaterialDescSnMode := flowmaterialFields[6].Descriptor() + // flowmaterial.DefaultSnMode holds the default value on creation for the snMode field. + flowmaterial.DefaultSnMode = flowmaterialDescSnMode.Default.(int) // flowmaterialDescUnitQty is the schema descriptor for unitQty field. flowmaterialDescUnitQty := flowmaterialFields[7].Descriptor() // flowmaterial.DefaultUnitQty holds the default value on creation for the unitQty field. @@ -648,30 +646,34 @@ func init() { materialDescManageMode := materialFields[6].Descriptor() // material.DefaultManageMode holds the default value on creation for the manageMode field. material.DefaultManageMode = materialDescManageMode.Default.(int) + // materialDescSnMode is the schema descriptor for snMode field. + materialDescSnMode := materialFields[7].Descriptor() + // material.DefaultSnMode holds the default value on creation for the snMode field. + material.DefaultSnMode = materialDescSnMode.Default.(int) // materialDescTemplateCode is the schema descriptor for templateCode field. - materialDescTemplateCode := materialFields[7].Descriptor() + materialDescTemplateCode := materialFields[8].Descriptor() // material.DefaultTemplateCode holds the default value on creation for the templateCode field. material.DefaultTemplateCode = materialDescTemplateCode.Default.(string) // material.TemplateCodeValidator is a validator for the "templateCode" field. It is called by the builders before save. material.TemplateCodeValidator = materialDescTemplateCode.Validators[0].(func(string) error) // materialDescSafetyStock is the schema descriptor for safetyStock field. - materialDescSafetyStock := materialFields[8].Descriptor() + materialDescSafetyStock := materialFields[9].Descriptor() // material.DefaultSafetyStock holds the default value on creation for the safetyStock field. material.DefaultSafetyStock = materialDescSafetyStock.Default.(int) // materialDescIsActive is the schema descriptor for isActive field. - materialDescIsActive := materialFields[9].Descriptor() + materialDescIsActive := materialFields[10].Descriptor() // material.DefaultIsActive holds the default value on creation for the isActive field. material.DefaultIsActive = materialDescIsActive.Default.(bool) // materialDescSyncPending is the schema descriptor for syncPending field. - materialDescSyncPending := materialFields[10].Descriptor() + materialDescSyncPending := materialFields[11].Descriptor() // material.DefaultSyncPending holds the default value on creation for the syncPending field. material.DefaultSyncPending = materialDescSyncPending.Default.(bool) // materialDescCreatedAt is the schema descriptor for createdAt field. - materialDescCreatedAt := materialFields[11].Descriptor() + materialDescCreatedAt := materialFields[12].Descriptor() // material.DefaultCreatedAt holds the default value on creation for the createdAt field. material.DefaultCreatedAt = materialDescCreatedAt.Default.(func() time.Time) // materialDescUpdatedAt is the schema descriptor for updatedAt field. - materialDescUpdatedAt := materialFields[12].Descriptor() + materialDescUpdatedAt := materialFields[13].Descriptor() // material.DefaultUpdatedAt holds the default value on creation for the updatedAt field. material.DefaultUpdatedAt = materialDescUpdatedAt.Default.(func() time.Time) // material.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. @@ -802,12 +804,10 @@ func init() { materialrequest.DefaultUnit = materialrequestDescUnit.Default.(string) // materialrequest.UnitValidator is a validator for the "unit" field. It is called by the builders before save. materialrequest.UnitValidator = materialrequestDescUnit.Validators[0].(func(string) error) - // materialrequestDescManageMode is the schema descriptor for manageMode field. - materialrequestDescManageMode := materialrequestFields[7].Descriptor() - // materialrequest.DefaultManageMode holds the default value on creation for the manageMode field. - materialrequest.DefaultManageMode = materialrequestDescManageMode.Default.(string) - // materialrequest.ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - materialrequest.ManageModeValidator = materialrequestDescManageMode.Validators[0].(func(string) error) + // materialrequestDescSnMode is the schema descriptor for snMode field. + materialrequestDescSnMode := materialrequestFields[7].Descriptor() + // materialrequest.DefaultSnMode holds the default value on creation for the snMode field. + materialrequest.DefaultSnMode = materialrequestDescSnMode.Default.(int) // materialrequestDescReqQty is the schema descriptor for reqQty field. materialrequestDescReqQty := materialrequestFields[8].Descriptor() // materialrequest.DefaultReqQty holds the default value on creation for the reqQty field. @@ -1576,36 +1576,42 @@ func init() { workorder.DefaultContractNo = workorderDescContractNo.Default.(string) // workorder.ContractNoValidator is a validator for the "contractNo" field. It is called by the builders before save. workorder.ContractNoValidator = workorderDescContractNo.Validators[0].(func(string) error) + // workorderDescOwnershipType is the schema descriptor for ownershipType field. + workorderDescOwnershipType := workorderFields[9].Descriptor() + // workorder.DefaultOwnershipType holds the default value on creation for the ownershipType field. + workorder.DefaultOwnershipType = workorderDescOwnershipType.Default.(string) + // workorder.OwnershipTypeValidator is a validator for the "ownershipType" field. It is called by the builders before save. + workorder.OwnershipTypeValidator = workorderDescOwnershipType.Validators[0].(func(string) error) // workorderDescProjectNo is the schema descriptor for projectNo field. - workorderDescProjectNo := workorderFields[9].Descriptor() + workorderDescProjectNo := workorderFields[10].Descriptor() // workorder.DefaultProjectNo holds the default value on creation for the projectNo field. workorder.DefaultProjectNo = workorderDescProjectNo.Default.(string) // workorder.ProjectNoValidator is a validator for the "projectNo" field. It is called by the builders before save. workorder.ProjectNoValidator = workorderDescProjectNo.Validators[0].(func(string) error) // workorderDescProductSerial is the schema descriptor for productSerial field. - workorderDescProductSerial := workorderFields[10].Descriptor() + workorderDescProductSerial := workorderFields[11].Descriptor() // workorder.DefaultProductSerial holds the default value on creation for the productSerial field. workorder.DefaultProductSerial = workorderDescProductSerial.Default.(string) // workorder.ProductSerialValidator is a validator for the "productSerial" field. It is called by the builders before save. workorder.ProductSerialValidator = workorderDescProductSerial.Validators[0].(func(string) error) // workorderDescCreatedBy is the schema descriptor for createdBy field. - workorderDescCreatedBy := workorderFields[11].Descriptor() + workorderDescCreatedBy := workorderFields[12].Descriptor() // workorder.DefaultCreatedBy holds the default value on creation for the createdBy field. workorder.DefaultCreatedBy = workorderDescCreatedBy.Default.(string) // workorder.CreatedByValidator is a validator for the "createdBy" field. It is called by the builders before save. workorder.CreatedByValidator = workorderDescCreatedBy.Validators[0].(func(string) error) // workorderDescStatus is the schema descriptor for status field. - workorderDescStatus := workorderFields[14].Descriptor() + workorderDescStatus := workorderFields[15].Descriptor() // workorder.DefaultStatus holds the default value on creation for the status field. workorder.DefaultStatus = workorderDescStatus.Default.(string) // workorder.StatusValidator is a validator for the "status" field. It is called by the builders before save. workorder.StatusValidator = workorderDescStatus.Validators[0].(func(string) error) // workorderDescCreatedAt is the schema descriptor for createdAt field. - workorderDescCreatedAt := workorderFields[19].Descriptor() + workorderDescCreatedAt := workorderFields[20].Descriptor() // workorder.DefaultCreatedAt holds the default value on creation for the createdAt field. workorder.DefaultCreatedAt = workorderDescCreatedAt.Default.(func() time.Time) // workorderDescUpdatedAt is the schema descriptor for updatedAt field. - workorderDescUpdatedAt := workorderFields[20].Descriptor() + workorderDescUpdatedAt := workorderFields[21].Descriptor() // workorder.DefaultUpdatedAt holds the default value on creation for the updatedAt field. workorder.DefaultUpdatedAt = workorderDescUpdatedAt.Default.(func() time.Time) // workorder.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. @@ -1686,12 +1692,10 @@ func init() { workpiecebind.DefaultUnit = workpiecebindDescUnit.Default.(string) // workpiecebind.UnitValidator is a validator for the "unit" field. It is called by the builders before save. workpiecebind.UnitValidator = workpiecebindDescUnit.Validators[0].(func(string) error) - // workpiecebindDescManageMode is the schema descriptor for manageMode field. - workpiecebindDescManageMode := workpiecebindFields[9].Descriptor() - // workpiecebind.DefaultManageMode holds the default value on creation for the manageMode field. - workpiecebind.DefaultManageMode = workpiecebindDescManageMode.Default.(string) - // workpiecebind.ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - workpiecebind.ManageModeValidator = workpiecebindDescManageMode.Validators[0].(func(string) error) + // workpiecebindDescSnMode is the schema descriptor for snMode field. + workpiecebindDescSnMode := workpiecebindFields[9].Descriptor() + // workpiecebind.DefaultSnMode holds the default value on creation for the snMode field. + workpiecebind.DefaultSnMode = workpiecebindDescSnMode.Default.(int) // workpiecebindDescBindValue is the schema descriptor for bindValue field. workpiecebindDescBindValue := workpiecebindFields[10].Descriptor() // workpiecebind.BindValueValidator is a validator for the "bindValue" field. It is called by the builders before save. diff --git a/bj_power_mes/ent/workorder.go b/bj_power_mes/ent/workorder.go index 01438b1..b2aba36 100644 --- a/bj_power_mes/ent/workorder.go +++ b/bj_power_mes/ent/workorder.go @@ -32,11 +32,13 @@ type WorkOrder struct { FinishedNum int `json:"finishedNum,omitempty"` // NG数量 FailNum int `json:"failNum,omitempty"` - // 合同编号 + // 归属编号(合同号或科技项目号,随归属类型二选一) ContractNo string `json:"contractNo,omitempty"` - // 工程编号(一个合同对应一个工程编号) + // 归属类型:workorder=合同号/project=科技项目号/other=其他 + OwnershipType string `json:"ownershipType,omitempty"` + // 工程编号(已废弃,保留防历史数据迁移) ProjectNo string `json:"projectNo,omitempty"` - // 产品序号(一个工程编号下各产品的序号) + // 产品序号(工单内每台产品的序号) ProductSerial string `json:"productSerial,omitempty"` // 创建人 CreatedBy string `json:"createdBy,omitempty"` @@ -70,7 +72,7 @@ func (*WorkOrder) scanValues(columns []string) ([]any, error) { values[i] = new([]byte) case workorder.FieldID, workorder.FieldProductTypeId, workorder.FieldQuantity, workorder.FieldFinishedNum, workorder.FieldFailNum: values[i] = new(sql.NullInt64) - case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus: + case workorder.FieldWorkOrderNo, workorder.FieldProductCode, workorder.FieldProductName, workorder.FieldContractNo, workorder.FieldOwnershipType, workorder.FieldProjectNo, workorder.FieldProductSerial, workorder.FieldCreatedBy, workorder.FieldStatus: values[i] = new(sql.NullString) case workorder.FieldDueDate, workorder.FieldPlanStart, workorder.FieldPlanEnd, workorder.FieldCompletedAt, workorder.FieldCreatedAt, workorder.FieldUpdatedAt: values[i] = new(sql.NullTime) @@ -143,6 +145,12 @@ func (_m *WorkOrder) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ContractNo = value.String } + case workorder.FieldOwnershipType: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field ownershipType", values[i]) + } else if value.Valid { + _m.OwnershipType = value.String + } case workorder.FieldProjectNo: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field projectNo", values[i]) @@ -284,6 +292,9 @@ func (_m *WorkOrder) String() string { builder.WriteString("contractNo=") builder.WriteString(_m.ContractNo) builder.WriteString(", ") + builder.WriteString("ownershipType=") + builder.WriteString(_m.OwnershipType) + builder.WriteString(", ") builder.WriteString("projectNo=") builder.WriteString(_m.ProjectNo) builder.WriteString(", ") diff --git a/bj_power_mes/ent/workorder/where.go b/bj_power_mes/ent/workorder/where.go index 3a7bbd7..3465f94 100644 --- a/bj_power_mes/ent/workorder/where.go +++ b/bj_power_mes/ent/workorder/where.go @@ -94,6 +94,11 @@ func ContractNo(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldContractNo, v)) } +// OwnershipType applies equality check predicate on the "ownershipType" field. It's identical to OwnershipTypeEQ. +func OwnershipType(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldEQ(FieldOwnershipType, v)) +} + // ProjectNo applies equality check predicate on the "projectNo" field. It's identical to ProjectNoEQ. func ProjectNo(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldProjectNo, v)) @@ -564,6 +569,71 @@ func ContractNoContainsFold(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldContainsFold(FieldContractNo, v)) } +// OwnershipTypeEQ applies the EQ predicate on the "ownershipType" field. +func OwnershipTypeEQ(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldEQ(FieldOwnershipType, v)) +} + +// OwnershipTypeNEQ applies the NEQ predicate on the "ownershipType" field. +func OwnershipTypeNEQ(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldNEQ(FieldOwnershipType, v)) +} + +// OwnershipTypeIn applies the In predicate on the "ownershipType" field. +func OwnershipTypeIn(vs ...string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldIn(FieldOwnershipType, vs...)) +} + +// OwnershipTypeNotIn applies the NotIn predicate on the "ownershipType" field. +func OwnershipTypeNotIn(vs ...string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldNotIn(FieldOwnershipType, vs...)) +} + +// OwnershipTypeGT applies the GT predicate on the "ownershipType" field. +func OwnershipTypeGT(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldGT(FieldOwnershipType, v)) +} + +// OwnershipTypeGTE applies the GTE predicate on the "ownershipType" field. +func OwnershipTypeGTE(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldGTE(FieldOwnershipType, v)) +} + +// OwnershipTypeLT applies the LT predicate on the "ownershipType" field. +func OwnershipTypeLT(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldLT(FieldOwnershipType, v)) +} + +// OwnershipTypeLTE applies the LTE predicate on the "ownershipType" field. +func OwnershipTypeLTE(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldLTE(FieldOwnershipType, v)) +} + +// OwnershipTypeContains applies the Contains predicate on the "ownershipType" field. +func OwnershipTypeContains(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldContains(FieldOwnershipType, v)) +} + +// OwnershipTypeHasPrefix applies the HasPrefix predicate on the "ownershipType" field. +func OwnershipTypeHasPrefix(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldHasPrefix(FieldOwnershipType, v)) +} + +// OwnershipTypeHasSuffix applies the HasSuffix predicate on the "ownershipType" field. +func OwnershipTypeHasSuffix(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldHasSuffix(FieldOwnershipType, v)) +} + +// OwnershipTypeEqualFold applies the EqualFold predicate on the "ownershipType" field. +func OwnershipTypeEqualFold(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldEqualFold(FieldOwnershipType, v)) +} + +// OwnershipTypeContainsFold applies the ContainsFold predicate on the "ownershipType" field. +func OwnershipTypeContainsFold(v string) predicate.WorkOrder { + return predicate.WorkOrder(sql.FieldContainsFold(FieldOwnershipType, v)) +} + // ProjectNoEQ applies the EQ predicate on the "projectNo" field. func ProjectNoEQ(v string) predicate.WorkOrder { return predicate.WorkOrder(sql.FieldEQ(FieldProjectNo, v)) diff --git a/bj_power_mes/ent/workorder/workorder.go b/bj_power_mes/ent/workorder/workorder.go index 9daabc4..55a2bb7 100644 --- a/bj_power_mes/ent/workorder/workorder.go +++ b/bj_power_mes/ent/workorder/workorder.go @@ -29,6 +29,8 @@ const ( FieldFailNum = "fail_num" // FieldContractNo holds the string denoting the contractno field in the database. FieldContractNo = "contract_no" + // FieldOwnershipType holds the string denoting the ownershiptype field in the database. + FieldOwnershipType = "ownership_type" // FieldProjectNo holds the string denoting the projectno field in the database. FieldProjectNo = "project_no" // FieldProductSerial holds the string denoting the productserial field in the database. @@ -68,6 +70,7 @@ var Columns = []string{ FieldFinishedNum, FieldFailNum, FieldContractNo, + FieldOwnershipType, FieldProjectNo, FieldProductSerial, FieldCreatedBy, @@ -113,6 +116,10 @@ var ( DefaultContractNo string // ContractNoValidator is a validator for the "contractNo" field. It is called by the builders before save. ContractNoValidator func(string) error + // DefaultOwnershipType holds the default value on creation for the "ownershipType" field. + DefaultOwnershipType string + // OwnershipTypeValidator is a validator for the "ownershipType" field. It is called by the builders before save. + OwnershipTypeValidator func(string) error // DefaultProjectNo holds the default value on creation for the "projectNo" field. DefaultProjectNo string // ProjectNoValidator is a validator for the "projectNo" field. It is called by the builders before save. @@ -187,6 +194,11 @@ func ByContractNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldContractNo, opts...).ToFunc() } +// ByOwnershipType orders the results by the ownershipType field. +func ByOwnershipType(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldOwnershipType, opts...).ToFunc() +} + // ByProjectNo orders the results by the projectNo field. func ByProjectNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldProjectNo, opts...).ToFunc() diff --git a/bj_power_mes/ent/workorder_create.go b/bj_power_mes/ent/workorder_create.go index 4c5ddf0..c02db99 100644 --- a/bj_power_mes/ent/workorder_create.go +++ b/bj_power_mes/ent/workorder_create.go @@ -116,6 +116,20 @@ func (_c *WorkOrderCreate) SetNillableContractNo(v *string) *WorkOrderCreate { return _c } +// SetOwnershipType sets the "ownershipType" field. +func (_c *WorkOrderCreate) SetOwnershipType(v string) *WorkOrderCreate { + _c.mutation.SetOwnershipType(v) + return _c +} + +// SetNillableOwnershipType sets the "ownershipType" field if the given value is not nil. +func (_c *WorkOrderCreate) SetNillableOwnershipType(v *string) *WorkOrderCreate { + if v != nil { + _c.SetOwnershipType(*v) + } + return _c +} + // SetProjectNo sets the "projectNo" field. func (_c *WorkOrderCreate) SetProjectNo(v string) *WorkOrderCreate { _c.mutation.SetProjectNo(v) @@ -333,6 +347,10 @@ func (_c *WorkOrderCreate) defaults() { v := workorder.DefaultContractNo _c.mutation.SetContractNo(v) } + if _, ok := _c.mutation.OwnershipType(); !ok { + v := workorder.DefaultOwnershipType + _c.mutation.SetOwnershipType(v) + } if _, ok := _c.mutation.ProjectNo(); !ok { v := workorder.DefaultProjectNo _c.mutation.SetProjectNo(v) @@ -405,6 +423,14 @@ func (_c *WorkOrderCreate) check() error { return &ValidationError{Name: "contractNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.contractNo": %w`, err)} } } + if _, ok := _c.mutation.OwnershipType(); !ok { + return &ValidationError{Name: "ownershipType", err: errors.New(`ent: missing required field "WorkOrder.ownershipType"`)} + } + if v, ok := _c.mutation.OwnershipType(); ok { + if err := workorder.OwnershipTypeValidator(v); err != nil { + return &ValidationError{Name: "ownershipType", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.ownershipType": %w`, err)} + } + } if _, ok := _c.mutation.ProjectNo(); !ok { return &ValidationError{Name: "projectNo", err: errors.New(`ent: missing required field "WorkOrder.projectNo"`)} } @@ -509,6 +535,10 @@ func (_c *WorkOrderCreate) createSpec() (*WorkOrder, *sqlgraph.CreateSpec) { _spec.SetField(workorder.FieldContractNo, field.TypeString, value) _node.ContractNo = value } + if value, ok := _c.mutation.OwnershipType(); ok { + _spec.SetField(workorder.FieldOwnershipType, field.TypeString, value) + _node.OwnershipType = value + } if value, ok := _c.mutation.ProjectNo(); ok { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) _node.ProjectNo = value diff --git a/bj_power_mes/ent/workorder_update.go b/bj_power_mes/ent/workorder_update.go index cf8cb44..a0c9b25 100644 --- a/bj_power_mes/ent/workorder_update.go +++ b/bj_power_mes/ent/workorder_update.go @@ -170,6 +170,20 @@ func (_u *WorkOrderUpdate) SetNillableContractNo(v *string) *WorkOrderUpdate { return _u } +// SetOwnershipType sets the "ownershipType" field. +func (_u *WorkOrderUpdate) SetOwnershipType(v string) *WorkOrderUpdate { + _u.mutation.SetOwnershipType(v) + return _u +} + +// SetNillableOwnershipType sets the "ownershipType" field if the given value is not nil. +func (_u *WorkOrderUpdate) SetNillableOwnershipType(v *string) *WorkOrderUpdate { + if v != nil { + _u.SetOwnershipType(*v) + } + return _u +} + // SetProjectNo sets the "projectNo" field. func (_u *WorkOrderUpdate) SetProjectNo(v string) *WorkOrderUpdate { _u.mutation.SetProjectNo(v) @@ -411,6 +425,11 @@ func (_u *WorkOrderUpdate) check() error { return &ValidationError{Name: "contractNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.contractNo": %w`, err)} } } + if v, ok := _u.mutation.OwnershipType(); ok { + if err := workorder.OwnershipTypeValidator(v); err != nil { + return &ValidationError{Name: "ownershipType", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.ownershipType": %w`, err)} + } + } if v, ok := _u.mutation.ProjectNo(); ok { if err := workorder.ProjectNoValidator(v); err != nil { return &ValidationError{Name: "projectNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.projectNo": %w`, err)} @@ -488,6 +507,9 @@ func (_u *WorkOrderUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.ContractNo(); ok { _spec.SetField(workorder.FieldContractNo, field.TypeString, value) } + if value, ok := _u.mutation.OwnershipType(); ok { + _spec.SetField(workorder.FieldOwnershipType, field.TypeString, value) + } if value, ok := _u.mutation.ProjectNo(); ok { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) } @@ -709,6 +731,20 @@ func (_u *WorkOrderUpdateOne) SetNillableContractNo(v *string) *WorkOrderUpdateO return _u } +// SetOwnershipType sets the "ownershipType" field. +func (_u *WorkOrderUpdateOne) SetOwnershipType(v string) *WorkOrderUpdateOne { + _u.mutation.SetOwnershipType(v) + return _u +} + +// SetNillableOwnershipType sets the "ownershipType" field if the given value is not nil. +func (_u *WorkOrderUpdateOne) SetNillableOwnershipType(v *string) *WorkOrderUpdateOne { + if v != nil { + _u.SetOwnershipType(*v) + } + return _u +} + // SetProjectNo sets the "projectNo" field. func (_u *WorkOrderUpdateOne) SetProjectNo(v string) *WorkOrderUpdateOne { _u.mutation.SetProjectNo(v) @@ -963,6 +999,11 @@ func (_u *WorkOrderUpdateOne) check() error { return &ValidationError{Name: "contractNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.contractNo": %w`, err)} } } + if v, ok := _u.mutation.OwnershipType(); ok { + if err := workorder.OwnershipTypeValidator(v); err != nil { + return &ValidationError{Name: "ownershipType", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.ownershipType": %w`, err)} + } + } if v, ok := _u.mutation.ProjectNo(); ok { if err := workorder.ProjectNoValidator(v); err != nil { return &ValidationError{Name: "projectNo", err: fmt.Errorf(`ent: validator failed for field "WorkOrder.projectNo": %w`, err)} @@ -1057,6 +1098,9 @@ func (_u *WorkOrderUpdateOne) sqlSave(ctx context.Context) (_node *WorkOrder, er if value, ok := _u.mutation.ContractNo(); ok { _spec.SetField(workorder.FieldContractNo, field.TypeString, value) } + if value, ok := _u.mutation.OwnershipType(); ok { + _spec.SetField(workorder.FieldOwnershipType, field.TypeString, value) + } if value, ok := _u.mutation.ProjectNo(); ok { _spec.SetField(workorder.FieldProjectNo, field.TypeString, value) } diff --git a/bj_power_mes/ent/workpiecebind.go b/bj_power_mes/ent/workpiecebind.go index 8cb5bec..be193d4 100644 --- a/bj_power_mes/ent/workpiecebind.go +++ b/bj_power_mes/ent/workpiecebind.go @@ -33,8 +33,8 @@ type WorkpieceBind struct { Spec string `json:"spec,omitempty"` // 单位 Unit string `json:"unit,omitempty"` - // ManageMode holds the value of the "manageMode" field. - ManageMode string `json:"manageMode,omitempty"` + // SnMode holds the value of the "snMode" field. + SnMode int `json:"snMode,omitempty"` // 绑定值:批次号 或 SN BindValue string `json:"bindValue,omitempty"` // BindType holds the value of the "bindType" field. @@ -51,9 +51,9 @@ func (*WorkpieceBind) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case workpiecebind.FieldID, workpiecebind.FieldFlowId: + case workpiecebind.FieldID, workpiecebind.FieldFlowId, workpiecebind.FieldSnMode: values[i] = new(sql.NullInt64) - case workpiecebind.FieldSn, workpiecebind.FieldOrderNo, workpiecebind.FieldStationNo, workpiecebind.FieldMaterialCode, workpiecebind.FieldMaterialName, workpiecebind.FieldSpec, workpiecebind.FieldUnit, workpiecebind.FieldManageMode, workpiecebind.FieldBindValue, workpiecebind.FieldBindType, workpiecebind.FieldOperator: + case workpiecebind.FieldSn, workpiecebind.FieldOrderNo, workpiecebind.FieldStationNo, workpiecebind.FieldMaterialCode, workpiecebind.FieldMaterialName, workpiecebind.FieldSpec, workpiecebind.FieldUnit, workpiecebind.FieldBindValue, workpiecebind.FieldBindType, workpiecebind.FieldOperator: values[i] = new(sql.NullString) case workpiecebind.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -126,11 +126,11 @@ func (_m *WorkpieceBind) assignValues(columns []string, values []any) error { } else if value.Valid { _m.Unit = value.String } - case workpiecebind.FieldManageMode: - if value, ok := values[i].(*sql.NullString); !ok { - return fmt.Errorf("unexpected type %T for field manageMode", values[i]) + case workpiecebind.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field snMode", values[i]) } else if value.Valid { - _m.ManageMode = value.String + _m.SnMode = int(value.Int64) } case workpiecebind.FieldBindValue: if value, ok := values[i].(*sql.NullString); !ok { @@ -216,8 +216,8 @@ func (_m *WorkpieceBind) String() string { builder.WriteString("unit=") builder.WriteString(_m.Unit) builder.WriteString(", ") - builder.WriteString("manageMode=") - builder.WriteString(_m.ManageMode) + builder.WriteString("snMode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) builder.WriteString(", ") builder.WriteString("bindValue=") builder.WriteString(_m.BindValue) diff --git a/bj_power_mes/ent/workpiecebind/where.go b/bj_power_mes/ent/workpiecebind/where.go index 10d6c61..7f7d776 100644 --- a/bj_power_mes/ent/workpiecebind/where.go +++ b/bj_power_mes/ent/workpiecebind/where.go @@ -94,9 +94,9 @@ func Unit(v string) predicate.WorkpieceBind { return predicate.WorkpieceBind(sql.FieldEQ(FieldUnit, v)) } -// ManageMode applies equality check predicate on the "manageMode" field. It's identical to ManageModeEQ. -func ManageMode(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldEQ(FieldManageMode, v)) +// SnMode applies equality check predicate on the "snMode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldEQ(FieldSnMode, v)) } // BindValue applies equality check predicate on the "bindValue" field. It's identical to BindValueEQ. @@ -614,69 +614,44 @@ func UnitContainsFold(v string) predicate.WorkpieceBind { return predicate.WorkpieceBind(sql.FieldContainsFold(FieldUnit, v)) } -// ManageModeEQ applies the EQ predicate on the "manageMode" field. -func ManageModeEQ(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldEQ(FieldManageMode, v)) +// SnModeEQ applies the EQ predicate on the "snMode" field. +func SnModeEQ(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldEQ(FieldSnMode, v)) } -// ManageModeNEQ applies the NEQ predicate on the "manageMode" field. -func ManageModeNEQ(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldNEQ(FieldManageMode, v)) +// SnModeNEQ applies the NEQ predicate on the "snMode" field. +func SnModeNEQ(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldNEQ(FieldSnMode, v)) } -// ManageModeIn applies the In predicate on the "manageMode" field. -func ManageModeIn(vs ...string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldIn(FieldManageMode, vs...)) +// SnModeIn applies the In predicate on the "snMode" field. +func SnModeIn(vs ...int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldIn(FieldSnMode, vs...)) } -// ManageModeNotIn applies the NotIn predicate on the "manageMode" field. -func ManageModeNotIn(vs ...string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldNotIn(FieldManageMode, vs...)) +// SnModeNotIn applies the NotIn predicate on the "snMode" field. +func SnModeNotIn(vs ...int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldNotIn(FieldSnMode, vs...)) } -// ManageModeGT applies the GT predicate on the "manageMode" field. -func ManageModeGT(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldGT(FieldManageMode, v)) +// SnModeGT applies the GT predicate on the "snMode" field. +func SnModeGT(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldGT(FieldSnMode, v)) } -// ManageModeGTE applies the GTE predicate on the "manageMode" field. -func ManageModeGTE(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldGTE(FieldManageMode, v)) +// SnModeGTE applies the GTE predicate on the "snMode" field. +func SnModeGTE(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldGTE(FieldSnMode, v)) } -// ManageModeLT applies the LT predicate on the "manageMode" field. -func ManageModeLT(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldLT(FieldManageMode, v)) +// SnModeLT applies the LT predicate on the "snMode" field. +func SnModeLT(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldLT(FieldSnMode, v)) } -// ManageModeLTE applies the LTE predicate on the "manageMode" field. -func ManageModeLTE(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldLTE(FieldManageMode, v)) -} - -// ManageModeContains applies the Contains predicate on the "manageMode" field. -func ManageModeContains(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldContains(FieldManageMode, v)) -} - -// ManageModeHasPrefix applies the HasPrefix predicate on the "manageMode" field. -func ManageModeHasPrefix(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldHasPrefix(FieldManageMode, v)) -} - -// ManageModeHasSuffix applies the HasSuffix predicate on the "manageMode" field. -func ManageModeHasSuffix(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldHasSuffix(FieldManageMode, v)) -} - -// ManageModeEqualFold applies the EqualFold predicate on the "manageMode" field. -func ManageModeEqualFold(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldEqualFold(FieldManageMode, v)) -} - -// ManageModeContainsFold applies the ContainsFold predicate on the "manageMode" field. -func ManageModeContainsFold(v string) predicate.WorkpieceBind { - return predicate.WorkpieceBind(sql.FieldContainsFold(FieldManageMode, v)) +// SnModeLTE applies the LTE predicate on the "snMode" field. +func SnModeLTE(v int) predicate.WorkpieceBind { + return predicate.WorkpieceBind(sql.FieldLTE(FieldSnMode, v)) } // BindValueEQ applies the EQ predicate on the "bindValue" field. diff --git a/bj_power_mes/ent/workpiecebind/workpiecebind.go b/bj_power_mes/ent/workpiecebind/workpiecebind.go index 58a7a9e..e524056 100644 --- a/bj_power_mes/ent/workpiecebind/workpiecebind.go +++ b/bj_power_mes/ent/workpiecebind/workpiecebind.go @@ -29,8 +29,8 @@ const ( FieldSpec = "spec" // FieldUnit holds the string denoting the unit field in the database. FieldUnit = "unit" - // FieldManageMode holds the string denoting the managemode field in the database. - FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the snmode field in the database. + FieldSnMode = "sn_mode" // FieldBindValue holds the string denoting the bindvalue field in the database. FieldBindValue = "bind_value" // FieldBindType holds the string denoting the bindtype field in the database. @@ -54,7 +54,7 @@ var Columns = []string{ FieldMaterialName, FieldSpec, FieldUnit, - FieldManageMode, + FieldSnMode, FieldBindValue, FieldBindType, FieldOperator, @@ -96,10 +96,8 @@ var ( DefaultUnit string // UnitValidator is a validator for the "unit" field. It is called by the builders before save. UnitValidator func(string) error - // DefaultManageMode holds the default value on creation for the "manageMode" field. - DefaultManageMode string - // ManageModeValidator is a validator for the "manageMode" field. It is called by the builders before save. - ManageModeValidator func(string) error + // DefaultSnMode holds the default value on creation for the "snMode" field. + DefaultSnMode int // BindValueValidator is a validator for the "bindValue" field. It is called by the builders before save. BindValueValidator func(string) error // DefaultBindType holds the default value on creation for the "bindType" field. @@ -164,9 +162,9 @@ func ByUnit(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldUnit, opts...).ToFunc() } -// ByManageMode orders the results by the manageMode field. -func ByManageMode(opts ...sql.OrderTermOption) OrderOption { - return sql.OrderByField(FieldManageMode, opts...).ToFunc() +// BySnMode orders the results by the snMode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() } // ByBindValue orders the results by the bindValue field. diff --git a/bj_power_mes/ent/workpiecebind_create.go b/bj_power_mes/ent/workpiecebind_create.go index 40612fc..1f43ac8 100644 --- a/bj_power_mes/ent/workpiecebind_create.go +++ b/bj_power_mes/ent/workpiecebind_create.go @@ -108,16 +108,16 @@ func (_c *WorkpieceBindCreate) SetNillableUnit(v *string) *WorkpieceBindCreate { return _c } -// SetManageMode sets the "manageMode" field. -func (_c *WorkpieceBindCreate) SetManageMode(v string) *WorkpieceBindCreate { - _c.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_c *WorkpieceBindCreate) SetSnMode(v int) *WorkpieceBindCreate { + _c.mutation.SetSnMode(v) return _c } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_c *WorkpieceBindCreate) SetNillableManageMode(v *string) *WorkpieceBindCreate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_c *WorkpieceBindCreate) SetNillableSnMode(v *int) *WorkpieceBindCreate { if v != nil { - _c.SetManageMode(*v) + _c.SetSnMode(*v) } return _c } @@ -231,9 +231,9 @@ func (_c *WorkpieceBindCreate) defaults() { v := workpiecebind.DefaultUnit _c.mutation.SetUnit(v) } - if _, ok := _c.mutation.ManageMode(); !ok { - v := workpiecebind.DefaultManageMode - _c.mutation.SetManageMode(v) + if _, ok := _c.mutation.SnMode(); !ok { + v := workpiecebind.DefaultSnMode + _c.mutation.SetSnMode(v) } if _, ok := _c.mutation.BindType(); !ok { v := workpiecebind.DefaultBindType @@ -310,13 +310,8 @@ func (_c *WorkpieceBindCreate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.unit": %w`, err)} } } - if _, ok := _c.mutation.ManageMode(); !ok { - return &ValidationError{Name: "manageMode", err: errors.New(`ent: missing required field "WorkpieceBind.manageMode"`)} - } - if v, ok := _c.mutation.ManageMode(); ok { - if err := workpiecebind.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.manageMode": %w`, err)} - } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "snMode", err: errors.New(`ent: missing required field "WorkpieceBind.snMode"`)} } if _, ok := _c.mutation.BindValue(); !ok { return &ValidationError{Name: "bindValue", err: errors.New(`ent: missing required field "WorkpieceBind.bindValue"`)} @@ -414,9 +409,9 @@ func (_c *WorkpieceBindCreate) createSpec() (*WorkpieceBind, *sqlgraph.CreateSpe _spec.SetField(workpiecebind.FieldUnit, field.TypeString, value) _node.Unit = value } - if value, ok := _c.mutation.ManageMode(); ok { - _spec.SetField(workpiecebind.FieldManageMode, field.TypeString, value) - _node.ManageMode = value + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(workpiecebind.FieldSnMode, field.TypeInt, value) + _node.SnMode = value } if value, ok := _c.mutation.BindValue(); ok { _spec.SetField(workpiecebind.FieldBindValue, field.TypeString, value) diff --git a/bj_power_mes/ent/workpiecebind_update.go b/bj_power_mes/ent/workpiecebind_update.go index cffa777..bd194d2 100644 --- a/bj_power_mes/ent/workpiecebind_update.go +++ b/bj_power_mes/ent/workpiecebind_update.go @@ -147,20 +147,27 @@ func (_u *WorkpieceBindUpdate) SetNillableUnit(v *string) *WorkpieceBindUpdate { return _u } -// SetManageMode sets the "manageMode" field. -func (_u *WorkpieceBindUpdate) SetManageMode(v string) *WorkpieceBindUpdate { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *WorkpieceBindUpdate) SetSnMode(v int) *WorkpieceBindUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *WorkpieceBindUpdate) SetNillableManageMode(v *string) *WorkpieceBindUpdate { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *WorkpieceBindUpdate) SetNillableSnMode(v *int) *WorkpieceBindUpdate { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *WorkpieceBindUpdate) AddSnMode(v int) *WorkpieceBindUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetBindValue sets the "bindValue" field. func (_u *WorkpieceBindUpdate) SetBindValue(v string) *WorkpieceBindUpdate { _u.mutation.SetBindValue(v) @@ -272,11 +279,6 @@ func (_u *WorkpieceBindUpdate) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := workpiecebind.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.manageMode": %w`, err)} - } - } if v, ok := _u.mutation.BindValue(); ok { if err := workpiecebind.BindValueValidator(v); err != nil { return &ValidationError{Name: "bindValue", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.bindValue": %w`, err)} @@ -340,8 +342,11 @@ func (_u *WorkpieceBindUpdate) sqlSave(ctx context.Context) (_node int, err erro if value, ok := _u.mutation.Unit(); ok { _spec.SetField(workpiecebind.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(workpiecebind.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(workpiecebind.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(workpiecebind.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.BindValue(); ok { _spec.SetField(workpiecebind.FieldBindValue, field.TypeString, value) @@ -493,20 +498,27 @@ func (_u *WorkpieceBindUpdateOne) SetNillableUnit(v *string) *WorkpieceBindUpdat return _u } -// SetManageMode sets the "manageMode" field. -func (_u *WorkpieceBindUpdateOne) SetManageMode(v string) *WorkpieceBindUpdateOne { - _u.mutation.SetManageMode(v) +// SetSnMode sets the "snMode" field. +func (_u *WorkpieceBindUpdateOne) SetSnMode(v int) *WorkpieceBindUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) return _u } -// SetNillableManageMode sets the "manageMode" field if the given value is not nil. -func (_u *WorkpieceBindUpdateOne) SetNillableManageMode(v *string) *WorkpieceBindUpdateOne { +// SetNillableSnMode sets the "snMode" field if the given value is not nil. +func (_u *WorkpieceBindUpdateOne) SetNillableSnMode(v *int) *WorkpieceBindUpdateOne { if v != nil { - _u.SetManageMode(*v) + _u.SetSnMode(*v) } return _u } +// AddSnMode adds value to the "snMode" field. +func (_u *WorkpieceBindUpdateOne) AddSnMode(v int) *WorkpieceBindUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetBindValue sets the "bindValue" field. func (_u *WorkpieceBindUpdateOne) SetBindValue(v string) *WorkpieceBindUpdateOne { _u.mutation.SetBindValue(v) @@ -631,11 +643,6 @@ func (_u *WorkpieceBindUpdateOne) check() error { return &ValidationError{Name: "unit", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.unit": %w`, err)} } } - if v, ok := _u.mutation.ManageMode(); ok { - if err := workpiecebind.ManageModeValidator(v); err != nil { - return &ValidationError{Name: "manageMode", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.manageMode": %w`, err)} - } - } if v, ok := _u.mutation.BindValue(); ok { if err := workpiecebind.BindValueValidator(v); err != nil { return &ValidationError{Name: "bindValue", err: fmt.Errorf(`ent: validator failed for field "WorkpieceBind.bindValue": %w`, err)} @@ -716,8 +723,11 @@ func (_u *WorkpieceBindUpdateOne) sqlSave(ctx context.Context) (_node *Workpiece if value, ok := _u.mutation.Unit(); ok { _spec.SetField(workpiecebind.FieldUnit, field.TypeString, value) } - if value, ok := _u.mutation.ManageMode(); ok { - _spec.SetField(workpiecebind.FieldManageMode, field.TypeString, value) + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(workpiecebind.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(workpiecebind.FieldSnMode, field.TypeInt, value) } if value, ok := _u.mutation.BindValue(); ok { _spec.SetField(workpiecebind.FieldBindValue, field.TypeString, value) diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index ce556b8..8a42504 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -12,11 +12,12 @@ export const helpProductType = { name: '编码', source: '系统自动生成 + 可手动修改。新建时会自动带出(格式 PROD-YYYYMMDD-序号),你可直接使用或改为自定义编码;编辑时保留已存值。一个产品编号可对应多个工单(同一型号今天做一批、明天做一批,工单号不同,产品编号相同)。', purpose: '产品唯一编码。它是 MES 内部识别该产品的标识,决定该产品的物料清单内容,也是工单、备料、拧紧、追溯的挂靠键。', - fill: '建议用有意义的编码,如 METER-01。要点:①两库对等(2026-09-29):本页读写 MES 本地物料副本并自动同步 WMS,WMS 宕机时新建/查询照常可用,推送失败自动重推;②成品完工后系统自动生成 SN 并回流 WMS 入库,无需人工对账;③如产品编号就是成品编码,则直接沿用该编码即可;④建好后不要随意改,否则下游工单/追溯的关联会断。' + fill: '建议用有意义的编码,如 METER-01。要点:①两库对等(2026-09-29):本页读写 MES 本地物料副本并自动同步 WMS,WMS 宕机时新建/查询照常可用,推送失败自动重推;②建档必选「类型」(结构件/电气件/其他)与「序列号件」(序列号件=录SN / 批次件=不录SN,选类型自动带默认可改);③成品完工回流 WMS 入库:序列号件以扫入的来料SN入账、批次件由系统发号,无需人工对账;④如产品编号就是成品编码,则直接沿用该编码即可;⑤建好后不要随意改,否则下游工单/追溯的关联会断。' }, { name: '规格', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '成品的规格型号,用于识别与打印', fill: '如:500×300×200' }, { name: '单位', source: '手工填写(必填)。与 WMS 物料档案必填口径一致。', purpose: '计量单位', fill: '如:台 / 套' }, - { name: '类别', source: '手工填写。可选,无上游来源。', purpose: '产品所属大类,便于分类统计', fill: '如:计量表 / 开关柜;可空' }, + { name: '类型', source: '下拉必选(结构件/电气件/其他)。', purpose: '产品的分类口径,仅作分类,不决定是否逐件SN管理', fill: '选择类型后自动带默认「序列号件」:电气件→序列号件,结构件/其他→批次件(可改)' }, + { name: '序列号件', source: '下拉必选(序列号件=录SN / 批次件=不录SN)。', purpose: '决定全链路 SN 行为:上线建档(序列号件须扫已在WMS入库登记的来料SN,批次件系统自动发号)、装机绑定(序列号件绑SN、批次件绑批次号)、备料出库与质量检验定位', fill: '未选择(请选择)不可保存;默认随「类型」联动带出,可手动改' }, { name: '启用', source: '开关选择。默认开启。', purpose: '启用后才允许在新建工单/备料的下拉里被选到', fill: '默认开启;暂时停产的可关闭(不删除,保留档案)' }, { name: '停用', source: '行内「停用」按钮(原「删除」,两库均不物理删除)。', purpose: '停用后该型号退出新建下拉,并自动同步 WMS 同步停用;历史工单/库存/追溯不受影响', fill: '点「停用」二次确认即可;已停用的行按钮显示「已停用」' } ] @@ -25,19 +26,18 @@ export const helpProductType = { export const helpWorkOrder = { title: '工单管理(新建 / 编辑 / 删除工单)', overview: - '工单 = 一个"合同/生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、选定物料清单、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"品类)。\n工单号会贯穿 备料单、拧紧查询、工件追溯、操作日志 全链路。\n\n工程编号:一个合同对应一个工程编号,一个工程编号下对应各个产品的产品序号——即「合同号 → 工程编号 → 产品序号」三级归属,用于按合同/工程项目归集与追溯。\n\n查询:支持按 工单号 / 产品编号 / 产品名称(模糊) / 合同号 / 工程编号 / 状态 组合筛选;删除:仅「已创建 / 待排产 / 已发布」且无排产、备料、生产数据的工单可删除(操作列「删除」),生产中或已完成的工单不可删除。', + '工单 = 一个"生产批次"的唯一载体,是生产执行和仓库出库挂靠的核心对象。\n\n全流程:先有产品型号(在「物料档案」里建档) → 建工单(选产品型号、定数量、勾选工艺组合) → 进"工艺"给工艺维护工艺步骤与物料清单 → 到"日排产"排哪天产多少 → 仓库按排产备料出库 → 产线装配/拧紧/报工 → 完工(成品 SN 系统自动生成,并自动回流 WMS 入库为"成品"品类)。\n产品工号会贯穿 备料单、拧紧查询、工件追溯、操作日志 全链路。\n\n客户编号体系(三级归属):一级=合同号/科技项目号(二选一,即「归属类型+归属编号」)→ 二级=产品工号(原工单号,一个产品工号对应一个新建工单/一批)→ 三级=产品序号(工单内每台)。产品编码=图号(与产品型号编码同值,随型号自动带出)。原「工程编号」已被合同号顶替,页面不再展示/录入/查询。\n\n查询:支持按 产品工号 / 图号 / 产品名称(模糊) / 归属类型 / 归属编号 / 状态 组合筛选;操作列「详情」可查看工单字段汇总与该工单的工件SN列表(产品序号/SN/类型/状态/当前工位);删除:仅「已创建」且无排产、备料、生产数据的工单可删除,生产中或已完成的工单不可删除。', sections: [ { title: '工单基本信息', fields: [ - { name: '工单号', source: '系统自动生成(WO+时间戳),可手工改。新建时自动带出。', purpose: '唯一标识一个工单,备料/出库/报工/追溯都挂在此号下', fill: '一般不用改;如改动须保证唯一' }, + { name: '产品工号', source: '系统自动生成(WO+时间戳),可手工改。新建时自动带出。', purpose: '唯一标识一批生产(原"工单号"),备料/出库/报工/追溯都挂在此号下', fill: '一般不用改;如改动须保证唯一' }, { name: '产品型号', source: '下拉选择。数据来自「物料档案」页面已启用的记录。', purpose: '说明这批生产的是什么产品,并决定物料清单内容', fill: '先到「物料档案」页面建好记录再选择' }, - { name: '合同号', source: '手工填写。', purpose: '标记本工单所属的合同(一个合同对应一个工程编号)', fill: '如 HT-2026-001(可空)' }, - { name: '工程编号', source: '手工填写。', purpose: '标记本工单所属的工程编号(一个工程编号下挂多个产品序号)', fill: '如 GC-2026-001(可空)' }, - { name: '产品序号', source: '手工填写。', purpose: '本产品在该工程编号下的序号,用于区分同工程下的不同产品', fill: '如 01、02(可空)' }, - - { name: '产品编号', source: '手工填写。通常与所选产品型号的编码一致。', purpose: '产品唯一编码,用于展示与追溯', fill: '如 METER-01,与产品型号编码对齐' }, - { name: '产品名称', source: '手工填写。通常与产品型号名称一致。', purpose: '产品中文名,用于展示', fill: '如 智能电表' }, + { name: '图号', source: '随产品型号自动带出(产品编码=图号,同值)。', purpose: '产品的图样编号,用于展示与追溯', fill: '随型号带出无需手填;未选型号时可手工填写' }, + { name: '产品名称', source: '随产品型号自动带出。', purpose: '产品中文名,用于展示', fill: '随型号带出,无需手填' }, + { name: '归属类型', source: '下拉必选:合同号 / 科技项目号 / 其他。', purpose: '一级归属的类型标记(合同号/科技项目号二选一)', fill: '按订单来源选择;归属会随半成品流转自动继承到 WMS' }, + { name: '归属编号', source: '手工填写。随归属类型填合同号或科技项目号。', purpose: '一级归属编号(合同号/科技项目号二选一)', fill: '如 HT-2026-001 或 KJ-2026-001;选「其他」可不填' }, + { name: '产品序号', source: '手工填写。', purpose: '三级归属:本工单内每台产品的序号,用于区分同批不同台', fill: '如 01、02(可空)' }, { name: '数量', source: '手工填写整数。', purpose: '本工单生产总数量(合同台数),决定需求量与排产上限', fill: '整数 ≥1,如 100' }, { name: '工艺组合', source: '按工艺分组勾选工位(数据来自「工位绑定」页的工位↔工艺绑定)。保存为 [{flowId,stationNo}]。', purpose: '本工单的执行路线;自动排产/备料拆分/产线下发均按此组合派生', fill: '默认每个已绑定工艺的工位全选;至少选一道工艺;全不选某工艺则该工艺不进入组合;执行顺序=工位号升序,可跳过未选工位' }, { name: '状态', source: '新建时选"已创建",后续由流程推进。', purpose: '工单生命周期:创建→发布→生产→完成', fill: '新建时选"已创建";也可在列表操作列点「状态」快捷流转(发布/开工/完工)' }, @@ -45,6 +45,13 @@ export const helpWorkOrder = { { name: '创建人', source: '系统自动记录(当前登录账号)。', purpose: '追溯工单由谁创建', fill: '只读,自动带入' } ] }, + { + title: '工单详情', + overview: '列表操作列「详情」打开只读抽屉:上半部分为工单字段汇总(产品工号/图号/名称/归属/数量/状态/日期),下半部分为该工单的工件SN列表。\n工件SN列表数据来源=工件进线登记记录:产品序号为工单内顺序号,SN 为工件唯一序列号,类型(序列号件/批次件)取自图号对应物料档案的「序列号件」设置,状态与当前工位为实时生产进度。', + fields: [ + { name: '工件SN列表', source: '既有工件查询接口按工单号过滤,实时读取。', purpose: '核对该批每台产品的 SN、类型、状态与当前工位', fill: '只读,无需操作' } + ] + }, { title: '工艺组合(路线)', overview: '新建/编辑工单时勾选「工艺组合」:按工艺分组,每组勾选该工艺要执行的工位。\n组合结果按工位号升序只读展示为路线条(如 2→5→6→8)——执行顺序=工位号升序,可跳过未选工位。\n「自动排产」要求工单已配置工艺组合:组合为空时按钮置灰,提示"请先选择工艺组合"。\n半成品再上线:编辑工单,只勾剩余要走的工位即可。', @@ -96,7 +103,7 @@ export const helpMaterial = { }, { title: '自动出库', - overview: '生成备料单时自动执行;也可在库存补齐后按排产日/工单一键补出。规则:结构件按批次号升序(FIFO)逐批出库,电气件按可用 SN 逐件出库,仅取 WMS「合格」在库库存;超出物料清单需求的领用必须填写超领原因(损耗/报废/返修),自动出库不擅自超领,超领部分会留在「未出齐」清单里等人工处理。', + overview: '生成备料单时自动执行;也可在库存补齐后按排产日/工单一键补出。规则:批次件按批次号升序(FIFO)逐批出库,序列号件按可用 SN 逐件出库(口径=物料档案「序列号件」),仅取 WMS「合格」在库库存;超出物料清单需求的领用必须填写超领原因(损耗/报废/返修),自动出库不擅自超领,超领部分会留在「未出齐」清单里等人工处理。', fields: [ { name: '一键自动出库', source: '人工在本页操作(生成时已自动执行一次)。', purpose: '把当前排产日/工单下未出齐的备料单补齐', fill: '选好日期或工单号后点「一键自动出库」,结果会列出仍未出齐的明细' } ] @@ -218,7 +225,7 @@ export const helpVirtualStation = { { name: '工单', source: '今日已启用日排产且工单已下发/在制(与终端口径一致)。', purpose: '本工位今天该干哪些工单', fill: '选择当前作业的工单' }, { name: '工件SN', source: '上线建档时系统生成的工件唯一码(标签/二维码)。', purpose: '定位工件与所属工单,报工/绑定都挂在 SN 下', fill: '扫码或手输后回车载入' }, { name: '工艺步骤', source: '工位绑定工艺的步骤模板(工艺页维护)。', purpose: '本工位要做什么、考核标准是什么', fill: '手填步骤逐项录入数值/结果;「检测确认」步骤需勾选;拧紧步骤由物理工位采集,本页只读' }, - { name: '配料', source: '工艺物料清单(flow_material)中该工艺要求装配的物料 + 已绑记录(bind-panel 接口)。', purpose: '装机绑定强校验:电气件需绑满单台用量 SN、结构件至少绑一个批次号,缺料不允许报工', fill: '在录入框填批次号/SN(多个用逗号分隔),随报工一次性提交' }, + { name: '配料', source: '工艺物料清单(flow_material)中该工艺要求装配的物料 + 已绑记录(bind-panel 接口)。', purpose: '装机绑定强校验:序列号件需绑满单台用量 SN、批次件至少绑一个批次号,缺料不允许报工', fill: '在录入框填批次号/SN(多个用逗号分隔),随报工一次性提交' }, { name: '完成报工', source: 'POST /station/report(与终端同一接口)。', purpose: '写实绩 + 步骤考核 + 装机绑定,原子提交', fill: '全部录入后点「完成报工」;报错按提示补齐' } ] } @@ -254,7 +261,7 @@ export const helpDock = { export const helpTrace = { title: '工件追溯', overview: - '输入工件 SN,查它的完整履历:进线/完工时间、各工位时间线、步骤考核数据(扭矩/角度)、拧紧记录、以及它用了哪些批次/电气件。\n\n数据来源:全部由前端各环节自动写入(扫码报工、拧紧采集、产线设备下发、工位完成),本页只读查询。', + '输入工件 SN,查它的完整履历:进线/完工时间、各工位时间线、步骤考核数据(扭矩/角度)、拧紧记录、以及它用了哪些批次号/序列号件。\n\n数据来源:全部由前端各环节自动写入(扫码报工、拧紧采集、产线设备下发、工位完成),本页只读查询。', fields: [ { name: '工件SN', source: '扫码枪/手输。来自工件条码。', purpose: '要追溯的工件唯一序列号', fill: '扫 SN 或手动输入后点查询' }, { name: '工单号', source: '手动输入。筛选条件。', purpose: '按工单号列出该工单下全部工件,再点行内「追溯」查看单个工件履历', fill: '可空;支持模糊匹配,回车即查' } @@ -322,7 +329,7 @@ export const helpEventLog = { export const helpProcessFlow = { title: '工艺(作业指导,含工艺步骤与物料清单)', overview: - '页面分「工艺列表」「工艺配置」两个页签:列表查看全部工艺并做启用/停用/删除;配置页维护工艺基本信息、工艺步骤与物料清单(新增与编辑共用,不再弹窗套弹窗)。\n\n工艺 = 一份「菜谱」:只描述某个产品该怎么装配(工艺步骤名、采集方式、考核标准、所需物料),可被多个工位绑定,不隶属某个工位。\n\n概念统一说明:\n· 工位:产线上的物理工位(工位数以数据库为准),工位号即顺序号,相当于「灶台」。\n· 工艺:一份作业指导(PDF + 工艺步骤 + 物料清单);其启用状态决定是否参与生产。\n· 工艺步骤:工艺内包含多个步骤(如:装配完成、拧紧扭矩、测试)。\n· 物料清单:该工艺装配所需物料(物料编号/名称/规格/单位/管控方式/单台用量/损耗率),整表覆盖保存。\n\n绑定关系在「工位绑定」页维护:为某工位选择启用的工艺即绑定;一个工位只能绑定一个工艺。工单在「工单管理」勾选「工艺组合」确定执行路线(工位号升序)。\n\n数据链路:本页维护工艺+工艺步骤+物料清单+考核标准 → 工位绑定页绑定 → 工单勾选工艺组合 → 工位终端按工艺步骤采集 → 报工按考核标准自动判 合格/不合格 → 工件追溯/绩效报表可见。', + '页面分「工艺列表」「工艺配置」两个页签:列表查看全部工艺并做启用/停用/删除;配置页维护工艺基本信息、工艺步骤与物料清单(新增与编辑共用,不再弹窗套弹窗)。\n\n工艺 = 一份「菜谱」:只描述某个产品该怎么装配(工艺步骤名、采集方式、考核标准、所需物料),可被多个工位绑定,不隶属某个工位。\n\n概念统一说明:\n· 工位:产线上的物理工位(工位数以数据库为准),工位号即顺序号,相当于「灶台」。\n· 工艺:一份作业指导(PDF + 工艺步骤 + 物料清单);其启用状态决定是否参与生产。\n· 工艺步骤:工艺内包含多个步骤(如:装配完成、拧紧扭矩、测试)。\n· 物料清单:该工艺装配所需物料(物料编号/名称/规格/单位/管理方式/单台用量/损耗率),整表覆盖保存。\n\n绑定关系在「工位绑定」页维护:为某工位选择启用的工艺即绑定;一个工位只能绑定一个工艺。工单在「工单管理」勾选「工艺组合」确定执行路线(工位号升序)。\n\n数据链路:本页维护工艺+工艺步骤+物料清单+考核标准 → 工位绑定页绑定 → 工单勾选工艺组合 → 工位终端按工艺步骤采集 → 报工按考核标准自动判 合格/不合格 → 工件追溯/绩效报表可见。', sections: [ { title: '工艺基本信息', @@ -333,7 +340,7 @@ export const helpProcessFlow = { { name: '作业指导PDF', source: '本页上传。文件由 MES 服务器保存。', purpose: '该工艺的作业指导图,工位终端打开预览', fill: '选择 PDF 上传,成功后显示文件名可预览' }, { name: '工艺步骤', source: '本页维护(步骤名/采集方式/是否拧紧/考核标准)。', purpose: '工位终端报工时按此动态渲染参数输入', fill: '一个工艺可含多个工艺步骤,按序号顺序执行' }, { name: '步骤附件/图纸', source: '每个工艺步骤单独上传(绑定式)。文件由 MES 服务器保存。', purpose: '把图纸精确绑定到具体步骤,工位终端按当前步骤自动展示对应图纸', fill: '在步骤行上传该步骤图纸/附件(可多个);随步骤自动分发到工位终端' }, - { name: '物料清单', source: '本页维护:物料编号(下拉选择,取自物料档案)/名称/规格/单位/管控方式/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编号取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管控方式自动带出、不可改;管控方式:批次=1、序列号=2' } + { name: '物料清单', source: '本页维护:物料编号(下拉选择,取自物料档案)/名称/规格/单位/管理方式/单台用量/损耗率%,整表覆盖保存。', purpose: '该工艺装配所需物料;备料需求 = 各工位分产量 × 单台用量 × (1+损耗率%)', fill: '物料编号取自物料档案编码(结构件通常即图号),选中后名称/规格/单位/管理方式自动带出、不可改;管理方式(序列号件)来自物料档案:1=序列号件(录SN)、2=批次件(不录SN)' } ] }, { @@ -440,6 +447,18 @@ export const helpInspect = { { name: '文字描述', source: '手动填写。', purpose: '异常详细说明', fill: '描述异常情况' } ] }, + { + title: '待签任务(拧紧审核签字)', + overview: + '集中展示拧紧数据中未审核的任务(按 工单号+SN+工位 聚合,按最近采集时间倒序)。此处签字 = 检验员第二签:操作人已由采集自动带入,检验员逐行点「审核签字」(可填审核意见),确认后该任务全部未审核记录的审核人标记为当前登录账号,并逐条写入拧紧审核留痕——可到 MES 后台【拧紧查询】页打开留痕查看。应拧为「未配置」表示该工位未绑定含扭矩步骤的工艺流程。', + fields: [ + { name: '工单号/SN/工位', source: '来自拧紧采集记录(未审核),按 工单号+SN+工位 聚合。', purpose: '定位待签任务', fill: '只读' }, + { name: '应拧', source: '该工位绑定工艺流程中 isTorque 步骤数。', purpose: '工艺基准数量', fill: '只读;工位未绑定流程时显示「未配置」' }, + { name: '实拧(未审核)/合格/不合格', source: '该组未审核记录统计。', purpose: '核对待签数量与质量', fill: '只读' }, + { name: '最近采集时间/操作人', source: '该组最近一条拧紧记录。', purpose: '判断任务新旧与操作人', fill: '只读' }, + { name: '审核签字', source: '弹窗确认后调 POST /torque/audit-group。', purpose: '检验员第二签,整组批量签字', fill: '可填审核意见,成功提示「已签字 N 条」' } + ] + }, { title: '记录查看', fields: [ diff --git a/bj_power_mes/frontend/src/pages/Inspect.vue b/bj_power_mes/frontend/src/pages/Inspect.vue index cae315b..5362a90 100644 --- a/bj_power_mes/frontend/src/pages/Inspect.vue +++ b/bj_power_mes/frontend/src/pages/Inspect.vue @@ -15,7 +15,7 @@ - +
点击上方按钮拍照上传 @@ -41,7 +41,7 @@ - +
点击上方按钮拍照上传 @@ -134,7 +134,7 @@ - +
点击上方按钮拍照上传 @@ -286,6 +286,20 @@ {{ detail.remark || '-' }} {{ detail.operator || '-' }} + +
@@ -337,6 +351,22 @@ + + @@ -344,7 +374,7 @@ + diff --git a/bj_power_mes/schema/flow_material.go b/bj_power_mes/schema/flow_material.go index 12f1ce0..8d60eed 100644 --- a/bj_power_mes/schema/flow_material.go +++ b/bj_power_mes/schema/flow_material.go @@ -28,8 +28,8 @@ func (FlowMaterial) Fields() []ent.Field { field.String("materialName").Default("").MaxLen(128), field.String("spec").Default("").MaxLen(128), field.String("unit").Default("").MaxLen(16), - // 1 批次(结构件) / 2 序列号(电气件) - field.String("manageMode").Default("2").MaxLen(10), + // 是否逐件SN管理(冗余自物料档案 sn_mode,绑定/备料行为唯一依据):1 序列号件(录SN) / 2 批次件 + field.Int("snMode").Default(2), field.Float("unitQty").Default(0).Comment("单台用量"), field.Float("lossRate").Default(0).Comment("损耗率%"), field.Time("createdAt").Default(time.Now).Immutable(), diff --git a/bj_power_mes/schema/inspection_record.go b/bj_power_mes/schema/inspection_record.go index 5f42e0a..ec9dfda 100644 --- a/bj_power_mes/schema/inspection_record.go +++ b/bj_power_mes/schema/inspection_record.go @@ -54,8 +54,8 @@ func (InspectionRecord) Fields() []ent.Field { field.String("disposalType").Default("").MaxLen(20).Comment("处置类型 退货/返修/退换/报废"), field.String("disposalRemark").Default("").MaxLen(500).Comment("处置说明"), // 批次号/SN(可选):判不合格联动 WMS 在库处置时定位库存行—— - // 电气件(manage_mode=2)填 SN、结构件(manage_mode=1)填批次号;留空则不联动 WMS - field.String("batchSn").Optional().MaxLen(128).Comment("批次号/SN(联动 WMS 在库处置:电气件=SN 结构件=批次)"), + // 序列号件(sn_mode=1)填 SN、批次件(sn_mode=2)填批次号(口径由后端按物料档案判定);留空则不联动 WMS + field.String("batchSn").Optional().MaxLen(128).Comment("批次号/SN(联动 WMS 在库处置:序列号件=SN 批次件=批次)"), field.Time("createdAt").Default(time.Now).Immutable(), } } diff --git a/bj_power_mes/schema/material.go b/bj_power_mes/schema/material.go index ea2a0a0..b9e676f 100644 --- a/bj_power_mes/schema/material.go +++ b/bj_power_mes/schema/material.go @@ -17,7 +17,11 @@ import ( // · MES 侧型号维护:先写本表,再推 WMS /api/internal/materials/upsert,推失败置 sync_pending 待重推(M3); // · 本地为空(冷启动)异步从 WMS 全量拉取补齐(M7);列表请求顺带重推 sync_pending 行; // · 工位终端/排产/型号下拉全部读本表,WMS 宕机不受影响(M6)。 -// 字段与 WMS MaterialRow 一致(item_type 1原材料/2半成品/3成品/4其他;manage_mode 1批次/2序列号/3其他)。 +// 字段与 WMS MaterialRow 一致(item_type 1原材料/2半成品/3成品/4其他)。 +// 「类型」与「是否逐件SN管理」解耦(2026-09-30 定稿): +// - manage_mode = 纯类型:1结构件/2电气件/3其他,不参与任何批次/SN 行为判断; +// - sn_mode = 是否逐件SN管理:0未选择(默认,必填)/1序列号件(录SN)/2批次件(不录SN), +// 全链路(上线建档/装机绑定/备料出库/质量检验)唯一行为依据。 type Material struct { ent.Schema } @@ -34,7 +38,8 @@ func (Material) Fields() []ent.Field { field.String("unit").Default("").MaxLen(32).Comment("计量单位"), field.String("description").Default("").MaxLen(255).Comment("说明"), field.Int("itemType").Default(1).Comment("品类 1原材料/3成品/4其他(半成品不是物料品类)"), - field.Int("manageMode").Default(1).Comment("管理粒度 1批次(结构件)/2序列号(电气件)/3其他"), + field.Int("manageMode").Default(1).Comment("类型 1结构件/2电气件/3其他(仅分类,不决定SN行为)"), + field.Int("snMode").Default(0).Comment("是否逐件SN管理 0未选择(必填)/1序列号件(录SN)/2批次件(不录SN)"), field.String("templateCode").Default("").MaxLen(64).Comment("模板编码"), field.Int("safetyStock").Default(0).Comment("安全库存(低于触发缺货预警)"), field.Bool("isActive").Default(true).Comment("启用/停用(两库均不物理删除)"), diff --git a/bj_power_mes/schema/material_request.go b/bj_power_mes/schema/material_request.go index 8fa5566..5a2646f 100644 --- a/bj_power_mes/schema/material_request.go +++ b/bj_power_mes/schema/material_request.go @@ -28,7 +28,8 @@ func (MaterialRequest) Fields() []ent.Field { field.String("materialCode").MaxLen(64).Comment("物料编码"), field.String("materialName").Default("").MaxLen(128), field.String("unit").Default("").MaxLen(16), - field.String("manageMode").Default("2").MaxLen(10), + // 是否逐件SN管理(冗余自物料档案 sn_mode,出库口径唯一依据):1 序列号件(逐件SN) / 2 批次件 + field.Int("snMode").Default(2), field.Float("reqQty").Default(0).Comment("需备数量"), // PENDING / LOCKED / DELIVERING / DONE field.String("status").Default("PENDING").MaxLen(20), diff --git a/bj_power_mes/schema/work_order.go b/bj_power_mes/schema/work_order.go index 42bb78e..4052473 100644 --- a/bj_power_mes/schema/work_order.go +++ b/bj_power_mes/schema/work_order.go @@ -30,10 +30,14 @@ func (WorkOrder) Fields() []ent.Field { field.Int("quantity").Default(1).Comment("工件数量"), field.Int("finishedNum").Default(0).Comment("完成数量"), field.Int("failNum").Default(0).Comment("NG数量"), - // 工程编号体系(客户口径 问题记录 L580):合同 → 工程编号 → 产品序号 - field.String("contractNo").Default("").MaxLen(64).Comment("合同编号"), - field.String("projectNo").Default("").MaxLen(64).Comment("工程编号(一个合同对应一个工程编号)"), - field.String("productSerial").Default("").MaxLen(64).Comment("产品序号(一个工程编号下各产品的序号)"), + // 客户编号体系(2026-09-30 对齐):一级=合同号/科技项目号(二选一)→ 二级=产品工号(工单号) + // → 三级=产品序号(工单内每台)。contractNo 复用为「归属编号」,ownershipType 标记其类型, + // 值域与 WMS inventories.ownership_type 一致:workorder=合同号 / project=科技项目号 / other=其他。 + field.String("contractNo").Default("").MaxLen(64).Comment("归属编号(合同号或科技项目号,随归属类型二选一)"), + field.String("ownershipType").Default("").MaxLen(20).Comment("归属类型:workorder=合同号/project=科技项目号/other=其他"), + // 工程编号已被合同号顶替(客户口径):字段保留仅防历史数据迁移,UI 不再展示/录入/查询 + field.String("projectNo").Default("").MaxLen(64).Comment("工程编号(已废弃,保留防历史数据迁移)"), + field.String("productSerial").Default("").MaxLen(64).Comment("产品序号(工单内每台产品的序号)"), // 创建人(取当前登录用户)+ 完成日期(必填) field.String("createdBy").Default("").MaxLen(64).Comment("创建人"), field.Time("dueDate").Optional().Nillable().Comment("完成日期(必填)"), diff --git a/bj_power_mes/schema/workpiece_bind.go b/bj_power_mes/schema/workpiece_bind.go index 5e994b4..a47ef50 100644 --- a/bj_power_mes/schema/workpiece_bind.go +++ b/bj_power_mes/schema/workpiece_bind.go @@ -31,11 +31,11 @@ func (WorkpieceBind) Fields() []ent.Field { field.String("materialName").Default("").MaxLen(128).Comment("物料名称"), field.String("spec").Default("").MaxLen(128).Comment("规格"), field.String("unit").Default("").MaxLen(16).Comment("单位"), - // 1 批次(结构件) / 2 序列号(电气件) - field.String("manageMode").Default("2").MaxLen(10), + // 是否逐件SN管理(冗余自物料档案 sn_mode,追溯展示/绑定口径依据):1 序列号件(SN) / 2 批次件 + field.Int("snMode").Default(2), // 结构件=批次号;电气件=SN 码 field.String("bindValue").MaxLen(128).Comment("绑定值:批次号 或 SN"), - // BATCH(批次绑定) / SN(序列号绑定),冗余自 manageMode 便于直接展示 + // BATCH(批次绑定) / SN(序列号绑定),冗余自 snMode 便于直接展示 field.String("bindType").Default("SN").MaxLen(10), field.String("operator").Default("").MaxLen(64).Comment("操作人"), field.Time("createdAt").Default(time.Now).Immutable().Comment("绑定时间"), diff --git a/bj_power_wms/ent/inboundorder.go b/bj_power_wms/ent/inboundorder.go index fa73af8..db96ec3 100644 --- a/bj_power_wms/ent/inboundorder.go +++ b/bj_power_wms/ent/inboundorder.go @@ -24,8 +24,10 @@ type InboundOrder struct { MaterialCode string `json:"materialCode,omitempty"` // 物料名称(冗余) MaterialName string `json:"materialName,omitempty"` - // 管理粒度 1批次/2序列号 + // 类型 1结构件/2电气件/3其他 ManageMode int `json:"manageMode,omitempty"` + // SN管理 1序列号件(逐件SN)/2批次件(数量)/0未选择 + SnMode int `json:"snMode,omitempty"` // 批次号(结构件) BatchNo string `json:"batchNo,omitempty"` // 入库区域(大区) @@ -72,7 +74,7 @@ func (*InboundOrder) scanValues(columns []string) ([]any, error) { switch columns[i] { case inboundorder.FieldVoided: values[i] = new(sql.NullBool) - case inboundorder.FieldID, inboundorder.FieldManageMode, inboundorder.FieldQuantity, inboundorder.FieldVoidedAt, inboundorder.FieldCreatedAt: + case inboundorder.FieldID, inboundorder.FieldManageMode, inboundorder.FieldSnMode, inboundorder.FieldQuantity, inboundorder.FieldVoidedAt, inboundorder.FieldCreatedAt: values[i] = new(sql.NullInt64) case inboundorder.FieldInboundNo, inboundorder.FieldInboundType, inboundorder.FieldMaterialCode, inboundorder.FieldMaterialName, inboundorder.FieldBatchNo, inboundorder.FieldZoneCode, inboundorder.FieldShelfNo, inboundorder.FieldLayerNo, inboundorder.FieldPositionNo, inboundorder.FieldOperator, inboundorder.FieldRemark, inboundorder.FieldInspectionNo, inboundorder.FieldOwnershipType, inboundorder.FieldOwnershipNo, inboundorder.FieldProductWorkNo, inboundorder.FieldQualityStatus, inboundorder.FieldVoidReason, inboundorder.FieldVoidedBy: values[i] = new(sql.NullString) @@ -127,6 +129,12 @@ func (_m *InboundOrder) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ManageMode = int(value.Int64) } + case inboundorder.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field sn_mode", values[i]) + } else if value.Valid { + _m.SnMode = int(value.Int64) + } case inboundorder.FieldBatchNo: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field batch_no", values[i]) @@ -286,6 +294,9 @@ func (_m *InboundOrder) String() string { builder.WriteString("manage_mode=") builder.WriteString(fmt.Sprintf("%v", _m.ManageMode)) builder.WriteString(", ") + builder.WriteString("sn_mode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) + builder.WriteString(", ") builder.WriteString("batch_no=") builder.WriteString(_m.BatchNo) builder.WriteString(", ") diff --git a/bj_power_wms/ent/inboundorder/inboundorder.go b/bj_power_wms/ent/inboundorder/inboundorder.go index 6220149..ea5e652 100644 --- a/bj_power_wms/ent/inboundorder/inboundorder.go +++ b/bj_power_wms/ent/inboundorder/inboundorder.go @@ -21,6 +21,8 @@ const ( FieldMaterialName = "material_name" // FieldManageMode holds the string denoting the manage_mode field in the database. FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the sn_mode field in the database. + FieldSnMode = "sn_mode" // FieldBatchNo holds the string denoting the batch_no field in the database. FieldBatchNo = "batch_no" // FieldZoneCode holds the string denoting the zone_code field in the database. @@ -69,6 +71,7 @@ var Columns = []string{ FieldMaterialCode, FieldMaterialName, FieldManageMode, + FieldSnMode, FieldBatchNo, FieldZoneCode, FieldShelfNo, @@ -104,6 +107,8 @@ var ( DefaultInboundType string // DefaultManageMode holds the default value on creation for the "manage_mode" field. DefaultManageMode int + // DefaultSnMode holds the default value on creation for the "sn_mode" field. + DefaultSnMode int // DefaultQuantity holds the default value on creation for the "quantity" field. DefaultQuantity int // DefaultOwnershipType holds the default value on creation for the "ownership_type" field. @@ -147,6 +152,11 @@ func ByManageMode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldManageMode, opts...).ToFunc() } +// BySnMode orders the results by the sn_mode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() +} + // ByBatchNo orders the results by the batch_no field. func ByBatchNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldBatchNo, opts...).ToFunc() diff --git a/bj_power_wms/ent/inboundorder/where.go b/bj_power_wms/ent/inboundorder/where.go index 2abf7b1..aff4a69 100644 --- a/bj_power_wms/ent/inboundorder/where.go +++ b/bj_power_wms/ent/inboundorder/where.go @@ -78,6 +78,11 @@ func ManageMode(v int) predicate.InboundOrder { return predicate.InboundOrder(sql.FieldEQ(FieldManageMode, v)) } +// SnMode applies equality check predicate on the "sn_mode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldEQ(FieldSnMode, v)) +} + // BatchNo applies equality check predicate on the "batch_no" field. It's identical to BatchNoEQ. func BatchNo(v string) predicate.InboundOrder { return predicate.InboundOrder(sql.FieldEQ(FieldBatchNo, v)) @@ -478,6 +483,46 @@ func ManageModeLTE(v int) predicate.InboundOrder { return predicate.InboundOrder(sql.FieldLTE(FieldManageMode, v)) } +// SnModeEQ applies the EQ predicate on the "sn_mode" field. +func SnModeEQ(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldEQ(FieldSnMode, v)) +} + +// SnModeNEQ applies the NEQ predicate on the "sn_mode" field. +func SnModeNEQ(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldNEQ(FieldSnMode, v)) +} + +// SnModeIn applies the In predicate on the "sn_mode" field. +func SnModeIn(vs ...int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldIn(FieldSnMode, vs...)) +} + +// SnModeNotIn applies the NotIn predicate on the "sn_mode" field. +func SnModeNotIn(vs ...int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldNotIn(FieldSnMode, vs...)) +} + +// SnModeGT applies the GT predicate on the "sn_mode" field. +func SnModeGT(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldGT(FieldSnMode, v)) +} + +// SnModeGTE applies the GTE predicate on the "sn_mode" field. +func SnModeGTE(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldGTE(FieldSnMode, v)) +} + +// SnModeLT applies the LT predicate on the "sn_mode" field. +func SnModeLT(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldLT(FieldSnMode, v)) +} + +// SnModeLTE applies the LTE predicate on the "sn_mode" field. +func SnModeLTE(v int) predicate.InboundOrder { + return predicate.InboundOrder(sql.FieldLTE(FieldSnMode, v)) +} + // BatchNoEQ applies the EQ predicate on the "batch_no" field. func BatchNoEQ(v string) predicate.InboundOrder { return predicate.InboundOrder(sql.FieldEQ(FieldBatchNo, v)) diff --git a/bj_power_wms/ent/inboundorder_create.go b/bj_power_wms/ent/inboundorder_create.go index 37968ae..09a7f35 100644 --- a/bj_power_wms/ent/inboundorder_create.go +++ b/bj_power_wms/ent/inboundorder_create.go @@ -75,6 +75,20 @@ func (_c *InboundOrderCreate) SetNillableManageMode(v *int) *InboundOrderCreate return _c } +// SetSnMode sets the "sn_mode" field. +func (_c *InboundOrderCreate) SetSnMode(v int) *InboundOrderCreate { + _c.mutation.SetSnMode(v) + return _c +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_c *InboundOrderCreate) SetNillableSnMode(v *int) *InboundOrderCreate { + if v != nil { + _c.SetSnMode(*v) + } + return _c +} + // SetBatchNo sets the "batch_no" field. func (_c *InboundOrderCreate) SetBatchNo(v string) *InboundOrderCreate { _c.mutation.SetBatchNo(v) @@ -362,6 +376,10 @@ func (_c *InboundOrderCreate) defaults() { v := inboundorder.DefaultManageMode _c.mutation.SetManageMode(v) } + if _, ok := _c.mutation.SnMode(); !ok { + v := inboundorder.DefaultSnMode + _c.mutation.SetSnMode(v) + } if _, ok := _c.mutation.Quantity(); !ok { v := inboundorder.DefaultQuantity _c.mutation.SetQuantity(v) @@ -394,6 +412,9 @@ func (_c *InboundOrderCreate) check() error { if _, ok := _c.mutation.ManageMode(); !ok { return &ValidationError{Name: "manage_mode", err: errors.New(`ent: missing required field "InboundOrder.manage_mode"`)} } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "sn_mode", err: errors.New(`ent: missing required field "InboundOrder.sn_mode"`)} + } if _, ok := _c.mutation.Quantity(); !ok { return &ValidationError{Name: "quantity", err: errors.New(`ent: missing required field "InboundOrder.quantity"`)} } @@ -456,6 +477,10 @@ func (_c *InboundOrderCreate) createSpec() (*InboundOrder, *sqlgraph.CreateSpec) _spec.SetField(inboundorder.FieldManageMode, field.TypeInt, value) _node.ManageMode = value } + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(inboundorder.FieldSnMode, field.TypeInt, value) + _node.SnMode = value + } if value, ok := _c.mutation.BatchNo(); ok { _spec.SetField(inboundorder.FieldBatchNo, field.TypeString, value) _node.BatchNo = value @@ -652,6 +677,24 @@ func (u *InboundOrderUpsert) AddManageMode(v int) *InboundOrderUpsert { return u } +// SetSnMode sets the "sn_mode" field. +func (u *InboundOrderUpsert) SetSnMode(v int) *InboundOrderUpsert { + u.Set(inboundorder.FieldSnMode, v) + return u +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InboundOrderUpsert) UpdateSnMode() *InboundOrderUpsert { + u.SetExcluded(inboundorder.FieldSnMode) + return u +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InboundOrderUpsert) AddSnMode(v int) *InboundOrderUpsert { + u.Add(inboundorder.FieldSnMode, v) + return u +} + // SetBatchNo sets the "batch_no" field. func (u *InboundOrderUpsert) SetBatchNo(v string) *InboundOrderUpsert { u.Set(inboundorder.FieldBatchNo, v) @@ -1088,6 +1131,27 @@ func (u *InboundOrderUpsertOne) UpdateManageMode() *InboundOrderUpsertOne { }) } +// SetSnMode sets the "sn_mode" field. +func (u *InboundOrderUpsertOne) SetSnMode(v int) *InboundOrderUpsertOne { + return u.Update(func(s *InboundOrderUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InboundOrderUpsertOne) AddSnMode(v int) *InboundOrderUpsertOne { + return u.Update(func(s *InboundOrderUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InboundOrderUpsertOne) UpdateSnMode() *InboundOrderUpsertOne { + return u.Update(func(s *InboundOrderUpsert) { + s.UpdateSnMode() + }) +} + // SetBatchNo sets the "batch_no" field. func (u *InboundOrderUpsertOne) SetBatchNo(v string) *InboundOrderUpsertOne { return u.Update(func(s *InboundOrderUpsert) { @@ -1740,6 +1804,27 @@ func (u *InboundOrderUpsertBulk) UpdateManageMode() *InboundOrderUpsertBulk { }) } +// SetSnMode sets the "sn_mode" field. +func (u *InboundOrderUpsertBulk) SetSnMode(v int) *InboundOrderUpsertBulk { + return u.Update(func(s *InboundOrderUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InboundOrderUpsertBulk) AddSnMode(v int) *InboundOrderUpsertBulk { + return u.Update(func(s *InboundOrderUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InboundOrderUpsertBulk) UpdateSnMode() *InboundOrderUpsertBulk { + return u.Update(func(s *InboundOrderUpsert) { + s.UpdateSnMode() + }) +} + // SetBatchNo sets the "batch_no" field. func (u *InboundOrderUpsertBulk) SetBatchNo(v string) *InboundOrderUpsertBulk { return u.Update(func(s *InboundOrderUpsert) { diff --git a/bj_power_wms/ent/inboundorder_update.go b/bj_power_wms/ent/inboundorder_update.go index 7e45aed..3b550e3 100644 --- a/bj_power_wms/ent/inboundorder_update.go +++ b/bj_power_wms/ent/inboundorder_update.go @@ -110,6 +110,27 @@ func (_u *InboundOrderUpdate) AddManageMode(v int) *InboundOrderUpdate { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *InboundOrderUpdate) SetSnMode(v int) *InboundOrderUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *InboundOrderUpdate) SetNillableSnMode(v *int) *InboundOrderUpdate { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *InboundOrderUpdate) AddSnMode(v int) *InboundOrderUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetBatchNo sets the "batch_no" field. func (_u *InboundOrderUpdate) SetBatchNo(v string) *InboundOrderUpdate { _u.mutation.SetBatchNo(v) @@ -523,6 +544,12 @@ func (_u *InboundOrderUpdate) sqlSave(ctx context.Context) (_node int, err error if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(inboundorder.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(inboundorder.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(inboundorder.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(inboundorder.FieldBatchNo, field.TypeString, value) } @@ -728,6 +755,27 @@ func (_u *InboundOrderUpdateOne) AddManageMode(v int) *InboundOrderUpdateOne { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *InboundOrderUpdateOne) SetSnMode(v int) *InboundOrderUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *InboundOrderUpdateOne) SetNillableSnMode(v *int) *InboundOrderUpdateOne { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *InboundOrderUpdateOne) AddSnMode(v int) *InboundOrderUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetBatchNo sets the "batch_no" field. func (_u *InboundOrderUpdateOne) SetBatchNo(v string) *InboundOrderUpdateOne { _u.mutation.SetBatchNo(v) @@ -1171,6 +1219,12 @@ func (_u *InboundOrderUpdateOne) sqlSave(ctx context.Context) (_node *InboundOrd if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(inboundorder.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(inboundorder.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(inboundorder.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(inboundorder.FieldBatchNo, field.TypeString, value) } diff --git a/bj_power_wms/ent/inventory.go b/bj_power_wms/ent/inventory.go index b1e7763..df9a0c2 100644 --- a/bj_power_wms/ent/inventory.go +++ b/bj_power_wms/ent/inventory.go @@ -16,21 +16,23 @@ type Inventory struct { config `json:"-"` // ID of the ent. ID int `json:"id,omitempty"` - // 管理粒度 1=结构件(批次) 2=电气件(SN) + // 类型 1结构件/2电气件/3其他 ManageMode int `json:"manageMode,omitempty"` + // SN管理 1序列号件(逐件SN)/2批次件(数量)/0未选择 + SnMode int `json:"snMode,omitempty"` // 品类 1=原材料 2=半成品 3=成品 Category int `json:"category,omitempty"` // 物料编码(关联 materials 表) MaterialCode string `json:"materialCode,omitempty"` // 物料名称(冗余,便于直接展示) MaterialName string `json:"materialName,omitempty"` - // 批次号(系统生成);电气件可关联所属批次 + // 批次号(系统生成);序列号件可关联所属批次 BatchNo string `json:"batchNo,omitempty"` - // 序列号(SN,仅电气件);全局唯一,空值表示非 SN 行 + // 序列号(SN,仅序列号件);全局唯一,空值表示非 SN 行 SnCode string `json:"snCode,omitempty"` - // 数量:结构件=批次余量;电气件=1 + // 数量:批次件=批次余量;序列号件=1 Quantity int `json:"quantity,omitempty"` - // 已锁定数量(库存占用):结构件=件数;电气件=0/1 + // 已锁定数量(库存占用):批次件=件数;序列号件=0/1 LockedQty int `json:"lockedQty,omitempty"` // 检验状态 未检/合格/不合格 QualityStatus string `json:"qualityStatus,omitempty"` @@ -42,7 +44,7 @@ type Inventory struct { LayerNo string `json:"layerNo,omitempty"` // 位置号(手填,如 12) PositionNo string `json:"positionNo,omitempty"` - // 生命周期:在库/锁定/出库/使用/报废(电气件用;结构件恒在库) + // 生命周期:在库/锁定/出库/使用/报废(序列号件用;批次件恒在库) Status string `json:"status,omitempty"` // 生产日期 ProductionDate string `json:"productionDate,omitempty"` @@ -88,7 +90,7 @@ func (*Inventory) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case inventory.FieldID, inventory.FieldManageMode, inventory.FieldCategory, inventory.FieldQuantity, inventory.FieldLockedQty, inventory.FieldRecordedAt, inventory.FieldCreatedAt, inventory.FieldUpdatedAt: + case inventory.FieldID, inventory.FieldManageMode, inventory.FieldSnMode, inventory.FieldCategory, inventory.FieldQuantity, inventory.FieldLockedQty, inventory.FieldRecordedAt, inventory.FieldCreatedAt, inventory.FieldUpdatedAt: values[i] = new(sql.NullInt64) case inventory.FieldMaterialCode, inventory.FieldMaterialName, inventory.FieldBatchNo, inventory.FieldSnCode, inventory.FieldQualityStatus, inventory.FieldZoneCode, inventory.FieldShelfNo, inventory.FieldLayerNo, inventory.FieldPositionNo, inventory.FieldStatus, inventory.FieldProductionDate, inventory.FieldSupplier, inventory.FieldInboundNo, inventory.FieldOrderNo, inventory.FieldProductWorkNo, inventory.FieldCompletedProcess, inventory.FieldOwnershipType, inventory.FieldOwnershipNo, inventory.FieldProductStatus, inventory.FieldRelatedStandard, inventory.FieldTestRecordNo, inventory.FieldRecordedBy, inventory.FieldOutboundReason, inventory.FieldStocktakeNo, inventory.FieldRemark: values[i] = new(sql.NullString) @@ -119,6 +121,12 @@ func (_m *Inventory) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ManageMode = int(value.Int64) } + case inventory.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field sn_mode", values[i]) + } else if value.Valid { + _m.SnMode = int(value.Int64) + } case inventory.FieldCategory: if value, ok := values[i].(*sql.NullInt64); !ok { return fmt.Errorf("unexpected type %T for field category", values[i]) @@ -344,6 +352,9 @@ func (_m *Inventory) String() string { builder.WriteString("manage_mode=") builder.WriteString(fmt.Sprintf("%v", _m.ManageMode)) builder.WriteString(", ") + builder.WriteString("sn_mode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) + builder.WriteString(", ") builder.WriteString("category=") builder.WriteString(fmt.Sprintf("%v", _m.Category)) builder.WriteString(", ") diff --git a/bj_power_wms/ent/inventory/inventory.go b/bj_power_wms/ent/inventory/inventory.go index 424a511..91e24c3 100644 --- a/bj_power_wms/ent/inventory/inventory.go +++ b/bj_power_wms/ent/inventory/inventory.go @@ -13,6 +13,8 @@ const ( FieldID = "id" // FieldManageMode holds the string denoting the manage_mode field in the database. FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the sn_mode field in the database. + FieldSnMode = "sn_mode" // FieldCategory holds the string denoting the category field in the database. FieldCategory = "category" // FieldMaterialCode holds the string denoting the material_code field in the database. @@ -83,6 +85,7 @@ const ( var Columns = []string{ FieldID, FieldManageMode, + FieldSnMode, FieldCategory, FieldMaterialCode, FieldMaterialName, @@ -127,6 +130,8 @@ func ValidColumn(column string) bool { } var ( + // DefaultSnMode holds the default value on creation for the "sn_mode" field. + DefaultSnMode int // DefaultCategory holds the default value on creation for the "category" field. DefaultCategory int // DefaultQuantity holds the default value on creation for the "quantity" field. @@ -168,6 +173,11 @@ func ByManageMode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldManageMode, opts...).ToFunc() } +// BySnMode orders the results by the sn_mode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() +} + // ByCategory orders the results by the category field. func ByCategory(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldCategory, opts...).ToFunc() diff --git a/bj_power_wms/ent/inventory/where.go b/bj_power_wms/ent/inventory/where.go index 0dc0109..19ee879 100644 --- a/bj_power_wms/ent/inventory/where.go +++ b/bj_power_wms/ent/inventory/where.go @@ -58,6 +58,11 @@ func ManageMode(v int) predicate.Inventory { return predicate.Inventory(sql.FieldEQ(FieldManageMode, v)) } +// SnMode applies equality check predicate on the "sn_mode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldEQ(FieldSnMode, v)) +} + // Category applies equality check predicate on the "category" field. It's identical to CategoryEQ. func Category(v int) predicate.Inventory { return predicate.Inventory(sql.FieldEQ(FieldCategory, v)) @@ -253,6 +258,46 @@ func ManageModeLTE(v int) predicate.Inventory { return predicate.Inventory(sql.FieldLTE(FieldManageMode, v)) } +// SnModeEQ applies the EQ predicate on the "sn_mode" field. +func SnModeEQ(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldEQ(FieldSnMode, v)) +} + +// SnModeNEQ applies the NEQ predicate on the "sn_mode" field. +func SnModeNEQ(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldNEQ(FieldSnMode, v)) +} + +// SnModeIn applies the In predicate on the "sn_mode" field. +func SnModeIn(vs ...int) predicate.Inventory { + return predicate.Inventory(sql.FieldIn(FieldSnMode, vs...)) +} + +// SnModeNotIn applies the NotIn predicate on the "sn_mode" field. +func SnModeNotIn(vs ...int) predicate.Inventory { + return predicate.Inventory(sql.FieldNotIn(FieldSnMode, vs...)) +} + +// SnModeGT applies the GT predicate on the "sn_mode" field. +func SnModeGT(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldGT(FieldSnMode, v)) +} + +// SnModeGTE applies the GTE predicate on the "sn_mode" field. +func SnModeGTE(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldGTE(FieldSnMode, v)) +} + +// SnModeLT applies the LT predicate on the "sn_mode" field. +func SnModeLT(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldLT(FieldSnMode, v)) +} + +// SnModeLTE applies the LTE predicate on the "sn_mode" field. +func SnModeLTE(v int) predicate.Inventory { + return predicate.Inventory(sql.FieldLTE(FieldSnMode, v)) +} + // CategoryEQ applies the EQ predicate on the "category" field. func CategoryEQ(v int) predicate.Inventory { return predicate.Inventory(sql.FieldEQ(FieldCategory, v)) diff --git a/bj_power_wms/ent/inventory_create.go b/bj_power_wms/ent/inventory_create.go index e751004..18f84d7 100644 --- a/bj_power_wms/ent/inventory_create.go +++ b/bj_power_wms/ent/inventory_create.go @@ -27,6 +27,20 @@ func (_c *InventoryCreate) SetManageMode(v int) *InventoryCreate { return _c } +// SetSnMode sets the "sn_mode" field. +func (_c *InventoryCreate) SetSnMode(v int) *InventoryCreate { + _c.mutation.SetSnMode(v) + return _c +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_c *InventoryCreate) SetNillableSnMode(v *int) *InventoryCreate { + if v != nil { + _c.SetSnMode(*v) + } + return _c +} + // SetCategory sets the "category" field. func (_c *InventoryCreate) SetCategory(v int) *InventoryCreate { _c.mutation.SetCategory(v) @@ -488,6 +502,10 @@ func (_c *InventoryCreate) ExecX(ctx context.Context) { // defaults sets the default values of the builder before save. func (_c *InventoryCreate) defaults() { + if _, ok := _c.mutation.SnMode(); !ok { + v := inventory.DefaultSnMode + _c.mutation.SetSnMode(v) + } if _, ok := _c.mutation.Category(); !ok { v := inventory.DefaultCategory _c.mutation.SetCategory(v) @@ -535,6 +553,9 @@ func (_c *InventoryCreate) check() error { if _, ok := _c.mutation.ManageMode(); !ok { return &ValidationError{Name: "manage_mode", err: errors.New(`ent: missing required field "Inventory.manage_mode"`)} } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "sn_mode", err: errors.New(`ent: missing required field "Inventory.sn_mode"`)} + } if _, ok := _c.mutation.Category(); !ok { return &ValidationError{Name: "category", err: errors.New(`ent: missing required field "Inventory.category"`)} } @@ -614,6 +635,10 @@ func (_c *InventoryCreate) createSpec() (*Inventory, *sqlgraph.CreateSpec) { _spec.SetField(inventory.FieldManageMode, field.TypeInt, value) _node.ManageMode = value } + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(inventory.FieldSnMode, field.TypeInt, value) + _node.SnMode = value + } if value, ok := _c.mutation.Category(); ok { _spec.SetField(inventory.FieldCategory, field.TypeInt, value) _node.Category = value @@ -808,6 +833,24 @@ func (u *InventoryUpsert) AddManageMode(v int) *InventoryUpsert { return u } +// SetSnMode sets the "sn_mode" field. +func (u *InventoryUpsert) SetSnMode(v int) *InventoryUpsert { + u.Set(inventory.FieldSnMode, v) + return u +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InventoryUpsert) UpdateSnMode() *InventoryUpsert { + u.SetExcluded(inventory.FieldSnMode) + return u +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InventoryUpsert) AddSnMode(v int) *InventoryUpsert { + u.Add(inventory.FieldSnMode, v) + return u +} + // SetCategory sets the "category" field. func (u *InventoryUpsert) SetCategory(v int) *InventoryUpsert { u.Set(inventory.FieldCategory, v) @@ -1397,6 +1440,27 @@ func (u *InventoryUpsertOne) UpdateManageMode() *InventoryUpsertOne { }) } +// SetSnMode sets the "sn_mode" field. +func (u *InventoryUpsertOne) SetSnMode(v int) *InventoryUpsertOne { + return u.Update(func(s *InventoryUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InventoryUpsertOne) AddSnMode(v int) *InventoryUpsertOne { + return u.Update(func(s *InventoryUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InventoryUpsertOne) UpdateSnMode() *InventoryUpsertOne { + return u.Update(func(s *InventoryUpsert) { + s.UpdateSnMode() + }) +} + // SetCategory sets the "category" field. func (u *InventoryUpsertOne) SetCategory(v int) *InventoryUpsertOne { return u.Update(func(s *InventoryUpsert) { @@ -2238,6 +2302,27 @@ func (u *InventoryUpsertBulk) UpdateManageMode() *InventoryUpsertBulk { }) } +// SetSnMode sets the "sn_mode" field. +func (u *InventoryUpsertBulk) SetSnMode(v int) *InventoryUpsertBulk { + return u.Update(func(s *InventoryUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *InventoryUpsertBulk) AddSnMode(v int) *InventoryUpsertBulk { + return u.Update(func(s *InventoryUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *InventoryUpsertBulk) UpdateSnMode() *InventoryUpsertBulk { + return u.Update(func(s *InventoryUpsert) { + s.UpdateSnMode() + }) +} + // SetCategory sets the "category" field. func (u *InventoryUpsertBulk) SetCategory(v int) *InventoryUpsertBulk { return u.Update(func(s *InventoryUpsert) { diff --git a/bj_power_wms/ent/inventory_update.go b/bj_power_wms/ent/inventory_update.go index 24474a4..e8b1e40 100644 --- a/bj_power_wms/ent/inventory_update.go +++ b/bj_power_wms/ent/inventory_update.go @@ -48,6 +48,27 @@ func (_u *InventoryUpdate) AddManageMode(v int) *InventoryUpdate { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *InventoryUpdate) SetSnMode(v int) *InventoryUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *InventoryUpdate) SetNillableSnMode(v *int) *InventoryUpdate { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *InventoryUpdate) AddSnMode(v int) *InventoryUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetCategory sets the "category" field. func (_u *InventoryUpdate) SetCategory(v int) *InventoryUpdate { _u.mutation.ResetCategory() @@ -714,6 +735,12 @@ func (_u *InventoryUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(inventory.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(inventory.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(inventory.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.Category(); ok { _spec.SetField(inventory.FieldCategory, field.TypeInt, value) } @@ -926,6 +953,27 @@ func (_u *InventoryUpdateOne) AddManageMode(v int) *InventoryUpdateOne { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *InventoryUpdateOne) SetSnMode(v int) *InventoryUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *InventoryUpdateOne) SetNillableSnMode(v *int) *InventoryUpdateOne { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *InventoryUpdateOne) AddSnMode(v int) *InventoryUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetCategory sets the "category" field. func (_u *InventoryUpdateOne) SetCategory(v int) *InventoryUpdateOne { _u.mutation.ResetCategory() @@ -1622,6 +1670,12 @@ func (_u *InventoryUpdateOne) sqlSave(ctx context.Context) (_node *Inventory, er if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(inventory.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(inventory.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(inventory.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.Category(); ok { _spec.SetField(inventory.FieldCategory, field.TypeInt, value) } diff --git a/bj_power_wms/ent/material.go b/bj_power_wms/ent/material.go index 9e36c3b..e087848 100644 --- a/bj_power_wms/ent/material.go +++ b/bj_power_wms/ent/material.go @@ -28,11 +28,13 @@ type Material struct { Description string `json:"description,omitempty"` // 品类 1原材料/3成品/4其他(半成品不是物料品类,由库存 category=2 承载) ItemType int `json:"itemType,omitempty"` - // 类型 1结构件(批次)/2电气件(序列号)/3其他 + // 类型 1结构件/2电气件/3其他 ManageMode int `json:"manageMode,omitempty"` - // 是否批次管理 + // SN管理 1序列号件(逐件SN)/2批次件(数量)/0未选择 + SnMode int `json:"snMode,omitempty"` + // 是否批次管理(按 sn_mode=2 派生) IsBatchManaged bool `json:"isBatchManaged,omitempty"` - // 是否序列号管理 + // 是否序列号管理(按 sn_mode=1 派生) IsSerialManaged bool `json:"isSerialManaged,omitempty"` // 物料模板编码(物料种类) TemplateCode string `json:"templateCode,omitempty"` @@ -54,7 +56,7 @@ func (*Material) scanValues(columns []string) ([]any, error) { switch columns[i] { case material.FieldIsBatchManaged, material.FieldIsSerialManaged, material.FieldIsActive: values[i] = new(sql.NullBool) - case material.FieldID, material.FieldItemType, material.FieldManageMode, material.FieldSafetyStock, material.FieldCreatedAt, material.FieldUpdatedAt: + case material.FieldID, material.FieldItemType, material.FieldManageMode, material.FieldSnMode, material.FieldSafetyStock, material.FieldCreatedAt, material.FieldUpdatedAt: values[i] = new(sql.NullInt64) case material.FieldCode, material.FieldName, material.FieldSpec, material.FieldUnit, material.FieldDescription, material.FieldTemplateCode: values[i] = new(sql.NullString) @@ -121,6 +123,12 @@ func (_m *Material) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ManageMode = int(value.Int64) } + case material.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field sn_mode", values[i]) + } else if value.Valid { + _m.SnMode = int(value.Int64) + } case material.FieldIsBatchManaged: if value, ok := values[i].(*sql.NullBool); !ok { return fmt.Errorf("unexpected type %T for field is_batch_managed", values[i]) @@ -220,6 +228,9 @@ func (_m *Material) String() string { builder.WriteString("manage_mode=") builder.WriteString(fmt.Sprintf("%v", _m.ManageMode)) builder.WriteString(", ") + builder.WriteString("sn_mode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) + builder.WriteString(", ") builder.WriteString("is_batch_managed=") builder.WriteString(fmt.Sprintf("%v", _m.IsBatchManaged)) builder.WriteString(", ") diff --git a/bj_power_wms/ent/material/material.go b/bj_power_wms/ent/material/material.go index f990ce7..ef3bd53 100644 --- a/bj_power_wms/ent/material/material.go +++ b/bj_power_wms/ent/material/material.go @@ -25,6 +25,8 @@ const ( FieldItemType = "item_type" // FieldManageMode holds the string denoting the manage_mode field in the database. FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the sn_mode field in the database. + FieldSnMode = "sn_mode" // FieldIsBatchManaged holds the string denoting the is_batch_managed field in the database. FieldIsBatchManaged = "is_batch_managed" // FieldIsSerialManaged holds the string denoting the is_serial_managed field in the database. @@ -53,6 +55,7 @@ var Columns = []string{ FieldDescription, FieldItemType, FieldManageMode, + FieldSnMode, FieldIsBatchManaged, FieldIsSerialManaged, FieldTemplateCode, @@ -77,6 +80,8 @@ var ( DefaultItemType int // DefaultManageMode holds the default value on creation for the "manage_mode" field. DefaultManageMode int + // DefaultSnMode holds the default value on creation for the "sn_mode" field. + DefaultSnMode int // DefaultIsBatchManaged holds the default value on creation for the "is_batch_managed" field. DefaultIsBatchManaged bool // DefaultIsSerialManaged holds the default value on creation for the "is_serial_managed" field. @@ -134,6 +139,11 @@ func ByManageMode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldManageMode, opts...).ToFunc() } +// BySnMode orders the results by the sn_mode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() +} + // ByIsBatchManaged orders the results by the is_batch_managed field. func ByIsBatchManaged(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldIsBatchManaged, opts...).ToFunc() diff --git a/bj_power_wms/ent/material/where.go b/bj_power_wms/ent/material/where.go index 9dcd3b0..734378b 100644 --- a/bj_power_wms/ent/material/where.go +++ b/bj_power_wms/ent/material/where.go @@ -88,6 +88,11 @@ func ManageMode(v int) predicate.Material { return predicate.Material(sql.FieldEQ(FieldManageMode, v)) } +// SnMode applies equality check predicate on the "sn_mode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.Material { + return predicate.Material(sql.FieldEQ(FieldSnMode, v)) +} + // IsBatchManaged applies equality check predicate on the "is_batch_managed" field. It's identical to IsBatchManagedEQ. func IsBatchManaged(v bool) predicate.Material { return predicate.Material(sql.FieldEQ(FieldIsBatchManaged, v)) @@ -558,6 +563,46 @@ func ManageModeLTE(v int) predicate.Material { return predicate.Material(sql.FieldLTE(FieldManageMode, v)) } +// SnModeEQ applies the EQ predicate on the "sn_mode" field. +func SnModeEQ(v int) predicate.Material { + return predicate.Material(sql.FieldEQ(FieldSnMode, v)) +} + +// SnModeNEQ applies the NEQ predicate on the "sn_mode" field. +func SnModeNEQ(v int) predicate.Material { + return predicate.Material(sql.FieldNEQ(FieldSnMode, v)) +} + +// SnModeIn applies the In predicate on the "sn_mode" field. +func SnModeIn(vs ...int) predicate.Material { + return predicate.Material(sql.FieldIn(FieldSnMode, vs...)) +} + +// SnModeNotIn applies the NotIn predicate on the "sn_mode" field. +func SnModeNotIn(vs ...int) predicate.Material { + return predicate.Material(sql.FieldNotIn(FieldSnMode, vs...)) +} + +// SnModeGT applies the GT predicate on the "sn_mode" field. +func SnModeGT(v int) predicate.Material { + return predicate.Material(sql.FieldGT(FieldSnMode, v)) +} + +// SnModeGTE applies the GTE predicate on the "sn_mode" field. +func SnModeGTE(v int) predicate.Material { + return predicate.Material(sql.FieldGTE(FieldSnMode, v)) +} + +// SnModeLT applies the LT predicate on the "sn_mode" field. +func SnModeLT(v int) predicate.Material { + return predicate.Material(sql.FieldLT(FieldSnMode, v)) +} + +// SnModeLTE applies the LTE predicate on the "sn_mode" field. +func SnModeLTE(v int) predicate.Material { + return predicate.Material(sql.FieldLTE(FieldSnMode, v)) +} + // IsBatchManagedEQ applies the EQ predicate on the "is_batch_managed" field. func IsBatchManagedEQ(v bool) predicate.Material { return predicate.Material(sql.FieldEQ(FieldIsBatchManaged, v)) diff --git a/bj_power_wms/ent/material_create.go b/bj_power_wms/ent/material_create.go index 1197d00..15403c4 100644 --- a/bj_power_wms/ent/material_create.go +++ b/bj_power_wms/ent/material_create.go @@ -103,6 +103,20 @@ func (_c *MaterialCreate) SetNillableManageMode(v *int) *MaterialCreate { return _c } +// SetSnMode sets the "sn_mode" field. +func (_c *MaterialCreate) SetSnMode(v int) *MaterialCreate { + _c.mutation.SetSnMode(v) + return _c +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_c *MaterialCreate) SetNillableSnMode(v *int) *MaterialCreate { + if v != nil { + _c.SetSnMode(*v) + } + return _c +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (_c *MaterialCreate) SetIsBatchManaged(v bool) *MaterialCreate { _c.mutation.SetIsBatchManaged(v) @@ -244,6 +258,10 @@ func (_c *MaterialCreate) defaults() { v := material.DefaultManageMode _c.mutation.SetManageMode(v) } + if _, ok := _c.mutation.SnMode(); !ok { + v := material.DefaultSnMode + _c.mutation.SetSnMode(v) + } if _, ok := _c.mutation.IsBatchManaged(); !ok { v := material.DefaultIsBatchManaged _c.mutation.SetIsBatchManaged(v) @@ -284,6 +302,9 @@ func (_c *MaterialCreate) check() error { if _, ok := _c.mutation.ManageMode(); !ok { return &ValidationError{Name: "manage_mode", err: errors.New(`ent: missing required field "Material.manage_mode"`)} } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "sn_mode", err: errors.New(`ent: missing required field "Material.sn_mode"`)} + } if _, ok := _c.mutation.IsBatchManaged(); !ok { return &ValidationError{Name: "is_batch_managed", err: errors.New(`ent: missing required field "Material.is_batch_managed"`)} } @@ -357,6 +378,10 @@ func (_c *MaterialCreate) createSpec() (*Material, *sqlgraph.CreateSpec) { _spec.SetField(material.FieldManageMode, field.TypeInt, value) _node.ManageMode = value } + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + _node.SnMode = value + } if value, ok := _c.mutation.IsBatchManaged(); ok { _spec.SetField(material.FieldIsBatchManaged, field.TypeBool, value) _node.IsBatchManaged = value @@ -551,6 +576,24 @@ func (u *MaterialUpsert) AddManageMode(v int) *MaterialUpsert { return u } +// SetSnMode sets the "sn_mode" field. +func (u *MaterialUpsert) SetSnMode(v int) *MaterialUpsert { + u.Set(material.FieldSnMode, v) + return u +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *MaterialUpsert) UpdateSnMode() *MaterialUpsert { + u.SetExcluded(material.FieldSnMode) + return u +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *MaterialUpsert) AddSnMode(v int) *MaterialUpsert { + u.Add(material.FieldSnMode, v) + return u +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (u *MaterialUpsert) SetIsBatchManaged(v bool) *MaterialUpsert { u.Set(material.FieldIsBatchManaged, v) @@ -832,6 +875,27 @@ func (u *MaterialUpsertOne) UpdateManageMode() *MaterialUpsertOne { }) } +// SetSnMode sets the "sn_mode" field. +func (u *MaterialUpsertOne) SetSnMode(v int) *MaterialUpsertOne { + return u.Update(func(s *MaterialUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *MaterialUpsertOne) AddSnMode(v int) *MaterialUpsertOne { + return u.Update(func(s *MaterialUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *MaterialUpsertOne) UpdateSnMode() *MaterialUpsertOne { + return u.Update(func(s *MaterialUpsert) { + s.UpdateSnMode() + }) +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (u *MaterialUpsertOne) SetIsBatchManaged(v bool) *MaterialUpsertOne { return u.Update(func(s *MaterialUpsert) { @@ -1295,6 +1359,27 @@ func (u *MaterialUpsertBulk) UpdateManageMode() *MaterialUpsertBulk { }) } +// SetSnMode sets the "sn_mode" field. +func (u *MaterialUpsertBulk) SetSnMode(v int) *MaterialUpsertBulk { + return u.Update(func(s *MaterialUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *MaterialUpsertBulk) AddSnMode(v int) *MaterialUpsertBulk { + return u.Update(func(s *MaterialUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *MaterialUpsertBulk) UpdateSnMode() *MaterialUpsertBulk { + return u.Update(func(s *MaterialUpsert) { + s.UpdateSnMode() + }) +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (u *MaterialUpsertBulk) SetIsBatchManaged(v bool) *MaterialUpsertBulk { return u.Update(func(s *MaterialUpsert) { diff --git a/bj_power_wms/ent/material_update.go b/bj_power_wms/ent/material_update.go index 756af2e..cbec923 100644 --- a/bj_power_wms/ent/material_update.go +++ b/bj_power_wms/ent/material_update.go @@ -157,6 +157,27 @@ func (_u *MaterialUpdate) AddManageMode(v int) *MaterialUpdate { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *MaterialUpdate) SetSnMode(v int) *MaterialUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *MaterialUpdate) SetNillableSnMode(v *int) *MaterialUpdate { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *MaterialUpdate) AddSnMode(v int) *MaterialUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (_u *MaterialUpdate) SetIsBatchManaged(v bool) *MaterialUpdate { _u.mutation.SetIsBatchManaged(v) @@ -359,6 +380,12 @@ func (_u *MaterialUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(material.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(material.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.IsBatchManaged(); ok { _spec.SetField(material.FieldIsBatchManaged, field.TypeBool, value) } @@ -542,6 +569,27 @@ func (_u *MaterialUpdateOne) AddManageMode(v int) *MaterialUpdateOne { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *MaterialUpdateOne) SetSnMode(v int) *MaterialUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *MaterialUpdateOne) SetNillableSnMode(v *int) *MaterialUpdateOne { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *MaterialUpdateOne) AddSnMode(v int) *MaterialUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (_u *MaterialUpdateOne) SetIsBatchManaged(v bool) *MaterialUpdateOne { _u.mutation.SetIsBatchManaged(v) @@ -774,6 +822,12 @@ func (_u *MaterialUpdateOne) sqlSave(ctx context.Context) (_node *Material, err if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(material.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(material.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(material.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.IsBatchManaged(); ok { _spec.SetField(material.FieldIsBatchManaged, field.TypeBool, value) } diff --git a/bj_power_wms/ent/migrate/schema.go b/bj_power_wms/ent/migrate/schema.go index 64d970c..427cb10 100644 --- a/bj_power_wms/ent/migrate/schema.go +++ b/bj_power_wms/ent/migrate/schema.go @@ -171,6 +171,7 @@ var ( {Name: "material_code", Type: field.TypeString}, {Name: "material_name", Type: field.TypeString, Nullable: true}, {Name: "manage_mode", Type: field.TypeInt, Default: 1}, + {Name: "sn_mode", Type: field.TypeInt, Default: 0}, {Name: "batch_no", Type: field.TypeString, Nullable: true}, {Name: "zone_code", Type: field.TypeString, Nullable: true}, {Name: "shelf_no", Type: field.TypeString, Nullable: true}, @@ -209,7 +210,7 @@ var ( { Name: "inboundorder_operator", Unique: false, - Columns: []*schema.Column{InboundOrdersColumns[12]}, + Columns: []*schema.Column{InboundOrdersColumns[13]}, }, }, } @@ -274,6 +275,7 @@ var ( InventoriesColumns = []*schema.Column{ {Name: "id", Type: field.TypeInt, Increment: true}, {Name: "manage_mode", Type: field.TypeInt}, + {Name: "sn_mode", Type: field.TypeInt, Default: 0}, {Name: "category", Type: field.TypeInt, Default: 1}, {Name: "material_code", Type: field.TypeString}, {Name: "material_name", Type: field.TypeString, Nullable: true}, @@ -318,34 +320,39 @@ var ( Columns: []*schema.Column{InventoriesColumns[1]}, }, { - Name: "inventory_category", + Name: "inventory_sn_mode", Unique: false, Columns: []*schema.Column{InventoriesColumns[2]}, }, { - Name: "inventory_material_code", + Name: "inventory_category", Unique: false, Columns: []*schema.Column{InventoriesColumns[3]}, }, { - Name: "inventory_quality_status", + Name: "inventory_material_code", Unique: false, - Columns: []*schema.Column{InventoriesColumns[9]}, + Columns: []*schema.Column{InventoriesColumns[4]}, }, { - Name: "inventory_zone_code", + Name: "inventory_quality_status", Unique: false, Columns: []*schema.Column{InventoriesColumns[10]}, }, + { + Name: "inventory_zone_code", + Unique: false, + Columns: []*schema.Column{InventoriesColumns[11]}, + }, { Name: "inventory_batch_no", Unique: false, - Columns: []*schema.Column{InventoriesColumns[5]}, + Columns: []*schema.Column{InventoriesColumns[6]}, }, { Name: "inventory_sn_code", Unique: false, - Columns: []*schema.Column{InventoriesColumns[6]}, + Columns: []*schema.Column{InventoriesColumns[7]}, }, }, } @@ -396,6 +403,7 @@ var ( {Name: "description", Type: field.TypeString, Nullable: true}, {Name: "item_type", Type: field.TypeInt, Default: 1}, {Name: "manage_mode", Type: field.TypeInt, Default: 1}, + {Name: "sn_mode", Type: field.TypeInt, Default: 0}, {Name: "is_batch_managed", Type: field.TypeBool, Default: false}, {Name: "is_serial_managed", Type: field.TypeBool, Default: false}, {Name: "template_code", Type: field.TypeString, Nullable: true}, @@ -418,7 +426,7 @@ var ( { Name: "material_template_code", Unique: false, - Columns: []*schema.Column{MaterialsColumns[10]}, + Columns: []*schema.Column{MaterialsColumns[11]}, }, { Name: "material_item_type", @@ -524,6 +532,7 @@ var ( {Name: "material_code", Type: field.TypeString}, {Name: "material_name", Type: field.TypeString, Nullable: true}, {Name: "manage_mode", Type: field.TypeInt, Default: 1}, + {Name: "sn_mode", Type: field.TypeInt, Default: 0}, {Name: "batch_no", Type: field.TypeString, Nullable: true}, {Name: "zone_code", Type: field.TypeString, Nullable: true}, {Name: "shelf_no", Type: field.TypeString, Nullable: true}, @@ -565,12 +574,12 @@ var ( { Name: "outboundorder_box_no", Unique: false, - Columns: []*schema.Column{OutboundOrdersColumns[23]}, + Columns: []*schema.Column{OutboundOrdersColumns[24]}, }, { Name: "outboundorder_inspection_no", Unique: false, - Columns: []*schema.Column{OutboundOrdersColumns[26]}, + Columns: []*schema.Column{OutboundOrdersColumns[27]}, }, }, } diff --git a/bj_power_wms/ent/mutation.go b/bj_power_wms/ent/mutation.go index c825a9a..a0c61b8 100644 --- a/bj_power_wms/ent/mutation.go +++ b/bj_power_wms/ent/mutation.go @@ -3983,6 +3983,8 @@ type InboundOrderMutation struct { material_name *string manage_mode *int addmanage_mode *int + sn_mode *int + addsn_mode *int batch_no *string zone_code *string shelf_no *string @@ -4321,6 +4323,62 @@ func (m *InboundOrderMutation) ResetManageMode() { m.addmanage_mode = nil } +// SetSnMode sets the "sn_mode" field. +func (m *InboundOrderMutation) SetSnMode(i int) { + m.sn_mode = &i + m.addsn_mode = nil +} + +// SnMode returns the value of the "sn_mode" field in the mutation. +func (m *InboundOrderMutation) SnMode() (r int, exists bool) { + v := m.sn_mode + if v == nil { + return + } + return *v, true +} + +// OldSnMode returns the old "sn_mode" field's value of the InboundOrder entity. +// If the InboundOrder object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *InboundOrderMutation) OldSnMode(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSnMode requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) + } + return oldValue.SnMode, nil +} + +// AddSnMode adds i to the "sn_mode" field. +func (m *InboundOrderMutation) AddSnMode(i int) { + if m.addsn_mode != nil { + *m.addsn_mode += i + } else { + m.addsn_mode = &i + } +} + +// AddedSnMode returns the value that was added to the "sn_mode" field in this mutation. +func (m *InboundOrderMutation) AddedSnMode() (r int, exists bool) { + v := m.addsn_mode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "sn_mode" field. +func (m *InboundOrderMutation) ResetSnMode() { + m.sn_mode = nil + m.addsn_mode = nil +} + // SetBatchNo sets the "batch_no" field. func (m *InboundOrderMutation) SetBatchNo(s string) { m.batch_no = &s @@ -5233,7 +5291,7 @@ func (m *InboundOrderMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *InboundOrderMutation) Fields() []string { - fields := make([]string, 0, 23) + fields := make([]string, 0, 24) if m.inbound_no != nil { fields = append(fields, inboundorder.FieldInboundNo) } @@ -5249,6 +5307,9 @@ func (m *InboundOrderMutation) Fields() []string { if m.manage_mode != nil { fields = append(fields, inboundorder.FieldManageMode) } + if m.sn_mode != nil { + fields = append(fields, inboundorder.FieldSnMode) + } if m.batch_no != nil { fields = append(fields, inboundorder.FieldBatchNo) } @@ -5321,6 +5382,8 @@ func (m *InboundOrderMutation) Field(name string) (ent.Value, bool) { return m.MaterialName() case inboundorder.FieldManageMode: return m.ManageMode() + case inboundorder.FieldSnMode: + return m.SnMode() case inboundorder.FieldBatchNo: return m.BatchNo() case inboundorder.FieldZoneCode: @@ -5376,6 +5439,8 @@ func (m *InboundOrderMutation) OldField(ctx context.Context, name string) (ent.V return m.OldMaterialName(ctx) case inboundorder.FieldManageMode: return m.OldManageMode(ctx) + case inboundorder.FieldSnMode: + return m.OldSnMode(ctx) case inboundorder.FieldBatchNo: return m.OldBatchNo(ctx) case inboundorder.FieldZoneCode: @@ -5456,6 +5521,13 @@ func (m *InboundOrderMutation) SetField(name string, value ent.Value) error { } m.SetManageMode(v) return nil + case inboundorder.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSnMode(v) + return nil case inboundorder.FieldBatchNo: v, ok := value.(string) if !ok { @@ -5593,6 +5665,9 @@ func (m *InboundOrderMutation) AddedFields() []string { if m.addmanage_mode != nil { fields = append(fields, inboundorder.FieldManageMode) } + if m.addsn_mode != nil { + fields = append(fields, inboundorder.FieldSnMode) + } if m.addquantity != nil { fields = append(fields, inboundorder.FieldQuantity) } @@ -5612,6 +5687,8 @@ func (m *InboundOrderMutation) AddedField(name string) (ent.Value, bool) { switch name { case inboundorder.FieldManageMode: return m.AddedManageMode() + case inboundorder.FieldSnMode: + return m.AddedSnMode() case inboundorder.FieldQuantity: return m.AddedQuantity() case inboundorder.FieldVoidedAt: @@ -5634,6 +5711,13 @@ func (m *InboundOrderMutation) AddField(name string, value ent.Value) error { } m.AddManageMode(v) return nil + case inboundorder.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case inboundorder.FieldQuantity: v, ok := value.(int) if !ok { @@ -5784,6 +5868,9 @@ func (m *InboundOrderMutation) ResetField(name string) error { case inboundorder.FieldManageMode: m.ResetManageMode() return nil + case inboundorder.FieldSnMode: + m.ResetSnMode() + return nil case inboundorder.FieldBatchNo: m.ResetBatchNo() return nil @@ -7957,6 +8044,8 @@ type InventoryMutation struct { id *int manage_mode *int addmanage_mode *int + sn_mode *int + addsn_mode *int category *int addcategory *int material_code *string @@ -8154,6 +8243,62 @@ func (m *InventoryMutation) ResetManageMode() { m.addmanage_mode = nil } +// SetSnMode sets the "sn_mode" field. +func (m *InventoryMutation) SetSnMode(i int) { + m.sn_mode = &i + m.addsn_mode = nil +} + +// SnMode returns the value of the "sn_mode" field in the mutation. +func (m *InventoryMutation) SnMode() (r int, exists bool) { + v := m.sn_mode + if v == nil { + return + } + return *v, true +} + +// OldSnMode returns the old "sn_mode" field's value of the Inventory entity. +// If the Inventory object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *InventoryMutation) OldSnMode(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSnMode requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) + } + return oldValue.SnMode, nil +} + +// AddSnMode adds i to the "sn_mode" field. +func (m *InventoryMutation) AddSnMode(i int) { + if m.addsn_mode != nil { + *m.addsn_mode += i + } else { + m.addsn_mode = &i + } +} + +// AddedSnMode returns the value that was added to the "sn_mode" field in this mutation. +func (m *InventoryMutation) AddedSnMode() (r int, exists bool) { + v := m.addsn_mode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "sn_mode" field. +func (m *InventoryMutation) ResetSnMode() { + m.sn_mode = nil + m.addsn_mode = nil +} + // SetCategory sets the "category" field. func (m *InventoryMutation) SetCategory(i int) { m.category = &i @@ -9685,10 +9830,13 @@ func (m *InventoryMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *InventoryMutation) Fields() []string { - fields := make([]string, 0, 32) + fields := make([]string, 0, 33) if m.manage_mode != nil { fields = append(fields, inventory.FieldManageMode) } + if m.sn_mode != nil { + fields = append(fields, inventory.FieldSnMode) + } if m.category != nil { fields = append(fields, inventory.FieldCategory) } @@ -9792,6 +9940,8 @@ func (m *InventoryMutation) Field(name string) (ent.Value, bool) { switch name { case inventory.FieldManageMode: return m.ManageMode() + case inventory.FieldSnMode: + return m.SnMode() case inventory.FieldCategory: return m.Category() case inventory.FieldMaterialCode: @@ -9865,6 +10015,8 @@ func (m *InventoryMutation) OldField(ctx context.Context, name string) (ent.Valu switch name { case inventory.FieldManageMode: return m.OldManageMode(ctx) + case inventory.FieldSnMode: + return m.OldSnMode(ctx) case inventory.FieldCategory: return m.OldCategory(ctx) case inventory.FieldMaterialCode: @@ -9943,6 +10095,13 @@ func (m *InventoryMutation) SetField(name string, value ent.Value) error { } m.SetManageMode(v) return nil + case inventory.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSnMode(v) + return nil case inventory.FieldCategory: v, ok := value.(int) if !ok { @@ -10171,6 +10330,9 @@ func (m *InventoryMutation) AddedFields() []string { if m.addmanage_mode != nil { fields = append(fields, inventory.FieldManageMode) } + if m.addsn_mode != nil { + fields = append(fields, inventory.FieldSnMode) + } if m.addcategory != nil { fields = append(fields, inventory.FieldCategory) } @@ -10199,6 +10361,8 @@ func (m *InventoryMutation) AddedField(name string) (ent.Value, bool) { switch name { case inventory.FieldManageMode: return m.AddedManageMode() + case inventory.FieldSnMode: + return m.AddedSnMode() case inventory.FieldCategory: return m.AddedCategory() case inventory.FieldQuantity: @@ -10227,6 +10391,13 @@ func (m *InventoryMutation) AddField(name string, value ent.Value) error { } m.AddManageMode(v) return nil + case inventory.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case inventory.FieldCategory: v, ok := value.(int) if !ok { @@ -10422,6 +10593,9 @@ func (m *InventoryMutation) ResetField(name string) error { case inventory.FieldManageMode: m.ResetManageMode() return nil + case inventory.FieldSnMode: + m.ResetSnMode() + return nil case inventory.FieldCategory: m.ResetCategory() return nil @@ -11571,6 +11745,8 @@ type MaterialMutation struct { additem_type *int manage_mode *int addmanage_mode *int + sn_mode *int + addsn_mode *int is_batch_managed *bool is_serial_managed *bool template_code *string @@ -12016,6 +12192,62 @@ func (m *MaterialMutation) ResetManageMode() { m.addmanage_mode = nil } +// SetSnMode sets the "sn_mode" field. +func (m *MaterialMutation) SetSnMode(i int) { + m.sn_mode = &i + m.addsn_mode = nil +} + +// SnMode returns the value of the "sn_mode" field in the mutation. +func (m *MaterialMutation) SnMode() (r int, exists bool) { + v := m.sn_mode + if v == nil { + return + } + return *v, true +} + +// OldSnMode returns the old "sn_mode" field's value of the Material entity. +// If the Material object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *MaterialMutation) OldSnMode(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSnMode requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) + } + return oldValue.SnMode, nil +} + +// AddSnMode adds i to the "sn_mode" field. +func (m *MaterialMutation) AddSnMode(i int) { + if m.addsn_mode != nil { + *m.addsn_mode += i + } else { + m.addsn_mode = &i + } +} + +// AddedSnMode returns the value that was added to the "sn_mode" field in this mutation. +func (m *MaterialMutation) AddedSnMode() (r int, exists bool) { + v := m.addsn_mode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "sn_mode" field. +func (m *MaterialMutation) ResetSnMode() { + m.sn_mode = nil + m.addsn_mode = nil +} + // SetIsBatchManaged sets the "is_batch_managed" field. func (m *MaterialMutation) SetIsBatchManaged(b bool) { m.is_batch_managed = &b @@ -12375,7 +12607,7 @@ func (m *MaterialMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *MaterialMutation) Fields() []string { - fields := make([]string, 0, 14) + fields := make([]string, 0, 15) if m.code != nil { fields = append(fields, material.FieldCode) } @@ -12397,6 +12629,9 @@ func (m *MaterialMutation) Fields() []string { if m.manage_mode != nil { fields = append(fields, material.FieldManageMode) } + if m.sn_mode != nil { + fields = append(fields, material.FieldSnMode) + } if m.is_batch_managed != nil { fields = append(fields, material.FieldIsBatchManaged) } @@ -12440,6 +12675,8 @@ func (m *MaterialMutation) Field(name string) (ent.Value, bool) { return m.ItemType() case material.FieldManageMode: return m.ManageMode() + case material.FieldSnMode: + return m.SnMode() case material.FieldIsBatchManaged: return m.IsBatchManaged() case material.FieldIsSerialManaged: @@ -12477,6 +12714,8 @@ func (m *MaterialMutation) OldField(ctx context.Context, name string) (ent.Value return m.OldItemType(ctx) case material.FieldManageMode: return m.OldManageMode(ctx) + case material.FieldSnMode: + return m.OldSnMode(ctx) case material.FieldIsBatchManaged: return m.OldIsBatchManaged(ctx) case material.FieldIsSerialManaged: @@ -12549,6 +12788,13 @@ func (m *MaterialMutation) SetField(name string, value ent.Value) error { } m.SetManageMode(v) return nil + case material.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSnMode(v) + return nil case material.FieldIsBatchManaged: v, ok := value.(bool) if !ok { @@ -12612,6 +12858,9 @@ func (m *MaterialMutation) AddedFields() []string { if m.addmanage_mode != nil { fields = append(fields, material.FieldManageMode) } + if m.addsn_mode != nil { + fields = append(fields, material.FieldSnMode) + } if m.addsafety_stock != nil { fields = append(fields, material.FieldSafetyStock) } @@ -12633,6 +12882,8 @@ func (m *MaterialMutation) AddedField(name string) (ent.Value, bool) { return m.AddedItemType() case material.FieldManageMode: return m.AddedManageMode() + case material.FieldSnMode: + return m.AddedSnMode() case material.FieldSafetyStock: return m.AddedSafetyStock() case material.FieldCreatedAt: @@ -12662,6 +12913,13 @@ func (m *MaterialMutation) AddField(name string, value ent.Value) error { } m.AddManageMode(v) return nil + case material.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case material.FieldSafetyStock: v, ok := value.(int) if !ok { @@ -12758,6 +13016,9 @@ func (m *MaterialMutation) ResetField(name string) error { case material.FieldManageMode: m.ResetManageMode() return nil + case material.FieldSnMode: + m.ResetSnMode() + return nil case material.FieldIsBatchManaged: m.ResetIsBatchManaged() return nil @@ -15420,6 +15681,8 @@ type OutboundOrderMutation struct { material_name *string manage_mode *int addmanage_mode *int + sn_mode *int + addsn_mode *int batch_no *string zone_code *string shelf_no *string @@ -16072,6 +16335,62 @@ func (m *OutboundOrderMutation) ResetManageMode() { m.addmanage_mode = nil } +// SetSnMode sets the "sn_mode" field. +func (m *OutboundOrderMutation) SetSnMode(i int) { + m.sn_mode = &i + m.addsn_mode = nil +} + +// SnMode returns the value of the "sn_mode" field in the mutation. +func (m *OutboundOrderMutation) SnMode() (r int, exists bool) { + v := m.sn_mode + if v == nil { + return + } + return *v, true +} + +// OldSnMode returns the old "sn_mode" field's value of the OutboundOrder entity. +// If the OutboundOrder object wasn't provided to the builder, the object is fetched from the database. +// An error is returned if the mutation operation is not UpdateOne, or the database query fails. +func (m *OutboundOrderMutation) OldSnMode(ctx context.Context) (v int, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSnMode is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSnMode requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSnMode: %w", err) + } + return oldValue.SnMode, nil +} + +// AddSnMode adds i to the "sn_mode" field. +func (m *OutboundOrderMutation) AddSnMode(i int) { + if m.addsn_mode != nil { + *m.addsn_mode += i + } else { + m.addsn_mode = &i + } +} + +// AddedSnMode returns the value that was added to the "sn_mode" field in this mutation. +func (m *OutboundOrderMutation) AddedSnMode() (r int, exists bool) { + v := m.addsn_mode + if v == nil { + return + } + return *v, true +} + +// ResetSnMode resets all changes to the "sn_mode" field. +func (m *OutboundOrderMutation) ResetSnMode() { + m.sn_mode = nil + m.addsn_mode = nil +} + // SetBatchNo sets the "batch_no" field. func (m *OutboundOrderMutation) SetBatchNo(s string) { m.batch_no = &s @@ -16904,7 +17223,7 @@ func (m *OutboundOrderMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *OutboundOrderMutation) Fields() []string { - fields := make([]string, 0, 28) + fields := make([]string, 0, 29) if m.outbound_no != nil { fields = append(fields, outboundorder.FieldOutboundNo) } @@ -16941,6 +17260,9 @@ func (m *OutboundOrderMutation) Fields() []string { if m.manage_mode != nil { fields = append(fields, outboundorder.FieldManageMode) } + if m.sn_mode != nil { + fields = append(fields, outboundorder.FieldSnMode) + } if m.batch_no != nil { fields = append(fields, outboundorder.FieldBatchNo) } @@ -17021,6 +17343,8 @@ func (m *OutboundOrderMutation) Field(name string) (ent.Value, bool) { return m.MaterialName() case outboundorder.FieldManageMode: return m.ManageMode() + case outboundorder.FieldSnMode: + return m.SnMode() case outboundorder.FieldBatchNo: return m.BatchNo() case outboundorder.FieldZoneCode: @@ -17086,6 +17410,8 @@ func (m *OutboundOrderMutation) OldField(ctx context.Context, name string) (ent. return m.OldMaterialName(ctx) case outboundorder.FieldManageMode: return m.OldManageMode(ctx) + case outboundorder.FieldSnMode: + return m.OldSnMode(ctx) case outboundorder.FieldBatchNo: return m.OldBatchNo(ctx) case outboundorder.FieldZoneCode: @@ -17211,6 +17537,13 @@ func (m *OutboundOrderMutation) SetField(name string, value ent.Value) error { } m.SetManageMode(v) return nil + case outboundorder.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSnMode(v) + return nil case outboundorder.FieldBatchNo: v, ok := value.(string) if !ok { @@ -17334,6 +17667,9 @@ func (m *OutboundOrderMutation) AddedFields() []string { if m.addmanage_mode != nil { fields = append(fields, outboundorder.FieldManageMode) } + if m.addsn_mode != nil { + fields = append(fields, outboundorder.FieldSnMode) + } if m.addquantity != nil { fields = append(fields, outboundorder.FieldQuantity) } @@ -17350,6 +17686,8 @@ func (m *OutboundOrderMutation) AddedField(name string) (ent.Value, bool) { switch name { case outboundorder.FieldManageMode: return m.AddedManageMode() + case outboundorder.FieldSnMode: + return m.AddedSnMode() case outboundorder.FieldQuantity: return m.AddedQuantity() case outboundorder.FieldCreatedAt: @@ -17370,6 +17708,13 @@ func (m *OutboundOrderMutation) AddField(name string, value ent.Value) error { } m.AddManageMode(v) return nil + case outboundorder.FieldSnMode: + v, ok := value.(int) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddSnMode(v) + return nil case outboundorder.FieldQuantity: v, ok := value.(int) if !ok { @@ -17570,6 +17915,9 @@ func (m *OutboundOrderMutation) ResetField(name string) error { case outboundorder.FieldManageMode: m.ResetManageMode() return nil + case outboundorder.FieldSnMode: + m.ResetSnMode() + return nil case outboundorder.FieldBatchNo: m.ResetBatchNo() return nil diff --git a/bj_power_wms/ent/outboundorder.go b/bj_power_wms/ent/outboundorder.go index 77fc142..85b94dd 100644 --- a/bj_power_wms/ent/outboundorder.go +++ b/bj_power_wms/ent/outboundorder.go @@ -38,8 +38,10 @@ type OutboundOrder struct { MaterialCode string `json:"materialCode,omitempty"` // 物料名称(冗余) MaterialName string `json:"materialName,omitempty"` - // 管理粒度 1批次/2序列号 + // 类型 1结构件/2电气件/3其他 ManageMode int `json:"manageMode,omitempty"` + // SN管理 1序列号件(逐件SN)/2批次件(数量)/0未选择 + SnMode int `json:"snMode,omitempty"` // 批次号(结构件) BatchNo string `json:"batchNo,omitempty"` // 出库区域(大区) @@ -82,7 +84,7 @@ func (*OutboundOrder) scanValues(columns []string) ([]any, error) { switch columns[i] { case outboundorder.FieldNeedAgv: values[i] = new(sql.NullBool) - case outboundorder.FieldID, outboundorder.FieldManageMode, outboundorder.FieldQuantity, outboundorder.FieldCreatedAt: + case outboundorder.FieldID, outboundorder.FieldManageMode, outboundorder.FieldSnMode, outboundorder.FieldQuantity, outboundorder.FieldCreatedAt: values[i] = new(sql.NullInt64) case outboundorder.FieldOutboundNo, outboundorder.FieldOutboundType, outboundorder.FieldStatus, outboundorder.FieldOutboundCategory, outboundorder.FieldOwnershipType, outboundorder.FieldOwnershipNo, outboundorder.FieldTargetStation, outboundorder.FieldOrderNo, outboundorder.FieldMaterialCode, outboundorder.FieldMaterialName, outboundorder.FieldBatchNo, outboundorder.FieldZoneCode, outboundorder.FieldShelfNo, outboundorder.FieldLayerNo, outboundorder.FieldPositionNo, outboundorder.FieldOperator, outboundorder.FieldReviewer, outboundorder.FieldTargetDock, outboundorder.FieldRemark, outboundorder.FieldBoxNo, outboundorder.FieldBoxSnList, outboundorder.FieldContractNo, outboundorder.FieldInspectionNo, outboundorder.FieldProductWorkNo: values[i] = new(sql.NullString) @@ -179,6 +181,12 @@ func (_m *OutboundOrder) assignValues(columns []string, values []any) error { } else if value.Valid { _m.ManageMode = int(value.Int64) } + case outboundorder.FieldSnMode: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field sn_mode", values[i]) + } else if value.Valid { + _m.SnMode = int(value.Int64) + } case outboundorder.FieldBatchNo: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field batch_no", values[i]) @@ -347,6 +355,9 @@ func (_m *OutboundOrder) String() string { builder.WriteString("manage_mode=") builder.WriteString(fmt.Sprintf("%v", _m.ManageMode)) builder.WriteString(", ") + builder.WriteString("sn_mode=") + builder.WriteString(fmt.Sprintf("%v", _m.SnMode)) + builder.WriteString(", ") builder.WriteString("batch_no=") builder.WriteString(_m.BatchNo) builder.WriteString(", ") diff --git a/bj_power_wms/ent/outboundorder/outboundorder.go b/bj_power_wms/ent/outboundorder/outboundorder.go index 9e16bea..7d52a15 100644 --- a/bj_power_wms/ent/outboundorder/outboundorder.go +++ b/bj_power_wms/ent/outboundorder/outboundorder.go @@ -35,6 +35,8 @@ const ( FieldMaterialName = "material_name" // FieldManageMode holds the string denoting the manage_mode field in the database. FieldManageMode = "manage_mode" + // FieldSnMode holds the string denoting the sn_mode field in the database. + FieldSnMode = "sn_mode" // FieldBatchNo holds the string denoting the batch_no field in the database. FieldBatchNo = "batch_no" // FieldZoneCode holds the string denoting the zone_code field in the database. @@ -86,6 +88,7 @@ var Columns = []string{ FieldMaterialCode, FieldMaterialName, FieldManageMode, + FieldSnMode, FieldBatchNo, FieldZoneCode, FieldShelfNo, @@ -123,6 +126,8 @@ var ( DefaultNeedAgv bool // DefaultManageMode holds the default value on creation for the "manage_mode" field. DefaultManageMode int + // DefaultSnMode holds the default value on creation for the "sn_mode" field. + DefaultSnMode int // DefaultQuantity holds the default value on creation for the "quantity" field. DefaultQuantity int // DefaultCreatedAt holds the default value on creation for the "created_at" field. @@ -197,6 +202,11 @@ func ByManageMode(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldManageMode, opts...).ToFunc() } +// BySnMode orders the results by the sn_mode field. +func BySnMode(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSnMode, opts...).ToFunc() +} + // ByBatchNo orders the results by the batch_no field. func ByBatchNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldBatchNo, opts...).ToFunc() diff --git a/bj_power_wms/ent/outboundorder/where.go b/bj_power_wms/ent/outboundorder/where.go index cc7568e..d7e907a 100644 --- a/bj_power_wms/ent/outboundorder/where.go +++ b/bj_power_wms/ent/outboundorder/where.go @@ -113,6 +113,11 @@ func ManageMode(v int) predicate.OutboundOrder { return predicate.OutboundOrder(sql.FieldEQ(FieldManageMode, v)) } +// SnMode applies equality check predicate on the "sn_mode" field. It's identical to SnModeEQ. +func SnMode(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldEQ(FieldSnMode, v)) +} + // BatchNo applies equality check predicate on the "batch_no" field. It's identical to BatchNoEQ. func BatchNo(v string) predicate.OutboundOrder { return predicate.OutboundOrder(sql.FieldEQ(FieldBatchNo, v)) @@ -953,6 +958,46 @@ func ManageModeLTE(v int) predicate.OutboundOrder { return predicate.OutboundOrder(sql.FieldLTE(FieldManageMode, v)) } +// SnModeEQ applies the EQ predicate on the "sn_mode" field. +func SnModeEQ(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldEQ(FieldSnMode, v)) +} + +// SnModeNEQ applies the NEQ predicate on the "sn_mode" field. +func SnModeNEQ(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldNEQ(FieldSnMode, v)) +} + +// SnModeIn applies the In predicate on the "sn_mode" field. +func SnModeIn(vs ...int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldIn(FieldSnMode, vs...)) +} + +// SnModeNotIn applies the NotIn predicate on the "sn_mode" field. +func SnModeNotIn(vs ...int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldNotIn(FieldSnMode, vs...)) +} + +// SnModeGT applies the GT predicate on the "sn_mode" field. +func SnModeGT(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldGT(FieldSnMode, v)) +} + +// SnModeGTE applies the GTE predicate on the "sn_mode" field. +func SnModeGTE(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldGTE(FieldSnMode, v)) +} + +// SnModeLT applies the LT predicate on the "sn_mode" field. +func SnModeLT(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldLT(FieldSnMode, v)) +} + +// SnModeLTE applies the LTE predicate on the "sn_mode" field. +func SnModeLTE(v int) predicate.OutboundOrder { + return predicate.OutboundOrder(sql.FieldLTE(FieldSnMode, v)) +} + // BatchNoEQ applies the EQ predicate on the "batch_no" field. func BatchNoEQ(v string) predicate.OutboundOrder { return predicate.OutboundOrder(sql.FieldEQ(FieldBatchNo, v)) diff --git a/bj_power_wms/ent/outboundorder_create.go b/bj_power_wms/ent/outboundorder_create.go index ad3e96f..e4fe8d6 100644 --- a/bj_power_wms/ent/outboundorder_create.go +++ b/bj_power_wms/ent/outboundorder_create.go @@ -173,6 +173,20 @@ func (_c *OutboundOrderCreate) SetNillableManageMode(v *int) *OutboundOrderCreat return _c } +// SetSnMode sets the "sn_mode" field. +func (_c *OutboundOrderCreate) SetSnMode(v int) *OutboundOrderCreate { + _c.mutation.SetSnMode(v) + return _c +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_c *OutboundOrderCreate) SetNillableSnMode(v *int) *OutboundOrderCreate { + if v != nil { + _c.SetSnMode(*v) + } + return _c +} + // SetBatchNo sets the "batch_no" field. func (_c *OutboundOrderCreate) SetBatchNo(v string) *OutboundOrderCreate { _c.mutation.SetBatchNo(v) @@ -448,6 +462,10 @@ func (_c *OutboundOrderCreate) defaults() { v := outboundorder.DefaultManageMode _c.mutation.SetManageMode(v) } + if _, ok := _c.mutation.SnMode(); !ok { + v := outboundorder.DefaultSnMode + _c.mutation.SetSnMode(v) + } if _, ok := _c.mutation.Quantity(); !ok { v := outboundorder.DefaultQuantity _c.mutation.SetQuantity(v) @@ -478,6 +496,9 @@ func (_c *OutboundOrderCreate) check() error { if _, ok := _c.mutation.ManageMode(); !ok { return &ValidationError{Name: "manage_mode", err: errors.New(`ent: missing required field "OutboundOrder.manage_mode"`)} } + if _, ok := _c.mutation.SnMode(); !ok { + return &ValidationError{Name: "sn_mode", err: errors.New(`ent: missing required field "OutboundOrder.sn_mode"`)} + } if _, ok := _c.mutation.Quantity(); !ok { return &ValidationError{Name: "quantity", err: errors.New(`ent: missing required field "OutboundOrder.quantity"`)} } @@ -559,6 +580,10 @@ func (_c *OutboundOrderCreate) createSpec() (*OutboundOrder, *sqlgraph.CreateSpe _spec.SetField(outboundorder.FieldManageMode, field.TypeInt, value) _node.ManageMode = value } + if value, ok := _c.mutation.SnMode(); ok { + _spec.SetField(outboundorder.FieldSnMode, field.TypeInt, value) + _node.SnMode = value + } if value, ok := _c.mutation.BatchNo(); ok { _spec.SetField(outboundorder.FieldBatchNo, field.TypeString, value) _node.BatchNo = value @@ -861,6 +886,24 @@ func (u *OutboundOrderUpsert) AddManageMode(v int) *OutboundOrderUpsert { return u } +// SetSnMode sets the "sn_mode" field. +func (u *OutboundOrderUpsert) SetSnMode(v int) *OutboundOrderUpsert { + u.Set(outboundorder.FieldSnMode, v) + return u +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *OutboundOrderUpsert) UpdateSnMode() *OutboundOrderUpsert { + u.SetExcluded(outboundorder.FieldSnMode) + return u +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *OutboundOrderUpsert) AddSnMode(v int) *OutboundOrderUpsert { + u.Add(outboundorder.FieldSnMode, v) + return u +} + // SetBatchNo sets the "batch_no" field. func (u *OutboundOrderUpsert) SetBatchNo(v string) *OutboundOrderUpsert { u.Set(outboundorder.FieldBatchNo, v) @@ -1406,6 +1449,27 @@ func (u *OutboundOrderUpsertOne) UpdateManageMode() *OutboundOrderUpsertOne { }) } +// SetSnMode sets the "sn_mode" field. +func (u *OutboundOrderUpsertOne) SetSnMode(v int) *OutboundOrderUpsertOne { + return u.Update(func(s *OutboundOrderUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *OutboundOrderUpsertOne) AddSnMode(v int) *OutboundOrderUpsertOne { + return u.Update(func(s *OutboundOrderUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *OutboundOrderUpsertOne) UpdateSnMode() *OutboundOrderUpsertOne { + return u.Update(func(s *OutboundOrderUpsert) { + s.UpdateSnMode() + }) +} + // SetBatchNo sets the "batch_no" field. func (u *OutboundOrderUpsertOne) SetBatchNo(v string) *OutboundOrderUpsertOne { return u.Update(func(s *OutboundOrderUpsert) { @@ -2163,6 +2227,27 @@ func (u *OutboundOrderUpsertBulk) UpdateManageMode() *OutboundOrderUpsertBulk { }) } +// SetSnMode sets the "sn_mode" field. +func (u *OutboundOrderUpsertBulk) SetSnMode(v int) *OutboundOrderUpsertBulk { + return u.Update(func(s *OutboundOrderUpsert) { + s.SetSnMode(v) + }) +} + +// AddSnMode adds v to the "sn_mode" field. +func (u *OutboundOrderUpsertBulk) AddSnMode(v int) *OutboundOrderUpsertBulk { + return u.Update(func(s *OutboundOrderUpsert) { + s.AddSnMode(v) + }) +} + +// UpdateSnMode sets the "sn_mode" field to the value that was provided on create. +func (u *OutboundOrderUpsertBulk) UpdateSnMode() *OutboundOrderUpsertBulk { + return u.Update(func(s *OutboundOrderUpsert) { + s.UpdateSnMode() + }) +} + // SetBatchNo sets the "batch_no" field. func (u *OutboundOrderUpsertBulk) SetBatchNo(v string) *OutboundOrderUpsertBulk { return u.Update(func(s *OutboundOrderUpsert) { diff --git a/bj_power_wms/ent/outboundorder_update.go b/bj_power_wms/ent/outboundorder_update.go index 1be7b26..a906d69 100644 --- a/bj_power_wms/ent/outboundorder_update.go +++ b/bj_power_wms/ent/outboundorder_update.go @@ -238,6 +238,27 @@ func (_u *OutboundOrderUpdate) AddManageMode(v int) *OutboundOrderUpdate { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *OutboundOrderUpdate) SetSnMode(v int) *OutboundOrderUpdate { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *OutboundOrderUpdate) SetNillableSnMode(v *int) *OutboundOrderUpdate { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *OutboundOrderUpdate) AddSnMode(v int) *OutboundOrderUpdate { + _u.mutation.AddSnMode(v) + return _u +} + // SetBatchNo sets the "batch_no" field. func (_u *OutboundOrderUpdate) SetBatchNo(v string) *OutboundOrderUpdate { _u.mutation.SetBatchNo(v) @@ -658,6 +679,12 @@ func (_u *OutboundOrderUpdate) sqlSave(ctx context.Context) (_node int, err erro if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(outboundorder.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(outboundorder.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(outboundorder.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(outboundorder.FieldBatchNo, field.TypeString, value) } @@ -985,6 +1012,27 @@ func (_u *OutboundOrderUpdateOne) AddManageMode(v int) *OutboundOrderUpdateOne { return _u } +// SetSnMode sets the "sn_mode" field. +func (_u *OutboundOrderUpdateOne) SetSnMode(v int) *OutboundOrderUpdateOne { + _u.mutation.ResetSnMode() + _u.mutation.SetSnMode(v) + return _u +} + +// SetNillableSnMode sets the "sn_mode" field if the given value is not nil. +func (_u *OutboundOrderUpdateOne) SetNillableSnMode(v *int) *OutboundOrderUpdateOne { + if v != nil { + _u.SetSnMode(*v) + } + return _u +} + +// AddSnMode adds value to the "sn_mode" field. +func (_u *OutboundOrderUpdateOne) AddSnMode(v int) *OutboundOrderUpdateOne { + _u.mutation.AddSnMode(v) + return _u +} + // SetBatchNo sets the "batch_no" field. func (_u *OutboundOrderUpdateOne) SetBatchNo(v string) *OutboundOrderUpdateOne { _u.mutation.SetBatchNo(v) @@ -1435,6 +1483,12 @@ func (_u *OutboundOrderUpdateOne) sqlSave(ctx context.Context) (_node *OutboundO if value, ok := _u.mutation.AddedManageMode(); ok { _spec.AddField(outboundorder.FieldManageMode, field.TypeInt, value) } + if value, ok := _u.mutation.SnMode(); ok { + _spec.SetField(outboundorder.FieldSnMode, field.TypeInt, value) + } + if value, ok := _u.mutation.AddedSnMode(); ok { + _spec.AddField(outboundorder.FieldSnMode, field.TypeInt, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(outboundorder.FieldBatchNo, field.TypeString, value) } diff --git a/bj_power_wms/ent/runtime.go b/bj_power_wms/ent/runtime.go index fbd74f5..ca19e7b 100644 --- a/bj_power_wms/ent/runtime.go +++ b/bj_power_wms/ent/runtime.go @@ -167,20 +167,24 @@ func init() { inboundorderDescManageMode := inboundorderFields[4].Descriptor() // inboundorder.DefaultManageMode holds the default value on creation for the manage_mode field. inboundorder.DefaultManageMode = inboundorderDescManageMode.Default.(int) + // inboundorderDescSnMode is the schema descriptor for sn_mode field. + inboundorderDescSnMode := inboundorderFields[5].Descriptor() + // inboundorder.DefaultSnMode holds the default value on creation for the sn_mode field. + inboundorder.DefaultSnMode = inboundorderDescSnMode.Default.(int) // inboundorderDescQuantity is the schema descriptor for quantity field. - inboundorderDescQuantity := inboundorderFields[10].Descriptor() + inboundorderDescQuantity := inboundorderFields[11].Descriptor() // inboundorder.DefaultQuantity holds the default value on creation for the quantity field. inboundorder.DefaultQuantity = inboundorderDescQuantity.Default.(int) // inboundorderDescOwnershipType is the schema descriptor for ownership_type field. - inboundorderDescOwnershipType := inboundorderFields[14].Descriptor() + inboundorderDescOwnershipType := inboundorderFields[15].Descriptor() // inboundorder.DefaultOwnershipType holds the default value on creation for the ownership_type field. inboundorder.DefaultOwnershipType = inboundorderDescOwnershipType.Default.(string) // inboundorderDescVoided is the schema descriptor for voided field. - inboundorderDescVoided := inboundorderFields[18].Descriptor() + inboundorderDescVoided := inboundorderFields[19].Descriptor() // inboundorder.DefaultVoided holds the default value on creation for the voided field. inboundorder.DefaultVoided = inboundorderDescVoided.Default.(bool) // inboundorderDescCreatedAt is the schema descriptor for created_at field. - inboundorderDescCreatedAt := inboundorderFields[22].Descriptor() + inboundorderDescCreatedAt := inboundorderFields[23].Descriptor() // inboundorder.DefaultCreatedAt holds the default value on creation for the created_at field. inboundorder.DefaultCreatedAt = inboundorderDescCreatedAt.Default.(func() int64) inspectionrecordFields := schema.InspectionRecord{}.Fields() @@ -219,50 +223,54 @@ func init() { inspectionrecord.DefaultUpdatedAt = inspectionrecordDescUpdatedAt.Default.(func() int64) inventoryFields := schema.Inventory{}.Fields() _ = inventoryFields + // inventoryDescSnMode is the schema descriptor for sn_mode field. + inventoryDescSnMode := inventoryFields[1].Descriptor() + // inventory.DefaultSnMode holds the default value on creation for the sn_mode field. + inventory.DefaultSnMode = inventoryDescSnMode.Default.(int) // inventoryDescCategory is the schema descriptor for category field. - inventoryDescCategory := inventoryFields[1].Descriptor() + inventoryDescCategory := inventoryFields[2].Descriptor() // inventory.DefaultCategory holds the default value on creation for the category field. inventory.DefaultCategory = inventoryDescCategory.Default.(int) // inventoryDescQuantity is the schema descriptor for quantity field. - inventoryDescQuantity := inventoryFields[6].Descriptor() + inventoryDescQuantity := inventoryFields[7].Descriptor() // inventory.DefaultQuantity holds the default value on creation for the quantity field. inventory.DefaultQuantity = inventoryDescQuantity.Default.(int) // inventoryDescLockedQty is the schema descriptor for locked_qty field. - inventoryDescLockedQty := inventoryFields[7].Descriptor() + inventoryDescLockedQty := inventoryFields[8].Descriptor() // inventory.DefaultLockedQty holds the default value on creation for the locked_qty field. inventory.DefaultLockedQty = inventoryDescLockedQty.Default.(int) // inventoryDescQualityStatus is the schema descriptor for quality_status field. - inventoryDescQualityStatus := inventoryFields[8].Descriptor() + inventoryDescQualityStatus := inventoryFields[9].Descriptor() // inventory.DefaultQualityStatus holds the default value on creation for the quality_status field. inventory.DefaultQualityStatus = inventoryDescQualityStatus.Default.(string) // inventoryDescStatus is the schema descriptor for status field. - inventoryDescStatus := inventoryFields[13].Descriptor() + inventoryDescStatus := inventoryFields[14].Descriptor() // inventory.DefaultStatus holds the default value on creation for the status field. inventory.DefaultStatus = inventoryDescStatus.Default.(string) // inventoryDescOrderNo is the schema descriptor for order_no field. - inventoryDescOrderNo := inventoryFields[17].Descriptor() + inventoryDescOrderNo := inventoryFields[18].Descriptor() // inventory.DefaultOrderNo holds the default value on creation for the order_no field. inventory.DefaultOrderNo = inventoryDescOrderNo.Default.(string) // inventory.OrderNoValidator is a validator for the "order_no" field. It is called by the builders before save. inventory.OrderNoValidator = inventoryDescOrderNo.Validators[0].(func(string) error) // inventoryDescCompletedProcess is the schema descriptor for completed_process field. - inventoryDescCompletedProcess := inventoryFields[19].Descriptor() + inventoryDescCompletedProcess := inventoryFields[20].Descriptor() // inventory.DefaultCompletedProcess holds the default value on creation for the completed_process field. inventory.DefaultCompletedProcess = inventoryDescCompletedProcess.Default.(string) // inventory.CompletedProcessValidator is a validator for the "completed_process" field. It is called by the builders before save. inventory.CompletedProcessValidator = inventoryDescCompletedProcess.Validators[0].(func(string) error) // inventoryDescStocktakeNo is the schema descriptor for stocktake_no field. - inventoryDescStocktakeNo := inventoryFields[28].Descriptor() + inventoryDescStocktakeNo := inventoryFields[29].Descriptor() // inventory.DefaultStocktakeNo holds the default value on creation for the stocktake_no field. inventory.DefaultStocktakeNo = inventoryDescStocktakeNo.Default.(string) // inventory.StocktakeNoValidator is a validator for the "stocktake_no" field. It is called by the builders before save. inventory.StocktakeNoValidator = inventoryDescStocktakeNo.Validators[0].(func(string) error) // inventoryDescCreatedAt is the schema descriptor for created_at field. - inventoryDescCreatedAt := inventoryFields[30].Descriptor() + inventoryDescCreatedAt := inventoryFields[31].Descriptor() // inventory.DefaultCreatedAt holds the default value on creation for the created_at field. inventory.DefaultCreatedAt = inventoryDescCreatedAt.Default.(func() int64) // inventoryDescUpdatedAt is the schema descriptor for updated_at field. - inventoryDescUpdatedAt := inventoryFields[31].Descriptor() + inventoryDescUpdatedAt := inventoryFields[32].Descriptor() // inventory.DefaultUpdatedAt holds the default value on creation for the updated_at field. inventory.DefaultUpdatedAt = inventoryDescUpdatedAt.Default.(func() int64) inventorylockFields := schema.InventoryLock{}.Fields() @@ -293,28 +301,32 @@ func init() { materialDescManageMode := materialFields[6].Descriptor() // material.DefaultManageMode holds the default value on creation for the manage_mode field. material.DefaultManageMode = materialDescManageMode.Default.(int) + // materialDescSnMode is the schema descriptor for sn_mode field. + materialDescSnMode := materialFields[7].Descriptor() + // material.DefaultSnMode holds the default value on creation for the sn_mode field. + material.DefaultSnMode = materialDescSnMode.Default.(int) // materialDescIsBatchManaged is the schema descriptor for is_batch_managed field. - materialDescIsBatchManaged := materialFields[7].Descriptor() + materialDescIsBatchManaged := materialFields[8].Descriptor() // material.DefaultIsBatchManaged holds the default value on creation for the is_batch_managed field. material.DefaultIsBatchManaged = materialDescIsBatchManaged.Default.(bool) // materialDescIsSerialManaged is the schema descriptor for is_serial_managed field. - materialDescIsSerialManaged := materialFields[8].Descriptor() + materialDescIsSerialManaged := materialFields[9].Descriptor() // material.DefaultIsSerialManaged holds the default value on creation for the is_serial_managed field. material.DefaultIsSerialManaged = materialDescIsSerialManaged.Default.(bool) // materialDescSafetyStock is the schema descriptor for safety_stock field. - materialDescSafetyStock := materialFields[10].Descriptor() + materialDescSafetyStock := materialFields[11].Descriptor() // material.DefaultSafetyStock holds the default value on creation for the safety_stock field. material.DefaultSafetyStock = materialDescSafetyStock.Default.(int) // materialDescIsActive is the schema descriptor for is_active field. - materialDescIsActive := materialFields[11].Descriptor() + materialDescIsActive := materialFields[12].Descriptor() // material.DefaultIsActive holds the default value on creation for the is_active field. material.DefaultIsActive = materialDescIsActive.Default.(bool) // materialDescCreatedAt is the schema descriptor for created_at field. - materialDescCreatedAt := materialFields[12].Descriptor() + materialDescCreatedAt := materialFields[13].Descriptor() // material.DefaultCreatedAt holds the default value on creation for the created_at field. material.DefaultCreatedAt = materialDescCreatedAt.Default.(func() int64) // materialDescUpdatedAt is the schema descriptor for updated_at field. - materialDescUpdatedAt := materialFields[13].Descriptor() + materialDescUpdatedAt := materialFields[14].Descriptor() // material.DefaultUpdatedAt holds the default value on creation for the updated_at field. material.DefaultUpdatedAt = materialDescUpdatedAt.Default.(func() int64) materialdemandFields := schema.MaterialDemand{}.Fields() @@ -385,12 +397,16 @@ func init() { outboundorderDescManageMode := outboundorderFields[11].Descriptor() // outboundorder.DefaultManageMode holds the default value on creation for the manage_mode field. outboundorder.DefaultManageMode = outboundorderDescManageMode.Default.(int) + // outboundorderDescSnMode is the schema descriptor for sn_mode field. + outboundorderDescSnMode := outboundorderFields[12].Descriptor() + // outboundorder.DefaultSnMode holds the default value on creation for the sn_mode field. + outboundorder.DefaultSnMode = outboundorderDescSnMode.Default.(int) // outboundorderDescQuantity is the schema descriptor for quantity field. - outboundorderDescQuantity := outboundorderFields[17].Descriptor() + outboundorderDescQuantity := outboundorderFields[18].Descriptor() // outboundorder.DefaultQuantity holds the default value on creation for the quantity field. outboundorder.DefaultQuantity = outboundorderDescQuantity.Default.(int) // outboundorderDescCreatedAt is the schema descriptor for created_at field. - outboundorderDescCreatedAt := outboundorderFields[27].Descriptor() + outboundorderDescCreatedAt := outboundorderFields[28].Descriptor() // outboundorder.DefaultCreatedAt holds the default value on creation for the created_at field. outboundorder.DefaultCreatedAt = outboundorderDescCreatedAt.Default.(func() int64) permissionFields := schema.Permission{}.Fields() diff --git a/bj_power_wms/frontend/src/help.js b/bj_power_wms/frontend/src/help.js index b5441f5..ff8b2d7 100644 --- a/bj_power_wms/frontend/src/help.js +++ b/bj_power_wms/frontend/src/help.js @@ -5,7 +5,7 @@ export const helpInbound = { title: '入库(来料入账)', overview: - '把到货的来料记入 WMS 库存。按管理类型分两种入库方式:\n· 结构件(螺丝/机加工件) → 按【批次】入库,一批多件;\n· 电气件(芯片/器件) → 按【SN 序列号】逐件扫码,可单件追溯。\n\n管理类型由 WMS 的"物料档案"决定(电气件/结构件),入库方式随之自动给出。\n入库是整个库存链路的第一环:入库(Held) → 质量检验(合格Z02) → 之后才能被出库锁定。\n\n本页四个页签(录入在前,记录在后点击才见),参照出库管理:\n· 结构件入库:按批次入库 + Excel 批量导入;\n· 电气件入库:逐件扫码 + Excel 批量导入;\n· 其他入库:辅料/螺栓/工装/试验设备等非结构件非电气件物料,规格型号强制;\n· 入库记录:分页列表(一单一行),点「明细」在右侧抽屉查看该单的行(懒加载+分页,不内嵌子表)。\n\n库位四级贯通:每笔入库除选「区域」外,还可录「货架/层/位置」三级货位;选物料后系统自动带入该物料最近一次入库的库位,可手动修改。', + '把到货的来料记入 WMS 库存。按「序列号件」(物料档案维护)分两种入库方式:\n· 批次件 → 按【批次】入库,一批多件;\n· 序列号件 → 按【SN 序列号】逐件扫码,可单件追溯。\n\n序列号件由 WMS 的"物料档案"决定(2026-09-30 与物料类型解耦,可独立设置),入库方式随之自动给出;物料档案未选择序列号件的物料不能入库。\n入库是整个库存链路的第一环:入库(Held) → 质量检验(合格Z02) → 之后才能被出库锁定。\n\n本页四个页签(录入在前,记录在后点击才见),参照出库管理:\n· 结构件入库:按批次入库 + Excel 批量导入;\n· 电气件入库:逐件扫码 + Excel 批量导入;\n· 其他入库:辅料/螺栓/工装/试验设备等非结构件非电气件物料,规格型号强制;\n· 入库记录:分页列表(一单一行),点「明细」在右侧抽屉查看该单的行(懒加载+分页,不内嵌子表)。\n\n库位四级贯通:每笔入库除选「区域」外,还可录「货架/层/位置」三级货位;选物料后系统自动带入该物料最近一次入库的库位,可手动修改。', sections: [ { title: '结构件入库(页签1)', @@ -38,7 +38,7 @@ export const helpInbound = { }, { title: '其他入库(页签3)', - overview: '适用于辅料、螺栓、工装、试验设备等既非结构件也非电气件的物料;规格型号强制(在物料档案维护,为空则拒绝入库)。支持归属(工单号/科技项目号/其他,必选)与库位四级。', + overview: '适用于辅料、螺栓、工装、试验设备等既非结构件也非电气件的物料;规格型号强制(在物料档案维护,为空则拒绝入库)。支持归属(合同号/科技项目号/其他,必选)与库位四级。', fields: [ { name: '物料', source: '下拉选择。来自"物料档案"类型为"其他"的物料。', purpose: '入库的其他类物料', fill: '选择图号;规格型号由档案带出,缺失需先补档案' }, { name: '规格型号', source: '选物料后自动带出(只读)。', purpose: '其他类物料强制记录规格', fill: '只读;为空时无法提交,需先到物料档案补全' }, @@ -51,10 +51,10 @@ export const helpInbound = { }, { title: '入库记录(页签4)', - overview: '分页展示全部入库单,结构件/电气件/其他同表(用"类型"列区分)。支持按入库单号、图号、类型、物料名称、归属单号、产品工号、入库时间筛选(各字段独立,无关键字混搜);列表含「区域」「库位」「检测单号」「质量状态」「归属」「产品工号」列;可按当前条件导出 xlsx。点行「明细」在右侧抽屉查看该单的行(懒加载+分页,避免电气件上万条 SN 撑爆前端)。', + overview: '分页展示全部入库单,结构件/电气件/其他同表(用"类型"列区分)。支持按入库单号、图号、类型、物料名称、归属单号、产品工号、入库时间筛选(各字段独立,无关键字混搜);列表含「区域」「库位」「检测单号」「质量状态」「归属」「产品工号」列;可按当前条件导出 xlsx。点行「明细」在右侧抽屉查看该单的行(懒加载+分页,避免序列号件上万条 SN 撑爆前端)。', fields: [ { name: '查询条件', source: '本页签顶部筛选区。', purpose: '缩小列表范围', fill: '可组合:入库单号(模糊)/图号(模糊)/类型(全部·结构件·电气件·其他)/物料名称(模糊)/归属单号(模糊·合同号/科技项目号)/产品工号(模糊)/状态(全部·有效·已作废)/入库时间区间' }, - { name: '状态 / 作废', source: '行「状态」列 + 行末「作废」按钮(权限 inbound:void)。', purpose: '作废错误入库单并回滚库存', fill: '点「作废」填写作废原因→确认;结构件按批次回滚数量、电气件按 SN 精确回滚(不影响其它单);已锁定/已出库的批次或 SN 须先处理' }, + { name: '状态 / 作废', source: '行「状态」列 + 行末「作废」按钮(权限 inbound:void)。', purpose: '作废错误入库单并回滚库存', fill: '点「作废」填写作废原因→确认;批次件按批次回滚数量、序列号件按 SN 精确回滚(不影响其它单);已锁定/已出库的批次或 SN 须先处理' }, { name: '明细', source: '行末「明细」按钮 → 右侧抽屉。', purpose: '查看该入库单的批次号/SN/数量明细', fill: '抽屉内分页展示,不回列表里嵌套子表' }, { name: '附件', source: '入库单行内附件(AttachmentPanel)。', purpose: '为入库单上传/查看随货单据、质检报告等附件', fill: '点行内附件按钮,在抽屉中上传或查看' }, { name: '导出', source: '按钮。后端 /inbound/export 按当前条件返回全部(不分页)。', purpose: '把筛选结果一次性导出为 xlsx', fill: '点【导出】下载"入库管理.xlsx"' } @@ -66,17 +66,17 @@ export const helpInbound = { export const helpOutbound = { title: '出库管理(统一主表)', overview: - '所有出库都落在同一张「出库主表」(OutboundOrder),用"类型"区分,装箱信息(箱号/SN清单/合同号)也直接记在主表上,不再单独建装箱表。\n三个页签:\n· 工单领料出库(操作):按 MES 工单号查询 WMS 同步台账领料,强约束"单物料累计出库 ≤ 工单需求总量";工单号下拉选择(来自 MES 实时工单,未完成优先,无输入默认展示前 20 条),支持输入模糊搜索;MES 不可达或工单未同步时下拉可能为空,可手输兜底(需台账已同步)。\n· 通用出库:不依赖工单的手动出库(退料/退货/样品/报废/发货/其他),支持结构件批次与电气件 SN,填箱号即一并记录装箱;MES 不可用或无需挂靠工单时请用本页。\n· 出库记录:统一主表的全量查询与导出(一键导出 CSV,含装箱信息),含工单号与目标工位。\n选用原则:有 MES 工单要按 物料清单 领料 → 工单领料出库(操作);无工单的自由出库/装箱发货 → 通用出库。\n\n通用出库操作顺序(客户诉求 问题17/18/20):① 先选物料(下拉统一显示 编码/图号/类型/品类)→ ② 系统自动判定出库类型(电气件/结构件,无需手选)→ ③ 选出库类别(纯标签,不联动任何地方;选「其他」时备注必填原因)→ ④ 填归属(合同号/科技项目号/其他,非其他时编号必填)→ ⑤ 结构件从可用批次下拉选批次(默认 FIFO 首个)并填数量 / 电气件逐个扫 SN → ⑥ 选目标工位(下拉,来自 MES 工位列表,不可手输)。\n\n说明:出库单号由系统自动生成、不可修改,规则与入库一致(入库 IB+ / 出库 OB+ 同一编号规则);出库无法与入库批次/合同对应,故出库类别仅是标签记录,列表与出库单都显示。质量门禁:发货/样品/其他类出库仅允许「合格」品;退货/报废/退料类豁免(本身即处置不合格品)。', + '所有出库都落在同一张「出库主表」(OutboundOrder),用"类型"区分,装箱信息(箱号/SN清单/合同号)也直接记在主表上,不再单独建装箱表。\n三个页签:\n· 工单领料出库(操作):按 MES 工单号查询 WMS 同步台账领料,强约束"单物料累计出库 ≤ 工单需求总量";工单号下拉选择(来自 MES 实时工单,未完成优先,无输入默认展示前 20 条),支持输入模糊搜索;MES 不可达或工单未同步时下拉可能为空,可手输兜底(需台账已同步)。\n· 通用出库:不依赖工单的手动出库(退料/退货/样品/报废/发货/其他),支持批次件(数量)与序列号件(SN),填箱号即一并记录装箱;MES 不可用或无需挂靠工单时请用本页。\n· 出库记录:统一主表的全量查询与导出(一键导出 CSV,含装箱信息),含工单号与目标工位。\n选用原则:有 MES 工单要按 物料清单 领料 → 工单领料出库(操作);无工单的自由出库/装箱发货 → 通用出库。\n\n通用出库操作顺序(客户诉求 问题17/18/20):① 先选物料(下拉统一显示 编码/图号/类型/品类)→ ② 系统自动判定记账方式(序列号件/批次件,由物料档案 sn_mode 决定,无需手选)→ ③ 选出库类别(纯标签,不联动任何地方;选「其他」时备注必填原因)→ ④ 填归属(合同号/科技项目号/其他,非其他时编号必填)→ ⑤ 批次件从可用批次下拉选批次(默认 FIFO 首个)并填数量 / 序列号件逐个扫 SN → ⑥ 选目标工位(下拉,来自 MES 工位列表,不可手输)。\n\n说明:出库单号由系统自动生成、不可修改,规则与入库一致(入库 IB+ / 出库 OB+ 同一编号规则);出库无法与入库批次/合同对应,故出库类别仅是标签记录,列表与出库单都显示。质量门禁:发货/样品/其他类出库仅允许「合格」品;退货/报废/退料类豁免(本身即处置不合格品)。', fields: [ { name: '备料出库-工单号', source: '下拉选择 + 模糊搜索。数据来自 MES 实时工单(未完成优先,无输入默认前 20 条)。', purpose: '出库挂靠的工单,决定可领料总量与需求缺口', fill: '下拉选工单号(或输入关键字模糊搜索;MES 不可达时可手输兜底),选中即查询该工单的物料台账' }, { name: '备料出库-目标工位', source: '下拉选择 DOCK01~DOCK20(选填,可过滤搜索)。', purpose: 'AGV 配送送达的接驳台(toDock 参数)', fill: '选择如 DOCK05;不选默认运到产线入口 DOCK01' }, { name: '备料出库-一键分配出库', source: '系统自动按 FIFO 分配。数据来自合格区Z02的批次库存。', purpose: '从合格区按先进先出凑够缺口并出库', fill: '点按钮,系统自动算批次并二次确认' }, { name: '通用出库-物料', source: '下拉选择(全项目统一组件)。', purpose: '选定要出库的物料', fill: '下拉显示 编码/图号/类型(电气件/结构件/其他)/品类(原材料/半成品/成品/其他),支持远程搜索' }, - { name: '通用出库-出库类型', source: '系统自动判定(来自物料档案的管理粒度)。', purpose: '决定走批次扣减还是 SN 扣减', fill: '只读:选物料后自动显示批次或序列号,无需也不允许手选' }, + { name: '通用出库-出库类型', source: '系统自动判定(来自物料档案的「序列号件」设置 sn_mode)。', purpose: '决定走批次扣减还是 SN 扣减(2026-09-30 与物料类型解耦)', fill: '只读:选物料后自动显示批次件或序列号件,无需也不允许手选' }, { name: '通用出库-出库类别', source: '下拉点选(纯标签记录,不联动任何地方)。', purpose: '区分退料/退货/样品/报废/发货/其他,列表与出库单均显示', fill: '必选;选「其他」时需在备注填写具体原因' }, { name: '通用出库-归属', source: '下拉选归属类型 + 手填归属编号。', purpose: '记录出库归属(合同号/科技项目号/其他),仅追溯不联动 MES', fill: '默认「其他」;选合同号/科技项目号时归属编号必填,长度≤64' }, { name: '通用出库-目标工位', source: '下拉选择(来自 MES 工位列表,不允许手输)。', purpose: '出库送到哪个装配工位,出库记录留痕工位号', fill: '下拉选工位(可搜索);选填' }, - { name: '通用出库-批次号', source: '结构件:下拉选择该物料在库可用批次(不手输)。电气件:逐个扫 SN。', purpose: '定位扣减哪个批次/哪些 SN', fill: '结构件默认带出 FIFO 首个可用批次(显示可用量/质量状态/区域)可改;电气件扫入 SN 列表(必填)' }, + { name: '通用出库-批次号', source: '批次件:下拉选择该物料在库可用批次(不手输)。序列号件:逐个扫 SN。', purpose: '定位扣减哪个批次/哪些 SN', fill: '批次件默认带出 FIFO 首个可用批次(显示可用量/质量状态/区域)可改;序列号件扫入 SN 列表(必填)' }, { name: '通用出库-区域 / 货架 / 层 / 位置(四级库位)', source: '与入库同口径的逐级联动下拉(选填)。选物料或批次后自动带入:① 该批次在库的实际库位 ② 该物料最近一次入库库位 ③ 都无则按所选区域推荐同区空位。', purpose: '指明从哪个货位取料,免手工挑选,出库留痕到具体货位', fill: '选物料/批次即自动填入四级,可逐级手动改;切换上级会自动清空下级' }, { name: '通用出库-箱号', source: '手动填写(选填)。', purpose: '整箱发货时填写,装箱信息随出库单记录(无需再单独录入装箱)', fill: '填箱号后,本出库单即带装箱属性,可在"出库记录"按箱号追溯' }, { name: '通用出库-合同号', source: '手动填写(选填)。', purpose: '关联合同,便于按合同追溯', fill: '可空' }, @@ -91,15 +91,15 @@ export const helpOutbound = { export const helpInventory = { title: '库存查询', overview: - '查看当前库存:全品类统一一张库存主表——原材料(结构件按批次/电气件按SN)、半成品(MES 暂存退库)、成品(MES 完工自动回流,系统生成 SN)。数据由入库、出库、检验、盘点及 MES 回流等业务实时维护,本页只读。\n\n本页四个视图页签(首屏默认「物料汇总」):\n· 物料汇总:一物料一行,直接回答"这个物料总共有多少"——总量/锁定/可用 + 质量分布(合格/未检/不合格) + 分布在哪些区域;点行下钻该物料的批次/SN 明细。\n· 库位明细:按 物料 × 区域 × 货架 × 层 × 位置 聚合(质量三列与批次/SN 数为列,不进分组键),支持区域→货架→层→位置四级联动筛选 + 质量快捷筛选(全部/未检/合格/不合格);点击行下钻批次/SN 明细。\n· 区域汇总:一区域一行六列(合格/未检/不合格/结构件/电气件/其他)+最近入库时间;质量状态与类型均降为列、不再拆行。\n· 缺料补货:拉取 MES 未来5天排产需求,对比本地可用量,分两列列出「安全库存补货量」(常规补货)与「排产缺料量」(订单驱动紧急补料),在途量暂无数据源显示"—";排产窗口标注需求起止日期。\n\n层级概念:入库单 → 批次/SN → 库存行。区域/库位/质量状态/批次/最近入库时间都是某物料的一对多属性,放在下钻明细中查看,不在物料行上并排平铺。', + '查看当前库存:全品类统一一张库存主表——原材料(批次件按批次/序列号件按SN)、半成品(MES 暂存退库)、成品(MES 完工自动回流,系统生成 SN)。数据由入库、出库、检验、盘点及 MES 回流等业务实时维护,本页只读。\n\n本页四个视图页签(首屏默认「物料汇总」):\n· 物料汇总:一物料一行,直接回答"这个物料总共有多少"——总量/锁定/可用 + 质量分布(合格/未检/不合格) + 分布在哪些区域;点行下钻该物料的批次/SN 明细。\n· 库位明细:按 物料 × 区域 × 货架 × 层 × 位置 聚合(质量三列与批次/SN 数为列,不进分组键),支持区域→货架→层→位置四级联动筛选 + 质量快捷筛选(全部/未检/合格/不合格);点击行下钻批次/SN 明细。\n· 区域汇总:一区域一行六列(合格/未检/不合格/结构件/电气件/其他)+最近入库时间;质量状态与类型均降为列、不再拆行。\n· 缺料补货:拉取 MES 未来5天排产需求,对比本地可用量,分两列列出「安全库存补货量」(常规补货)与「排产缺料量」(订单驱动紧急补料),在途量暂无数据源显示"—";排产窗口标注需求起止日期。\n\n层级概念:入库单 → 批次/SN → 库存行。区域/库位/质量状态/批次/最近入库时间都是某物料的一对多属性,放在下钻明细中查看,不在物料行上并排平铺。', fields: [ { name: '图号 / 物料名称', source: '筛选条件(物料汇总、库位明细视图生效)。', purpose: '只看某个物料', fill: '输入图号或名称,可空=全部' }, - { name: '库存类型', source: '单选(全部/结构件/电气件/其他)。结构件=类型1且排除「其他」;电气件=类型2;其他=类型3(辅料/工装/试验设备)。', purpose: '类型三分互斥:结构件=批次数量管理;电气件=SN 单件管理;其他=辅料/工装/试验设备(按批次管理)', fill: '全部 / 结构件 / 电气件 / 其他;物料汇总与库位明细视图生效' }, + { name: '库存类型', source: '单选(全部/结构件/电气件/其他)。结构件=类型1且排除「其他」;电气件=类型2;其他=类型3(辅料/工装/试验设备)。', purpose: '纯分类筛选(2026-09-30 类型与记账方式解耦):类型不再决定批次/SN 行为,记账方式由物料档案「序列号件」(sn_mode)独立决定', fill: '全部 / 结构件 / 电气件 / 其他;物料汇总与库位明细视图生效' }, { name: '品类', source: '单选(全部/原材料/半成品/成品/其他)。', purpose: '按品类过滤:原材料=采购到货入库;半成品=MES 工位暂存退库;成品=MES 完工自动回流(成品 SN 系统生成,入库单号形如 MES:工单号);其他=辅料/工装/试验设备(ITEM_TYPE=4)', fill: '全部 / 原材料 / 半成品 / 成品 / 其他;物料汇总与库位明细视图生效' }, { name: '库位明细-区域/货架/层/位置', source: '四级联动下拉(仅「库位明细」视图生效)。区域来自"区域维护";选区域后联动出货架、选货架联动出层、选层联动出位置,上级清空自动清空下级。', purpose: '精确到货位筛选库存,与入库/出库库位四级贯通', fill: '逐级选择;只选区域也可只按大区筛;切换上级自动清空下级' }, { name: '库位明细-质量状态', source: '单选(全部/未检/合格/不合格,仅「库位明细」生效)。', purpose: '不合格品一屏定位(需求A5)', fill: '选「不合格」直接看所有隔离中的不良库存' }, { name: '库位明细-入库时间', source: '仅「库位明细」生效的日期筛选(默认近3个月起)。', purpose: '按入库时间收窄', fill: '可与区域/质量组合' }, - { name: '区域汇总-六列', source: '系统实时聚合,一区域一行。', purpose: '质量(合格/未检/不合格)与类型(结构件/电气件/其他)都已降为列,避免同区拆多行;最近入库时间取该区最近一笔入库', fill: '只读:结构件=批次数量、电气件=SN 单件、其他=辅料工装试验设备;具体货架/层/位置四级货位见「库位明细」下钻' }, + { name: '区域汇总-六列', source: '系统实时聚合,一区域一行。', purpose: '质量(合格/未检/不合格)与类型(结构件/电气件/其他)都已降为列,避免同区拆多行;最近入库时间取该区最近一笔入库', fill: '只读:批次件=批次数量、序列号件=SN 单件、其他=辅料工装试验设备;具体货架/层/位置四级货位见「库位明细」下钻' }, { name: '数量等式(七大域审计)', source: '系统实时计算,本页只读。', purpose: '保证库存数量自洽', fill: '库存量(总数) = 可用量 + 锁定量;总数 = 合格 + 未检 + 不合格(质量分布守恒);可用量 = 总数 − 锁定量' }, { name: '物料汇总-质量分布', source: '系统按当前在库行统计。', purpose: '一个物料合格/未检/不合格各多少', fill: '合格/未检/不合格三列,自动统计' }, { name: '物料汇总-分布区域', source: '系统统计该物料当前占用了哪些区域。', purpose: '一个物料可跨多个区域存放(批次可拆分),物料行不写死单一区域', fill: '如 Z02、Z05;点行下钻可看每个批次/SN 具体在哪个区' }, @@ -109,26 +109,26 @@ export const helpInventory = { { name: 'ID / 创建时间', source: '物料汇总行取物料主表(material),区域汇总行取区域主表(zone)。', purpose: '行标识与主档建立时间,用于追溯与对账', fill: '系统自动带出,只读;物料档案/区域缺失时显示 -' }, { name: '缺料补货(视图四)', source: '拉取 MES /api/internal/material-demand(未来5天日排产需求)对比本地可用量实时计算。', purpose: '一眼看出需补什么、补多少:「安全库存补货量」(常规补货) 与「排产缺料量」(订单驱动紧急补料) 分两列、不合并', fill: '排产缺料量>0 标红、安全库存补货量>0 标橙;在途量暂无数据源显示"—"不臆造;排产窗口显示需求起止日期;顶部标注 MES 拉取时间' }, { name: '导出', source: '按钮(权限 inventory:export)。后端按当前视图全量导出 xlsx。', purpose: '把结果导出存档', fill: '物料汇总→「物料汇总.xlsx」;库位明细→「库存明细.xlsx」;区域汇总→「区域汇总.xlsx」;缺料补货视图数据随 MES 排产动态变化,不提供导出' }, - { name: '生产退不良(视图五)', source: '页面签五「生产退不良」。产线使用中(已出库/已消耗)发现的不良品退回库房隔离的登记入口。', purpose: '已出库/已消耗的物料,产线用后才发现坏,在此登记退回:系统重建隔离库存行(质量=不合格,不进可用),随后到「库位明细」按质量筛选「不合格」找到该行,走「在库处置」(退货/换修/报废/让步接收)完成闭环', fill: '必填:始发工位号、关联工单号、物料编码、退回数量、质量原因;电气件逐行录入 SN(数=数量),结构件可填批次号(留空自动生成);退回隔离区四级库位可选。提交即重建隔离库存行并生成退不良单(RECEIVED),全程事件日志留痕' } + { name: '生产退不良(视图五)', source: '页面签五「生产退不良」。产线使用中(已出库/已消耗)发现的不良品退回库房隔离的登记入口。', purpose: '已出库/已消耗的物料,产线用后才发现坏,在此登记退回:系统重建隔离库存行(质量=不合格,不进可用),随后到「库位明细」按质量筛选「不合格」找到该行,走「在库处置」(退货/换修/报废/让步接收)完成闭环', fill: '必填:始发工位号、关联工单号、物料编码、退回数量、质量原因;序列号件逐行录入 SN(数=数量),批次件可填批次号(留空自动生成);退回隔离区四级库位可选。提交即重建隔离库存行并生成退不良单(RECEIVED),全程事件日志留痕' } ] } export const helpInspection = { title: '检验(来料/过程/完工)', overview: - '【三检分工与边界】\n· 来料检(incoming):对采购/外协到货、入库前的物料验收,按入库批次/SN 判定。合格才能入库上架,不合格隔离退货。\n· 过程检(process):对产线在制物料/半成品巡检,判定质量状态。\n· 完工检(finished):对 MES 回流的成品 SN 做最终检验(对象固定为成品 SN,无“批次”选项)。成品入库时质量状态为“未检”,完工检合格后置“合格”,成品方可发货;不合格可返修/让步接收。闭环:MES 报工→成品入库(未检)→WMS 完工检→合格→可发货。\n\n【检验做什么】把库存行的“质量状态”从未检翻转为合格/不合格,与存放区域无关。库存校验只取质量状态=合格的行参与出库/锁库。\n\n【报检数守恒】报检数 = 合格数 + 不合格数;合格数不得大于报检数;判定合格时合格数应等于报检数(否则请改判不合格并选处置方式)。\n\n【不合格处置(需求23 换修闭环)】判不合格必选处置:退货(须填货运单号、库存置待退) / 换修(隔离为不合格,等返修后重新报检) / 让步接收(审批后放行,质量状态置合格) / 报废 / 部分入库(仅结构件批次:一次只处理 1 个批次,按合格数拆行)。已判不合格的记录也可在列表里再次处置。\n\n【结构件 vs 电气件/其他的不合格口径】\n· 结构件(批次):一行数量 N,判不合格=整批隔离;“N 里坏 M 个”用「部分入库」填合格数 N−M,系统拆出 (N−M) 合格批次 + M 不合格批次。\n· 电气件(SN)/其他:逐个判定(检验数固定 1),每个 SN/件一条记录、一行库存,选中判不合格即隔离该件,无需拆分。\n\n【归属口径(需求22)】归属类型 = 合同号 / 科技项目号 / 其他,默认“其他”。这里的“合同号”是独立维度标签,与 MES 工单号不是同一东西;手动输入、不联动 MES、不校验格式(长度≤64)。\n\n【按物料统计】统计页需先选择物料再点“统计”,不做全表实时聚合。\n\n本页四个页签(录入在前、记录在后点击才加载):\n· 质量检验录入(默认打开):逐个判定——每一条待检目标(批次号/SN)独立成一行,分别选结论、填检验数/合格数,不合格数=检验数−合格数自动算出;整组点一次「提交」调 /inspection/batch-flip 原子翻转,多行同 id 自动去重。\n· 待检清单:按入库单分组展示(主行=入库单,展开看该单的批次/SN 明细与未检数量),支持整单送检、单条送检、跨行勾选送检;送检即把目标回填到「质量检验录入」并带入归属,免去手输编号。\n· 检验记录(点击才加载):历史判定记录,含「不合格数」列(=检验数−合格数,后端复核)。\n· 按物料统计:选物料后聚合其检验次数与合格率。\n\n菜单按业务分为来料/过程/完工三个入口,同一张表、同一接口,仅按检验类别默认过滤。每条检验记录可上传/查看附件(检测报告/照片)。', + '【三检分工与边界】\n· 来料检(incoming):对采购/外协到货、入库前的物料验收,按入库批次/SN 判定。合格才能入库上架,不合格隔离退货。\n· 过程检(process):对产线在制物料/半成品巡检,判定质量状态。\n· 完工检(finished):对 MES 回流的成品 SN 做最终检验(对象固定为成品 SN,无“批次”选项)。成品入库时质量状态为“未检”,完工检合格后置“合格”,成品方可发货;不合格可返修/让步接收。闭环:MES 报工→成品入库(未检)→WMS 完工检→合格→可发货。\n\n【检验做什么】把库存行的“质量状态”从未检翻转为合格/不合格,与存放区域无关。库存校验只取质量状态=合格的行参与出库/锁库。\n\n【报检数守恒】报检数 = 合格数 + 不合格数;合格数不得大于报检数;判定合格时合格数应等于报检数(否则请改判不合格并选处置方式)。\n\n【不合格处置(需求23 换修闭环)】判不合格必选处置:退货(须填货运单号、库存置待退) / 换修(隔离为不合格,等返修后重新报检) / 让步接收(审批后放行,质量状态置合格) / 报废 / 部分入库(仅批次件:一次只处理 1 个批次,按合格数拆行)。已判不合格的记录也可在列表里再次处置。\n\n【批次件 vs 序列号件/其他的不合格口径】\n· 批次件:一行数量 N,判不合格=整批隔离;“N 里坏 M 个”用「部分入库」填合格数 N−M,系统拆出 (N−M) 合格批次 + M 不合格批次。\n· 序列号件/其他:逐个判定(检验数固定 1),每个 SN/件一条记录、一行库存,选中判不合格即隔离该件,无需拆分。\n\n【归属口径(需求22)】归属类型 = 合同号 / 科技项目号 / 其他,默认“其他”。这里的“合同号”是独立维度标签,与 MES 工单号不是同一东西;手动输入、不联动 MES、不校验格式(长度≤64)。\n\n【按物料统计】统计页需先选择物料再点“统计”,不做全表实时聚合。\n\n本页四个页签(录入在前、记录在后点击才加载):\n· 质量检验录入(默认打开):逐个判定——每一条待检目标(批次号/SN)独立成一行,分别选结论、填检验数/合格数,不合格数=检验数−合格数自动算出;整组点一次「提交」调 /inspection/batch-flip 原子翻转,多行同 id 自动去重。\n· 待检清单:按入库单分组展示(主行=入库单,展开看该单的批次/SN 明细与未检数量),支持整单送检、单条送检、跨行勾选送检;送检即把目标回填到「质量检验录入」并带入归属,免去手输编号。\n· 检验记录(点击才加载):历史判定记录,含「不合格数」列(=检验数−合格数,后端复核)。\n· 按物料统计:选物料后聚合其检验次数与合格率。\n\n菜单按业务分为来料/过程/完工三个入口,同一张表、同一接口,仅按检验类别默认过滤。每条检验记录可上传/查看附件(检测报告/照片)。', fields: [ { name: '三检边界', source: '菜单入口锁定检验类别。', purpose: '来料检=入库验收;过程检=在制巡检;完工检=成品 SN 终检', fill: '按左侧菜单进入对应页面,页内不再切换类别' }, - { name: '目标类型', source: '单选,决定录入框标题与可选库存范围。完工检固定为 SN,不展示切换。', purpose: '检验对象:批次(结构件) / 序列号(电气件) / 其他(辅料·工装·试验设备,按 1 件判定)', fill: '批次 BATCH / 序列号 SN / 其他 OTHER(任一切换都会自动刷新“从库存选”下拉与可选库存范围)' }, + { name: '目标类型', source: '单选,决定录入框标题与可选库存范围。完工检固定为 SN,不展示切换。', purpose: '检验对象:批次件 / 序列号件 / 其他(辅料·工装·试验设备,按 1 件判定);按记账方式(物料档案 sn_mode)划分,与物料类型无关', fill: '批次件 BATCH / 序列号件 SN / 其他 OTHER(任一切换都会自动刷新“从库存选”下拉与可选库存范围)' }, { name: '检验结论', source: '单选。', purpose: '判定结果', fill: '合格 / 不合格' }, { name: '记录人 / 审核人', source: '手动填写(默认当前用户)。完工检显示为“审核人”。', purpose: '谁检验/审核的,追溯用', fill: '姓名' }, { name: '从库存选批次号/SN', source: '下拉选择,数据来自当前库存(按目标类型过滤;完工检只列成品 category=3)。', purpose: '避免手输编号、防止输错', fill: '在库存里挑待检的批次号/SN,自动加入清单' }, { name: '录入批次号/SN', source: '扫码枪/粘贴。来自批次号/SN条码。', purpose: '单条或多条待检编号', fill: '扫入或粘贴后点【录入到列表】,多编号用逗号/分号/空格/回车分隔;每条独立成行参与逐个判定' }, { name: '待检清单(页签二)', source: '调用 /inspection/pending 按入库单分组(主行=入库单,展开看批次/SN 明细与未检数量)。', purpose: '无需手输编号即可把待检目标送进录入页,杜绝输错', fill: '支持 整单送检(该单全部未检目标)/ 单条送检(展开行内单个目标)/ 跨行勾选送检(勾选多条后批量送);送检即回填「质量检验录入」并带入归属,可在此页按 图号/入库类型/目标类型 筛选' }, { name: '逐个判定(录入页)', source: '录入页以「条目」为单位:每一条待检目标(批次号/SN)独立成一行,各自选结论、填检验数/合格数,不合格数=检验数−合格数自动算出。', purpose: '一条入库单往往含多批次/SN,逐个判定互不串扰', fill: '点「提交」整组一次性调 /inspection/batch-flip 翻转;同一 targetId 多行自动去重;选「合格」时合格数默认等于检验数,选「不合格」须填不合格处置' }, - { name: '检验数 / 合格数', source: '结构件批次可编辑;SN/其他固定 1 件判定、不可改数。守恒:检验数 = 合格数 + 不合格数。', purpose: '量化该条目标的抽检结果', fill: '结构件:合格数≤检验数,判合格时两者相等;SN/其他:固定 1/1(合格) 或 1/0(不合格),不合格即整件隔离、无需拆分' }, + { name: '检验数 / 合格数', source: '批次件可编辑;序列号件/其他固定 1 件判定、不可改数。守恒:检验数 = 合格数 + 不合格数。', purpose: '量化该条目标的抽检结果', fill: '批次件:合格数≤检验数,判合格时两者相等;序列号件/其他:固定 1/1(合格) 或 1/0(不合格),不合格即整件隔离、无需拆分' }, { name: '归属', source: '下拉选择类型 + 手动输入编号(默认其他)。', purpose: '标记检验对象归属,便于按归属查询', fill: '合同号 / 科技项目号 / 其他;编号手动输入、不校验格式、长度≤64' }, - { name: '不合格处置', source: '判定“不合格”时必选:退货 / 换修 / 让步接收 / 报废 / 部分入库(仅结构件批次可选,SN/其他不展示该选项)。', purpose: '不合格品不入库、不上产线,须明确去向(需求23 换修闭环)', fill: '退货(填货运单号→待退) / 换修(隔离不合格→待返修) / 让步接收(放行→合格) / 报废 / 部分入库(单批次拆批:合格部分入库、差额隔离)' }, + { name: '不合格处置', source: '判定“不合格”时必选:退货 / 换修 / 让步接收 / 报废 / 部分入库(仅批次件可选,序列号件/其他不展示该选项)。', purpose: '不合格品不入库、不上产线,须明确去向(需求23 换修闭环)', fill: '退货(填货运单号→待退) / 换修(隔离不合格→待返修) / 让步接收(放行→合格) / 报废 / 部分入库(单批次拆批:合格部分入库、差额隔离)' }, { name: '附件', source: '行内附件抽屉(bizType=检验记录)。', purpose: '为该检验记录上传/查看附件(如检测报告、照片)', fill: '点行内附件按钮,在抽屉中上传或查看' }, { name: '检验记录-筛选/导出', source: '切换到“检验记录”页签后可见。', purpose: '按条件分页查询历史记录并导出', fill: '支持按 批次/SN、图号/名称/型号(三框模糊)、归属单号、产品工号、检验类型、结论、记录人、时间范围(默认近3个月) 组合筛选;列表含「不合格数」列(=检验数−合格数,后端复核)与「产品工号」列(随入库单带出);点【导出】下载 xlsx' }, { name: '按物料统计', source: '切换到“按物料统计”页签,先选物料再点统计。', purpose: '看某物料的检验次数/合格率', fill: '必选物料;按时间区间与检验类别聚合,每次检验独立计数' } @@ -141,7 +141,7 @@ export const helpStocktake = { '盘的是「库存量」(实物在库总数),不是可用量、不是锁定量。账面数=发起时快照的库存量,实盘数=实际数到的库存量,差异=实盘-账面。\n\n' + '完整闭环(顶部步骤条引导):\n' + '① 发起盘点:选范围(全库/按区域/按物料) → 冻结库存快照 + 锁定该范围库存 → 生成盘点单号,状态「进行中」,目标数量=本次覆盖的批次/SN 总数(自动算)。\n' + - '② 扫码实盘:扫批次号(结构件)弹数量框填实盘数;扫 SN(电气件)自动记 1、直接提交。发起后盘点单号自动带入扫码区,无需手动粘贴。\n' + + '② 扫码实盘:扫批次号(批次件)弹数量框填实盘数;扫 SN(序列号件)自动记 1、直接提交。发起后盘点单号自动带入扫码区,无需手动粘贴。\n' + '③ 完成盘点:先选未盘项处理方式(按账面保留/盘亏为0) → 二次确认是否写回 → 写回则生成盘点调整单修正库存 → 解锁库存。\n\n' + '三条铁律:\n' + '• 盘点期间库存冻结:进行中盘点单锁定的批次/SN,禁止出库、入库追加、锁定,避免差异混入正常业务变动(完成或取消后自动解锁)。\n' + @@ -153,7 +153,7 @@ export const helpStocktake = { { name: '操作人', source: '登录账号自动带出。', purpose: '发起盘点人', fill: '自动' }, { name: '目标数量', source: '发起时自动统计。', purpose: '本次盘点覆盖的批次/SN 总数', fill: '自动,无需填写' }, { name: '发起盘点', source: '按钮操作(权限 stocktake:start)。', purpose: '按范围冻结快照并锁定库存,生成盘点单号', fill: '点按钮选范围后发起;范围内库存若已被别的进行中盘点单锁定则拒绝' }, - { name: '批次号 / SN 序列号', source: '扫码枪。来自批次号/SN条码。', purpose: '要盘点的批次号(结构件)或 SN(电气件)', fill: '扫码回车提交;同一目标重复扫=覆盖实盘数;SN 自动记 1' }, + { name: '批次号 / SN 序列号', source: '扫码枪。来自批次号/SN条码。', purpose: '要盘点的批次号(批次件)或 SN(序列号件)', fill: '扫码回车提交;同一目标重复扫=覆盖实盘数;SN 自动记 1' }, { name: '实盘数量', source: '扫码/手输。', purpose: '实际数到的库存量', fill: '仅批次件需填非负整数;SN 由系统自动置 1,无需填' }, { name: '未盘项处理', source: '完成盘点弹窗选择。', purpose: '盘点单覆盖但未扫到的项如何归置', fill: '按账面保留(不计差异) / 盘亏为0(实盘记0,差异=-账面)' }, { name: '差异写回库存', source: '完成盘点弹窗勾选(默认勾选,可取消;权限 stocktake:writeback)。', purpose: '是否用实盘差异修正账面库存', fill: '勾选=生成盘点调整单写回;取消=仅出结论不改库存。已用二次确认弹窗取代旧开关,防误触' }, @@ -227,20 +227,20 @@ export const helpLedger = { export const helpReturnOrder = { title: '退库确认', overview: - '工位退库的接收确认环节:工位终端上操作工把「没用完 / 有问题的物料」做退库发起,系统预建一张「待确认收货」的退库单;仓库保管员在本页审核并实物点收,点「确认收货」后系统按规则把物料加回库存,退库单置为「已收货」,整条退库链路闭环。\n\n数据链路:工位终端退库 → MES 落事件日志并调用 WMS 内部接口 → WMS 预建退库单(PENDING) → 本页确认收货(选退库类型、退回库位、电气件逐个扫码 / 结构件按数量)→ 库存加回 → 回写工单备料台账「退回量」,缺口恢复可再叫料。\n\n三个关键规则(客户诉求 问题14):\n1) 退库类型——「剩余物料」= 正常用剩,加回后置「未检」,由检验员判定合格/不合格;「问题物料」= 有质量疑虑,加回后直接置「不合格」隔离,绝不混入可用/合格库存。\n2) 退回库位——默认带入该物料最近一次的原库位(区域/货架/层/位置),可手动修改;目标货位即使已被其他物料占用也允许混放,系统只记数量、不校验位置冲突。\n3) 数量录入方式按物料管理粒度自动区分——电气件(序列号管理)必须逐个扫码录入 SN,扫码数须与退库数完全一致(一物一码守恒,SN 复用原出库行回到在库);结构件(批次管理)按退库数量整体加回,可指定批次号,留空则沿用/自动生成。\n\n说明:退库单状态只有两种——待确认收货 / 已收货。同一工单 + 同一物料 + 同一工位只会预建一条待收货退库单(防止重复提交)。本页不含「删除」,退库一经确认即形成库存流水,不可撤销。', + '工位退库的接收确认环节:工位终端上操作工把「没用完 / 有问题的物料」做退库发起,系统预建一张「待确认收货」的退库单;仓库保管员在本页审核并实物点收,点「确认收货」后系统按规则把物料加回库存,退库单置为「已收货」,整条退库链路闭环。\n\n数据链路:工位终端退库 → MES 落事件日志并调用 WMS 内部接口 → WMS 预建退库单(PENDING) → 本页确认收货(选退库类型、退回库位、序列号件逐个扫码 / 批次件按数量)→ 库存加回 → 回写工单备料台账「退回量」,缺口恢复可再叫料。\n\n三个关键规则(客户诉求 问题14):\n1) 退库类型——「剩余物料」= 正常用剩,加回后置「未检」,由检验员判定合格/不合格;「问题物料」= 有质量疑虑,加回后直接置「不合格」隔离,绝不混入可用/合格库存。\n2) 退回库位——默认带入该物料最近一次的原库位(区域/货架/层/位置),可手动修改;目标货位即使已被其他物料占用也允许混放,系统只记数量、不校验位置冲突。\n3) 数量录入方式按物料「序列号件」(物料档案 sn_mode)自动区分——序列号件必须逐个扫码录入 SN,扫码数须与退库数完全一致(一物一码守恒,SN 复用原出库行回到在库);批次件按退库数量整体加回,可指定批次号,留空则沿用/自动生成。\n\n说明:退库单状态只有两种——待确认收货 / 已收货。同一工单 + 同一物料 + 同一工位只会预建一条待收货退库单(防止重复提交)。本页不含「删除」,退库一经确认即形成库存流水,不可撤销。', fields: [ { name: '状态', source: '筛选条件,系统维护。', purpose: '只看待确认收货或已收货的退库单', fill: '选「待确认收货」优先处理' }, { name: '退库单号', source: '系统自动生成(TH + 时间戳)。', purpose: '唯一标识一张退库单,便于对账追溯', fill: '自动生成,无需填写' }, { name: '工单号 / 退库工位 / 产品序列号', source: '工位终端退库时自动带入。', purpose: '定位退的是什么工单、哪件产品的物料', fill: '只读' }, { name: '图号 / 名称 / 规格', source: '工位终端退库时带入(来自物料档案)。', purpose: '是哪一种物料退库', fill: '只读' }, - { name: '数量 / 单位', source: '工位终端填写。', purpose: '退多少(电气件须逐个扫码等于此数;结构件按此数整体加回)', fill: '只读' }, + { name: '数量 / 单位', source: '工位终端填写。', purpose: '退多少(序列号件须逐个扫码等于此数;批次件按此数整体加回)', fill: '只读' }, { name: '退库原因', source: '工位终端填写。', purpose: '说明为什么退库(如剩余料 / 错料 / 不良更换)', fill: '只读' }, { name: '退库类型', source: '库管确认收货时选择。', purpose: '区分「剩余物料」与「问题物料」,决定加回后的质量状态', fill: '剩余物料→置未检走检验;问题物料→置不合格隔离' }, { name: '退回库位(区域/货架/层/位置)', source: '库管确认收货时选择,默认带入原库位。', purpose: '物料退回到哪个货位,贯穿库存明细/盘点/导出全链路', fill: '逐级下拉选择,可手动改;允许混放,不校验位置冲突' }, - { name: '扫码录入 SN', source: '库管确认收货时逐个扫码(仅电气件)。', purpose: '一物一码,保证退回的每个序列号可追溯', fill: '扫描/输入 SN 回车添加,扫码数须等于退库数量' }, - { name: '批次号', source: '库管确认收货时填写(仅结构件)。', purpose: '指定加回到哪个批次', fill: '留空则沿用同料同货位同状态在库批次,无则自动生成' }, + { name: '扫码录入 SN', source: '库管确认收货时逐个扫码(仅序列号件)。', purpose: '一物一码,保证退回的每个序列号可追溯', fill: '扫描/输入 SN 回车添加,扫码数须等于退库数量' }, + { name: '批次号', source: '库管确认收货时填写(仅批次件)。', purpose: '指定加回到哪个批次', fill: '留空则沿用同料同货位同状态在库批次,无则自动生成' }, { name: '退库人 / 退库时间', source: '系统记录。', purpose: '追溯谁在什么时候发起的退库', fill: '只读' }, - { name: '确认收货', source: '库管在本页操作(权限码 return:confirm)。', purpose: '实物点收无误后确认,库存加回', fill: '核对实物 → 选退库类型/库位 →(电气件扫码)→ 点「确认收货」' }, + { name: '确认收货', source: '库管在本页操作(权限码 return:confirm)。', purpose: '实物点收无误后确认,库存加回', fill: '核对实物 → 选退库类型/库位 →(序列号件扫码)→ 点「确认收货」' }, { name: '收货人 / 收货时间', source: '系统在确认时记录当前登录人。', purpose: '追溯谁确认的收货', fill: '只读,确认后自动写入' } ] } @@ -293,14 +293,15 @@ export const helpAttachment = { export const helpMaterial = { title: '物料档案', overview: - '定义每一种物料的字典:叫什么、什么规格、什么品类(原材料/成品/其他)、是【结构件(批次)】还是【电气件(SN)】。\n此处维护的物料会作为下拉选项出现在入库/出库/装箱等页面;其中"类型"直接决定后续入库方式——结构件走批次(一批多件)、电气件走 SN 逐件扫码(单件追溯)。\n\n品类来源:原材料=进货来的(外购);成品=自己生产的;其他=辅料/工装/试验设备等。成品还可以作为零部件,放进另一个成品的物料清单(BOM)里被再次加工成新的成品。\n\n品类说明:1=原材料(默认) / 3=成品 / 4=其他(辅料/工装/试验设备)。半成品不是物料品类(2026-09-22 定稿)——半成品是工件状态,由统一库存主表品类 category=2 承载,物料档案不再有半成品行。编码主数据单一来源在本表:MES 的「物料档案」页面即是本表中"成品"品类的视图(实时拉取本表,不双录)——两系统的「物料档案」指向同一份主数据,以本表为准。库存主表 inventories 的品类与其呼应。列表支持按品类筛选,导出含品类列。\n\n物料档案是库房的另一道地基:先建好物料,入库时才能选到;类型选错会导致入库方式与追溯粒度不符。\n\n命名说明:本档案维护的物料在出库/看板等页面统一以"图号"展示(客户口径)。安全库存在本档案维护,可用量低于它时会在「库房看板」首页触发缺货预警。', + '定义每一种物料的字典:叫什么、什么规格、什么品类(原材料/成品/其他)、什么类型(结构件/电气件/其他),以及是【序列号件】还是【批次件】。\n此处维护的物料会作为下拉选项出现在入库/出库/装箱等页面;「类型」仅用于分类统计/筛选/页签归属;「序列号件」(sn_mode) 决定出入库的记账方式——序列号件走 SN 逐件扫码(单件追溯)、批次件按数量一批多件。两者相互独立(2026-09-30 解耦定稿):选类型时自动带默认(电气件→序列号件,结构件/其他→批次件),可手动更改。\n\n品类来源:原材料=进货来的(外购);成品=自己生产的;其他=辅料/工装/试验设备等。成品还可以作为零部件,放进另一个成品的物料清单(BOM)里被再次加工成新的成品。\n\n品类说明:1=原材料(默认) / 3=成品 / 4=其他(辅料/工装/试验设备)。半成品不是物料品类(2026-09-22 定稿)——半成品是工件状态,由统一库存主表品类 category=2 承载,物料档案不再有半成品行。编码主数据单一来源在本表:MES 的「物料档案」页面即是本表中"成品"品类的视图(实时拉取本表,不双录)——两系统的「物料档案」指向同一份主数据,以本表为准。库存主表 inventories 的品类与其呼应。列表支持按品类筛选,导出含品类列。\n\n物料档案是库房的另一道地基:先建好物料,入库时才能选到;「序列号件」未选择(0)的物料不能出入库。\n\n命名说明:本档案维护的物料在出库/看板等页面统一以"图号"展示(客户口径)。安全库存在本档案维护,可用量低于它时会在「库房看板」首页触发缺货预警。', fields: [ { name: '图号', source: '手工填写,仓库自定义(新增后不可改)。在出库/看板等页面显示为"图号"。', purpose: '物料唯一编号(即图号)', fill: '如 SCREW-M3;新增后不可改编码' }, { name: '名称', source: '手工填写(必填)。', purpose: '物料名称', fill: '如 螺丝 M3' }, { name: '规格', source: '手工填写(必填)。', purpose: '规格型号', fill: '如 M3×8' }, { name: '单位', source: '手工填写(必填)。', purpose: '计量单位', fill: '如 个/套' }, { name: '品类', source: '必填。创建时默认"原材料";成品品类也可在 MES 的「物料档案」页维护(两系统同一份主数据,以本表为准)。', purpose: '区分原材料/成品/其他,与统一库存主表品类对应;原材料为进货、成品为自产(半成品不是物料品类,由库存 category=2 承载)', fill: '查询区可选 原材料/成品/其他' }, - { name: '类型', source: '必填(与「品类」相互独立)。选择:批次(结构件,按批管料) / 序列号(电气件,按件唯一) / 其他(辅料/工装/试验设备,按批次数量管理)。', purpose: '决定入库方式:结构件/其他走批次、电气件走 SN 逐件扫码', fill: '批次 / 序列号 / 其他' }, + { name: '类型', source: '必填(与「品类」「序列号件」相互独立)。选择:结构件 / 电气件 / 其他(辅料/工装/试验设备)。', purpose: '纯分类维度(2026-09-30 解耦定稿):仅用于分类统计、筛选与入库页签归属,不再决定批次/SN 行为', fill: '结构件 / 电气件 / 其他' }, + { name: '序列号件', source: '必选(与「类型」相互独立,2026-09-30 解耦定稿)。选择类型时自动带默认:电气件→序列号件,结构件/其他→批次件;可手动更改。', purpose: '决定出入库记账方式:序列号件=逐件录 SN 单件追溯;批次件=按数量一批多件;未选择(0)的物料不能出入库', fill: '序列号件(逐件录SN) / 批次件(按数量,不录SN)' }, { name: '安全库存', source: '必填整数(默认0)。', purpose: '该物料的最低库存警戒线;可用量低于它会在「库房看板」首页触发缺货预警', fill: '如 100;0=不预警' }, { name: '说明', source: '手工填写(可空)。', purpose: '补充描述', fill: '可空' } ] diff --git a/bj_power_wms/frontend/src/layouts/MainLayout.vue b/bj_power_wms/frontend/src/layouts/MainLayout.vue index 9205529..d504e16 100644 --- a/bj_power_wms/frontend/src/layouts/MainLayout.vue +++ b/bj_power_wms/frontend/src/layouts/MainLayout.vue @@ -85,9 +85,7 @@ const menuGroups = [ { path: '/inbound', title: '入库管理', icon: Download, code: 'inbound:view' }, { path: '/outbound', title: '出库管理', icon: Upload, code: 'outbound:view' }, { path: '/return-order', title: '退库确认', icon: RefreshLeft, code: 'return:view' }, - { path: '/inspection-incoming', title: '来料检验', icon: CircleCheck, code: 'inspection:view' }, - { path: '/inspection-process', title: '过程检验', icon: CircleCheck, code: 'inspection:view' }, - { path: '/inspection-final', title: '完工检验', icon: CircleCheck, code: 'inspection:view' } + { path: '/inspection-incoming', title: '来料检验', icon: CircleCheck, code: 'inspection:view' } ] }, { diff --git a/bj_power_wms/frontend/src/pages/BaseData.vue b/bj_power_wms/frontend/src/pages/BaseData.vue index bdc158d..18facc4 100644 --- a/bj_power_wms/frontend/src/pages/BaseData.vue +++ b/bj_power_wms/frontend/src/pages/BaseData.vue @@ -305,11 +305,16 @@ const matDialog = ref(false) const mEditingId = ref(0) const mForm = reactive({ code: '', name: '', spec: '', unit: '', - manageMode: 1, templateCode: '', description: '', + manageMode: 1, snMode: 0, templateCode: '', description: '', itemType: 1, safetyStock: 0, isActive: true }) const mSaving = ref(false) +// 类型默认联动(2026-09-30 类型与SN行为解耦):电气件→序列号件(1),结构件/其他→批次件(2);用户可手动改 +function onMatTypeChange() { + mForm.snMode = Number(mForm.manageMode) === 2 ? 1 : 2 +} + async function loadMaterials() { materialLoading.value = true try { @@ -342,13 +347,14 @@ function resetMForm() { mEditingId.value = 0 Object.assign(mForm, { code: '', name: '', spec: '', unit: '', - manageMode: 1, templateCode: '', description: '', + manageMode: 1, snMode: 0, templateCode: '', description: '', itemType: 1, safetyStock: 0, isActive: true }) } function openMatCreate() { resetMForm() + onMatTypeChange() // 新增默认按类型联动带出序列号件/批次件 matDialog.value = true } @@ -357,6 +363,7 @@ function openMatEdit(row) { Object.assign(mForm, { code: row.code, name: row.name, spec: row.spec || '', unit: row.unit || '', manageMode: row.manageMode, + snMode: Number(row.snMode) || 0, templateCode: row.templateCode || '', itemType: row.itemType || 1, safetyStock: row.safetyStock || 0, @@ -392,6 +399,11 @@ async function saveMaterial() { ElMessage.warning('类型为必填项') return } + // 序列号件必选(2026-09-30 解耦定稿):0=未选择不可保存 + if (![1, 2].includes(Number(mForm.snMode))) { + ElMessage.warning('请选择序列号件(序列号件 / 批次件)') + return + } const okSave = await confirmAction( mEditingId.value ? `确认保存物料「${mForm.code}」的修改?` : `确认新增物料「${String(mForm.code || '').trim()}」?保存后可继续上传图纸/附件。`, mEditingId.value ? '编辑确认' : '新增确认' @@ -399,15 +411,15 @@ async function saveMaterial() { if (!okSave) return mSaving.value = true try { - // 类型(1结构件/2电气件/3其他)与品类相互独立,原样提交 - const manageMode = Number(mForm.manageMode) + // 类型(1结构件/2电气件/3其他)与品类相互独立,原样提交;snMode(1序列号件/2批次件)独立提交 const base = { name: String(mForm.name || '').trim(), spec: String(mForm.spec || '').trim(), unit: String(mForm.unit || '').trim(), description: mForm.description, itemType: Number(mForm.itemType), - manageMode, + manageMode: Number(mForm.manageMode), + snMode: Number(mForm.snMode), safetyStock: Number(mForm.safetyStock) || 0, isActive: !!mForm.isActive } @@ -442,6 +454,16 @@ function itemTypeTagType(t) { return t === 3 ? 'success' : t === 4 ? 'danger' : 'info' } +// 类型显示(纯分类语境:1结构件/2电气件/3其他,2026-09-30 与SN行为解耦) +function matTypeText(m) { + if (m === 3) return '其他' + return m === 2 ? '电气件' : '结构件' +} +// 序列号件显示(记账语境:1序列号件/2批次件/0未选择) +function snModeText(v) { + return Number(v) === 1 ? '序列号件' : Number(v) === 2 ? '批次件' : '未选择' +} + // 区域维护 / 物料档案共用同一组件:切换菜单时复用,watch(mode, immediate) 保证进入即加载 watch( () => props.mode, @@ -878,8 +900,8 @@ async function onMaterialFile(e) { - - + + @@ -924,10 +946,17 @@ async function onMaterialFile(e) { {{ itemTypeText(row.itemType) }} - + + + + @@ -977,12 +1006,19 @@ async function onMaterialFile(e) { - - - + + + + + + + + + 选类型时自动带默认,可手动更改;未选择不可出入库 + 低于该值触发缺货预警(0=不预警) diff --git a/bj_power_wms/frontend/src/pages/Inbound.vue b/bj_power_wms/frontend/src/pages/Inbound.vue index 7138d60..2399653 100644 --- a/bj_power_wms/frontend/src/pages/Inbound.vue +++ b/bj_power_wms/frontend/src/pages/Inbound.vue @@ -127,6 +127,7 @@ async function submitBatch() { const data = await request.post('/inbound/create', { inboundNo: form1.inboundNo.trim(), inboundType: 'purchase', + manageMode: 1, // 结构件页签(后端防呆:与物料档案类型不一致时拒绝) materialCode: form1.materialCode, batchNo: form1.batchNo.trim(), quantity: form1.quantity, @@ -211,6 +212,7 @@ async function submitSn() { const data = await request.post('/inbound/create', { inboundNo: form2.inboundNo.trim(), inboundType: 'purchase', + manageMode: 2, // 电气件页签(后端防呆:与物料档案类型不一致时拒绝) materialCode: form2.materialCode, zoneCode: form2.zoneCode, shelfNo: form2.shelfNo.trim(), @@ -332,6 +334,7 @@ async function submitOther() { const data = await request.post('/inbound/create', { inboundNo: form3.inboundNo.trim(), inboundType: 'other', + manageMode: 3, // 其他页签(后端防呆:与物料档案类型不一致时拒绝) materialCode: form3.materialCode, batchNo: form3.batchNo.trim(), quantity: form3.quantity, diff --git a/bj_power_wms/frontend/src/pages/Inspection.vue b/bj_power_wms/frontend/src/pages/Inspection.vue index d8a52d2..0fca032 100644 --- a/bj_power_wms/frontend/src/pages/Inspection.vue +++ b/bj_power_wms/frontend/src/pages/Inspection.vue @@ -1,7 +1,7 @@ - + +
diff --git a/bj_power_workstation/etc/bj_power_workstation.yaml b/bj_power_workstation/etc/bj_power_workstation.yaml index 09418f5..19207ee 100644 --- a/bj_power_workstation/etc/bj_power_workstation.yaml +++ b/bj_power_workstation/etc/bj_power_workstation.yaml @@ -23,8 +23,10 @@ Internal: # 工位配置:StationNo 固定本终端工位号(仅允许运维改配置后重启生效,工人无法在前端修改)。 # 应拧颗数不再由工位固定配置,而是取自工件工艺流程中「拧紧工艺步骤」的数量。 +# Dock 固定本工位接驳台(AGV 点位编号):叫料自动送达该接驳台,工人不可在界面选择/修改。 Station: StationNo: 1 + Dock: R1 # 工艺文件 PDF 本地预缓存目录(留空关闭缓存) PdfCache: diff --git a/bj_power_workstation/frontend/src/api/index.js b/bj_power_workstation/frontend/src/api/index.js index 6dfcf14..2f2f85e 100644 --- a/bj_power_workstation/frontend/src/api/index.js +++ b/bj_power_workstation/frontend/src/api/index.js @@ -74,7 +74,8 @@ export const ackLineMove = (data) => request.post('/api/line/move/ack', data) // 点位人工记账:{pointNo, sn, orderNo, action: 'IN'|'OUT'} export const occupyLinePoint = (data) => request.post('/api/line/occupy', data) -// 工位叫料:{stationNo, dock, orderNo, items:[{materialCode, materialName, unit, manageMode, qty}]} +// 工位叫料:{stationNo, orderNo, items:[{materialCode, materialName, unit, snMode, qty}]} +// 接驳台不由前端传入:服务端按配置文件(Station.Dock)自动填充目标接驳台 export const callLineMaterial = (data) => request.post('/api/line/call-material', data) // 待接料列表(本工位):{stationNo, status, orderNo, planDate} → MES 备料单(待接料行) diff --git a/bj_power_workstation/frontend/src/help.js b/bj_power_workstation/frontend/src/help.js index 73d2c2b..32e6012 100644 --- a/bj_power_workstation/frontend/src/help.js +++ b/bj_power_workstation/frontend/src/help.js @@ -84,7 +84,7 @@ export const helpPdf = { export const helpOnline = { title: '上线建档 使用说明', overview: - '上线建档运行在产线进线口(工位号 0)。成品在此登记发号、按物料清单核对领料,建档上线后流转到第 1 道装配工位。\n\n标准流程:①选工单(带出产品与物料清单)→ ②按物料清单核对应领料 → ③扫描/生成工件 SN → ④点「确认建档上线」。\n\n数据链路:工单/物料清单(MES) → 建档上线(MES 生成在制工件,工位号 0) → 流转到装配工位。', + '上线建档运行在产线进线口(工位号 0)。成品在此登记建档、按物料清单核对领料,建档上线后流转到第 1 道装配工位。\n\n标准流程:①选工单(带出产品、序列号件口径与物料清单)→ ②按物料清单核对应领料 → ③按口径录入工件 SN(序列号件扫来料SN / 批次件自动发号)→ ④点「确认建档上线」。\n\n数据链路:工单/物料清单/序列号件口径(MES) → 建档上线(MES 生成在制工件,工位号 0) → 流转到装配工位。', sections: [ { title: '选工单与产品', @@ -104,9 +104,9 @@ export const helpOnline = { }, { title: '工件 SN 与建档提交', - overview: 'SN 是成品唯一编号,进线登记即系统发号,全程可追溯。', + overview: 'SN 是成品唯一编号,按产品档案「序列号件」口径分流:序列号件须扫已在 WMS 入库登记的来料SN(不再自动发号);批次件提交后系统自动发号,全程可追溯。', fields: [ - { name: '工件 SN', source: '扫码枪扫描 / 系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '用扫码枪扫条码,或点「自动生成」由系统发号' }, + { name: '工件 SN', source: '序列号件:扫码枪扫来料SN(需已在 WMS 入库登记);批次件:系统自动生成。', purpose: '唯一识别本台成品,拧紧/工艺/追溯都挂在此 SN 下', fill: '序列号件=扫描来料SN(必填,MES 校验其在 WMS 库存);批次件=无需手填,提交后系统自动发号' }, { name: '上线位在制品', source: 'MES 实时查询。工位号 0 的在制工件。', purpose: '看清已建档待流转的工件,防止重复建档', fill: '只读展示,点「刷新」更新' }, { name: '确认建档上线', source: '按钮操作 + 确认框。数据上报到 MES。', purpose: '正式建档上线,工件进入产线待第 1 工位加工', fill: '满足工单/SN/领料核对后点击并二次确认;MES 不可达时自动离线缓存重传' } ] @@ -145,24 +145,24 @@ export const helpOffline = { export const helpMaterial = { title: '物料 / 叫料 使用说明', overview: - '本页用于装配物料绑定与缺料叫料。电气件必须扫码 SN 绑定(一件一码可追溯),结构件按批次绑定;缺料时选本工位接驳台叫料,AGV 送达该接驳台。', + '本页用于装配物料绑定与缺料叫料。序列号件必须扫码 SN 绑定(一件一码可追溯),批次件按批次绑定(口径=MES 物料档案「序列号件」);缺料时提交叫料,AGV 自动送达本工位固定接驳台(由工位终端配置文件设定)。', sections: [ { title: '装配物料绑定', overview: '先在「作业」页扫描工件 SN,再按本工位应绑物料逐项扫码绑定。', fields: [ - { name: '应绑物料', source: 'MES 物料清单。按产品与工位带出。', purpose: '列明本工位需绑定的物料及已绑/应绑数量', fill: '对照标签:电气件扫 SN、结构件扫批次号,回车或点「绑定」' }, + { name: '应绑物料', source: 'MES 物料清单。按产品与工位带出。', purpose: '列明本工位需绑定的物料及已绑/应绑数量', fill: '对照标签:序列号件扫 SN、批次件扫批次号,回车或点「绑定」' }, { name: '已绑标签', source: 'MES 绑定记录。', purpose: '展示已绑定的 SN/批次,可点 × 撤销', fill: '绑错时点标签上的 × 撤销重绑' }, { name: '已绑齐/未绑齐', source: '系统统计。已绑数 / 应绑数。', purpose: '提示本工位物料是否齐套', fill: '未绑齐会红色提示缺料,需补齐后才能完工' } ] }, { title: '叫料', - overview: '选本工位接驳台,填写缺料明细提交,AGV 将物料送达接驳台。', + overview: '填写缺料明细提交,AGV 将物料自动送达本工位固定接驳台(接驳台由配置文件设定,不可更改)。', fields: [ - { name: '接驳台', source: '产线点位配置。本工位的 AGV 接驳点位。', purpose: '确定物料送达位置', fill: '下拉选本工位接驳台' }, + { name: '本工位接驳台', source: '工位终端配置文件(etc yaml,Station.Dock)。', purpose: '确定物料送达位置', fill: '只读展示,不可选择;仅运维改配置并重启后生效' }, { name: '叫料明细', source: '手动录入 / 按缺料一键填充。', purpose: '列明需补的图号、名称、单位、数量', fill: '点「按缺料填充」自动生成,或「添加一行」手填' }, - { name: '提交叫料', source: '按钮操作。数据上报到 MES/库管。', purpose: '发起补料请求,通知 AGV/库管送料', fill: '选接驳台 + 有效明细后点击提交' } + { name: '提交叫料', source: '按钮操作。数据上报到 MES/库管。', purpose: '发起补料请求,通知 AGV/库管送料', fill: '填写有效明细后点击提交' } ] } ] @@ -221,7 +221,7 @@ export const helpInspect = { fields: [ { name: '应急呼叫', source: '按钮操作。实时通知班长。', purpose: '设备故障/缺料/安全等紧急上报', fill: '填写说明后点「发送应急呼叫」' }, { name: '数量不符上报', source: '按钮操作。通知库管。', purpose: '应发与实收不一致时上报差异', fill: '填应发/实收数量,差异非 0 时可提交' }, - { name: '工位退料', source: '按钮操作。待库管收货。', purpose: '多余物料退回库房', fill: '填图号/数量后提交,等库管确认收货' } + { name: '工位退料', source: '按钮操作。推送 WMS 库房收货。', purpose: '多余物料退回库房', fill: '填图号/数量后提交,推送 WMS 生成退库单,待库房收货入库' } ] } ] diff --git a/bj_power_workstation/frontend/src/store/station.js b/bj_power_workstation/frontend/src/store/station.js index 9d7a250..bad59ef 100644 --- a/bj_power_workstation/frontend/src/store/station.js +++ b/bj_power_workstation/frontend/src/store/station.js @@ -21,6 +21,7 @@ import { getUser } from '../utils/request' export const state = reactive({ stationNo: 0, + dock: '', orderNo: '', currentSn: '', task: null, @@ -51,6 +52,8 @@ export const orderNo = computed({ set: (v) => { state.orderNo = v || '' } }) export const stationNo = computed(() => state.stationNo) +// 本工位固定接驳台(服务端 yaml 配置 Station.Dock,只读):叫料自动送达,工人不可选择 +export const stationDock = computed(() => state.dock) export const stepValues = computed(() => state.stepValues) export const stepChecks = computed(() => state.stepChecks) export const bindInputs = computed(() => state.bindInputs) @@ -202,6 +205,8 @@ export async function loadConfig() { const cfg = await getConfig() // 0=上线位、13=下线位为虚拟工位,需允许 stationNo=0(不能用 >0 否则上线位被当未配置) if (cfg && typeof cfg.stationNo === 'number' && cfg.stationNo >= 0) state.stationNo = cfg.stationNo + // 本工位固定接驳台(服务端配置,只读展示用) + if (cfg && typeof cfg.dock === 'string' && cfg.dock) state.dock = cfg.dock } catch { /* 静默 */ } } diff --git a/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue b/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue index 7a7fc94..3769725 100644 --- a/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue +++ b/bj_power_workstation/frontend/src/views/panels/InspectPanel.vue @@ -82,7 +82,7 @@
- 提交完工确认 + 确认该SN已完成生产 @@ -145,7 +145,7 @@ - 提交退料(待库管收货) + 提交退料(推送 WMS 库房收货) @@ -154,7 +154,7 @@ + diff --git a/客户问题.md b/客户问题.md index e71490f..bbc7f20 100644 --- a/客户问题.md +++ b/客户问题.md @@ -176,10 +176,10 @@ MES系统: 孙彦飞答复:已完成 9、开工签到的照片如何上传(用扫码枪)? -孙彦飞答复:已完成。pad可拍照、扫码枪也可以 +孙彦飞答复:已完成。pad可拍照、扫码枪也可以。打开工位终端网页,拍照签到。其他探索(同wifi扫码打开相册上传) 10、完工确认修改“确认该SN已完成生产”,扫描SN码。 -孙彦飞答复:已完成。工艺配置里面可以配置这一项。 +孙彦飞答复:已完成。并添加弹窗二次确认。 11、异常上报看看其他示例中是如何使用的? @@ -198,7 +198,7 @@ MES系统: 工位终端: 工位终端需要进一步完善:开工签到、工位点检、申请巡检、工序间检验、工艺文件查询、叫料/退料、工序开始/结束/暂停、应急呼叫等。 -孙彦飞答复:待确定 +孙彦飞答复:已完成 @@ -218,48 +218,61 @@ MES系统: 5、增加涵盖一个产品生产流程卡; -孙彦飞答复: +孙彦飞答复:已完成。 6、若一个产品当天没有完成,停留在流水线上,第二天流水线怎么开始? -孙彦飞答复: +孙彦飞答复:待讨论 7、增加一个0号工位和13号工位; -孙彦飞答复: +孙彦飞答复:已完成。 工位部分: 1、需要结合检验卡或生产流程卡进行工位操作确认; 孙彦飞答复: 2、每个工位对精密器件应进行扫码录入;记录在检验单上; -孙彦飞答复: +孙彦飞答复:工艺流程可配置 出入库部分: 1:已知原材料库存量和生产原材料清单计算出可生产数量,并设置原材料缺货报警提示; -孙彦飞答复: +孙彦飞答复:已完成。 2、库房这边能否查询原材料清单,便于库房管理人员根据清单提供不同工位需要的原材料; -孙彦飞答复: +孙彦飞答复:已完成。 3、工位上发现原材料数量与下发的原材数量不一致,怎么解决?; -孙彦飞答复: +孙彦飞答复:已完成。 4、工位上原材料退库怎么处理? -孙彦飞答复: +孙彦飞答复:已完成。 质量检验录入: 应先录入产品BOM,包含物料编码、归属(项目)、名称图号型号、相关标准(检验细则)、工序所属;然后在质量检验录入时输入对应物料编码或名称图号型号即可调出相应物料信息;检验完成后记录要包括报检单号、SN/批次、生产厂家、检验员、检验单号、检验日期、上传附件(PDF、图片)。对于不合格品,要能根据相应模板一键生成不合格单;对于后续不合格品处理,要区分退货、返修、退换。 +孙彦飞答复:已完成。 + + 检验记录查询: 应支持模糊查询,包括但不限于输入物料编码、名称、图号、型号即可查询。 +孙彦飞答复:已完成。 + 工艺流程界面: 单个工序要可以上传相应工序的工艺文件,让工位终端可以进行查询。 +孙彦飞答复:已完成。 + + 巡检终端: 对于过程巡检一栏,要支持分工序提交工序间检验记录,且支持上传附件(图片、PDF)。单个产品所有工序完成后,可以根据相应模板一键生成工序间检验记录。 +孙彦飞答复:已完成。 + + 资料导入: 1.增加批量导入产品BOM功能 -孙彦飞答复: +孙彦飞答复:已优化。用料唯一来源=工单工艺组合×工艺物料清单 + 2.图纸管理,如何上传,如何分发,是否按工序分发等 -孙彦飞答复: +孙彦飞答复:已完成。 + @@ -271,127 +284,156 @@ MES系统: 软件问题汇总: 1、编号名称问题:删除工程编号。合同号/科技项目编号为一级编号,正常工程项目使用合同号,科技项目使用科技项目编号,二者只能选择其中一种使用。工单号改为产品工号为二级编号,对应一类产品。产品编号改为产品序号,为三级编号,对应每台产品。 -孙彦飞答复:物料档案的图号不变,也就是 问题里面 对应的产品编码。入库管理的结构件入库、电气件入库、其他入库,归属下拉框里面的工单编号改为合同号,改完以后的单选下拉框结果为:合同号、科技项目号、其他。在归属下面新增产品工号,让客户手动填入。 -相关的筛选页面,也同步更改,例如:出库管理、出库记录、入库记录、来料检验、半成品管理,不限于这些举例。 -并且,wms的半成品管理,是否需要选择归属呢?本来就有这个信息,和成品同归属,这个当前逻辑,无法闭环呢。哎!!! +孙彦飞答复:已完成 2、库房管理物料档案页面增加货架区域、货架号、第一层(存放位置);其中图号改为材料编码; -孙彦飞答复:图号,是统一命名,第一期问题清单的需求。不做修改 +孙彦飞答复:区域管理更完善,无需修改; 图号,是统一命名,第一期问题清单的需求。 3、工艺页面损耗率解释一下怎么考虑? -孙彦飞答复: +孙彦飞答复:已完成 4、出库管理内“箱号”解释一下? -孙彦飞答复: +孙彦飞答复:无业务关联约束,仅记录,箱号=通用出库手填的装箱标识,可填任何可以代表出库标识的内容。或者更名 更合适的内容 如 出库备注,或者 删除此字段。 5、解释一下自动排产原则是什么?(根据什么进行排产) 孙彦飞答复:已完成 -产线软件问题清单 -问号为不明确待回复项,句号为修改项。 + + WMS系统: 1、把过程检验和完工检验放到仓储作业里,是不是不合适?过程检验指的是什么,工序间检验吗;完工应该是指生产过程中的完工检验吧,建议都放入MES系统中。 -孙彦飞答复: +孙彦飞答复:已完成 2、入库中的归属信息是下拉列表,具体的信息是在哪里录入? 孙彦飞答复: +Buddy:已实现(需解释)。归属下拉三选项为固定枚举,编号是录入时手工填写的文本(非从主数据选择);唯一样系统取数=半成品入库填工单号后自动从 MES 解析合同号带出。方案:向客户解释合同号/科技项目号为手填维度标签;若客户要下拉选择,需新增合同/项目主数据表。待决策:是否建合同号主数据(建议本期不做)。 3、来料检的信息不能为空。 孙彦飞答复: +Buddy:未实现。当前仅 目标类型/归属类型/归属编号/待检编号/记录人 必填;报检单号、检验单号、相关标准、生产厂家、检验说明、附件均可空提交(后端可空落库),检验日期为系统生成。方案:前端 rules+后端校验将上述字段全部必填。待决策:附件是否强制必填;完工检是否同步收紧。 4、来料检如果是批次,那需要录入第多少批,共多少件。 孙彦飞答复: +Buddy:未实现。库存与检验表均无「第几批/共几件」字段。方案:检验记录增加 batch_seq(第几批)、batch_total(共几件)两个数字字段,录入页填写、记录列表与导出同步展示,历史数据留空不受影响。待决策:两字段是否必填。 4、来料检里的从库存选批次号是什么作用? 孙彦飞答复: +Buddy:已实现(需解释)。该控件在检验录入页(绑定入库单送检时自动隐藏):远程下拉从在库批次/SN 里挑待检对象,选中即加入待检清单并带出图号/名称/数量,防手输错号。方案:向客户解释即可。待决策:无。 5、入库记录增加一个按归属查询。 孙彦飞答复: +Buddy:已实现。入库记录筛选已有「归属单号」(合同号/科技项目号模糊)与「产品工号」两项,后端模糊匹配。待决策:无。 6、现在入库的料是否都需要建档,那能否在添加物料入库的时候,自动匹配,新的材料自动建档? 孙彦飞答复: +Buddy:未实现。入库提交与 Excel 导入遇物料不存在均报错拦截(物料不存在),无自动建档/自动匹配。方案:入库表单校验物料不存在时弹窗确认,用入库单内 图号(=编码)/名称/规格/类型 自动建档后继续入库(保持 WMS 物料档案唯一真源与全必填口径);Excel 导入路径维持报错。待决策:是否放开自动建档(涉及主数据严肃性,建议做)。 7、解释一下,原料类(SN/结构件/其它)如果刚开始判定合格入库,实际使用过程中不合格,转为退货或换修,系统如何修改和调整? 孙彦飞答复: +Buddy:已实现。两条路径:①在库处置——对不合格行处置:退货=待退并自动生成退供应商出库扣库存、返修=不合格隔离、让步=转合格、报废=不合格+报废;②生产退不良登记(库存查询页独立 Tab):产线不良品退回即重建「不合格」隔离库存行并生成退不良单。无需改动。待决策:无。 8、库存查询增加一个按归属查询。 孙彦飞答复: +Buddy:部分实现。库位明细已支持「归属单号」模糊筛选;物料汇总接口未接归属参数(归属在库存行级,汇总按物料聚合)。方案:物料汇总接口增加归属单号过滤(先筛行再聚合),前端筛选同步。待决策:物料汇总是否需要(库位明细已可按归属查)。 9、现在来料检验中,是否保函两条路,一条是输入物料待检,报检后从已选清单完成检验结果录入;另外一条是在来料检验栏中手动输入信息,提交检验记录? 孙彦飞答复: +Buddy:已实现。两条路都在:①绑定入库单送检,或从库存选批次/SN 加入待检清单后批量录结果;②检验录入页手动输入批次/SN 与信息直接提交记录,两路同接口。待决策:无。 10、锁定量是说已列至排产计划的? 孙彦飞答复: +Buddy:已实现但口径与客户理解不同。锁定量=被「锁库」操作占用的数量(批次件按 locked_qty 累加、SN 件按锁定行数),可用量=数量−锁定量;当前系统内无主动锁库调用方(MES 备料直接出库扣减、盘点走独立冻结),故锁定量实际恒为 0,不等于「已列至排产计划」。方案:向客户如实解释;若要排产即锁定,需 MES 备料接入锁库接口(与「一次位移一次账变」铁律冲突,建议不做)。待决策:是否需要排产占用联动锁库。 11、产成品入库在哪里?如果跟半成品写到一起,那改名为“半成品/成品管理”。 孙彦飞答复: +Buddy:部分实现。菜单现名「半成品管理」;成品入库由 MES 完工自动回流(后端同接口已支持成品类别),不在 WMS 页面手工入库,成品在库存查询按品类查看。方案:菜单改名「半成品/成品管理」+ 增加「成品」Tab(成品入库复用现有接口,或仅展示成品查询与完工检验入口)。待决策:是否需要手工成品入库入口(客户原话倾向改名并入)。 12、需要在AGV穿越到相邻厂房,接收半成品到库房。能否设置虚拟接驳台? 孙彦飞答复: +Buddy:未实现。接驳台主数据真源在 MES(dockType/stationNo 等),仅 line 类型与工位 1:1,无虚拟/跨厂区字段。方案:MES 接驳台放行 dockType=virtual(虚拟接驳台:不绑工位、不参与工位双校验),AGV 任务与出库目标接驳台填虚拟编码即可流转,WMS 出库目标下拉按类型过滤。待决策:虚拟接驳台编码规则、是否在看板展示。 MES系统: 1、拧紧查询是否有必要单独成一条目,建议放到工件追溯中。 孙彦飞答复: +Buddy:已实现(并存)。拧紧查询有独立菜单(SN/工单/工位/日期复合查询、一级汇总+二级明细、审核签字),工件追溯页另有只读「拧紧数据」Tab——客户要的并入追溯已有体现。方案:推荐保留独立菜单(统计与审核签字入口)+追溯只读;若客户坚持合并,下线独立菜单并把审核签字迁入追溯页。待决策:二选一,等客户拍板。 2、mes里的物料档案,是不是没有关于产品和物料的信息,应保存的都是产线设备和其他生产物料工具,改名为设备管理 孙彦飞答复: +Buddy:建议不改名。事实:MES 物料档案=成品/物料本地副本(本地优先、异步同步 WMS,WMS 宕机可用),不是设备/工装台账;系统当前无设备管理模块,改名「设备管理」与页面内容不符。方案:保持「物料档案」;客户若要设备台账,另立独立「设备管理」模块(设备档案+绑定工位)。待决策:客户是否真要设备台账(建议按新需求排期)。 3、工位绑定中如果一个工位只能绑定一个工艺,那更换生产产品的话,需要重新绑定? 孙彦飞答复:需要,更换产品本身也是需要重新定义工艺。这个步骤不管放到哪里,都是少不了的。 +Buddy:已实现(答复一致)。工位绑定工艺为单值字段=一工位一工艺;工单保存、排产、下发、报工四处强校验组合与绑定一致,换产品须先改绑。待决策:无。 4、工艺列表中,是不是应该生产的某项产品规定为工艺,芯片安装、喷漆这种规定为工艺步骤,然后物料清单链接工艺步骤?整体上提一级,工艺步骤不再罗列比如第一遍红漆、第二遍绿漆这种再下一级的工作内容。 孙彦飞答复:“红漆、第二遍绿漆”,需要罗列,这里只是举例,可以自行定义,如果不需要,可以不建立这一步。但是,如果要记录sn、如果要记录 拧紧数据,就必须有触发点。 +Buddy:已实现(答复一致)。工艺步骤即自定义触发点:SN 记录、拧紧采集、考核采集、检测确认都挂在步骤上,「第几遍漆」按需自建、不需要可不建。待决策:无。 5、工艺步骤中的采集方式是什么意思?工艺步骤只能上传pdf附件。考核标准是怎么输进去? 孙彦飞答复:已完成。原来就有这个考核标准,我忘记点开给看一看了。 +Buddy:已实现。采集方式=AUTO(拧紧枪自动)/MANUAL(手填)/NONE(仅记录),步骤附件仅 PDF;考核标准为独立配置(指标/单位/GE/LE/RANGE 等判定),报工时自动判定落库。待决策:无。 6、工件追溯需要显示出现有内容外,还需要查看工件的过程检验情况、操作工位、操作人员、操作时间,试验数据。 孙彦飞答复: +Buddy:部分实现。追溯已含 工位时间线(工位/操作人/起止时间)、步骤考核数据(试验类)、拧紧数据、成品关联、装机绑定;缺 过程检验/完工检验记录。方案:追溯接口并入该 SN 的检验记录(过程+完工),前端加「检验记录」Tab。待决策:无(建议本期补齐)。 7、生产流程卡主要是用于对单个工件依据标准,使用原材料情况、生产情况、检验情况的记录和追溯,跟工件追溯功能类似。 孙彦飞答复:维度不一样,工件追溯,可以查看任何 电气件 等,当前位置, 到哪里去了,等。 生产流程卡 是生产结果的表示。 +Buddy:已实现(答复一致)。型号级流程卡=制造定义(工位组合/工艺步骤/物料分组/检验卡项/历史首末作业时间),SN 级流程卡与工件追溯=单件实绩,两套口径代码分离清晰。待决策:无。 8、巡检终端部分功能可能需要在后期调试时继续完善。 孙彦飞答复: +Buddy:无需开发。方案:接受调试期完善,现场反馈统一进《问题记录.md》逐条闭环,本期不加功能。待决策:无。 9、固定日产是用于生产天数小于工程要求天数?实际情况多为前期因为不熟练生产速度满,中后期逐渐加快,所以排产应该也是保持前松,中紧,后松的状态进行排产,是否可以实现? 孙彦飞答复:排期时,预览时,用户可以自行调节,总数据要对的上。 +Buddy:已实现(答复一致)。自动排产出预览后可逐日手调任意节奏(前松/中紧/后松),仅校验合计=应排总数。待决策:无。 10、日排产栏中按时间从前到后排序修改,现在为从后到前。 孙彦飞答复:增量数据,都是“从后到前”,防止数据量太大,新建内容一直看不到。 +Buddy:部分实现。当前日排产按排产日期降序。方案:日排产属业务日期表(非录入流水,不受「增量列表倒序」铁律约束),建议改为按排产日期升序(同日按工单号)展示,或前端加升降序切换。待决策:默认改为升序是否直接回复客户。 11、可生产套数的公式是不是错了,应该是最小库存量/单台用量。 孙彦飞答复: +Buddy:已实现,公式与客户口径一致。可生产套数=对有未取消日排产的工单,取各物料 WMS 可用量÷该工单单台含损耗用量 的最小值向下取整;可用量仅计合格口径。无需修改。待决策:无。 12、多个工单同时生产的话,日排产栏中使用多栏表格或其他方式将不同工单号的进行区分,不要重叠放到一起。 孙彦飞答复: +Buddy:未实现。日排产为平铺表格,多工单仅靠工单号列文字区分。方案:同工单行合并工单号单元格(span-method)+ 按工单着色,改动最小;或提供 按工单/按日期 视图切换。待决策:展示形式(推荐合并单元格+着色)。 13、多个工单同时生产时,下发工单操作的逻辑是不是还没有理顺? 孙彦飞答复:已完成。原来不支持多工单混生产,已兼容。需要说明:滚筒线是单向流动,如果工单跳跃进行比如,工位1 7 9 加工工单A,2 4 5 6 10 加工工单B,那么滚筒线最好不要做缓存使用。系统把是否滚筒线缓存,做成可配置项。 +Buddy:部分实现。多工单数据层已支持(工单可并行、产线点位台账记录所属工单号);滚筒线缓存已做成可配置项 pipeline_cache(基础设置页,1=启用/0=串行,当前为预留、流转逻辑未消费);但 PLC 下发握手是全局串行锁——任一工单未收到完成信号,其他工单也发不了。待决策:PLC 真机接入时握手锁是否改为按工单+工位维度(与 PLC 方对齐时一并定)。 14、备料单中的表格内,操作栏显示已接料是什么意思,已发出为0,为什么就显示已接料? 孙彦飞答复: +Buddy:已实现但口径有观感坑。「已接料完结」=行状态 DONE;对账视图把 MES 接料量按 工单+图号 跨所有备料单行聚合,同工单存在补料行或多条排产行时,本行已发出 0 也会显示有接料。方案:①操作按钮文案改「确认接料」且仅本行已发出>0 可点;②对账列注明按工单+图号累计或改按行聚合。待决策:对账口径按行还是按工单+图号(推荐按行+工单汇总行)。 15、质量检验栏中的过程检和完工检,这两项不应该是巡检终端录入的吗,为什么会在这里可以录入? 孙彦飞答复: +Buddy:已实现(现状如此)。MES 质量检验页可新建/录入过程检、完工检(按钮权限 produce.quality:edit),与巡检终端(PAD)双入口同后端。方案:与 WMS 清单第 1 条联动定稿——现场录入以巡检终端为主渠道,MES 网页保留为管理/补录入口;WMS 侧删过程/完工检菜单。待决策:MES 网页录入权限是否下发给非巡检角色。 工位终端: 1、当前工位的步骤完成后,应该先申请报检(需要考虑如何将检验的工作与工位的工作汇总到一起,最终体现到施工单上),报检通过后,报工(上传工作量)并流转至下一步骤对应工位。 孙彦飞答复: +Buddy:未实现严格门禁。现状:报工无报检前置(报工条件不含巡检状态),过程巡检/完工确认是并行动作;需检验步骤须勾「检测确认(合格)」且服务端强校验,巡检签字在巡检终端事后完成。方案:把需检验步骤的巡检签字前置到报工前——报工条件增加「该 SN 本工位待签字巡检已确认」,MES 报工接口同步校验(同库改动小)。待决策:报工前强制等签字是否影响生产节拍(客户拍板)。 2、有些工艺步骤是不需要录入信息的,是否会卡到这一步无法继续处理? 孙彦飞答复: +Buddy:已实现。采集方式 NONE 的步骤终端不渲染、不参与校验,天然放行不卡;MANUAL 步骤必须录值(防漏检的有意设计,无跳过按钮)。方案:现场把不需要录入的步骤采集方式配为 NONE 即可,无需开发。待决策:无。 3、工位上对需要组装的电气件进行扫码,这一工作在哪个页面完成,是装配物料绑定页面吗? 孙彦飞答复: +Buddy:已实现。在工位终端「物料/叫料」页签的「装配物料绑定」面板:序列号件必扫 SN、批次件扫批次,绑定实时落 MES 装机绑定表,并作为报工齐套强校验(未绑齐阻断报工)。待决策:无。 4、移料的作用解释一下。 孙彦飞答复: +Buddy:已实现(需解释)。移料=产线点位间工件移动登记与指令闭环:点位图选起点→终点下发移料指令(已下发→已应答→已到位→已闭环),到位回写点位台账(唯一事实源),支持人工上料/下料记账与 AGV/PLC 联动;作业页上料/移出自动带出。方案:向客户解释即可。待决策:无。 @@ -400,11 +442,14 @@ MES系统: 1、mes 工单管理 新建工单 , 提示:请至少勾选一个工位形成工艺组合 。但是,底部 工艺组合 ,没有显示工艺,无法选择 孙彦飞答复: +Buddy:非代码缺陷,现场为旧包/未绑定工艺。当前源码建单已不强制工艺组合(未选仅提示「排产/开工前须配置」,排产/开工时后端强校验),提示语「请至少勾选一个工位形成工艺组合」在现源码中已不存在——客户看到的是旧 exe(exe 未重建,编译期快照)。工艺组合区只显示「已绑定启用工位的工艺」,工位未绑定工艺/未启用时区域为空属配置前置。方案:①现场核实工位是否已绑工艺;②重建 exe 后复测;③可给组合区加空态说明(指向基础配置-关联工位)。待决策:是否加空态提示文案(小改)。 2、禁止:序列号、批次、其他。 改为: 电气件、结构件、其他 孙彦飞答复: 1、出库管理 --- 通用出库 --- 出库类型 ,物料选择已经显示 电气件,出库类型 不需要存在了 。2、 +Buddy:部分实现。物料「类型」已是 结构件/电气件/其他(2026-09-30 解耦定稿,纯分类维度);客户看到的「序列号、批次、其他」是检验录入的「目标类型」(批次件/序列号件/其他,记账方式维度,与类型已解耦,不建议混同改名);答复第 1 点「通用出库出库类型下拉不需要存在」尚未实施——下拉仍在(Outbound.vue 出库类型)。方案:①删除通用出库「出库类型」下拉及其提交字段(物料选择已带类型);②向客户解释目标类型=记账方式。待决策:确认后一次删净。 3、当前现象:来料检验、过程检验、完工检验,都在wms,并且内容竟然一样。 孙彦飞答复:客户也提出 同样 疑惑,问是否合适,为什么要有 过程检验、完工检验。并且,位置是否正确。 +Buddy:与产线软件问题清单 WMS 第 1 条同根同方案。事实:三菜单复用同一组件同一接口(路由 meta 区分检验类型),字段与行为一致所以内容雷同。方案:WMS 删除过程检验/完工检验菜单,过程检/完工检归 MES 质量检验页+巡检终端,WMS 留来料检验与检验记录查询。待决策:客户确认后一次删净。