diff --git a/bj_power_mes/ent/alert.go b/bj_power_mes/ent/alert.go index 36020c9..c0049d5 100644 --- a/bj_power_mes/ent/alert.go +++ b/bj_power_mes/ent/alert.go @@ -29,6 +29,8 @@ type Alert struct { RefType string `json:"refType,omitempty"` // 关联业务ID RefId string `json:"refId,omitempty"` + // 关联工单号(按工单号查询用) + OrderNo string `json:"orderNo,omitempty"` // UNREAD/READ Status string `json:"status,omitempty"` // 接收人 @@ -45,7 +47,7 @@ func (*Alert) scanValues(columns []string) ([]any, error) { switch columns[i] { case alert.FieldID, alert.FieldRuleId: values[i] = new(sql.NullInt64) - case alert.FieldType, alert.FieldTitle, alert.FieldContent, alert.FieldRefType, alert.FieldRefId, alert.FieldStatus, alert.FieldReceiver: + case alert.FieldType, alert.FieldTitle, alert.FieldContent, alert.FieldRefType, alert.FieldRefId, alert.FieldOrderNo, alert.FieldStatus, alert.FieldReceiver: values[i] = new(sql.NullString) case alert.FieldCreatedAt: values[i] = new(sql.NullTime) @@ -106,6 +108,12 @@ func (_m *Alert) assignValues(columns []string, values []any) error { } else if value.Valid { _m.RefId = value.String } + case alert.FieldOrderNo: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field orderNo", values[i]) + } else if value.Valid { + _m.OrderNo = value.String + } case alert.FieldStatus: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field status", values[i]) @@ -178,6 +186,9 @@ func (_m *Alert) String() string { builder.WriteString("refId=") builder.WriteString(_m.RefId) builder.WriteString(", ") + builder.WriteString("orderNo=") + builder.WriteString(_m.OrderNo) + builder.WriteString(", ") builder.WriteString("status=") builder.WriteString(_m.Status) builder.WriteString(", ") diff --git a/bj_power_mes/ent/alert/alert.go b/bj_power_mes/ent/alert/alert.go index 36a73b6..1e72785 100644 --- a/bj_power_mes/ent/alert/alert.go +++ b/bj_power_mes/ent/alert/alert.go @@ -25,6 +25,8 @@ const ( FieldRefType = "ref_type" // FieldRefId holds the string denoting the refid field in the database. FieldRefId = "ref_id" + // FieldOrderNo holds the string denoting the orderno field in the database. + FieldOrderNo = "order_no" // FieldStatus holds the string denoting the status field in the database. FieldStatus = "status" // FieldReceiver holds the string denoting the receiver field in the database. @@ -44,6 +46,7 @@ var Columns = []string{ FieldContent, FieldRefType, FieldRefId, + FieldOrderNo, FieldStatus, FieldReceiver, FieldCreatedAt, @@ -78,6 +81,10 @@ var ( DefaultRefId string // RefIdValidator is a validator for the "refId" field. It is called by the builders before save. RefIdValidator func(string) error + // DefaultOrderNo holds the default value on creation for the "orderNo" field. + DefaultOrderNo string + // OrderNoValidator is a validator for the "orderNo" field. It is called by the builders before save. + OrderNoValidator func(string) error // DefaultStatus holds the default value on creation for the "status" field. DefaultStatus string // StatusValidator is a validator for the "status" field. It is called by the builders before save. @@ -130,6 +137,11 @@ func ByRefId(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldRefId, opts...).ToFunc() } +// ByOrderNo orders the results by the orderNo field. +func ByOrderNo(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldOrderNo, opts...).ToFunc() +} + // ByStatus orders the results by the status field. func ByStatus(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldStatus, opts...).ToFunc() diff --git a/bj_power_mes/ent/alert/where.go b/bj_power_mes/ent/alert/where.go index 94c2412..962b13a 100644 --- a/bj_power_mes/ent/alert/where.go +++ b/bj_power_mes/ent/alert/where.go @@ -84,6 +84,11 @@ func RefId(v string) predicate.Alert { return predicate.Alert(sql.FieldEQ(FieldRefId, v)) } +// OrderNo applies equality check predicate on the "orderNo" field. It's identical to OrderNoEQ. +func OrderNo(v string) predicate.Alert { + return predicate.Alert(sql.FieldEQ(FieldOrderNo, v)) +} + // Status applies equality check predicate on the "status" field. It's identical to StatusEQ. func Status(v string) predicate.Alert { return predicate.Alert(sql.FieldEQ(FieldStatus, v)) @@ -464,6 +469,71 @@ func RefIdContainsFold(v string) predicate.Alert { return predicate.Alert(sql.FieldContainsFold(FieldRefId, v)) } +// OrderNoEQ applies the EQ predicate on the "orderNo" field. +func OrderNoEQ(v string) predicate.Alert { + return predicate.Alert(sql.FieldEQ(FieldOrderNo, v)) +} + +// OrderNoNEQ applies the NEQ predicate on the "orderNo" field. +func OrderNoNEQ(v string) predicate.Alert { + return predicate.Alert(sql.FieldNEQ(FieldOrderNo, v)) +} + +// OrderNoIn applies the In predicate on the "orderNo" field. +func OrderNoIn(vs ...string) predicate.Alert { + return predicate.Alert(sql.FieldIn(FieldOrderNo, vs...)) +} + +// OrderNoNotIn applies the NotIn predicate on the "orderNo" field. +func OrderNoNotIn(vs ...string) predicate.Alert { + return predicate.Alert(sql.FieldNotIn(FieldOrderNo, vs...)) +} + +// OrderNoGT applies the GT predicate on the "orderNo" field. +func OrderNoGT(v string) predicate.Alert { + return predicate.Alert(sql.FieldGT(FieldOrderNo, v)) +} + +// OrderNoGTE applies the GTE predicate on the "orderNo" field. +func OrderNoGTE(v string) predicate.Alert { + return predicate.Alert(sql.FieldGTE(FieldOrderNo, v)) +} + +// OrderNoLT applies the LT predicate on the "orderNo" field. +func OrderNoLT(v string) predicate.Alert { + return predicate.Alert(sql.FieldLT(FieldOrderNo, v)) +} + +// OrderNoLTE applies the LTE predicate on the "orderNo" field. +func OrderNoLTE(v string) predicate.Alert { + return predicate.Alert(sql.FieldLTE(FieldOrderNo, v)) +} + +// OrderNoContains applies the Contains predicate on the "orderNo" field. +func OrderNoContains(v string) predicate.Alert { + return predicate.Alert(sql.FieldContains(FieldOrderNo, v)) +} + +// OrderNoHasPrefix applies the HasPrefix predicate on the "orderNo" field. +func OrderNoHasPrefix(v string) predicate.Alert { + return predicate.Alert(sql.FieldHasPrefix(FieldOrderNo, v)) +} + +// OrderNoHasSuffix applies the HasSuffix predicate on the "orderNo" field. +func OrderNoHasSuffix(v string) predicate.Alert { + return predicate.Alert(sql.FieldHasSuffix(FieldOrderNo, v)) +} + +// OrderNoEqualFold applies the EqualFold predicate on the "orderNo" field. +func OrderNoEqualFold(v string) predicate.Alert { + return predicate.Alert(sql.FieldEqualFold(FieldOrderNo, v)) +} + +// OrderNoContainsFold applies the ContainsFold predicate on the "orderNo" field. +func OrderNoContainsFold(v string) predicate.Alert { + return predicate.Alert(sql.FieldContainsFold(FieldOrderNo, v)) +} + // StatusEQ applies the EQ predicate on the "status" field. func StatusEQ(v string) predicate.Alert { return predicate.Alert(sql.FieldEQ(FieldStatus, v)) diff --git a/bj_power_mes/ent/alert_create.go b/bj_power_mes/ent/alert_create.go index 2f2c377..702cbff 100644 --- a/bj_power_mes/ent/alert_create.go +++ b/bj_power_mes/ent/alert_create.go @@ -88,6 +88,20 @@ func (_c *AlertCreate) SetNillableRefId(v *string) *AlertCreate { return _c } +// SetOrderNo sets the "orderNo" field. +func (_c *AlertCreate) SetOrderNo(v string) *AlertCreate { + _c.mutation.SetOrderNo(v) + return _c +} + +// SetNillableOrderNo sets the "orderNo" field if the given value is not nil. +func (_c *AlertCreate) SetNillableOrderNo(v *string) *AlertCreate { + if v != nil { + _c.SetOrderNo(*v) + } + return _c +} + // SetStatus sets the "status" field. func (_c *AlertCreate) SetStatus(v string) *AlertCreate { _c.mutation.SetStatus(v) @@ -187,6 +201,10 @@ func (_c *AlertCreate) defaults() { v := alert.DefaultRefId _c.mutation.SetRefId(v) } + if _, ok := _c.mutation.OrderNo(); !ok { + v := alert.DefaultOrderNo + _c.mutation.SetOrderNo(v) + } if _, ok := _c.mutation.Status(); !ok { v := alert.DefaultStatus _c.mutation.SetStatus(v) @@ -246,6 +264,14 @@ func (_c *AlertCreate) check() error { return &ValidationError{Name: "refId", err: fmt.Errorf(`ent: validator failed for field "Alert.refId": %w`, err)} } } + if _, ok := _c.mutation.OrderNo(); !ok { + return &ValidationError{Name: "orderNo", err: errors.New(`ent: missing required field "Alert.orderNo"`)} + } + if v, ok := _c.mutation.OrderNo(); ok { + if err := alert.OrderNoValidator(v); err != nil { + return &ValidationError{Name: "orderNo", err: fmt.Errorf(`ent: validator failed for field "Alert.orderNo": %w`, err)} + } + } if _, ok := _c.mutation.Status(); !ok { return &ValidationError{Name: "status", err: errors.New(`ent: missing required field "Alert.status"`)} } @@ -326,6 +352,10 @@ func (_c *AlertCreate) createSpec() (*Alert, *sqlgraph.CreateSpec) { _spec.SetField(alert.FieldRefId, field.TypeString, value) _node.RefId = value } + if value, ok := _c.mutation.OrderNo(); ok { + _spec.SetField(alert.FieldOrderNo, field.TypeString, value) + _node.OrderNo = value + } if value, ok := _c.mutation.Status(); ok { _spec.SetField(alert.FieldStatus, field.TypeString, value) _node.Status = value diff --git a/bj_power_mes/ent/alert_update.go b/bj_power_mes/ent/alert_update.go index b9420b5..b82dd9b 100644 --- a/bj_power_mes/ent/alert_update.go +++ b/bj_power_mes/ent/alert_update.go @@ -119,6 +119,20 @@ func (_u *AlertUpdate) SetNillableRefId(v *string) *AlertUpdate { return _u } +// SetOrderNo sets the "orderNo" field. +func (_u *AlertUpdate) SetOrderNo(v string) *AlertUpdate { + _u.mutation.SetOrderNo(v) + return _u +} + +// SetNillableOrderNo sets the "orderNo" field if the given value is not nil. +func (_u *AlertUpdate) SetNillableOrderNo(v *string) *AlertUpdate { + if v != nil { + _u.SetOrderNo(*v) + } + return _u +} + // SetStatus sets the "status" field. func (_u *AlertUpdate) SetStatus(v string) *AlertUpdate { _u.mutation.SetStatus(v) @@ -206,6 +220,11 @@ func (_u *AlertUpdate) check() error { return &ValidationError{Name: "refId", err: fmt.Errorf(`ent: validator failed for field "Alert.refId": %w`, err)} } } + if v, ok := _u.mutation.OrderNo(); ok { + if err := alert.OrderNoValidator(v); err != nil { + return &ValidationError{Name: "orderNo", err: fmt.Errorf(`ent: validator failed for field "Alert.orderNo": %w`, err)} + } + } if v, ok := _u.mutation.Status(); ok { if err := alert.StatusValidator(v); err != nil { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "Alert.status": %w`, err)} @@ -258,6 +277,9 @@ func (_u *AlertUpdate) sqlSave(ctx context.Context) (_node int, err error) { if value, ok := _u.mutation.RefId(); ok { _spec.SetField(alert.FieldRefId, field.TypeString, value) } + if value, ok := _u.mutation.OrderNo(); ok { + _spec.SetField(alert.FieldOrderNo, field.TypeString, value) + } if value, ok := _u.mutation.Status(); ok { _spec.SetField(alert.FieldStatus, field.TypeString, value) } @@ -377,6 +399,20 @@ func (_u *AlertUpdateOne) SetNillableRefId(v *string) *AlertUpdateOne { return _u } +// SetOrderNo sets the "orderNo" field. +func (_u *AlertUpdateOne) SetOrderNo(v string) *AlertUpdateOne { + _u.mutation.SetOrderNo(v) + return _u +} + +// SetNillableOrderNo sets the "orderNo" field if the given value is not nil. +func (_u *AlertUpdateOne) SetNillableOrderNo(v *string) *AlertUpdateOne { + if v != nil { + _u.SetOrderNo(*v) + } + return _u +} + // SetStatus sets the "status" field. func (_u *AlertUpdateOne) SetStatus(v string) *AlertUpdateOne { _u.mutation.SetStatus(v) @@ -477,6 +513,11 @@ func (_u *AlertUpdateOne) check() error { return &ValidationError{Name: "refId", err: fmt.Errorf(`ent: validator failed for field "Alert.refId": %w`, err)} } } + if v, ok := _u.mutation.OrderNo(); ok { + if err := alert.OrderNoValidator(v); err != nil { + return &ValidationError{Name: "orderNo", err: fmt.Errorf(`ent: validator failed for field "Alert.orderNo": %w`, err)} + } + } if v, ok := _u.mutation.Status(); ok { if err := alert.StatusValidator(v); err != nil { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "Alert.status": %w`, err)} @@ -546,6 +587,9 @@ func (_u *AlertUpdateOne) sqlSave(ctx context.Context) (_node *Alert, err error) if value, ok := _u.mutation.RefId(); ok { _spec.SetField(alert.FieldRefId, field.TypeString, value) } + if value, ok := _u.mutation.OrderNo(); ok { + _spec.SetField(alert.FieldOrderNo, field.TypeString, value) + } if value, ok := _u.mutation.Status(); ok { _spec.SetField(alert.FieldStatus, field.TypeString, value) } diff --git a/bj_power_mes/ent/materialqtyreport.go b/bj_power_mes/ent/materialqtyreport.go index 91d0d8f..4373e1d 100644 --- a/bj_power_mes/ent/materialqtyreport.go +++ b/bj_power_mes/ent/materialqtyreport.go @@ -35,8 +35,18 @@ type MaterialQtyReport struct { DiffQty int `json:"diffQty,omitempty"` // 差异原因 Cause string `json:"cause,omitempty"` - // PENDING/RESOLVED + // PENDING/PROCESSING/REPLENISHED/RETURNED/ADJUSTED/CLOSED Status string `json:"status,omitempty"` + // 处理方式 REPLENISH补发/RETURN退库/ADJUST调整 + HandleType string `json:"handleType,omitempty"` + // 处理生成的单据号(补料单号/退库单号) + HandleDocNo string `json:"handleDocNo,omitempty"` + // 处理说明 + HandleNote string `json:"handleNote,omitempty"` + // 处理人 + HandledBy string `json:"handledBy,omitempty"` + // 处理时间(unix 秒) + HandledAt int64 `json:"handledAt,omitempty"` // 上报人 Operator string `json:"operator,omitempty"` // CreatedAt holds the value of the "createdAt" field. @@ -51,9 +61,9 @@ func (*MaterialQtyReport) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case materialqtyreport.FieldID, materialqtyreport.FieldStationNo, materialqtyreport.FieldPlanQty, materialqtyreport.FieldActualQty, materialqtyreport.FieldDiffQty: + case materialqtyreport.FieldID, materialqtyreport.FieldStationNo, materialqtyreport.FieldPlanQty, materialqtyreport.FieldActualQty, materialqtyreport.FieldDiffQty, materialqtyreport.FieldHandledAt: values[i] = new(sql.NullInt64) - case materialqtyreport.FieldOrderNo, materialqtyreport.FieldSn, materialqtyreport.FieldMaterialCode, materialqtyreport.FieldMaterialName, materialqtyreport.FieldCause, materialqtyreport.FieldStatus, materialqtyreport.FieldOperator: + case materialqtyreport.FieldOrderNo, materialqtyreport.FieldSn, materialqtyreport.FieldMaterialCode, materialqtyreport.FieldMaterialName, materialqtyreport.FieldCause, materialqtyreport.FieldStatus, materialqtyreport.FieldHandleType, materialqtyreport.FieldHandleDocNo, materialqtyreport.FieldHandleNote, materialqtyreport.FieldHandledBy, materialqtyreport.FieldOperator: values[i] = new(sql.NullString) case materialqtyreport.FieldCreatedAt, materialqtyreport.FieldResolvedAt: values[i] = new(sql.NullTime) @@ -138,6 +148,36 @@ func (_m *MaterialQtyReport) assignValues(columns []string, values []any) error } else if value.Valid { _m.Status = value.String } + case materialqtyreport.FieldHandleType: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field handleType", values[i]) + } else if value.Valid { + _m.HandleType = value.String + } + case materialqtyreport.FieldHandleDocNo: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field handleDocNo", values[i]) + } else if value.Valid { + _m.HandleDocNo = value.String + } + case materialqtyreport.FieldHandleNote: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field handleNote", values[i]) + } else if value.Valid { + _m.HandleNote = value.String + } + case materialqtyreport.FieldHandledBy: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field handledBy", values[i]) + } else if value.Valid { + _m.HandledBy = value.String + } + case materialqtyreport.FieldHandledAt: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field handledAt", values[i]) + } else if value.Valid { + _m.HandledAt = value.Int64 + } case materialqtyreport.FieldOperator: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field operator", values[i]) @@ -223,6 +263,21 @@ func (_m *MaterialQtyReport) String() string { builder.WriteString("status=") builder.WriteString(_m.Status) builder.WriteString(", ") + builder.WriteString("handleType=") + builder.WriteString(_m.HandleType) + builder.WriteString(", ") + builder.WriteString("handleDocNo=") + builder.WriteString(_m.HandleDocNo) + builder.WriteString(", ") + builder.WriteString("handleNote=") + builder.WriteString(_m.HandleNote) + builder.WriteString(", ") + builder.WriteString("handledBy=") + builder.WriteString(_m.HandledBy) + builder.WriteString(", ") + builder.WriteString("handledAt=") + builder.WriteString(fmt.Sprintf("%v", _m.HandledAt)) + builder.WriteString(", ") builder.WriteString("operator=") builder.WriteString(_m.Operator) builder.WriteString(", ") diff --git a/bj_power_mes/ent/materialqtyreport/materialqtyreport.go b/bj_power_mes/ent/materialqtyreport/materialqtyreport.go index cd10c8d..ab8f48f 100644 --- a/bj_power_mes/ent/materialqtyreport/materialqtyreport.go +++ b/bj_power_mes/ent/materialqtyreport/materialqtyreport.go @@ -33,6 +33,16 @@ const ( FieldCause = "cause" // FieldStatus holds the string denoting the status field in the database. FieldStatus = "status" + // FieldHandleType holds the string denoting the handletype field in the database. + FieldHandleType = "handle_type" + // FieldHandleDocNo holds the string denoting the handledocno field in the database. + FieldHandleDocNo = "handle_doc_no" + // FieldHandleNote holds the string denoting the handlenote field in the database. + FieldHandleNote = "handle_note" + // FieldHandledBy holds the string denoting the handledby field in the database. + FieldHandledBy = "handled_by" + // FieldHandledAt holds the string denoting the handledat field in the database. + FieldHandledAt = "handled_at" // FieldOperator holds the string denoting the operator field in the database. FieldOperator = "operator" // FieldCreatedAt holds the string denoting the createdat field in the database. @@ -56,6 +66,11 @@ var Columns = []string{ FieldDiffQty, FieldCause, FieldStatus, + FieldHandleType, + FieldHandleDocNo, + FieldHandleNote, + FieldHandledBy, + FieldHandledAt, FieldOperator, FieldCreatedAt, FieldResolvedAt, @@ -104,6 +119,24 @@ var ( DefaultStatus string // StatusValidator is a validator for the "status" field. It is called by the builders before save. StatusValidator func(string) error + // DefaultHandleType holds the default value on creation for the "handleType" field. + DefaultHandleType string + // HandleTypeValidator is a validator for the "handleType" field. It is called by the builders before save. + HandleTypeValidator func(string) error + // DefaultHandleDocNo holds the default value on creation for the "handleDocNo" field. + DefaultHandleDocNo string + // HandleDocNoValidator is a validator for the "handleDocNo" field. It is called by the builders before save. + HandleDocNoValidator func(string) error + // DefaultHandleNote holds the default value on creation for the "handleNote" field. + DefaultHandleNote string + // HandleNoteValidator is a validator for the "handleNote" field. It is called by the builders before save. + HandleNoteValidator func(string) error + // DefaultHandledBy holds the default value on creation for the "handledBy" field. + DefaultHandledBy string + // HandledByValidator is a validator for the "handledBy" field. It is called by the builders before save. + HandledByValidator func(string) error + // DefaultHandledAt holds the default value on creation for the "handledAt" field. + DefaultHandledAt int64 // DefaultOperator holds the default value on creation for the "operator" field. DefaultOperator string // OperatorValidator is a validator for the "operator" field. It is called by the builders before save. @@ -172,6 +205,31 @@ func ByStatus(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldStatus, opts...).ToFunc() } +// ByHandleType orders the results by the handleType field. +func ByHandleType(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHandleType, opts...).ToFunc() +} + +// ByHandleDocNo orders the results by the handleDocNo field. +func ByHandleDocNo(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHandleDocNo, opts...).ToFunc() +} + +// ByHandleNote orders the results by the handleNote field. +func ByHandleNote(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHandleNote, opts...).ToFunc() +} + +// ByHandledBy orders the results by the handledBy field. +func ByHandledBy(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHandledBy, opts...).ToFunc() +} + +// ByHandledAt orders the results by the handledAt field. +func ByHandledAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHandledAt, opts...).ToFunc() +} + // ByOperator orders the results by the operator field. func ByOperator(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldOperator, opts...).ToFunc() diff --git a/bj_power_mes/ent/materialqtyreport/where.go b/bj_power_mes/ent/materialqtyreport/where.go index fb96812..40e9591 100644 --- a/bj_power_mes/ent/materialqtyreport/where.go +++ b/bj_power_mes/ent/materialqtyreport/where.go @@ -104,6 +104,31 @@ func Status(v string) predicate.MaterialQtyReport { return predicate.MaterialQtyReport(sql.FieldEQ(FieldStatus, v)) } +// HandleType applies equality check predicate on the "handleType" field. It's identical to HandleTypeEQ. +func HandleType(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleType, v)) +} + +// HandleDocNo applies equality check predicate on the "handleDocNo" field. It's identical to HandleDocNoEQ. +func HandleDocNo(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleDocNo, v)) +} + +// HandleNote applies equality check predicate on the "handleNote" field. It's identical to HandleNoteEQ. +func HandleNote(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleNote, v)) +} + +// HandledBy applies equality check predicate on the "handledBy" field. It's identical to HandledByEQ. +func HandledBy(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandledBy, v)) +} + +// HandledAt applies equality check predicate on the "handledAt" field. It's identical to HandledAtEQ. +func HandledAt(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandledAt, v)) +} + // Operator applies equality check predicate on the "operator" field. It's identical to OperatorEQ. func Operator(v string) predicate.MaterialQtyReport { return predicate.MaterialQtyReport(sql.FieldEQ(FieldOperator, v)) @@ -669,6 +694,306 @@ func StatusContainsFold(v string) predicate.MaterialQtyReport { return predicate.MaterialQtyReport(sql.FieldContainsFold(FieldStatus, v)) } +// HandleTypeEQ applies the EQ predicate on the "handleType" field. +func HandleTypeEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleType, v)) +} + +// HandleTypeNEQ applies the NEQ predicate on the "handleType" field. +func HandleTypeNEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNEQ(FieldHandleType, v)) +} + +// HandleTypeIn applies the In predicate on the "handleType" field. +func HandleTypeIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldIn(FieldHandleType, vs...)) +} + +// HandleTypeNotIn applies the NotIn predicate on the "handleType" field. +func HandleTypeNotIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNotIn(FieldHandleType, vs...)) +} + +// HandleTypeGT applies the GT predicate on the "handleType" field. +func HandleTypeGT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGT(FieldHandleType, v)) +} + +// HandleTypeGTE applies the GTE predicate on the "handleType" field. +func HandleTypeGTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGTE(FieldHandleType, v)) +} + +// HandleTypeLT applies the LT predicate on the "handleType" field. +func HandleTypeLT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLT(FieldHandleType, v)) +} + +// HandleTypeLTE applies the LTE predicate on the "handleType" field. +func HandleTypeLTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLTE(FieldHandleType, v)) +} + +// HandleTypeContains applies the Contains predicate on the "handleType" field. +func HandleTypeContains(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContains(FieldHandleType, v)) +} + +// HandleTypeHasPrefix applies the HasPrefix predicate on the "handleType" field. +func HandleTypeHasPrefix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasPrefix(FieldHandleType, v)) +} + +// HandleTypeHasSuffix applies the HasSuffix predicate on the "handleType" field. +func HandleTypeHasSuffix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasSuffix(FieldHandleType, v)) +} + +// HandleTypeEqualFold applies the EqualFold predicate on the "handleType" field. +func HandleTypeEqualFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEqualFold(FieldHandleType, v)) +} + +// HandleTypeContainsFold applies the ContainsFold predicate on the "handleType" field. +func HandleTypeContainsFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContainsFold(FieldHandleType, v)) +} + +// HandleDocNoEQ applies the EQ predicate on the "handleDocNo" field. +func HandleDocNoEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleDocNo, v)) +} + +// HandleDocNoNEQ applies the NEQ predicate on the "handleDocNo" field. +func HandleDocNoNEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNEQ(FieldHandleDocNo, v)) +} + +// HandleDocNoIn applies the In predicate on the "handleDocNo" field. +func HandleDocNoIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldIn(FieldHandleDocNo, vs...)) +} + +// HandleDocNoNotIn applies the NotIn predicate on the "handleDocNo" field. +func HandleDocNoNotIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNotIn(FieldHandleDocNo, vs...)) +} + +// HandleDocNoGT applies the GT predicate on the "handleDocNo" field. +func HandleDocNoGT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGT(FieldHandleDocNo, v)) +} + +// HandleDocNoGTE applies the GTE predicate on the "handleDocNo" field. +func HandleDocNoGTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGTE(FieldHandleDocNo, v)) +} + +// HandleDocNoLT applies the LT predicate on the "handleDocNo" field. +func HandleDocNoLT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLT(FieldHandleDocNo, v)) +} + +// HandleDocNoLTE applies the LTE predicate on the "handleDocNo" field. +func HandleDocNoLTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLTE(FieldHandleDocNo, v)) +} + +// HandleDocNoContains applies the Contains predicate on the "handleDocNo" field. +func HandleDocNoContains(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContains(FieldHandleDocNo, v)) +} + +// HandleDocNoHasPrefix applies the HasPrefix predicate on the "handleDocNo" field. +func HandleDocNoHasPrefix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasPrefix(FieldHandleDocNo, v)) +} + +// HandleDocNoHasSuffix applies the HasSuffix predicate on the "handleDocNo" field. +func HandleDocNoHasSuffix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasSuffix(FieldHandleDocNo, v)) +} + +// HandleDocNoEqualFold applies the EqualFold predicate on the "handleDocNo" field. +func HandleDocNoEqualFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEqualFold(FieldHandleDocNo, v)) +} + +// HandleDocNoContainsFold applies the ContainsFold predicate on the "handleDocNo" field. +func HandleDocNoContainsFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContainsFold(FieldHandleDocNo, v)) +} + +// HandleNoteEQ applies the EQ predicate on the "handleNote" field. +func HandleNoteEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandleNote, v)) +} + +// HandleNoteNEQ applies the NEQ predicate on the "handleNote" field. +func HandleNoteNEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNEQ(FieldHandleNote, v)) +} + +// HandleNoteIn applies the In predicate on the "handleNote" field. +func HandleNoteIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldIn(FieldHandleNote, vs...)) +} + +// HandleNoteNotIn applies the NotIn predicate on the "handleNote" field. +func HandleNoteNotIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNotIn(FieldHandleNote, vs...)) +} + +// HandleNoteGT applies the GT predicate on the "handleNote" field. +func HandleNoteGT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGT(FieldHandleNote, v)) +} + +// HandleNoteGTE applies the GTE predicate on the "handleNote" field. +func HandleNoteGTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGTE(FieldHandleNote, v)) +} + +// HandleNoteLT applies the LT predicate on the "handleNote" field. +func HandleNoteLT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLT(FieldHandleNote, v)) +} + +// HandleNoteLTE applies the LTE predicate on the "handleNote" field. +func HandleNoteLTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLTE(FieldHandleNote, v)) +} + +// HandleNoteContains applies the Contains predicate on the "handleNote" field. +func HandleNoteContains(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContains(FieldHandleNote, v)) +} + +// HandleNoteHasPrefix applies the HasPrefix predicate on the "handleNote" field. +func HandleNoteHasPrefix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasPrefix(FieldHandleNote, v)) +} + +// HandleNoteHasSuffix applies the HasSuffix predicate on the "handleNote" field. +func HandleNoteHasSuffix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasSuffix(FieldHandleNote, v)) +} + +// HandleNoteEqualFold applies the EqualFold predicate on the "handleNote" field. +func HandleNoteEqualFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEqualFold(FieldHandleNote, v)) +} + +// HandleNoteContainsFold applies the ContainsFold predicate on the "handleNote" field. +func HandleNoteContainsFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContainsFold(FieldHandleNote, v)) +} + +// HandledByEQ applies the EQ predicate on the "handledBy" field. +func HandledByEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandledBy, v)) +} + +// HandledByNEQ applies the NEQ predicate on the "handledBy" field. +func HandledByNEQ(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNEQ(FieldHandledBy, v)) +} + +// HandledByIn applies the In predicate on the "handledBy" field. +func HandledByIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldIn(FieldHandledBy, vs...)) +} + +// HandledByNotIn applies the NotIn predicate on the "handledBy" field. +func HandledByNotIn(vs ...string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNotIn(FieldHandledBy, vs...)) +} + +// HandledByGT applies the GT predicate on the "handledBy" field. +func HandledByGT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGT(FieldHandledBy, v)) +} + +// HandledByGTE applies the GTE predicate on the "handledBy" field. +func HandledByGTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGTE(FieldHandledBy, v)) +} + +// HandledByLT applies the LT predicate on the "handledBy" field. +func HandledByLT(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLT(FieldHandledBy, v)) +} + +// HandledByLTE applies the LTE predicate on the "handledBy" field. +func HandledByLTE(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLTE(FieldHandledBy, v)) +} + +// HandledByContains applies the Contains predicate on the "handledBy" field. +func HandledByContains(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContains(FieldHandledBy, v)) +} + +// HandledByHasPrefix applies the HasPrefix predicate on the "handledBy" field. +func HandledByHasPrefix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasPrefix(FieldHandledBy, v)) +} + +// HandledByHasSuffix applies the HasSuffix predicate on the "handledBy" field. +func HandledByHasSuffix(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldHasSuffix(FieldHandledBy, v)) +} + +// HandledByEqualFold applies the EqualFold predicate on the "handledBy" field. +func HandledByEqualFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEqualFold(FieldHandledBy, v)) +} + +// HandledByContainsFold applies the ContainsFold predicate on the "handledBy" field. +func HandledByContainsFold(v string) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldContainsFold(FieldHandledBy, v)) +} + +// HandledAtEQ applies the EQ predicate on the "handledAt" field. +func HandledAtEQ(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldEQ(FieldHandledAt, v)) +} + +// HandledAtNEQ applies the NEQ predicate on the "handledAt" field. +func HandledAtNEQ(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNEQ(FieldHandledAt, v)) +} + +// HandledAtIn applies the In predicate on the "handledAt" field. +func HandledAtIn(vs ...int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldIn(FieldHandledAt, vs...)) +} + +// HandledAtNotIn applies the NotIn predicate on the "handledAt" field. +func HandledAtNotIn(vs ...int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldNotIn(FieldHandledAt, vs...)) +} + +// HandledAtGT applies the GT predicate on the "handledAt" field. +func HandledAtGT(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGT(FieldHandledAt, v)) +} + +// HandledAtGTE applies the GTE predicate on the "handledAt" field. +func HandledAtGTE(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldGTE(FieldHandledAt, v)) +} + +// HandledAtLT applies the LT predicate on the "handledAt" field. +func HandledAtLT(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLT(FieldHandledAt, v)) +} + +// HandledAtLTE applies the LTE predicate on the "handledAt" field. +func HandledAtLTE(v int64) predicate.MaterialQtyReport { + return predicate.MaterialQtyReport(sql.FieldLTE(FieldHandledAt, v)) +} + // OperatorEQ applies the EQ predicate on the "operator" field. func OperatorEQ(v string) predicate.MaterialQtyReport { return predicate.MaterialQtyReport(sql.FieldEQ(FieldOperator, v)) diff --git a/bj_power_mes/ent/materialqtyreport_create.go b/bj_power_mes/ent/materialqtyreport_create.go index efd8af0..f2f6a2f 100644 --- a/bj_power_mes/ent/materialqtyreport_create.go +++ b/bj_power_mes/ent/materialqtyreport_create.go @@ -160,6 +160,76 @@ func (_c *MaterialQtyReportCreate) SetNillableStatus(v *string) *MaterialQtyRepo return _c } +// SetHandleType sets the "handleType" field. +func (_c *MaterialQtyReportCreate) SetHandleType(v string) *MaterialQtyReportCreate { + _c.mutation.SetHandleType(v) + return _c +} + +// SetNillableHandleType sets the "handleType" field if the given value is not nil. +func (_c *MaterialQtyReportCreate) SetNillableHandleType(v *string) *MaterialQtyReportCreate { + if v != nil { + _c.SetHandleType(*v) + } + return _c +} + +// SetHandleDocNo sets the "handleDocNo" field. +func (_c *MaterialQtyReportCreate) SetHandleDocNo(v string) *MaterialQtyReportCreate { + _c.mutation.SetHandleDocNo(v) + return _c +} + +// SetNillableHandleDocNo sets the "handleDocNo" field if the given value is not nil. +func (_c *MaterialQtyReportCreate) SetNillableHandleDocNo(v *string) *MaterialQtyReportCreate { + if v != nil { + _c.SetHandleDocNo(*v) + } + return _c +} + +// SetHandleNote sets the "handleNote" field. +func (_c *MaterialQtyReportCreate) SetHandleNote(v string) *MaterialQtyReportCreate { + _c.mutation.SetHandleNote(v) + return _c +} + +// SetNillableHandleNote sets the "handleNote" field if the given value is not nil. +func (_c *MaterialQtyReportCreate) SetNillableHandleNote(v *string) *MaterialQtyReportCreate { + if v != nil { + _c.SetHandleNote(*v) + } + return _c +} + +// SetHandledBy sets the "handledBy" field. +func (_c *MaterialQtyReportCreate) SetHandledBy(v string) *MaterialQtyReportCreate { + _c.mutation.SetHandledBy(v) + return _c +} + +// SetNillableHandledBy sets the "handledBy" field if the given value is not nil. +func (_c *MaterialQtyReportCreate) SetNillableHandledBy(v *string) *MaterialQtyReportCreate { + if v != nil { + _c.SetHandledBy(*v) + } + return _c +} + +// SetHandledAt sets the "handledAt" field. +func (_c *MaterialQtyReportCreate) SetHandledAt(v int64) *MaterialQtyReportCreate { + _c.mutation.SetHandledAt(v) + return _c +} + +// SetNillableHandledAt sets the "handledAt" field if the given value is not nil. +func (_c *MaterialQtyReportCreate) SetNillableHandledAt(v *int64) *MaterialQtyReportCreate { + if v != nil { + _c.SetHandledAt(*v) + } + return _c +} + // SetOperator sets the "operator" field. func (_c *MaterialQtyReportCreate) SetOperator(v string) *MaterialQtyReportCreate { _c.mutation.SetOperator(v) @@ -283,6 +353,26 @@ func (_c *MaterialQtyReportCreate) defaults() { v := materialqtyreport.DefaultStatus _c.mutation.SetStatus(v) } + if _, ok := _c.mutation.HandleType(); !ok { + v := materialqtyreport.DefaultHandleType + _c.mutation.SetHandleType(v) + } + if _, ok := _c.mutation.HandleDocNo(); !ok { + v := materialqtyreport.DefaultHandleDocNo + _c.mutation.SetHandleDocNo(v) + } + if _, ok := _c.mutation.HandleNote(); !ok { + v := materialqtyreport.DefaultHandleNote + _c.mutation.SetHandleNote(v) + } + if _, ok := _c.mutation.HandledBy(); !ok { + v := materialqtyreport.DefaultHandledBy + _c.mutation.SetHandledBy(v) + } + if _, ok := _c.mutation.HandledAt(); !ok { + v := materialqtyreport.DefaultHandledAt + _c.mutation.SetHandledAt(v) + } if _, ok := _c.mutation.Operator(); !ok { v := materialqtyreport.DefaultOperator _c.mutation.SetOperator(v) @@ -355,6 +445,41 @@ func (_c *MaterialQtyReportCreate) check() error { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.status": %w`, err)} } } + if _, ok := _c.mutation.HandleType(); !ok { + return &ValidationError{Name: "handleType", err: errors.New(`ent: missing required field "MaterialQtyReport.handleType"`)} + } + if v, ok := _c.mutation.HandleType(); ok { + if err := materialqtyreport.HandleTypeValidator(v); err != nil { + return &ValidationError{Name: "handleType", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleType": %w`, err)} + } + } + if _, ok := _c.mutation.HandleDocNo(); !ok { + return &ValidationError{Name: "handleDocNo", err: errors.New(`ent: missing required field "MaterialQtyReport.handleDocNo"`)} + } + if v, ok := _c.mutation.HandleDocNo(); ok { + if err := materialqtyreport.HandleDocNoValidator(v); err != nil { + return &ValidationError{Name: "handleDocNo", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleDocNo": %w`, err)} + } + } + if _, ok := _c.mutation.HandleNote(); !ok { + return &ValidationError{Name: "handleNote", err: errors.New(`ent: missing required field "MaterialQtyReport.handleNote"`)} + } + if v, ok := _c.mutation.HandleNote(); ok { + if err := materialqtyreport.HandleNoteValidator(v); err != nil { + return &ValidationError{Name: "handleNote", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleNote": %w`, err)} + } + } + if _, ok := _c.mutation.HandledBy(); !ok { + return &ValidationError{Name: "handledBy", err: errors.New(`ent: missing required field "MaterialQtyReport.handledBy"`)} + } + if v, ok := _c.mutation.HandledBy(); ok { + if err := materialqtyreport.HandledByValidator(v); err != nil { + return &ValidationError{Name: "handledBy", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handledBy": %w`, err)} + } + } + if _, ok := _c.mutation.HandledAt(); !ok { + return &ValidationError{Name: "handledAt", err: errors.New(`ent: missing required field "MaterialQtyReport.handledAt"`)} + } if _, ok := _c.mutation.Operator(); !ok { return &ValidationError{Name: "operator", err: errors.New(`ent: missing required field "MaterialQtyReport.operator"`)} } @@ -443,6 +568,26 @@ func (_c *MaterialQtyReportCreate) createSpec() (*MaterialQtyReport, *sqlgraph.C _spec.SetField(materialqtyreport.FieldStatus, field.TypeString, value) _node.Status = value } + if value, ok := _c.mutation.HandleType(); ok { + _spec.SetField(materialqtyreport.FieldHandleType, field.TypeString, value) + _node.HandleType = value + } + if value, ok := _c.mutation.HandleDocNo(); ok { + _spec.SetField(materialqtyreport.FieldHandleDocNo, field.TypeString, value) + _node.HandleDocNo = value + } + if value, ok := _c.mutation.HandleNote(); ok { + _spec.SetField(materialqtyreport.FieldHandleNote, field.TypeString, value) + _node.HandleNote = value + } + if value, ok := _c.mutation.HandledBy(); ok { + _spec.SetField(materialqtyreport.FieldHandledBy, field.TypeString, value) + _node.HandledBy = value + } + if value, ok := _c.mutation.HandledAt(); ok { + _spec.SetField(materialqtyreport.FieldHandledAt, field.TypeInt64, value) + _node.HandledAt = value + } if value, ok := _c.mutation.Operator(); ok { _spec.SetField(materialqtyreport.FieldOperator, field.TypeString, value) _node.Operator = value diff --git a/bj_power_mes/ent/materialqtyreport_update.go b/bj_power_mes/ent/materialqtyreport_update.go index 03fa5e2..9523286 100644 --- a/bj_power_mes/ent/materialqtyreport_update.go +++ b/bj_power_mes/ent/materialqtyreport_update.go @@ -197,6 +197,83 @@ func (_u *MaterialQtyReportUpdate) SetNillableStatus(v *string) *MaterialQtyRepo return _u } +// SetHandleType sets the "handleType" field. +func (_u *MaterialQtyReportUpdate) SetHandleType(v string) *MaterialQtyReportUpdate { + _u.mutation.SetHandleType(v) + return _u +} + +// SetNillableHandleType sets the "handleType" field if the given value is not nil. +func (_u *MaterialQtyReportUpdate) SetNillableHandleType(v *string) *MaterialQtyReportUpdate { + if v != nil { + _u.SetHandleType(*v) + } + return _u +} + +// SetHandleDocNo sets the "handleDocNo" field. +func (_u *MaterialQtyReportUpdate) SetHandleDocNo(v string) *MaterialQtyReportUpdate { + _u.mutation.SetHandleDocNo(v) + return _u +} + +// SetNillableHandleDocNo sets the "handleDocNo" field if the given value is not nil. +func (_u *MaterialQtyReportUpdate) SetNillableHandleDocNo(v *string) *MaterialQtyReportUpdate { + if v != nil { + _u.SetHandleDocNo(*v) + } + return _u +} + +// SetHandleNote sets the "handleNote" field. +func (_u *MaterialQtyReportUpdate) SetHandleNote(v string) *MaterialQtyReportUpdate { + _u.mutation.SetHandleNote(v) + return _u +} + +// SetNillableHandleNote sets the "handleNote" field if the given value is not nil. +func (_u *MaterialQtyReportUpdate) SetNillableHandleNote(v *string) *MaterialQtyReportUpdate { + if v != nil { + _u.SetHandleNote(*v) + } + return _u +} + +// SetHandledBy sets the "handledBy" field. +func (_u *MaterialQtyReportUpdate) SetHandledBy(v string) *MaterialQtyReportUpdate { + _u.mutation.SetHandledBy(v) + return _u +} + +// SetNillableHandledBy sets the "handledBy" field if the given value is not nil. +func (_u *MaterialQtyReportUpdate) SetNillableHandledBy(v *string) *MaterialQtyReportUpdate { + if v != nil { + _u.SetHandledBy(*v) + } + return _u +} + +// SetHandledAt sets the "handledAt" field. +func (_u *MaterialQtyReportUpdate) SetHandledAt(v int64) *MaterialQtyReportUpdate { + _u.mutation.ResetHandledAt() + _u.mutation.SetHandledAt(v) + return _u +} + +// SetNillableHandledAt sets the "handledAt" field if the given value is not nil. +func (_u *MaterialQtyReportUpdate) SetNillableHandledAt(v *int64) *MaterialQtyReportUpdate { + if v != nil { + _u.SetHandledAt(*v) + } + return _u +} + +// AddHandledAt adds value to the "handledAt" field. +func (_u *MaterialQtyReportUpdate) AddHandledAt(v int64) *MaterialQtyReportUpdate { + _u.mutation.AddHandledAt(v) + return _u +} + // SetOperator sets the "operator" field. func (_u *MaterialQtyReportUpdate) SetOperator(v string) *MaterialQtyReportUpdate { _u.mutation.SetOperator(v) @@ -295,6 +372,26 @@ func (_u *MaterialQtyReportUpdate) check() error { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.status": %w`, err)} } } + if v, ok := _u.mutation.HandleType(); ok { + if err := materialqtyreport.HandleTypeValidator(v); err != nil { + return &ValidationError{Name: "handleType", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleType": %w`, err)} + } + } + if v, ok := _u.mutation.HandleDocNo(); ok { + if err := materialqtyreport.HandleDocNoValidator(v); err != nil { + return &ValidationError{Name: "handleDocNo", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleDocNo": %w`, err)} + } + } + if v, ok := _u.mutation.HandleNote(); ok { + if err := materialqtyreport.HandleNoteValidator(v); err != nil { + return &ValidationError{Name: "handleNote", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleNote": %w`, err)} + } + } + if v, ok := _u.mutation.HandledBy(); ok { + if err := materialqtyreport.HandledByValidator(v); err != nil { + return &ValidationError{Name: "handledBy", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handledBy": %w`, err)} + } + } if v, ok := _u.mutation.Operator(); ok { if err := materialqtyreport.OperatorValidator(v); err != nil { return &ValidationError{Name: "operator", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.operator": %w`, err)} @@ -363,6 +460,24 @@ func (_u *MaterialQtyReportUpdate) sqlSave(ctx context.Context) (_node int, err if value, ok := _u.mutation.Status(); ok { _spec.SetField(materialqtyreport.FieldStatus, field.TypeString, value) } + if value, ok := _u.mutation.HandleType(); ok { + _spec.SetField(materialqtyreport.FieldHandleType, field.TypeString, value) + } + if value, ok := _u.mutation.HandleDocNo(); ok { + _spec.SetField(materialqtyreport.FieldHandleDocNo, field.TypeString, value) + } + if value, ok := _u.mutation.HandleNote(); ok { + _spec.SetField(materialqtyreport.FieldHandleNote, field.TypeString, value) + } + if value, ok := _u.mutation.HandledBy(); ok { + _spec.SetField(materialqtyreport.FieldHandledBy, field.TypeString, value) + } + if value, ok := _u.mutation.HandledAt(); ok { + _spec.SetField(materialqtyreport.FieldHandledAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedHandledAt(); ok { + _spec.AddField(materialqtyreport.FieldHandledAt, field.TypeInt64, value) + } if value, ok := _u.mutation.Operator(); ok { _spec.SetField(materialqtyreport.FieldOperator, field.TypeString, value) } @@ -562,6 +677,83 @@ func (_u *MaterialQtyReportUpdateOne) SetNillableStatus(v *string) *MaterialQtyR return _u } +// SetHandleType sets the "handleType" field. +func (_u *MaterialQtyReportUpdateOne) SetHandleType(v string) *MaterialQtyReportUpdateOne { + _u.mutation.SetHandleType(v) + return _u +} + +// SetNillableHandleType sets the "handleType" field if the given value is not nil. +func (_u *MaterialQtyReportUpdateOne) SetNillableHandleType(v *string) *MaterialQtyReportUpdateOne { + if v != nil { + _u.SetHandleType(*v) + } + return _u +} + +// SetHandleDocNo sets the "handleDocNo" field. +func (_u *MaterialQtyReportUpdateOne) SetHandleDocNo(v string) *MaterialQtyReportUpdateOne { + _u.mutation.SetHandleDocNo(v) + return _u +} + +// SetNillableHandleDocNo sets the "handleDocNo" field if the given value is not nil. +func (_u *MaterialQtyReportUpdateOne) SetNillableHandleDocNo(v *string) *MaterialQtyReportUpdateOne { + if v != nil { + _u.SetHandleDocNo(*v) + } + return _u +} + +// SetHandleNote sets the "handleNote" field. +func (_u *MaterialQtyReportUpdateOne) SetHandleNote(v string) *MaterialQtyReportUpdateOne { + _u.mutation.SetHandleNote(v) + return _u +} + +// SetNillableHandleNote sets the "handleNote" field if the given value is not nil. +func (_u *MaterialQtyReportUpdateOne) SetNillableHandleNote(v *string) *MaterialQtyReportUpdateOne { + if v != nil { + _u.SetHandleNote(*v) + } + return _u +} + +// SetHandledBy sets the "handledBy" field. +func (_u *MaterialQtyReportUpdateOne) SetHandledBy(v string) *MaterialQtyReportUpdateOne { + _u.mutation.SetHandledBy(v) + return _u +} + +// SetNillableHandledBy sets the "handledBy" field if the given value is not nil. +func (_u *MaterialQtyReportUpdateOne) SetNillableHandledBy(v *string) *MaterialQtyReportUpdateOne { + if v != nil { + _u.SetHandledBy(*v) + } + return _u +} + +// SetHandledAt sets the "handledAt" field. +func (_u *MaterialQtyReportUpdateOne) SetHandledAt(v int64) *MaterialQtyReportUpdateOne { + _u.mutation.ResetHandledAt() + _u.mutation.SetHandledAt(v) + return _u +} + +// SetNillableHandledAt sets the "handledAt" field if the given value is not nil. +func (_u *MaterialQtyReportUpdateOne) SetNillableHandledAt(v *int64) *MaterialQtyReportUpdateOne { + if v != nil { + _u.SetHandledAt(*v) + } + return _u +} + +// AddHandledAt adds value to the "handledAt" field. +func (_u *MaterialQtyReportUpdateOne) AddHandledAt(v int64) *MaterialQtyReportUpdateOne { + _u.mutation.AddHandledAt(v) + return _u +} + // SetOperator sets the "operator" field. func (_u *MaterialQtyReportUpdateOne) SetOperator(v string) *MaterialQtyReportUpdateOne { _u.mutation.SetOperator(v) @@ -673,6 +865,26 @@ func (_u *MaterialQtyReportUpdateOne) check() error { return &ValidationError{Name: "status", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.status": %w`, err)} } } + if v, ok := _u.mutation.HandleType(); ok { + if err := materialqtyreport.HandleTypeValidator(v); err != nil { + return &ValidationError{Name: "handleType", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleType": %w`, err)} + } + } + if v, ok := _u.mutation.HandleDocNo(); ok { + if err := materialqtyreport.HandleDocNoValidator(v); err != nil { + return &ValidationError{Name: "handleDocNo", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleDocNo": %w`, err)} + } + } + if v, ok := _u.mutation.HandleNote(); ok { + if err := materialqtyreport.HandleNoteValidator(v); err != nil { + return &ValidationError{Name: "handleNote", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handleNote": %w`, err)} + } + } + if v, ok := _u.mutation.HandledBy(); ok { + if err := materialqtyreport.HandledByValidator(v); err != nil { + return &ValidationError{Name: "handledBy", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.handledBy": %w`, err)} + } + } if v, ok := _u.mutation.Operator(); ok { if err := materialqtyreport.OperatorValidator(v); err != nil { return &ValidationError{Name: "operator", err: fmt.Errorf(`ent: validator failed for field "MaterialQtyReport.operator": %w`, err)} @@ -758,6 +970,24 @@ func (_u *MaterialQtyReportUpdateOne) sqlSave(ctx context.Context) (_node *Mater if value, ok := _u.mutation.Status(); ok { _spec.SetField(materialqtyreport.FieldStatus, field.TypeString, value) } + if value, ok := _u.mutation.HandleType(); ok { + _spec.SetField(materialqtyreport.FieldHandleType, field.TypeString, value) + } + if value, ok := _u.mutation.HandleDocNo(); ok { + _spec.SetField(materialqtyreport.FieldHandleDocNo, field.TypeString, value) + } + if value, ok := _u.mutation.HandleNote(); ok { + _spec.SetField(materialqtyreport.FieldHandleNote, field.TypeString, value) + } + if value, ok := _u.mutation.HandledBy(); ok { + _spec.SetField(materialqtyreport.FieldHandledBy, field.TypeString, value) + } + if value, ok := _u.mutation.HandledAt(); ok { + _spec.SetField(materialqtyreport.FieldHandledAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedHandledAt(); ok { + _spec.AddField(materialqtyreport.FieldHandledAt, field.TypeInt64, value) + } if value, ok := _u.mutation.Operator(); ok { _spec.SetField(materialqtyreport.FieldOperator, field.TypeString, value) } diff --git a/bj_power_mes/ent/materialrequest.go b/bj_power_mes/ent/materialrequest.go index c43a09d..ec93702 100644 --- a/bj_power_mes/ent/materialrequest.go +++ b/bj_power_mes/ent/materialrequest.go @@ -41,8 +41,24 @@ type MaterialRequest struct { StationNo int `json:"stationNo,omitempty"` // 该物料所属装配工序(1~12) ProcessCode int `json:"processCode,omitempty"` - // 已发料数量（分批出库累加） + // 已发出量（分批出库累加；幂等基准，勿与已接料混用） SentQty float64 `json:"sentQty,omitempty"` + // 已接料量（工位扫码接料累加） + ReceivedQty float64 `json:"receivedQty,omitempty"` + // 最近接料时间(unix 秒) + ReceivedAt int64 `json:"receivedAt,omitempty"` + // 接料人 + ReceiveBy string `json:"receiveBy,omitempty"` + // 来源 PLAN/REFILL + Source string `json:"source,omitempty"` + // 超出 BOM 需求的数量 + OverQty float64 `json:"overQty,omitempty"` + // 超领原因 损耗/报废/返修/其他 + OverReason string `json:"overReason,omitempty"` + // 关联数量不符单号 + RefReportNo string `json:"refReportNo,omitempty"` + // 是否需要AGV配送到接驳台 + NeedAgv bool `json:"needAgv,omitempty"` // 发料批次号（分批出库时填写） BatchNo string `json:"batchNo,omitempty"` // Operator holds the value of the "operator" field. @@ -59,11 +75,13 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) { values := make([]any, len(columns)) for i := range columns { switch columns[i] { - case materialrequest.FieldReqQty, materialrequest.FieldSentQty: + case materialrequest.FieldNeedAgv: + 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.FieldProcessCode: + case materialrequest.FieldID, materialrequest.FieldStationNo, materialrequest.FieldProcessCode, 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.FieldBatchNo, materialrequest.FieldOperator: + 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: values[i] = new(sql.NullString) case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt: values[i] = new(sql.NullTime) @@ -166,6 +184,54 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error { } else if value.Valid { _m.SentQty = value.Float64 } + case materialrequest.FieldReceivedQty: + if value, ok := values[i].(*sql.NullFloat64); !ok { + return fmt.Errorf("unexpected type %T for field receivedQty", values[i]) + } else if value.Valid { + _m.ReceivedQty = value.Float64 + } + case materialrequest.FieldReceivedAt: + if value, ok := values[i].(*sql.NullInt64); !ok { + return fmt.Errorf("unexpected type %T for field receivedAt", values[i]) + } else if value.Valid { + _m.ReceivedAt = value.Int64 + } + case materialrequest.FieldReceiveBy: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field receiveBy", values[i]) + } else if value.Valid { + _m.ReceiveBy = value.String + } + case materialrequest.FieldSource: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field source", values[i]) + } else if value.Valid { + _m.Source = value.String + } + case materialrequest.FieldOverQty: + if value, ok := values[i].(*sql.NullFloat64); !ok { + return fmt.Errorf("unexpected type %T for field overQty", values[i]) + } else if value.Valid { + _m.OverQty = value.Float64 + } + case materialrequest.FieldOverReason: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field overReason", values[i]) + } else if value.Valid { + _m.OverReason = value.String + } + case materialrequest.FieldRefReportNo: + if value, ok := values[i].(*sql.NullString); !ok { + return fmt.Errorf("unexpected type %T for field refReportNo", values[i]) + } else if value.Valid { + _m.RefReportNo = value.String + } + case materialrequest.FieldNeedAgv: + if value, ok := values[i].(*sql.NullBool); !ok { + return fmt.Errorf("unexpected type %T for field needAgv", values[i]) + } else if value.Valid { + _m.NeedAgv = value.Bool + } case materialrequest.FieldBatchNo: if value, ok := values[i].(*sql.NullString); !ok { return fmt.Errorf("unexpected type %T for field batchNo", values[i]) @@ -266,6 +332,30 @@ func (_m *MaterialRequest) String() string { builder.WriteString("sentQty=") builder.WriteString(fmt.Sprintf("%v", _m.SentQty)) builder.WriteString(", ") + builder.WriteString("receivedQty=") + builder.WriteString(fmt.Sprintf("%v", _m.ReceivedQty)) + builder.WriteString(", ") + builder.WriteString("receivedAt=") + builder.WriteString(fmt.Sprintf("%v", _m.ReceivedAt)) + builder.WriteString(", ") + builder.WriteString("receiveBy=") + builder.WriteString(_m.ReceiveBy) + builder.WriteString(", ") + builder.WriteString("source=") + builder.WriteString(_m.Source) + builder.WriteString(", ") + builder.WriteString("overQty=") + builder.WriteString(fmt.Sprintf("%v", _m.OverQty)) + builder.WriteString(", ") + builder.WriteString("overReason=") + builder.WriteString(_m.OverReason) + builder.WriteString(", ") + builder.WriteString("refReportNo=") + builder.WriteString(_m.RefReportNo) + builder.WriteString(", ") + builder.WriteString("needAgv=") + builder.WriteString(fmt.Sprintf("%v", _m.NeedAgv)) + builder.WriteString(", ") builder.WriteString("batchNo=") builder.WriteString(_m.BatchNo) builder.WriteString(", ") diff --git a/bj_power_mes/ent/materialrequest/materialrequest.go b/bj_power_mes/ent/materialrequest/materialrequest.go index 8234af1..1c34c8f 100644 --- a/bj_power_mes/ent/materialrequest/materialrequest.go +++ b/bj_power_mes/ent/materialrequest/materialrequest.go @@ -39,6 +39,22 @@ const ( FieldProcessCode = "process_code" // FieldSentQty holds the string denoting the sentqty field in the database. FieldSentQty = "sent_qty" + // FieldReceivedQty holds the string denoting the receivedqty field in the database. + FieldReceivedQty = "received_qty" + // FieldReceivedAt holds the string denoting the receivedat field in the database. + FieldReceivedAt = "received_at" + // FieldReceiveBy holds the string denoting the receiveby field in the database. + FieldReceiveBy = "receive_by" + // FieldSource holds the string denoting the source field in the database. + FieldSource = "source" + // FieldOverQty holds the string denoting the overqty field in the database. + FieldOverQty = "over_qty" + // FieldOverReason holds the string denoting the overreason field in the database. + FieldOverReason = "over_reason" + // FieldRefReportNo holds the string denoting the refreportno field in the database. + FieldRefReportNo = "ref_report_no" + // FieldNeedAgv holds the string denoting the needagv field in the database. + FieldNeedAgv = "need_agv" // FieldBatchNo holds the string denoting the batchno field in the database. FieldBatchNo = "batch_no" // FieldOperator holds the string denoting the operator field in the database. @@ -67,6 +83,14 @@ var Columns = []string{ FieldStationNo, FieldProcessCode, FieldSentQty, + FieldReceivedQty, + FieldReceivedAt, + FieldReceiveBy, + FieldSource, + FieldOverQty, + FieldOverReason, + FieldRefReportNo, + FieldNeedAgv, FieldBatchNo, FieldOperator, FieldCreatedAt, @@ -120,6 +144,30 @@ var ( DefaultProcessCode int // DefaultSentQty holds the default value on creation for the "sentQty" field. DefaultSentQty float64 + // DefaultReceivedQty holds the default value on creation for the "receivedQty" field. + DefaultReceivedQty float64 + // DefaultReceivedAt holds the default value on creation for the "receivedAt" field. + DefaultReceivedAt int64 + // DefaultReceiveBy holds the default value on creation for the "receiveBy" field. + DefaultReceiveBy string + // ReceiveByValidator is a validator for the "receiveBy" field. It is called by the builders before save. + ReceiveByValidator func(string) error + // DefaultSource holds the default value on creation for the "source" field. + DefaultSource string + // SourceValidator is a validator for the "source" field. It is called by the builders before save. + SourceValidator func(string) error + // DefaultOverQty holds the default value on creation for the "overQty" field. + DefaultOverQty float64 + // DefaultOverReason holds the default value on creation for the "overReason" field. + DefaultOverReason string + // OverReasonValidator is a validator for the "overReason" field. It is called by the builders before save. + OverReasonValidator func(string) error + // DefaultRefReportNo holds the default value on creation for the "refReportNo" field. + DefaultRefReportNo string + // RefReportNoValidator is a validator for the "refReportNo" field. It is called by the builders before save. + RefReportNoValidator func(string) error + // DefaultNeedAgv holds the default value on creation for the "needAgv" field. + DefaultNeedAgv bool // DefaultBatchNo holds the default value on creation for the "batchNo" field. DefaultBatchNo string // BatchNoValidator is a validator for the "batchNo" field. It is called by the builders before save. @@ -211,6 +259,46 @@ func BySentQty(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldSentQty, opts...).ToFunc() } +// ByReceivedQty orders the results by the receivedQty field. +func ByReceivedQty(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldReceivedQty, opts...).ToFunc() +} + +// ByReceivedAt orders the results by the receivedAt field. +func ByReceivedAt(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldReceivedAt, opts...).ToFunc() +} + +// ByReceiveBy orders the results by the receiveBy field. +func ByReceiveBy(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldReceiveBy, opts...).ToFunc() +} + +// BySource orders the results by the source field. +func BySource(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSource, opts...).ToFunc() +} + +// ByOverQty orders the results by the overQty field. +func ByOverQty(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldOverQty, opts...).ToFunc() +} + +// ByOverReason orders the results by the overReason field. +func ByOverReason(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldOverReason, opts...).ToFunc() +} + +// ByRefReportNo orders the results by the refReportNo field. +func ByRefReportNo(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldRefReportNo, opts...).ToFunc() +} + +// ByNeedAgv orders the results by the needAgv field. +func ByNeedAgv(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldNeedAgv, opts...).ToFunc() +} + // ByBatchNo orders the results by the batchNo field. func ByBatchNo(opts ...sql.OrderTermOption) OrderOption { return sql.OrderByField(FieldBatchNo, opts...).ToFunc() diff --git a/bj_power_mes/ent/materialrequest/where.go b/bj_power_mes/ent/materialrequest/where.go index b603252..8993198 100644 --- a/bj_power_mes/ent/materialrequest/where.go +++ b/bj_power_mes/ent/materialrequest/where.go @@ -119,6 +119,46 @@ func SentQty(v float64) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldEQ(FieldSentQty, v)) } +// ReceivedQty applies equality check predicate on the "receivedQty" field. It's identical to ReceivedQtyEQ. +func ReceivedQty(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceivedQty, v)) +} + +// ReceivedAt applies equality check predicate on the "receivedAt" field. It's identical to ReceivedAtEQ. +func ReceivedAt(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceivedAt, v)) +} + +// ReceiveBy applies equality check predicate on the "receiveBy" field. It's identical to ReceiveByEQ. +func ReceiveBy(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceiveBy, v)) +} + +// Source applies equality check predicate on the "source" field. It's identical to SourceEQ. +func Source(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldSource, v)) +} + +// OverQty applies equality check predicate on the "overQty" field. It's identical to OverQtyEQ. +func OverQty(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldOverQty, v)) +} + +// OverReason applies equality check predicate on the "overReason" field. It's identical to OverReasonEQ. +func OverReason(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldOverReason, v)) +} + +// RefReportNo applies equality check predicate on the "refReportNo" field. It's identical to RefReportNoEQ. +func RefReportNo(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldRefReportNo, v)) +} + +// NeedAgv applies equality check predicate on the "needAgv" field. It's identical to NeedAgvEQ. +func NeedAgv(v bool) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldNeedAgv, v)) +} + // BatchNo applies equality check predicate on the "batchNo" field. It's identical to BatchNoEQ. func BatchNo(v string) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldEQ(FieldBatchNo, v)) @@ -884,6 +924,396 @@ func SentQtyLTE(v float64) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldLTE(FieldSentQty, v)) } +// ReceivedQtyEQ applies the EQ predicate on the "receivedQty" field. +func ReceivedQtyEQ(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceivedQty, v)) +} + +// ReceivedQtyNEQ applies the NEQ predicate on the "receivedQty" field. +func ReceivedQtyNEQ(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldReceivedQty, v)) +} + +// ReceivedQtyIn applies the In predicate on the "receivedQty" field. +func ReceivedQtyIn(vs ...float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldReceivedQty, vs...)) +} + +// ReceivedQtyNotIn applies the NotIn predicate on the "receivedQty" field. +func ReceivedQtyNotIn(vs ...float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldReceivedQty, vs...)) +} + +// ReceivedQtyGT applies the GT predicate on the "receivedQty" field. +func ReceivedQtyGT(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldReceivedQty, v)) +} + +// ReceivedQtyGTE applies the GTE predicate on the "receivedQty" field. +func ReceivedQtyGTE(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldReceivedQty, v)) +} + +// ReceivedQtyLT applies the LT predicate on the "receivedQty" field. +func ReceivedQtyLT(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldReceivedQty, v)) +} + +// ReceivedQtyLTE applies the LTE predicate on the "receivedQty" field. +func ReceivedQtyLTE(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldReceivedQty, v)) +} + +// ReceivedAtEQ applies the EQ predicate on the "receivedAt" field. +func ReceivedAtEQ(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceivedAt, v)) +} + +// ReceivedAtNEQ applies the NEQ predicate on the "receivedAt" field. +func ReceivedAtNEQ(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldReceivedAt, v)) +} + +// ReceivedAtIn applies the In predicate on the "receivedAt" field. +func ReceivedAtIn(vs ...int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldReceivedAt, vs...)) +} + +// ReceivedAtNotIn applies the NotIn predicate on the "receivedAt" field. +func ReceivedAtNotIn(vs ...int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldReceivedAt, vs...)) +} + +// ReceivedAtGT applies the GT predicate on the "receivedAt" field. +func ReceivedAtGT(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldReceivedAt, v)) +} + +// ReceivedAtGTE applies the GTE predicate on the "receivedAt" field. +func ReceivedAtGTE(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldReceivedAt, v)) +} + +// ReceivedAtLT applies the LT predicate on the "receivedAt" field. +func ReceivedAtLT(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldReceivedAt, v)) +} + +// ReceivedAtLTE applies the LTE predicate on the "receivedAt" field. +func ReceivedAtLTE(v int64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldReceivedAt, v)) +} + +// ReceiveByEQ applies the EQ predicate on the "receiveBy" field. +func ReceiveByEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldReceiveBy, v)) +} + +// ReceiveByNEQ applies the NEQ predicate on the "receiveBy" field. +func ReceiveByNEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldReceiveBy, v)) +} + +// ReceiveByIn applies the In predicate on the "receiveBy" field. +func ReceiveByIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldReceiveBy, vs...)) +} + +// ReceiveByNotIn applies the NotIn predicate on the "receiveBy" field. +func ReceiveByNotIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldReceiveBy, vs...)) +} + +// ReceiveByGT applies the GT predicate on the "receiveBy" field. +func ReceiveByGT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldReceiveBy, v)) +} + +// ReceiveByGTE applies the GTE predicate on the "receiveBy" field. +func ReceiveByGTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldReceiveBy, v)) +} + +// ReceiveByLT applies the LT predicate on the "receiveBy" field. +func ReceiveByLT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldReceiveBy, v)) +} + +// ReceiveByLTE applies the LTE predicate on the "receiveBy" field. +func ReceiveByLTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldReceiveBy, v)) +} + +// ReceiveByContains applies the Contains predicate on the "receiveBy" field. +func ReceiveByContains(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContains(FieldReceiveBy, v)) +} + +// ReceiveByHasPrefix applies the HasPrefix predicate on the "receiveBy" field. +func ReceiveByHasPrefix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasPrefix(FieldReceiveBy, v)) +} + +// ReceiveByHasSuffix applies the HasSuffix predicate on the "receiveBy" field. +func ReceiveByHasSuffix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasSuffix(FieldReceiveBy, v)) +} + +// ReceiveByEqualFold applies the EqualFold predicate on the "receiveBy" field. +func ReceiveByEqualFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEqualFold(FieldReceiveBy, v)) +} + +// ReceiveByContainsFold applies the ContainsFold predicate on the "receiveBy" field. +func ReceiveByContainsFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContainsFold(FieldReceiveBy, v)) +} + +// SourceEQ applies the EQ predicate on the "source" field. +func SourceEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldSource, v)) +} + +// SourceNEQ applies the NEQ predicate on the "source" field. +func SourceNEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldSource, v)) +} + +// SourceIn applies the In predicate on the "source" field. +func SourceIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldSource, vs...)) +} + +// SourceNotIn applies the NotIn predicate on the "source" field. +func SourceNotIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldSource, vs...)) +} + +// SourceGT applies the GT predicate on the "source" field. +func SourceGT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldSource, v)) +} + +// SourceGTE applies the GTE predicate on the "source" field. +func SourceGTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldSource, v)) +} + +// SourceLT applies the LT predicate on the "source" field. +func SourceLT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldSource, v)) +} + +// SourceLTE applies the LTE predicate on the "source" field. +func SourceLTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldSource, v)) +} + +// SourceContains applies the Contains predicate on the "source" field. +func SourceContains(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContains(FieldSource, v)) +} + +// SourceHasPrefix applies the HasPrefix predicate on the "source" field. +func SourceHasPrefix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasPrefix(FieldSource, v)) +} + +// SourceHasSuffix applies the HasSuffix predicate on the "source" field. +func SourceHasSuffix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasSuffix(FieldSource, v)) +} + +// SourceEqualFold applies the EqualFold predicate on the "source" field. +func SourceEqualFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEqualFold(FieldSource, v)) +} + +// SourceContainsFold applies the ContainsFold predicate on the "source" field. +func SourceContainsFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContainsFold(FieldSource, v)) +} + +// OverQtyEQ applies the EQ predicate on the "overQty" field. +func OverQtyEQ(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldOverQty, v)) +} + +// OverQtyNEQ applies the NEQ predicate on the "overQty" field. +func OverQtyNEQ(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldOverQty, v)) +} + +// OverQtyIn applies the In predicate on the "overQty" field. +func OverQtyIn(vs ...float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldOverQty, vs...)) +} + +// OverQtyNotIn applies the NotIn predicate on the "overQty" field. +func OverQtyNotIn(vs ...float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldOverQty, vs...)) +} + +// OverQtyGT applies the GT predicate on the "overQty" field. +func OverQtyGT(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldOverQty, v)) +} + +// OverQtyGTE applies the GTE predicate on the "overQty" field. +func OverQtyGTE(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldOverQty, v)) +} + +// OverQtyLT applies the LT predicate on the "overQty" field. +func OverQtyLT(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldOverQty, v)) +} + +// OverQtyLTE applies the LTE predicate on the "overQty" field. +func OverQtyLTE(v float64) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldOverQty, v)) +} + +// OverReasonEQ applies the EQ predicate on the "overReason" field. +func OverReasonEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldOverReason, v)) +} + +// OverReasonNEQ applies the NEQ predicate on the "overReason" field. +func OverReasonNEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldOverReason, v)) +} + +// OverReasonIn applies the In predicate on the "overReason" field. +func OverReasonIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldOverReason, vs...)) +} + +// OverReasonNotIn applies the NotIn predicate on the "overReason" field. +func OverReasonNotIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldOverReason, vs...)) +} + +// OverReasonGT applies the GT predicate on the "overReason" field. +func OverReasonGT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldOverReason, v)) +} + +// OverReasonGTE applies the GTE predicate on the "overReason" field. +func OverReasonGTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldOverReason, v)) +} + +// OverReasonLT applies the LT predicate on the "overReason" field. +func OverReasonLT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldOverReason, v)) +} + +// OverReasonLTE applies the LTE predicate on the "overReason" field. +func OverReasonLTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldOverReason, v)) +} + +// OverReasonContains applies the Contains predicate on the "overReason" field. +func OverReasonContains(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContains(FieldOverReason, v)) +} + +// OverReasonHasPrefix applies the HasPrefix predicate on the "overReason" field. +func OverReasonHasPrefix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasPrefix(FieldOverReason, v)) +} + +// OverReasonHasSuffix applies the HasSuffix predicate on the "overReason" field. +func OverReasonHasSuffix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasSuffix(FieldOverReason, v)) +} + +// OverReasonEqualFold applies the EqualFold predicate on the "overReason" field. +func OverReasonEqualFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEqualFold(FieldOverReason, v)) +} + +// OverReasonContainsFold applies the ContainsFold predicate on the "overReason" field. +func OverReasonContainsFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContainsFold(FieldOverReason, v)) +} + +// RefReportNoEQ applies the EQ predicate on the "refReportNo" field. +func RefReportNoEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldRefReportNo, v)) +} + +// RefReportNoNEQ applies the NEQ predicate on the "refReportNo" field. +func RefReportNoNEQ(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldRefReportNo, v)) +} + +// RefReportNoIn applies the In predicate on the "refReportNo" field. +func RefReportNoIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldIn(FieldRefReportNo, vs...)) +} + +// RefReportNoNotIn applies the NotIn predicate on the "refReportNo" field. +func RefReportNoNotIn(vs ...string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNotIn(FieldRefReportNo, vs...)) +} + +// RefReportNoGT applies the GT predicate on the "refReportNo" field. +func RefReportNoGT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGT(FieldRefReportNo, v)) +} + +// RefReportNoGTE applies the GTE predicate on the "refReportNo" field. +func RefReportNoGTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldGTE(FieldRefReportNo, v)) +} + +// RefReportNoLT applies the LT predicate on the "refReportNo" field. +func RefReportNoLT(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLT(FieldRefReportNo, v)) +} + +// RefReportNoLTE applies the LTE predicate on the "refReportNo" field. +func RefReportNoLTE(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldLTE(FieldRefReportNo, v)) +} + +// RefReportNoContains applies the Contains predicate on the "refReportNo" field. +func RefReportNoContains(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContains(FieldRefReportNo, v)) +} + +// RefReportNoHasPrefix applies the HasPrefix predicate on the "refReportNo" field. +func RefReportNoHasPrefix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasPrefix(FieldRefReportNo, v)) +} + +// RefReportNoHasSuffix applies the HasSuffix predicate on the "refReportNo" field. +func RefReportNoHasSuffix(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldHasSuffix(FieldRefReportNo, v)) +} + +// RefReportNoEqualFold applies the EqualFold predicate on the "refReportNo" field. +func RefReportNoEqualFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEqualFold(FieldRefReportNo, v)) +} + +// RefReportNoContainsFold applies the ContainsFold predicate on the "refReportNo" field. +func RefReportNoContainsFold(v string) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldContainsFold(FieldRefReportNo, v)) +} + +// NeedAgvEQ applies the EQ predicate on the "needAgv" field. +func NeedAgvEQ(v bool) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldEQ(FieldNeedAgv, v)) +} + +// NeedAgvNEQ applies the NEQ predicate on the "needAgv" field. +func NeedAgvNEQ(v bool) predicate.MaterialRequest { + return predicate.MaterialRequest(sql.FieldNEQ(FieldNeedAgv, v)) +} + // BatchNoEQ applies the EQ predicate on the "batchNo" field. func BatchNoEQ(v string) predicate.MaterialRequest { return predicate.MaterialRequest(sql.FieldEQ(FieldBatchNo, v)) diff --git a/bj_power_mes/ent/materialrequest_create.go b/bj_power_mes/ent/materialrequest_create.go index 699ed08..5870541 100644 --- a/bj_power_mes/ent/materialrequest_create.go +++ b/bj_power_mes/ent/materialrequest_create.go @@ -170,6 +170,118 @@ func (_c *MaterialRequestCreate) SetNillableSentQty(v *float64) *MaterialRequest return _c } +// SetReceivedQty sets the "receivedQty" field. +func (_c *MaterialRequestCreate) SetReceivedQty(v float64) *MaterialRequestCreate { + _c.mutation.SetReceivedQty(v) + return _c +} + +// SetNillableReceivedQty sets the "receivedQty" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableReceivedQty(v *float64) *MaterialRequestCreate { + if v != nil { + _c.SetReceivedQty(*v) + } + return _c +} + +// SetReceivedAt sets the "receivedAt" field. +func (_c *MaterialRequestCreate) SetReceivedAt(v int64) *MaterialRequestCreate { + _c.mutation.SetReceivedAt(v) + return _c +} + +// SetNillableReceivedAt sets the "receivedAt" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableReceivedAt(v *int64) *MaterialRequestCreate { + if v != nil { + _c.SetReceivedAt(*v) + } + return _c +} + +// SetReceiveBy sets the "receiveBy" field. +func (_c *MaterialRequestCreate) SetReceiveBy(v string) *MaterialRequestCreate { + _c.mutation.SetReceiveBy(v) + return _c +} + +// SetNillableReceiveBy sets the "receiveBy" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableReceiveBy(v *string) *MaterialRequestCreate { + if v != nil { + _c.SetReceiveBy(*v) + } + return _c +} + +// SetSource sets the "source" field. +func (_c *MaterialRequestCreate) SetSource(v string) *MaterialRequestCreate { + _c.mutation.SetSource(v) + return _c +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableSource(v *string) *MaterialRequestCreate { + if v != nil { + _c.SetSource(*v) + } + return _c +} + +// SetOverQty sets the "overQty" field. +func (_c *MaterialRequestCreate) SetOverQty(v float64) *MaterialRequestCreate { + _c.mutation.SetOverQty(v) + return _c +} + +// SetNillableOverQty sets the "overQty" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableOverQty(v *float64) *MaterialRequestCreate { + if v != nil { + _c.SetOverQty(*v) + } + return _c +} + +// SetOverReason sets the "overReason" field. +func (_c *MaterialRequestCreate) SetOverReason(v string) *MaterialRequestCreate { + _c.mutation.SetOverReason(v) + return _c +} + +// SetNillableOverReason sets the "overReason" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableOverReason(v *string) *MaterialRequestCreate { + if v != nil { + _c.SetOverReason(*v) + } + return _c +} + +// SetRefReportNo sets the "refReportNo" field. +func (_c *MaterialRequestCreate) SetRefReportNo(v string) *MaterialRequestCreate { + _c.mutation.SetRefReportNo(v) + return _c +} + +// SetNillableRefReportNo sets the "refReportNo" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableRefReportNo(v *string) *MaterialRequestCreate { + if v != nil { + _c.SetRefReportNo(*v) + } + return _c +} + +// SetNeedAgv sets the "needAgv" field. +func (_c *MaterialRequestCreate) SetNeedAgv(v bool) *MaterialRequestCreate { + _c.mutation.SetNeedAgv(v) + return _c +} + +// SetNillableNeedAgv sets the "needAgv" field if the given value is not nil. +func (_c *MaterialRequestCreate) SetNillableNeedAgv(v *bool) *MaterialRequestCreate { + if v != nil { + _c.SetNeedAgv(*v) + } + return _c +} + // SetBatchNo sets the "batchNo" field. func (_c *MaterialRequestCreate) SetBatchNo(v string) *MaterialRequestCreate { _c.mutation.SetBatchNo(v) @@ -303,6 +415,38 @@ func (_c *MaterialRequestCreate) defaults() { v := materialrequest.DefaultSentQty _c.mutation.SetSentQty(v) } + if _, ok := _c.mutation.ReceivedQty(); !ok { + v := materialrequest.DefaultReceivedQty + _c.mutation.SetReceivedQty(v) + } + if _, ok := _c.mutation.ReceivedAt(); !ok { + v := materialrequest.DefaultReceivedAt + _c.mutation.SetReceivedAt(v) + } + if _, ok := _c.mutation.ReceiveBy(); !ok { + v := materialrequest.DefaultReceiveBy + _c.mutation.SetReceiveBy(v) + } + if _, ok := _c.mutation.Source(); !ok { + v := materialrequest.DefaultSource + _c.mutation.SetSource(v) + } + if _, ok := _c.mutation.OverQty(); !ok { + v := materialrequest.DefaultOverQty + _c.mutation.SetOverQty(v) + } + if _, ok := _c.mutation.OverReason(); !ok { + v := materialrequest.DefaultOverReason + _c.mutation.SetOverReason(v) + } + if _, ok := _c.mutation.RefReportNo(); !ok { + v := materialrequest.DefaultRefReportNo + _c.mutation.SetRefReportNo(v) + } + if _, ok := _c.mutation.NeedAgv(); !ok { + v := materialrequest.DefaultNeedAgv + _c.mutation.SetNeedAgv(v) + } if _, ok := _c.mutation.BatchNo(); !ok { v := materialrequest.DefaultBatchNo _c.mutation.SetBatchNo(v) @@ -407,6 +551,50 @@ func (_c *MaterialRequestCreate) check() error { if _, ok := _c.mutation.SentQty(); !ok { return &ValidationError{Name: "sentQty", err: errors.New(`ent: missing required field "MaterialRequest.sentQty"`)} } + if _, ok := _c.mutation.ReceivedQty(); !ok { + return &ValidationError{Name: "receivedQty", err: errors.New(`ent: missing required field "MaterialRequest.receivedQty"`)} + } + if _, ok := _c.mutation.ReceivedAt(); !ok { + return &ValidationError{Name: "receivedAt", err: errors.New(`ent: missing required field "MaterialRequest.receivedAt"`)} + } + if _, ok := _c.mutation.ReceiveBy(); !ok { + return &ValidationError{Name: "receiveBy", err: errors.New(`ent: missing required field "MaterialRequest.receiveBy"`)} + } + if v, ok := _c.mutation.ReceiveBy(); ok { + if err := materialrequest.ReceiveByValidator(v); err != nil { + return &ValidationError{Name: "receiveBy", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.receiveBy": %w`, err)} + } + } + if _, ok := _c.mutation.Source(); !ok { + return &ValidationError{Name: "source", err: errors.New(`ent: missing required field "MaterialRequest.source"`)} + } + if v, ok := _c.mutation.Source(); ok { + if err := materialrequest.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.source": %w`, err)} + } + } + if _, ok := _c.mutation.OverQty(); !ok { + return &ValidationError{Name: "overQty", err: errors.New(`ent: missing required field "MaterialRequest.overQty"`)} + } + if _, ok := _c.mutation.OverReason(); !ok { + return &ValidationError{Name: "overReason", err: errors.New(`ent: missing required field "MaterialRequest.overReason"`)} + } + if v, ok := _c.mutation.OverReason(); ok { + if err := materialrequest.OverReasonValidator(v); err != nil { + return &ValidationError{Name: "overReason", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.overReason": %w`, err)} + } + } + if _, ok := _c.mutation.RefReportNo(); !ok { + return &ValidationError{Name: "refReportNo", err: errors.New(`ent: missing required field "MaterialRequest.refReportNo"`)} + } + if v, ok := _c.mutation.RefReportNo(); ok { + if err := materialrequest.RefReportNoValidator(v); err != nil { + return &ValidationError{Name: "refReportNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.refReportNo": %w`, err)} + } + } + if _, ok := _c.mutation.NeedAgv(); !ok { + return &ValidationError{Name: "needAgv", err: errors.New(`ent: missing required field "MaterialRequest.needAgv"`)} + } if _, ok := _c.mutation.BatchNo(); !ok { return &ValidationError{Name: "batchNo", err: errors.New(`ent: missing required field "MaterialRequest.batchNo"`)} } @@ -515,6 +703,38 @@ func (_c *MaterialRequestCreate) createSpec() (*MaterialRequest, *sqlgraph.Creat _spec.SetField(materialrequest.FieldSentQty, field.TypeFloat64, value) _node.SentQty = value } + if value, ok := _c.mutation.ReceivedQty(); ok { + _spec.SetField(materialrequest.FieldReceivedQty, field.TypeFloat64, value) + _node.ReceivedQty = value + } + if value, ok := _c.mutation.ReceivedAt(); ok { + _spec.SetField(materialrequest.FieldReceivedAt, field.TypeInt64, value) + _node.ReceivedAt = value + } + if value, ok := _c.mutation.ReceiveBy(); ok { + _spec.SetField(materialrequest.FieldReceiveBy, field.TypeString, value) + _node.ReceiveBy = value + } + if value, ok := _c.mutation.Source(); ok { + _spec.SetField(materialrequest.FieldSource, field.TypeString, value) + _node.Source = value + } + if value, ok := _c.mutation.OverQty(); ok { + _spec.SetField(materialrequest.FieldOverQty, field.TypeFloat64, value) + _node.OverQty = value + } + if value, ok := _c.mutation.OverReason(); ok { + _spec.SetField(materialrequest.FieldOverReason, field.TypeString, value) + _node.OverReason = value + } + if value, ok := _c.mutation.RefReportNo(); ok { + _spec.SetField(materialrequest.FieldRefReportNo, field.TypeString, value) + _node.RefReportNo = value + } + if value, ok := _c.mutation.NeedAgv(); ok { + _spec.SetField(materialrequest.FieldNeedAgv, field.TypeBool, value) + _node.NeedAgv = value + } if value, ok := _c.mutation.BatchNo(); ok { _spec.SetField(materialrequest.FieldBatchNo, field.TypeString, value) _node.BatchNo = value diff --git a/bj_power_mes/ent/materialrequest_update.go b/bj_power_mes/ent/materialrequest_update.go index 17e1f71..5a1b1f6 100644 --- a/bj_power_mes/ent/materialrequest_update.go +++ b/bj_power_mes/ent/materialrequest_update.go @@ -239,6 +239,139 @@ func (_u *MaterialRequestUpdate) AddSentQty(v float64) *MaterialRequestUpdate { return _u } +// SetReceivedQty sets the "receivedQty" field. +func (_u *MaterialRequestUpdate) SetReceivedQty(v float64) *MaterialRequestUpdate { + _u.mutation.ResetReceivedQty() + _u.mutation.SetReceivedQty(v) + return _u +} + +// SetNillableReceivedQty sets the "receivedQty" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableReceivedQty(v *float64) *MaterialRequestUpdate { + if v != nil { + _u.SetReceivedQty(*v) + } + return _u +} + +// AddReceivedQty adds value to the "receivedQty" field. +func (_u *MaterialRequestUpdate) AddReceivedQty(v float64) *MaterialRequestUpdate { + _u.mutation.AddReceivedQty(v) + return _u +} + +// SetReceivedAt sets the "receivedAt" field. +func (_u *MaterialRequestUpdate) SetReceivedAt(v int64) *MaterialRequestUpdate { + _u.mutation.ResetReceivedAt() + _u.mutation.SetReceivedAt(v) + return _u +} + +// SetNillableReceivedAt sets the "receivedAt" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableReceivedAt(v *int64) *MaterialRequestUpdate { + if v != nil { + _u.SetReceivedAt(*v) + } + return _u +} + +// AddReceivedAt adds value to the "receivedAt" field. +func (_u *MaterialRequestUpdate) AddReceivedAt(v int64) *MaterialRequestUpdate { + _u.mutation.AddReceivedAt(v) + return _u +} + +// SetReceiveBy sets the "receiveBy" field. +func (_u *MaterialRequestUpdate) SetReceiveBy(v string) *MaterialRequestUpdate { + _u.mutation.SetReceiveBy(v) + return _u +} + +// SetNillableReceiveBy sets the "receiveBy" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableReceiveBy(v *string) *MaterialRequestUpdate { + if v != nil { + _u.SetReceiveBy(*v) + } + return _u +} + +// SetSource sets the "source" field. +func (_u *MaterialRequestUpdate) SetSource(v string) *MaterialRequestUpdate { + _u.mutation.SetSource(v) + return _u +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableSource(v *string) *MaterialRequestUpdate { + if v != nil { + _u.SetSource(*v) + } + return _u +} + +// SetOverQty sets the "overQty" field. +func (_u *MaterialRequestUpdate) SetOverQty(v float64) *MaterialRequestUpdate { + _u.mutation.ResetOverQty() + _u.mutation.SetOverQty(v) + return _u +} + +// SetNillableOverQty sets the "overQty" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableOverQty(v *float64) *MaterialRequestUpdate { + if v != nil { + _u.SetOverQty(*v) + } + return _u +} + +// AddOverQty adds value to the "overQty" field. +func (_u *MaterialRequestUpdate) AddOverQty(v float64) *MaterialRequestUpdate { + _u.mutation.AddOverQty(v) + return _u +} + +// SetOverReason sets the "overReason" field. +func (_u *MaterialRequestUpdate) SetOverReason(v string) *MaterialRequestUpdate { + _u.mutation.SetOverReason(v) + return _u +} + +// SetNillableOverReason sets the "overReason" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableOverReason(v *string) *MaterialRequestUpdate { + if v != nil { + _u.SetOverReason(*v) + } + return _u +} + +// SetRefReportNo sets the "refReportNo" field. +func (_u *MaterialRequestUpdate) SetRefReportNo(v string) *MaterialRequestUpdate { + _u.mutation.SetRefReportNo(v) + return _u +} + +// SetNillableRefReportNo sets the "refReportNo" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableRefReportNo(v *string) *MaterialRequestUpdate { + if v != nil { + _u.SetRefReportNo(*v) + } + return _u +} + +// SetNeedAgv sets the "needAgv" field. +func (_u *MaterialRequestUpdate) SetNeedAgv(v bool) *MaterialRequestUpdate { + _u.mutation.SetNeedAgv(v) + return _u +} + +// SetNillableNeedAgv sets the "needAgv" field if the given value is not nil. +func (_u *MaterialRequestUpdate) SetNillableNeedAgv(v *bool) *MaterialRequestUpdate { + if v != nil { + _u.SetNeedAgv(*v) + } + return _u +} + // SetBatchNo sets the "batchNo" field. func (_u *MaterialRequestUpdate) SetBatchNo(v string) *MaterialRequestUpdate { _u.mutation.SetBatchNo(v) @@ -367,6 +500,26 @@ func (_u *MaterialRequestUpdate) check() error { return &ValidationError{Name: "targetDock", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.targetDock": %w`, err)} } } + if v, ok := _u.mutation.ReceiveBy(); ok { + if err := materialrequest.ReceiveByValidator(v); err != nil { + return &ValidationError{Name: "receiveBy", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.receiveBy": %w`, err)} + } + } + if v, ok := _u.mutation.Source(); ok { + if err := materialrequest.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.source": %w`, err)} + } + } + if v, ok := _u.mutation.OverReason(); ok { + if err := materialrequest.OverReasonValidator(v); err != nil { + return &ValidationError{Name: "overReason", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.overReason": %w`, err)} + } + } + if v, ok := _u.mutation.RefReportNo(); ok { + if err := materialrequest.RefReportNoValidator(v); err != nil { + return &ValidationError{Name: "refReportNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.refReportNo": %w`, err)} + } + } if v, ok := _u.mutation.BatchNo(); ok { if err := materialrequest.BatchNoValidator(v); err != nil { return &ValidationError{Name: "batchNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.batchNo": %w`, err)} @@ -449,6 +602,39 @@ func (_u *MaterialRequestUpdate) sqlSave(ctx context.Context) (_node int, err er if value, ok := _u.mutation.AddedSentQty(); ok { _spec.AddField(materialrequest.FieldSentQty, field.TypeFloat64, value) } + if value, ok := _u.mutation.ReceivedQty(); ok { + _spec.SetField(materialrequest.FieldReceivedQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.AddedReceivedQty(); ok { + _spec.AddField(materialrequest.FieldReceivedQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.ReceivedAt(); ok { + _spec.SetField(materialrequest.FieldReceivedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedReceivedAt(); ok { + _spec.AddField(materialrequest.FieldReceivedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.ReceiveBy(); ok { + _spec.SetField(materialrequest.FieldReceiveBy, field.TypeString, value) + } + if value, ok := _u.mutation.Source(); ok { + _spec.SetField(materialrequest.FieldSource, field.TypeString, value) + } + if value, ok := _u.mutation.OverQty(); ok { + _spec.SetField(materialrequest.FieldOverQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.AddedOverQty(); ok { + _spec.AddField(materialrequest.FieldOverQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.OverReason(); ok { + _spec.SetField(materialrequest.FieldOverReason, field.TypeString, value) + } + if value, ok := _u.mutation.RefReportNo(); ok { + _spec.SetField(materialrequest.FieldRefReportNo, field.TypeString, value) + } + if value, ok := _u.mutation.NeedAgv(); ok { + _spec.SetField(materialrequest.FieldNeedAgv, field.TypeBool, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(materialrequest.FieldBatchNo, field.TypeString, value) } @@ -693,6 +879,139 @@ func (_u *MaterialRequestUpdateOne) AddSentQty(v float64) *MaterialRequestUpdate return _u } +// SetReceivedQty sets the "receivedQty" field. +func (_u *MaterialRequestUpdateOne) SetReceivedQty(v float64) *MaterialRequestUpdateOne { + _u.mutation.ResetReceivedQty() + _u.mutation.SetReceivedQty(v) + return _u +} + +// SetNillableReceivedQty sets the "receivedQty" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableReceivedQty(v *float64) *MaterialRequestUpdateOne { + if v != nil { + _u.SetReceivedQty(*v) + } + return _u +} + +// AddReceivedQty adds value to the "receivedQty" field. +func (_u *MaterialRequestUpdateOne) AddReceivedQty(v float64) *MaterialRequestUpdateOne { + _u.mutation.AddReceivedQty(v) + return _u +} + +// SetReceivedAt sets the "receivedAt" field. +func (_u *MaterialRequestUpdateOne) SetReceivedAt(v int64) *MaterialRequestUpdateOne { + _u.mutation.ResetReceivedAt() + _u.mutation.SetReceivedAt(v) + return _u +} + +// SetNillableReceivedAt sets the "receivedAt" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableReceivedAt(v *int64) *MaterialRequestUpdateOne { + if v != nil { + _u.SetReceivedAt(*v) + } + return _u +} + +// AddReceivedAt adds value to the "receivedAt" field. +func (_u *MaterialRequestUpdateOne) AddReceivedAt(v int64) *MaterialRequestUpdateOne { + _u.mutation.AddReceivedAt(v) + return _u +} + +// SetReceiveBy sets the "receiveBy" field. +func (_u *MaterialRequestUpdateOne) SetReceiveBy(v string) *MaterialRequestUpdateOne { + _u.mutation.SetReceiveBy(v) + return _u +} + +// SetNillableReceiveBy sets the "receiveBy" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableReceiveBy(v *string) *MaterialRequestUpdateOne { + if v != nil { + _u.SetReceiveBy(*v) + } + return _u +} + +// SetSource sets the "source" field. +func (_u *MaterialRequestUpdateOne) SetSource(v string) *MaterialRequestUpdateOne { + _u.mutation.SetSource(v) + return _u +} + +// SetNillableSource sets the "source" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableSource(v *string) *MaterialRequestUpdateOne { + if v != nil { + _u.SetSource(*v) + } + return _u +} + +// SetOverQty sets the "overQty" field. +func (_u *MaterialRequestUpdateOne) SetOverQty(v float64) *MaterialRequestUpdateOne { + _u.mutation.ResetOverQty() + _u.mutation.SetOverQty(v) + return _u +} + +// SetNillableOverQty sets the "overQty" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableOverQty(v *float64) *MaterialRequestUpdateOne { + if v != nil { + _u.SetOverQty(*v) + } + return _u +} + +// AddOverQty adds value to the "overQty" field. +func (_u *MaterialRequestUpdateOne) AddOverQty(v float64) *MaterialRequestUpdateOne { + _u.mutation.AddOverQty(v) + return _u +} + +// SetOverReason sets the "overReason" field. +func (_u *MaterialRequestUpdateOne) SetOverReason(v string) *MaterialRequestUpdateOne { + _u.mutation.SetOverReason(v) + return _u +} + +// SetNillableOverReason sets the "overReason" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableOverReason(v *string) *MaterialRequestUpdateOne { + if v != nil { + _u.SetOverReason(*v) + } + return _u +} + +// SetRefReportNo sets the "refReportNo" field. +func (_u *MaterialRequestUpdateOne) SetRefReportNo(v string) *MaterialRequestUpdateOne { + _u.mutation.SetRefReportNo(v) + return _u +} + +// SetNillableRefReportNo sets the "refReportNo" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableRefReportNo(v *string) *MaterialRequestUpdateOne { + if v != nil { + _u.SetRefReportNo(*v) + } + return _u +} + +// SetNeedAgv sets the "needAgv" field. +func (_u *MaterialRequestUpdateOne) SetNeedAgv(v bool) *MaterialRequestUpdateOne { + _u.mutation.SetNeedAgv(v) + return _u +} + +// SetNillableNeedAgv sets the "needAgv" field if the given value is not nil. +func (_u *MaterialRequestUpdateOne) SetNillableNeedAgv(v *bool) *MaterialRequestUpdateOne { + if v != nil { + _u.SetNeedAgv(*v) + } + return _u +} + // SetBatchNo sets the "batchNo" field. func (_u *MaterialRequestUpdateOne) SetBatchNo(v string) *MaterialRequestUpdateOne { _u.mutation.SetBatchNo(v) @@ -834,6 +1153,26 @@ func (_u *MaterialRequestUpdateOne) check() error { return &ValidationError{Name: "targetDock", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.targetDock": %w`, err)} } } + if v, ok := _u.mutation.ReceiveBy(); ok { + if err := materialrequest.ReceiveByValidator(v); err != nil { + return &ValidationError{Name: "receiveBy", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.receiveBy": %w`, err)} + } + } + if v, ok := _u.mutation.Source(); ok { + if err := materialrequest.SourceValidator(v); err != nil { + return &ValidationError{Name: "source", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.source": %w`, err)} + } + } + if v, ok := _u.mutation.OverReason(); ok { + if err := materialrequest.OverReasonValidator(v); err != nil { + return &ValidationError{Name: "overReason", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.overReason": %w`, err)} + } + } + if v, ok := _u.mutation.RefReportNo(); ok { + if err := materialrequest.RefReportNoValidator(v); err != nil { + return &ValidationError{Name: "refReportNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.refReportNo": %w`, err)} + } + } if v, ok := _u.mutation.BatchNo(); ok { if err := materialrequest.BatchNoValidator(v); err != nil { return &ValidationError{Name: "batchNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.batchNo": %w`, err)} @@ -933,6 +1272,39 @@ func (_u *MaterialRequestUpdateOne) sqlSave(ctx context.Context) (_node *Materia if value, ok := _u.mutation.AddedSentQty(); ok { _spec.AddField(materialrequest.FieldSentQty, field.TypeFloat64, value) } + if value, ok := _u.mutation.ReceivedQty(); ok { + _spec.SetField(materialrequest.FieldReceivedQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.AddedReceivedQty(); ok { + _spec.AddField(materialrequest.FieldReceivedQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.ReceivedAt(); ok { + _spec.SetField(materialrequest.FieldReceivedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.AddedReceivedAt(); ok { + _spec.AddField(materialrequest.FieldReceivedAt, field.TypeInt64, value) + } + if value, ok := _u.mutation.ReceiveBy(); ok { + _spec.SetField(materialrequest.FieldReceiveBy, field.TypeString, value) + } + if value, ok := _u.mutation.Source(); ok { + _spec.SetField(materialrequest.FieldSource, field.TypeString, value) + } + if value, ok := _u.mutation.OverQty(); ok { + _spec.SetField(materialrequest.FieldOverQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.AddedOverQty(); ok { + _spec.AddField(materialrequest.FieldOverQty, field.TypeFloat64, value) + } + if value, ok := _u.mutation.OverReason(); ok { + _spec.SetField(materialrequest.FieldOverReason, field.TypeString, value) + } + if value, ok := _u.mutation.RefReportNo(); ok { + _spec.SetField(materialrequest.FieldRefReportNo, field.TypeString, value) + } + if value, ok := _u.mutation.NeedAgv(); ok { + _spec.SetField(materialrequest.FieldNeedAgv, field.TypeBool, value) + } if value, ok := _u.mutation.BatchNo(); ok { _spec.SetField(materialrequest.FieldBatchNo, field.TypeString, value) } diff --git a/bj_power_mes/ent/migrate/schema.go b/bj_power_mes/ent/migrate/schema.go index fd090f8..e498de1 100644 --- a/bj_power_mes/ent/migrate/schema.go +++ b/bj_power_mes/ent/migrate/schema.go @@ -18,6 +18,7 @@ var ( {Name: "content", Type: field.TypeString, Size: 500, Default: ""}, {Name: "ref_type", Type: field.TypeString, Size: 40, Default: ""}, {Name: "ref_id", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "order_no", Type: field.TypeString, Size: 64, Default: ""}, {Name: "status", Type: field.TypeString, Size: 10, Default: "UNREAD"}, {Name: "receiver", Type: field.TypeString, Size: 255, Default: ""}, {Name: "created_at", Type: field.TypeTime}, @@ -31,7 +32,7 @@ var ( { Name: "alert_status", Unique: false, - Columns: []*schema.Column{AlertColumns[7]}, + Columns: []*schema.Column{AlertColumns[8]}, }, { Name: "alert_type", @@ -41,7 +42,7 @@ var ( { Name: "alert_created_at", Unique: false, - Columns: []*schema.Column{AlertColumns[9]}, + Columns: []*schema.Column{AlertColumns[10]}, }, }, } @@ -351,7 +352,12 @@ var ( {Name: "actual_qty", Type: field.TypeInt, Default: 0}, {Name: "diff_qty", Type: field.TypeInt, Default: 0}, {Name: "cause", Type: field.TypeString, Size: 255, Default: ""}, - {Name: "status", Type: field.TypeString, Size: 10, Default: "PENDING"}, + {Name: "status", Type: field.TypeString, Size: 16, Default: "PENDING"}, + {Name: "handle_type", Type: field.TypeString, Size: 16, Default: ""}, + {Name: "handle_doc_no", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "handle_note", Type: field.TypeString, Size: 255, Default: ""}, + {Name: "handled_by", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "handled_at", Type: field.TypeInt64, Default: 0}, {Name: "operator", Type: field.TypeString, Size: 64, Default: ""}, {Name: "created_at", Type: field.TypeTime}, {Name: "resolved_at", Type: field.TypeTime, Nullable: true}, @@ -380,7 +386,7 @@ var ( { Name: "materialqtyreport_created_at", Unique: false, - Columns: []*schema.Column{MaterialQtyReportColumns[12]}, + Columns: []*schema.Column{MaterialQtyReportColumns[17]}, }, }, } @@ -400,6 +406,14 @@ var ( {Name: "station_no", Type: field.TypeInt, Default: 0}, {Name: "process_code", Type: field.TypeInt, Default: 0}, {Name: "sent_qty", Type: field.TypeFloat64, Default: 0}, + {Name: "received_qty", Type: field.TypeFloat64, Default: 0}, + {Name: "received_at", Type: field.TypeInt64, Default: 0}, + {Name: "receive_by", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "source", Type: field.TypeString, Size: 16, Default: "PLAN"}, + {Name: "over_qty", Type: field.TypeFloat64, Default: 0}, + {Name: "over_reason", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "ref_report_no", Type: field.TypeString, Size: 64, Default: ""}, + {Name: "need_agv", Type: field.TypeBool, Default: false}, {Name: "batch_no", Type: field.TypeString, Size: 64, Default: ""}, {Name: "operator", Type: field.TypeString, Size: 64, Default: ""}, {Name: "created_at", Type: field.TypeTime}, diff --git a/bj_power_mes/ent/mutation.go b/bj_power_mes/ent/mutation.go index 3199e3f..0f3ffc9 100644 --- a/bj_power_mes/ent/mutation.go +++ b/bj_power_mes/ent/mutation.go @@ -102,6 +102,7 @@ type AlertMutation struct { content *string refType *string refId *string + orderNo *string status *string receiver *string createdAt *time.Time @@ -451,6 +452,42 @@ func (m *AlertMutation) ResetRefId() { m.refId = nil } +// SetOrderNo sets the "orderNo" field. +func (m *AlertMutation) SetOrderNo(s string) { + m.orderNo = &s +} + +// OrderNo returns the value of the "orderNo" field in the mutation. +func (m *AlertMutation) OrderNo() (r string, exists bool) { + v := m.orderNo + if v == nil { + return + } + return *v, true +} + +// OldOrderNo returns the old "orderNo" field's value of the Alert entity. +// If the Alert 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 *AlertMutation) OldOrderNo(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldOrderNo is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldOrderNo requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldOrderNo: %w", err) + } + return oldValue.OrderNo, nil +} + +// ResetOrderNo resets all changes to the "orderNo" field. +func (m *AlertMutation) ResetOrderNo() { + m.orderNo = nil +} + // SetStatus sets the "status" field. func (m *AlertMutation) SetStatus(s string) { m.status = &s @@ -593,7 +630,7 @@ func (m *AlertMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *AlertMutation) Fields() []string { - fields := make([]string, 0, 9) + fields := make([]string, 0, 10) if m.ruleId != nil { fields = append(fields, alert.FieldRuleId) } @@ -612,6 +649,9 @@ func (m *AlertMutation) Fields() []string { if m.refId != nil { fields = append(fields, alert.FieldRefId) } + if m.orderNo != nil { + fields = append(fields, alert.FieldOrderNo) + } if m.status != nil { fields = append(fields, alert.FieldStatus) } @@ -641,6 +681,8 @@ func (m *AlertMutation) Field(name string) (ent.Value, bool) { return m.RefType() case alert.FieldRefId: return m.RefId() + case alert.FieldOrderNo: + return m.OrderNo() case alert.FieldStatus: return m.Status() case alert.FieldReceiver: @@ -668,6 +710,8 @@ func (m *AlertMutation) OldField(ctx context.Context, name string) (ent.Value, e return m.OldRefType(ctx) case alert.FieldRefId: return m.OldRefId(ctx) + case alert.FieldOrderNo: + return m.OldOrderNo(ctx) case alert.FieldStatus: return m.OldStatus(ctx) case alert.FieldReceiver: @@ -725,6 +769,13 @@ func (m *AlertMutation) SetField(name string, value ent.Value) error { } m.SetRefId(v) return nil + case alert.FieldOrderNo: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetOrderNo(v) + return nil case alert.FieldStatus: v, ok := value.(string) if !ok { @@ -828,6 +879,9 @@ func (m *AlertMutation) ResetField(name string) error { case alert.FieldRefId: m.ResetRefId() return nil + case alert.FieldOrderNo: + m.ResetOrderNo() + return nil case alert.FieldStatus: m.ResetStatus() return nil @@ -8851,6 +8905,12 @@ type MaterialQtyReportMutation struct { adddiffQty *int cause *string status *string + handleType *string + handleDocNo *string + handleNote *string + handledBy *string + handledAt *int64 + addhandledAt *int64 operator *string createdAt *time.Time resolvedAt *time.Time @@ -9404,6 +9464,206 @@ func (m *MaterialQtyReportMutation) ResetStatus() { m.status = nil } +// SetHandleType sets the "handleType" field. +func (m *MaterialQtyReportMutation) SetHandleType(s string) { + m.handleType = &s +} + +// HandleType returns the value of the "handleType" field in the mutation. +func (m *MaterialQtyReportMutation) HandleType() (r string, exists bool) { + v := m.handleType + if v == nil { + return + } + return *v, true +} + +// OldHandleType returns the old "handleType" field's value of the MaterialQtyReport entity. +// If the MaterialQtyReport 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 *MaterialQtyReportMutation) OldHandleType(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldHandleType is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldHandleType requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldHandleType: %w", err) + } + return oldValue.HandleType, nil +} + +// ResetHandleType resets all changes to the "handleType" field. +func (m *MaterialQtyReportMutation) ResetHandleType() { + m.handleType = nil +} + +// SetHandleDocNo sets the "handleDocNo" field. +func (m *MaterialQtyReportMutation) SetHandleDocNo(s string) { + m.handleDocNo = &s +} + +// HandleDocNo returns the value of the "handleDocNo" field in the mutation. +func (m *MaterialQtyReportMutation) HandleDocNo() (r string, exists bool) { + v := m.handleDocNo + if v == nil { + return + } + return *v, true +} + +// OldHandleDocNo returns the old "handleDocNo" field's value of the MaterialQtyReport entity. +// If the MaterialQtyReport 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 *MaterialQtyReportMutation) OldHandleDocNo(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldHandleDocNo is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldHandleDocNo requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldHandleDocNo: %w", err) + } + return oldValue.HandleDocNo, nil +} + +// ResetHandleDocNo resets all changes to the "handleDocNo" field. +func (m *MaterialQtyReportMutation) ResetHandleDocNo() { + m.handleDocNo = nil +} + +// SetHandleNote sets the "handleNote" field. +func (m *MaterialQtyReportMutation) SetHandleNote(s string) { + m.handleNote = &s +} + +// HandleNote returns the value of the "handleNote" field in the mutation. +func (m *MaterialQtyReportMutation) HandleNote() (r string, exists bool) { + v := m.handleNote + if v == nil { + return + } + return *v, true +} + +// OldHandleNote returns the old "handleNote" field's value of the MaterialQtyReport entity. +// If the MaterialQtyReport 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 *MaterialQtyReportMutation) OldHandleNote(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldHandleNote is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldHandleNote requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldHandleNote: %w", err) + } + return oldValue.HandleNote, nil +} + +// ResetHandleNote resets all changes to the "handleNote" field. +func (m *MaterialQtyReportMutation) ResetHandleNote() { + m.handleNote = nil +} + +// SetHandledBy sets the "handledBy" field. +func (m *MaterialQtyReportMutation) SetHandledBy(s string) { + m.handledBy = &s +} + +// HandledBy returns the value of the "handledBy" field in the mutation. +func (m *MaterialQtyReportMutation) HandledBy() (r string, exists bool) { + v := m.handledBy + if v == nil { + return + } + return *v, true +} + +// OldHandledBy returns the old "handledBy" field's value of the MaterialQtyReport entity. +// If the MaterialQtyReport 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 *MaterialQtyReportMutation) OldHandledBy(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldHandledBy is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldHandledBy requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldHandledBy: %w", err) + } + return oldValue.HandledBy, nil +} + +// ResetHandledBy resets all changes to the "handledBy" field. +func (m *MaterialQtyReportMutation) ResetHandledBy() { + m.handledBy = nil +} + +// SetHandledAt sets the "handledAt" field. +func (m *MaterialQtyReportMutation) SetHandledAt(i int64) { + m.handledAt = &i + m.addhandledAt = nil +} + +// HandledAt returns the value of the "handledAt" field in the mutation. +func (m *MaterialQtyReportMutation) HandledAt() (r int64, exists bool) { + v := m.handledAt + if v == nil { + return + } + return *v, true +} + +// OldHandledAt returns the old "handledAt" field's value of the MaterialQtyReport entity. +// If the MaterialQtyReport 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 *MaterialQtyReportMutation) OldHandledAt(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldHandledAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldHandledAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldHandledAt: %w", err) + } + return oldValue.HandledAt, nil +} + +// AddHandledAt adds i to the "handledAt" field. +func (m *MaterialQtyReportMutation) AddHandledAt(i int64) { + if m.addhandledAt != nil { + *m.addhandledAt += i + } else { + m.addhandledAt = &i + } +} + +// AddedHandledAt returns the value that was added to the "handledAt" field in this mutation. +func (m *MaterialQtyReportMutation) AddedHandledAt() (r int64, exists bool) { + v := m.addhandledAt + if v == nil { + return + } + return *v, true +} + +// ResetHandledAt resets all changes to the "handledAt" field. +func (m *MaterialQtyReportMutation) ResetHandledAt() { + m.handledAt = nil + m.addhandledAt = nil +} + // SetOperator sets the "operator" field. func (m *MaterialQtyReportMutation) SetOperator(s string) { m.operator = &s @@ -9559,7 +9819,7 @@ func (m *MaterialQtyReportMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *MaterialQtyReportMutation) Fields() []string { - fields := make([]string, 0, 13) + fields := make([]string, 0, 18) if m.stationNo != nil { fields = append(fields, materialqtyreport.FieldStationNo) } @@ -9590,6 +9850,21 @@ func (m *MaterialQtyReportMutation) Fields() []string { if m.status != nil { fields = append(fields, materialqtyreport.FieldStatus) } + if m.handleType != nil { + fields = append(fields, materialqtyreport.FieldHandleType) + } + if m.handleDocNo != nil { + fields = append(fields, materialqtyreport.FieldHandleDocNo) + } + if m.handleNote != nil { + fields = append(fields, materialqtyreport.FieldHandleNote) + } + if m.handledBy != nil { + fields = append(fields, materialqtyreport.FieldHandledBy) + } + if m.handledAt != nil { + fields = append(fields, materialqtyreport.FieldHandledAt) + } if m.operator != nil { fields = append(fields, materialqtyreport.FieldOperator) } @@ -9627,6 +9902,16 @@ func (m *MaterialQtyReportMutation) Field(name string) (ent.Value, bool) { return m.Cause() case materialqtyreport.FieldStatus: return m.Status() + case materialqtyreport.FieldHandleType: + return m.HandleType() + case materialqtyreport.FieldHandleDocNo: + return m.HandleDocNo() + case materialqtyreport.FieldHandleNote: + return m.HandleNote() + case materialqtyreport.FieldHandledBy: + return m.HandledBy() + case materialqtyreport.FieldHandledAt: + return m.HandledAt() case materialqtyreport.FieldOperator: return m.Operator() case materialqtyreport.FieldCreatedAt: @@ -9662,6 +9947,16 @@ func (m *MaterialQtyReportMutation) OldField(ctx context.Context, name string) ( return m.OldCause(ctx) case materialqtyreport.FieldStatus: return m.OldStatus(ctx) + case materialqtyreport.FieldHandleType: + return m.OldHandleType(ctx) + case materialqtyreport.FieldHandleDocNo: + return m.OldHandleDocNo(ctx) + case materialqtyreport.FieldHandleNote: + return m.OldHandleNote(ctx) + case materialqtyreport.FieldHandledBy: + return m.OldHandledBy(ctx) + case materialqtyreport.FieldHandledAt: + return m.OldHandledAt(ctx) case materialqtyreport.FieldOperator: return m.OldOperator(ctx) case materialqtyreport.FieldCreatedAt: @@ -9747,6 +10042,41 @@ func (m *MaterialQtyReportMutation) SetField(name string, value ent.Value) error } m.SetStatus(v) return nil + case materialqtyreport.FieldHandleType: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetHandleType(v) + return nil + case materialqtyreport.FieldHandleDocNo: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetHandleDocNo(v) + return nil + case materialqtyreport.FieldHandleNote: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetHandleNote(v) + return nil + case materialqtyreport.FieldHandledBy: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetHandledBy(v) + return nil + case materialqtyreport.FieldHandledAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetHandledAt(v) + return nil case materialqtyreport.FieldOperator: v, ok := value.(string) if !ok { @@ -9788,6 +10118,9 @@ func (m *MaterialQtyReportMutation) AddedFields() []string { if m.adddiffQty != nil { fields = append(fields, materialqtyreport.FieldDiffQty) } + if m.addhandledAt != nil { + fields = append(fields, materialqtyreport.FieldHandledAt) + } return fields } @@ -9804,6 +10137,8 @@ func (m *MaterialQtyReportMutation) AddedField(name string) (ent.Value, bool) { return m.AddedActualQty() case materialqtyreport.FieldDiffQty: return m.AddedDiffQty() + case materialqtyreport.FieldHandledAt: + return m.AddedHandledAt() } return nil, false } @@ -9841,6 +10176,13 @@ func (m *MaterialQtyReportMutation) AddField(name string, value ent.Value) error } m.AddDiffQty(v) return nil + case materialqtyreport.FieldHandledAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddHandledAt(v) + return nil } return fmt.Errorf("unknown MaterialQtyReport numeric field %s", name) } @@ -9907,6 +10249,21 @@ func (m *MaterialQtyReportMutation) ResetField(name string) error { case materialqtyreport.FieldStatus: m.ResetStatus() return nil + case materialqtyreport.FieldHandleType: + m.ResetHandleType() + return nil + case materialqtyreport.FieldHandleDocNo: + m.ResetHandleDocNo() + return nil + case materialqtyreport.FieldHandleNote: + m.ResetHandleNote() + return nil + case materialqtyreport.FieldHandledBy: + m.ResetHandledBy() + return nil + case materialqtyreport.FieldHandledAt: + m.ResetHandledAt() + return nil case materialqtyreport.FieldOperator: m.ResetOperator() return nil @@ -9991,6 +10348,17 @@ type MaterialRequestMutation struct { addprocessCode *int sentQty *float64 addsentQty *float64 + receivedQty *float64 + addreceivedQty *float64 + receivedAt *int64 + addreceivedAt *int64 + receiveBy *string + source *string + overQty *float64 + addoverQty *float64 + overReason *string + refReportNo *string + needAgv *bool batchNo *string operator *string createdAt *time.Time @@ -10653,6 +11021,354 @@ func (m *MaterialRequestMutation) ResetSentQty() { m.addsentQty = nil } +// SetReceivedQty sets the "receivedQty" field. +func (m *MaterialRequestMutation) SetReceivedQty(f float64) { + m.receivedQty = &f + m.addreceivedQty = nil +} + +// ReceivedQty returns the value of the "receivedQty" field in the mutation. +func (m *MaterialRequestMutation) ReceivedQty() (r float64, exists bool) { + v := m.receivedQty + if v == nil { + return + } + return *v, true +} + +// OldReceivedQty returns the old "receivedQty" 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) OldReceivedQty(ctx context.Context) (v float64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldReceivedQty is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldReceivedQty requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldReceivedQty: %w", err) + } + return oldValue.ReceivedQty, nil +} + +// AddReceivedQty adds f to the "receivedQty" field. +func (m *MaterialRequestMutation) AddReceivedQty(f float64) { + if m.addreceivedQty != nil { + *m.addreceivedQty += f + } else { + m.addreceivedQty = &f + } +} + +// AddedReceivedQty returns the value that was added to the "receivedQty" field in this mutation. +func (m *MaterialRequestMutation) AddedReceivedQty() (r float64, exists bool) { + v := m.addreceivedQty + if v == nil { + return + } + return *v, true +} + +// ResetReceivedQty resets all changes to the "receivedQty" field. +func (m *MaterialRequestMutation) ResetReceivedQty() { + m.receivedQty = nil + m.addreceivedQty = nil +} + +// SetReceivedAt sets the "receivedAt" field. +func (m *MaterialRequestMutation) SetReceivedAt(i int64) { + m.receivedAt = &i + m.addreceivedAt = nil +} + +// ReceivedAt returns the value of the "receivedAt" field in the mutation. +func (m *MaterialRequestMutation) ReceivedAt() (r int64, exists bool) { + v := m.receivedAt + if v == nil { + return + } + return *v, true +} + +// OldReceivedAt returns the old "receivedAt" 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) OldReceivedAt(ctx context.Context) (v int64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldReceivedAt is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldReceivedAt requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldReceivedAt: %w", err) + } + return oldValue.ReceivedAt, nil +} + +// AddReceivedAt adds i to the "receivedAt" field. +func (m *MaterialRequestMutation) AddReceivedAt(i int64) { + if m.addreceivedAt != nil { + *m.addreceivedAt += i + } else { + m.addreceivedAt = &i + } +} + +// AddedReceivedAt returns the value that was added to the "receivedAt" field in this mutation. +func (m *MaterialRequestMutation) AddedReceivedAt() (r int64, exists bool) { + v := m.addreceivedAt + if v == nil { + return + } + return *v, true +} + +// ResetReceivedAt resets all changes to the "receivedAt" field. +func (m *MaterialRequestMutation) ResetReceivedAt() { + m.receivedAt = nil + m.addreceivedAt = nil +} + +// SetReceiveBy sets the "receiveBy" field. +func (m *MaterialRequestMutation) SetReceiveBy(s string) { + m.receiveBy = &s +} + +// ReceiveBy returns the value of the "receiveBy" field in the mutation. +func (m *MaterialRequestMutation) ReceiveBy() (r string, exists bool) { + v := m.receiveBy + if v == nil { + return + } + return *v, true +} + +// OldReceiveBy returns the old "receiveBy" 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) OldReceiveBy(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldReceiveBy is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldReceiveBy requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldReceiveBy: %w", err) + } + return oldValue.ReceiveBy, nil +} + +// ResetReceiveBy resets all changes to the "receiveBy" field. +func (m *MaterialRequestMutation) ResetReceiveBy() { + m.receiveBy = nil +} + +// SetSource sets the "source" field. +func (m *MaterialRequestMutation) SetSource(s string) { + m.source = &s +} + +// Source returns the value of the "source" field in the mutation. +func (m *MaterialRequestMutation) Source() (r string, exists bool) { + v := m.source + if v == nil { + return + } + return *v, true +} + +// OldSource returns the old "source" 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) OldSource(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldSource is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldSource requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldSource: %w", err) + } + return oldValue.Source, nil +} + +// ResetSource resets all changes to the "source" field. +func (m *MaterialRequestMutation) ResetSource() { + m.source = nil +} + +// SetOverQty sets the "overQty" field. +func (m *MaterialRequestMutation) SetOverQty(f float64) { + m.overQty = &f + m.addoverQty = nil +} + +// OverQty returns the value of the "overQty" field in the mutation. +func (m *MaterialRequestMutation) OverQty() (r float64, exists bool) { + v := m.overQty + if v == nil { + return + } + return *v, true +} + +// OldOverQty returns the old "overQty" 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) OldOverQty(ctx context.Context) (v float64, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldOverQty is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldOverQty requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldOverQty: %w", err) + } + return oldValue.OverQty, nil +} + +// AddOverQty adds f to the "overQty" field. +func (m *MaterialRequestMutation) AddOverQty(f float64) { + if m.addoverQty != nil { + *m.addoverQty += f + } else { + m.addoverQty = &f + } +} + +// AddedOverQty returns the value that was added to the "overQty" field in this mutation. +func (m *MaterialRequestMutation) AddedOverQty() (r float64, exists bool) { + v := m.addoverQty + if v == nil { + return + } + return *v, true +} + +// ResetOverQty resets all changes to the "overQty" field. +func (m *MaterialRequestMutation) ResetOverQty() { + m.overQty = nil + m.addoverQty = nil +} + +// SetOverReason sets the "overReason" field. +func (m *MaterialRequestMutation) SetOverReason(s string) { + m.overReason = &s +} + +// OverReason returns the value of the "overReason" field in the mutation. +func (m *MaterialRequestMutation) OverReason() (r string, exists bool) { + v := m.overReason + if v == nil { + return + } + return *v, true +} + +// OldOverReason returns the old "overReason" 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) OldOverReason(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldOverReason is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldOverReason requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldOverReason: %w", err) + } + return oldValue.OverReason, nil +} + +// ResetOverReason resets all changes to the "overReason" field. +func (m *MaterialRequestMutation) ResetOverReason() { + m.overReason = nil +} + +// SetRefReportNo sets the "refReportNo" field. +func (m *MaterialRequestMutation) SetRefReportNo(s string) { + m.refReportNo = &s +} + +// RefReportNo returns the value of the "refReportNo" field in the mutation. +func (m *MaterialRequestMutation) RefReportNo() (r string, exists bool) { + v := m.refReportNo + if v == nil { + return + } + return *v, true +} + +// OldRefReportNo returns the old "refReportNo" 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) OldRefReportNo(ctx context.Context) (v string, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldRefReportNo is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldRefReportNo requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldRefReportNo: %w", err) + } + return oldValue.RefReportNo, nil +} + +// ResetRefReportNo resets all changes to the "refReportNo" field. +func (m *MaterialRequestMutation) ResetRefReportNo() { + m.refReportNo = nil +} + +// SetNeedAgv sets the "needAgv" field. +func (m *MaterialRequestMutation) SetNeedAgv(b bool) { + m.needAgv = &b +} + +// NeedAgv returns the value of the "needAgv" field in the mutation. +func (m *MaterialRequestMutation) NeedAgv() (r bool, exists bool) { + v := m.needAgv + if v == nil { + return + } + return *v, true +} + +// OldNeedAgv returns the old "needAgv" 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) OldNeedAgv(ctx context.Context) (v bool, err error) { + if !m.op.Is(OpUpdateOne) { + return v, errors.New("OldNeedAgv is only allowed on UpdateOne operations") + } + if m.id == nil || m.oldValue == nil { + return v, errors.New("OldNeedAgv requires an ID field in the mutation") + } + oldValue, err := m.oldValue(ctx) + if err != nil { + return v, fmt.Errorf("querying old value for OldNeedAgv: %w", err) + } + return oldValue.NeedAgv, nil +} + +// ResetNeedAgv resets all changes to the "needAgv" field. +func (m *MaterialRequestMutation) ResetNeedAgv() { + m.needAgv = nil +} + // SetBatchNo sets the "batchNo" field. func (m *MaterialRequestMutation) SetBatchNo(s string) { m.batchNo = &s @@ -10844,7 +11560,7 @@ func (m *MaterialRequestMutation) Type() string { // order to get all numeric fields that were incremented/decremented, call // AddedFields(). func (m *MaterialRequestMutation) Fields() []string { - fields := make([]string, 0, 17) + fields := make([]string, 0, 25) if m.requestNo != nil { fields = append(fields, materialrequest.FieldRequestNo) } @@ -10884,6 +11600,30 @@ func (m *MaterialRequestMutation) Fields() []string { if m.sentQty != nil { fields = append(fields, materialrequest.FieldSentQty) } + if m.receivedQty != nil { + fields = append(fields, materialrequest.FieldReceivedQty) + } + if m.receivedAt != nil { + fields = append(fields, materialrequest.FieldReceivedAt) + } + if m.receiveBy != nil { + fields = append(fields, materialrequest.FieldReceiveBy) + } + if m.source != nil { + fields = append(fields, materialrequest.FieldSource) + } + if m.overQty != nil { + fields = append(fields, materialrequest.FieldOverQty) + } + if m.overReason != nil { + fields = append(fields, materialrequest.FieldOverReason) + } + if m.refReportNo != nil { + fields = append(fields, materialrequest.FieldRefReportNo) + } + if m.needAgv != nil { + fields = append(fields, materialrequest.FieldNeedAgv) + } if m.batchNo != nil { fields = append(fields, materialrequest.FieldBatchNo) } @@ -10930,6 +11670,22 @@ func (m *MaterialRequestMutation) Field(name string) (ent.Value, bool) { return m.ProcessCode() case materialrequest.FieldSentQty: return m.SentQty() + case materialrequest.FieldReceivedQty: + return m.ReceivedQty() + case materialrequest.FieldReceivedAt: + return m.ReceivedAt() + case materialrequest.FieldReceiveBy: + return m.ReceiveBy() + case materialrequest.FieldSource: + return m.Source() + case materialrequest.FieldOverQty: + return m.OverQty() + case materialrequest.FieldOverReason: + return m.OverReason() + case materialrequest.FieldRefReportNo: + return m.RefReportNo() + case materialrequest.FieldNeedAgv: + return m.NeedAgv() case materialrequest.FieldBatchNo: return m.BatchNo() case materialrequest.FieldOperator: @@ -10973,6 +11729,22 @@ func (m *MaterialRequestMutation) OldField(ctx context.Context, name string) (en return m.OldProcessCode(ctx) case materialrequest.FieldSentQty: return m.OldSentQty(ctx) + case materialrequest.FieldReceivedQty: + return m.OldReceivedQty(ctx) + case materialrequest.FieldReceivedAt: + return m.OldReceivedAt(ctx) + case materialrequest.FieldReceiveBy: + return m.OldReceiveBy(ctx) + case materialrequest.FieldSource: + return m.OldSource(ctx) + case materialrequest.FieldOverQty: + return m.OldOverQty(ctx) + case materialrequest.FieldOverReason: + return m.OldOverReason(ctx) + case materialrequest.FieldRefReportNo: + return m.OldRefReportNo(ctx) + case materialrequest.FieldNeedAgv: + return m.OldNeedAgv(ctx) case materialrequest.FieldBatchNo: return m.OldBatchNo(ctx) case materialrequest.FieldOperator: @@ -11081,6 +11853,62 @@ func (m *MaterialRequestMutation) SetField(name string, value ent.Value) error { } m.SetSentQty(v) return nil + case materialrequest.FieldReceivedQty: + v, ok := value.(float64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetReceivedQty(v) + return nil + case materialrequest.FieldReceivedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetReceivedAt(v) + return nil + case materialrequest.FieldReceiveBy: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetReceiveBy(v) + return nil + case materialrequest.FieldSource: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetSource(v) + return nil + case materialrequest.FieldOverQty: + v, ok := value.(float64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetOverQty(v) + return nil + case materialrequest.FieldOverReason: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetOverReason(v) + return nil + case materialrequest.FieldRefReportNo: + v, ok := value.(string) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetRefReportNo(v) + return nil + case materialrequest.FieldNeedAgv: + v, ok := value.(bool) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.SetNeedAgv(v) + return nil case materialrequest.FieldBatchNo: v, ok := value.(string) if !ok { @@ -11129,6 +11957,15 @@ func (m *MaterialRequestMutation) AddedFields() []string { if m.addsentQty != nil { fields = append(fields, materialrequest.FieldSentQty) } + if m.addreceivedQty != nil { + fields = append(fields, materialrequest.FieldReceivedQty) + } + if m.addreceivedAt != nil { + fields = append(fields, materialrequest.FieldReceivedAt) + } + if m.addoverQty != nil { + fields = append(fields, materialrequest.FieldOverQty) + } return fields } @@ -11145,6 +11982,12 @@ func (m *MaterialRequestMutation) AddedField(name string) (ent.Value, bool) { return m.AddedProcessCode() case materialrequest.FieldSentQty: return m.AddedSentQty() + case materialrequest.FieldReceivedQty: + return m.AddedReceivedQty() + case materialrequest.FieldReceivedAt: + return m.AddedReceivedAt() + case materialrequest.FieldOverQty: + return m.AddedOverQty() } return nil, false } @@ -11182,6 +12025,27 @@ func (m *MaterialRequestMutation) AddField(name string, value ent.Value) error { } m.AddSentQty(v) return nil + case materialrequest.FieldReceivedQty: + v, ok := value.(float64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddReceivedQty(v) + return nil + case materialrequest.FieldReceivedAt: + v, ok := value.(int64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddReceivedAt(v) + return nil + case materialrequest.FieldOverQty: + v, ok := value.(float64) + if !ok { + return fmt.Errorf("unexpected type %T for field %s", value, name) + } + m.AddOverQty(v) + return nil } return fmt.Errorf("unknown MaterialRequest numeric field %s", name) } @@ -11257,6 +12121,30 @@ func (m *MaterialRequestMutation) ResetField(name string) error { case materialrequest.FieldSentQty: m.ResetSentQty() return nil + case materialrequest.FieldReceivedQty: + m.ResetReceivedQty() + return nil + case materialrequest.FieldReceivedAt: + m.ResetReceivedAt() + return nil + case materialrequest.FieldReceiveBy: + m.ResetReceiveBy() + return nil + case materialrequest.FieldSource: + m.ResetSource() + return nil + case materialrequest.FieldOverQty: + m.ResetOverQty() + return nil + case materialrequest.FieldOverReason: + m.ResetOverReason() + return nil + case materialrequest.FieldRefReportNo: + m.ResetRefReportNo() + return nil + case materialrequest.FieldNeedAgv: + m.ResetNeedAgv() + return nil case materialrequest.FieldBatchNo: m.ResetBatchNo() return nil diff --git a/bj_power_mes/ent/runtime.go b/bj_power_mes/ent/runtime.go index 5c80c8d..29d4c20 100644 --- a/bj_power_mes/ent/runtime.go +++ b/bj_power_mes/ent/runtime.go @@ -75,20 +75,26 @@ func init() { alert.DefaultRefId = alertDescRefId.Default.(string) // alert.RefIdValidator is a validator for the "refId" field. It is called by the builders before save. alert.RefIdValidator = alertDescRefId.Validators[0].(func(string) error) + // alertDescOrderNo is the schema descriptor for orderNo field. + alertDescOrderNo := alertFields[7].Descriptor() + // alert.DefaultOrderNo holds the default value on creation for the orderNo field. + alert.DefaultOrderNo = alertDescOrderNo.Default.(string) + // alert.OrderNoValidator is a validator for the "orderNo" field. It is called by the builders before save. + alert.OrderNoValidator = alertDescOrderNo.Validators[0].(func(string) error) // alertDescStatus is the schema descriptor for status field. - alertDescStatus := alertFields[7].Descriptor() + alertDescStatus := alertFields[8].Descriptor() // alert.DefaultStatus holds the default value on creation for the status field. alert.DefaultStatus = alertDescStatus.Default.(string) // alert.StatusValidator is a validator for the "status" field. It is called by the builders before save. alert.StatusValidator = alertDescStatus.Validators[0].(func(string) error) // alertDescReceiver is the schema descriptor for receiver field. - alertDescReceiver := alertFields[8].Descriptor() + alertDescReceiver := alertFields[9].Descriptor() // alert.DefaultReceiver holds the default value on creation for the receiver field. alert.DefaultReceiver = alertDescReceiver.Default.(string) // alert.ReceiverValidator is a validator for the "receiver" field. It is called by the builders before save. alert.ReceiverValidator = alertDescReceiver.Validators[0].(func(string) error) // alertDescCreatedAt is the schema descriptor for createdAt field. - alertDescCreatedAt := alertFields[9].Descriptor() + alertDescCreatedAt := alertFields[10].Descriptor() // alert.DefaultCreatedAt holds the default value on creation for the createdAt field. alert.DefaultCreatedAt = alertDescCreatedAt.Default.(func() time.Time) // alertDescID is the schema descriptor for id field. @@ -639,14 +645,42 @@ func init() { materialqtyreport.DefaultStatus = materialqtyreportDescStatus.Default.(string) // materialqtyreport.StatusValidator is a validator for the "status" field. It is called by the builders before save. materialqtyreport.StatusValidator = materialqtyreportDescStatus.Validators[0].(func(string) error) + // materialqtyreportDescHandleType is the schema descriptor for handleType field. + materialqtyreportDescHandleType := materialqtyreportFields[11].Descriptor() + // materialqtyreport.DefaultHandleType holds the default value on creation for the handleType field. + materialqtyreport.DefaultHandleType = materialqtyreportDescHandleType.Default.(string) + // materialqtyreport.HandleTypeValidator is a validator for the "handleType" field. It is called by the builders before save. + materialqtyreport.HandleTypeValidator = materialqtyreportDescHandleType.Validators[0].(func(string) error) + // materialqtyreportDescHandleDocNo is the schema descriptor for handleDocNo field. + materialqtyreportDescHandleDocNo := materialqtyreportFields[12].Descriptor() + // materialqtyreport.DefaultHandleDocNo holds the default value on creation for the handleDocNo field. + materialqtyreport.DefaultHandleDocNo = materialqtyreportDescHandleDocNo.Default.(string) + // materialqtyreport.HandleDocNoValidator is a validator for the "handleDocNo" field. It is called by the builders before save. + materialqtyreport.HandleDocNoValidator = materialqtyreportDescHandleDocNo.Validators[0].(func(string) error) + // materialqtyreportDescHandleNote is the schema descriptor for handleNote field. + materialqtyreportDescHandleNote := materialqtyreportFields[13].Descriptor() + // materialqtyreport.DefaultHandleNote holds the default value on creation for the handleNote field. + materialqtyreport.DefaultHandleNote = materialqtyreportDescHandleNote.Default.(string) + // materialqtyreport.HandleNoteValidator is a validator for the "handleNote" field. It is called by the builders before save. + materialqtyreport.HandleNoteValidator = materialqtyreportDescHandleNote.Validators[0].(func(string) error) + // materialqtyreportDescHandledBy is the schema descriptor for handledBy field. + materialqtyreportDescHandledBy := materialqtyreportFields[14].Descriptor() + // materialqtyreport.DefaultHandledBy holds the default value on creation for the handledBy field. + materialqtyreport.DefaultHandledBy = materialqtyreportDescHandledBy.Default.(string) + // materialqtyreport.HandledByValidator is a validator for the "handledBy" field. It is called by the builders before save. + materialqtyreport.HandledByValidator = materialqtyreportDescHandledBy.Validators[0].(func(string) error) + // materialqtyreportDescHandledAt is the schema descriptor for handledAt field. + materialqtyreportDescHandledAt := materialqtyreportFields[15].Descriptor() + // materialqtyreport.DefaultHandledAt holds the default value on creation for the handledAt field. + materialqtyreport.DefaultHandledAt = materialqtyreportDescHandledAt.Default.(int64) // materialqtyreportDescOperator is the schema descriptor for operator field. - materialqtyreportDescOperator := materialqtyreportFields[11].Descriptor() + materialqtyreportDescOperator := materialqtyreportFields[16].Descriptor() // materialqtyreport.DefaultOperator holds the default value on creation for the operator field. materialqtyreport.DefaultOperator = materialqtyreportDescOperator.Default.(string) // materialqtyreport.OperatorValidator is a validator for the "operator" field. It is called by the builders before save. materialqtyreport.OperatorValidator = materialqtyreportDescOperator.Validators[0].(func(string) error) // materialqtyreportDescCreatedAt is the schema descriptor for createdAt field. - materialqtyreportDescCreatedAt := materialqtyreportFields[12].Descriptor() + materialqtyreportDescCreatedAt := materialqtyreportFields[17].Descriptor() // materialqtyreport.DefaultCreatedAt holds the default value on creation for the createdAt field. materialqtyreport.DefaultCreatedAt = materialqtyreportDescCreatedAt.Default.(func() time.Time) // materialqtyreportDescID is the schema descriptor for id field. @@ -717,24 +751,64 @@ func init() { materialrequestDescSentQty := materialrequestFields[13].Descriptor() // materialrequest.DefaultSentQty holds the default value on creation for the sentQty field. materialrequest.DefaultSentQty = materialrequestDescSentQty.Default.(float64) + // materialrequestDescReceivedQty is the schema descriptor for receivedQty field. + materialrequestDescReceivedQty := materialrequestFields[14].Descriptor() + // materialrequest.DefaultReceivedQty holds the default value on creation for the receivedQty field. + materialrequest.DefaultReceivedQty = materialrequestDescReceivedQty.Default.(float64) + // materialrequestDescReceivedAt is the schema descriptor for receivedAt field. + materialrequestDescReceivedAt := materialrequestFields[15].Descriptor() + // materialrequest.DefaultReceivedAt holds the default value on creation for the receivedAt field. + materialrequest.DefaultReceivedAt = materialrequestDescReceivedAt.Default.(int64) + // materialrequestDescReceiveBy is the schema descriptor for receiveBy field. + materialrequestDescReceiveBy := materialrequestFields[16].Descriptor() + // materialrequest.DefaultReceiveBy holds the default value on creation for the receiveBy field. + materialrequest.DefaultReceiveBy = materialrequestDescReceiveBy.Default.(string) + // materialrequest.ReceiveByValidator is a validator for the "receiveBy" field. It is called by the builders before save. + materialrequest.ReceiveByValidator = materialrequestDescReceiveBy.Validators[0].(func(string) error) + // materialrequestDescSource is the schema descriptor for source field. + materialrequestDescSource := materialrequestFields[17].Descriptor() + // materialrequest.DefaultSource holds the default value on creation for the source field. + materialrequest.DefaultSource = materialrequestDescSource.Default.(string) + // materialrequest.SourceValidator is a validator for the "source" field. It is called by the builders before save. + materialrequest.SourceValidator = materialrequestDescSource.Validators[0].(func(string) error) + // materialrequestDescOverQty is the schema descriptor for overQty field. + materialrequestDescOverQty := materialrequestFields[18].Descriptor() + // materialrequest.DefaultOverQty holds the default value on creation for the overQty field. + materialrequest.DefaultOverQty = materialrequestDescOverQty.Default.(float64) + // materialrequestDescOverReason is the schema descriptor for overReason field. + materialrequestDescOverReason := materialrequestFields[19].Descriptor() + // materialrequest.DefaultOverReason holds the default value on creation for the overReason field. + materialrequest.DefaultOverReason = materialrequestDescOverReason.Default.(string) + // materialrequest.OverReasonValidator is a validator for the "overReason" field. It is called by the builders before save. + materialrequest.OverReasonValidator = materialrequestDescOverReason.Validators[0].(func(string) error) + // materialrequestDescRefReportNo is the schema descriptor for refReportNo field. + materialrequestDescRefReportNo := materialrequestFields[20].Descriptor() + // materialrequest.DefaultRefReportNo holds the default value on creation for the refReportNo field. + materialrequest.DefaultRefReportNo = materialrequestDescRefReportNo.Default.(string) + // materialrequest.RefReportNoValidator is a validator for the "refReportNo" field. It is called by the builders before save. + materialrequest.RefReportNoValidator = materialrequestDescRefReportNo.Validators[0].(func(string) error) + // materialrequestDescNeedAgv is the schema descriptor for needAgv field. + materialrequestDescNeedAgv := materialrequestFields[21].Descriptor() + // materialrequest.DefaultNeedAgv holds the default value on creation for the needAgv field. + materialrequest.DefaultNeedAgv = materialrequestDescNeedAgv.Default.(bool) // materialrequestDescBatchNo is the schema descriptor for batchNo field. - materialrequestDescBatchNo := materialrequestFields[14].Descriptor() + materialrequestDescBatchNo := materialrequestFields[22].Descriptor() // materialrequest.DefaultBatchNo holds the default value on creation for the batchNo field. materialrequest.DefaultBatchNo = materialrequestDescBatchNo.Default.(string) // materialrequest.BatchNoValidator is a validator for the "batchNo" field. It is called by the builders before save. materialrequest.BatchNoValidator = materialrequestDescBatchNo.Validators[0].(func(string) error) // materialrequestDescOperator is the schema descriptor for operator field. - materialrequestDescOperator := materialrequestFields[15].Descriptor() + materialrequestDescOperator := materialrequestFields[23].Descriptor() // materialrequest.DefaultOperator holds the default value on creation for the operator field. materialrequest.DefaultOperator = materialrequestDescOperator.Default.(string) // materialrequest.OperatorValidator is a validator for the "operator" field. It is called by the builders before save. materialrequest.OperatorValidator = materialrequestDescOperator.Validators[0].(func(string) error) // materialrequestDescCreatedAt is the schema descriptor for createdAt field. - materialrequestDescCreatedAt := materialrequestFields[16].Descriptor() + materialrequestDescCreatedAt := materialrequestFields[24].Descriptor() // materialrequest.DefaultCreatedAt holds the default value on creation for the createdAt field. materialrequest.DefaultCreatedAt = materialrequestDescCreatedAt.Default.(func() time.Time) // materialrequestDescUpdatedAt is the schema descriptor for updatedAt field. - materialrequestDescUpdatedAt := materialrequestFields[17].Descriptor() + materialrequestDescUpdatedAt := materialrequestFields[25].Descriptor() // materialrequest.DefaultUpdatedAt holds the default value on creation for the updatedAt field. materialrequest.DefaultUpdatedAt = materialrequestDescUpdatedAt.Default.(func() time.Time) // materialrequest.UpdateDefaultUpdatedAt holds the default value on update for the updatedAt field. diff --git a/bj_power_mes/frontend/src/help.js b/bj_power_mes/frontend/src/help.js index 07cf799..5299a5e 100644 --- a/bj_power_mes/frontend/src/help.js +++ b/bj_power_mes/frontend/src/help.js @@ -102,7 +102,7 @@ export const helpBom = { export const helpMaterial = { title: '备料单（按日排产自动算料）', overview: - '备料单 = 仓库备料的依据：某天要生产的所有工单，各需要哪些物料、各要多少。\n\n操作方式：① 先到「日排产」排好某天的计划数量；② 回到本页选该「日期」；③ 点「按日排产生成备料」，系统按各产品物料清单自动计算（计划数量 × 单台用量 × (1+损耗率)）并生成备料单明细；④ 仓库据此备料出库，由 AGV 配送到各工位。\n\n数据链路：日排产 → 本页按日期自动算料生成备料单 → 仓库出库 → AGV 配送。', + '备料单 = 仓库备料的依据：某天要生产的所有工单，各需要哪些物料、各要多少。\n\n操作方式：① 先到「日排产」排好某天的计划数量；② 回到本页选该「日期」；③ 点「按日排产生成备料」，系统按各产品物料清单自动计算（计划数量 × 单台用量 × (1+损耗率)）并生成备料单明细；④ 生成的同时系统按 FIFO 从 WMS 合格库存自动出库（平时无需人工领料），出库达标的备料单转为「已备料」，由 AGV 配送到各工位。\n\n库存不足怎么办：已出的部分照常记账，差额保持「待备料」并触发「备料未齐套」预警；补货后点「一键自动出库」即可补出（不会超领，重复执行安全）。\n\n超领规则：实际用量超出物料清单需求（损耗/报废/返修）时，系统不硬卡——WMS 出库时填写超领原因即放行并留痕，可统计、可预警；不填原因仍会被拦截。\n\n来源说明：「排产备料」= 按日排产自动生成；「工位补料」= 工位叫料/数量不符补发生成，仓库应优先发补料单。\n\n数据链路：日排产 → 本页按日期自动算料生成备料单 → 自动出库（WMS 扣账）→ AGV 配送 → 工位接料。', sections: [ { title: '生成备料', @@ -111,11 +111,50 @@ export const helpMaterial = { { name: '日期', source: '手动选择。', purpose: '按哪个排产日期生成备料', fill: '先选择排产日期，再点「按日排产生成备料」' } ] }, + { + title: '自动出库', + overview: '生成备料单时自动执行；也可在库存补齐后按排产日/工单一键补出。规则：结构件按批次号升序（FIFO）逐批出库，电气件按可用 SN 逐件出库，仅取 WMS「合格」在库库存；超出物料清单需求的领用必须填写超领原因（损耗/报废/返修），自动出库不擅自超领，超领部分会留在「未出齐」清单里等人工处理。', + fields: [ + { name: '一键自动出库', source: '人工在本页操作（生成时已自动执行一次）。', purpose: '把当前排产日/工单下未出齐的备料单补齐', fill: '选好日期或工单号后点「一键自动出库」，结果会列出仍未出齐的明细' } + ] + }, + { + title: '物料去向对账', + overview: + '点「物料去向对账」查看工单物料的完整去向（只读汇总，不新增账本）：需求总量、已发出（仓库已出库）、已退回、已消耗（报工核销）、在途（已发出−已接料）、工位余（已接料−已消耗−已退回）、待发缺口。可展开行看接料明细（每张备料单的实收与确认人），并可导出 CSV。\n\n对账状态只标三类硬异常，其余一律「正常」：① 超领 = 净领用（已发出−已退回）超过需求，超领原因在 WMS「出库管理」留痕可查；② 完结剩料 = 台账已领料完结但工位仍压料（没耗也没退），请催报工或发起退料；③ 在途等待 = 已发出未接料（含已送达未扫码），请看 WMS 出库单是否已送达或催工位扫码。生产中的待发缺口属正常状态，不标色。\n\n消耗明细与出库明细不跨系统重复展示：消耗按工序合计的留痕在 WMS 操作日志按工单号查询；出库明细与超领原因在 WMS「出库管理」按工单号查询。', + fields: [ + { name: '物料去向对账', source: 'WMS 台账 + 本系统已接料量实时合成，前端现算异常。', purpose: '一眼看清料到哪一步了、账对不对', fill: '按当前筛选条件查询，弹窗展示；行可展开看接料明细，右下角可导出 CSV' } + ] + }, { title: '查询字段', fields: [ { name: '工单号', source: '手动输入。筛选条件。', purpose: '只查看指定工单的备料', fill: '可空，空=看全部工单' }, - { name: '状态', source: '下拉。待备料/已确认。', purpose: '按备料进度筛选', fill: '可空' } + { name: '来源', source: '系统标记。排产备料=日排产自动生成；工位补料=工位叫料/差异补发。', purpose: '区分正常备料与补料，补料优先发', fill: '可空=全部' }, + { name: '状态', source: '下拉。待备料 / 已备料(已出库) / 配送中 / 已接料完结。', purpose: '按备料进度筛选', fill: '可空' } + ] + } + ] +} + +export const helpQtyReport = { + title: '数量不符处理（差异闭环）', + overview: + '工位接料时发现「实收 ≠ 应发」，操作工在工位终端上报后，差异记录进入本页等待处理——这是差异闭环的唯一处理入口。\n\n处理方式三选一：\n· 补发：系统生成一张「工位补料」备料单（来源=工位补料），走既有自动出库链路补齐差额，补发量计入工单消耗；\n· 退库：系统生成 WMS 退库单（多发/错发的料退回仓库），仓库确认收货后库存加回、台账缺口自动回补；\n· 调整：双方确认差异、填写说明后直接关闭（不补不退）。\n\n处理完成后差异置为已处理并记录处理单据号，关联预警可在「预警中心」看到同一件事的提醒。补发/退库的单据流转状态请到「备料单」或 WMS「退库单」页查看。', + sections: [ + { + title: '查询字段', + fields: [ + { name: '状态', source: '系统维护。待处理/已处理。', purpose: '只看待处理的差异', fill: '默认待处理' }, + { name: '工位 / 工单号 / 图号', source: '工位终端上报时写入。', purpose: '定位差异来源', fill: '可空=全部，不区分大小写' } + ] + }, + { + title: '处理操作', + fields: [ + { name: '补发', source: '人工在本页操作。', purpose: '少发时补齐差额（生成工位补料单）', fill: '点「补发」→ 确认' }, + { name: '退库', source: '人工在本页操作。', purpose: '多发/错发时退回仓库（生成退库单）', fill: '点「退库」→ 确认' }, + { name: '调整', source: '人工在本页操作（需填处理说明）。', purpose: '少量差异双方确认后关闭', fill: '点「调整」→ 填说明 → 确认' } ] } ] @@ -203,7 +242,8 @@ export const helpTrace = { overview: '输入工件 SN，查它的完整履历：进线/完工时间、各工位时间线、步骤考核数据(扭矩/角度)、拧紧记录、以及它用了哪些批次/电气件。\n\n数据来源：全部由前端各环节自动写入(扫码报工、拧紧采集、产线设备下发、工位完成)，本页只读查询。', fields: [ - { name: '工件SN', source: '扫码枪/手输。来自工件条码。', purpose: '要追溯的工件唯一序列号', fill: '扫 SN 或手动输入后点查询' } + { name: '工件SN', source: '扫码枪/手输。来自工件条码。', purpose: '要追溯的工件唯一序列号', fill: '扫 SN 或手动输入后点查询' }, + { name: '工单号', source: '手动输入。筛选条件。', purpose: '按工单号列出该工单下全部工件，再点行内「追溯」查看单个工件履历', fill: '可空；支持模糊匹配，回车即查' } ] } @@ -310,6 +350,7 @@ export const helpPerformance = { fields: [ { name: '操作人', source: '筛选条件。来自报工实绩的 operator 字段(工位终端登录人)。', purpose: '只看某个工人的工作量', fill: '输入姓名/账号，可空=全部' }, { name: '工位', source: '下拉选择(工位数以数据库为准)。', purpose: '只看某个工位的报工情况', fill: '可空=全部工位' }, + { name: '工单号', source: '手动输入。筛选条件，取自报工实绩所属工单。', purpose: '只看某个工单的作业量与效率', fill: '可空=全部工单；支持模糊匹配，导出同样生效' }, { name: '日期范围', source: '筛选条件。来自报工实绩的产生时间，默认近 90 天。', purpose: '按时间段统计', fill: '选择起止日期；导出时同一范围' }, { name: '完成数', source: '自动汇总。该 操作人×日期×工位 的报工次数。', purpose: '工作量核心指标', fill: '只读' }, { name: '合格数/不合格数', source: '自动汇总。按报工实绩 result 字段(合格/不合格)分类计数。', purpose: '质量指标，OK+NG=完成数', fill: '只读' }, @@ -428,6 +469,7 @@ export const helpWip = { overview: '在制品 = 已进线但尚未完工的工件（状态 已上线/在制/返修），跨天继续停留在此列表中。\n\n数据来源：MES 工件实时状态（GET /workpieces/in-process）。当前工位支持 0=上线位(虚拟)、1~12=物理工位、13=下线位(虚拟)，工位数以数据库为准。\n\n与日排产的关系：已进线未完工的工件跨天继续，日排产仅排「未开工数量」，不会重复排产。停留时长自进线起算，便于发现滞留件。', fields: [ + { name: '工单号', source: '手动输入。筛选条件。', purpose: '只看某个工单的在制品', fill: '可空=全部；支持模糊匹配，回车即查' }, { name: '当前工位', source: '按工件状态与工位组合推算。', purpose: '工件此刻停在哪一工位', fill: '只读，可筛选' }, { name: '状态', source: '系统维护。', purpose: '已上线/在制/返修', fill: '只读，可筛选' }, { name: '进度', source: '已完成工序数 / 工位组合总工序数。', purpose: '看该件走到第几步', fill: '只读' }, @@ -442,6 +484,7 @@ export const helpAlertCenter = { fields: [ { name: '状态', source: '系统维护（未读/已读）。', purpose: '区分待处理与已处理预警', fill: '筛选项单选：全部/未读/已读' }, { name: '预警类型', source: '内置触发源自动写入。', purpose: '只关注某一类异常', fill: '下拉选择八类之一，留空=全部' }, + { name: '工单号', source: '触发预警时自动关联（如拧紧不合格按其 SN 反查所属工单）。', purpose: '按工单号排查该工单相关的所有预警', fill: '可空=全部；支持模糊匹配' }, { name: '开始时间 / 结束时间', source: '系统记录触发时刻。', purpose: '按时间范围缩小排查范围', fill: '开始时间默认当天；结束时间留空=不限' }, { name: '类型', source: '内置触发源自动写入。', purpose: '区分八类预警（含应急呼叫）', fill: '只读' }, { name: '标题 / 内容', source: '触发时系统自动生成。', purpose: '说明预警的具体对象与原因', fill: '只读' }, @@ -466,7 +509,7 @@ export const helpAttachment = { { name: '大小', source: '系统统计上传达字节数。', purpose: '评估占用空间', fill: '只读' }, { name: '状态', source: '系统维护（有效/已归档/已删除）。', purpose: '区分当前可用的与已归档/已删除的附件', fill: '只读' }, { name: '预览 / 下载', source: '预览走免鉴权直链（PDF/图片浏览器内联打开）；下载走鉴权路由并带回中文文件名。', purpose: '查看或另存附件', fill: '点击对应按钮' }, - { name: '删除', source: '人工在本页操作（逻辑删除，需二次确认）。', purpose: '移除无效附件（保留可追溯索引）', fill: '点「删除」并确认' }, - { name: '归档清理', source: '人工在本页操作（先预览数量再确认执行）。', purpose: '把早于本地保留年数的附件移到外部备份目录并标记已归档，释放磁盘', fill: '点「归档清理」→确认' } + { name: '删除', source: '行末按钮（权限 sys.attachment:manage，需二次确认）。', purpose: '逻辑删除无效附件（保留可追溯索引）', fill: '点「删除」并确认；无权限时该按钮不显示' }, + { name: '归档清理', source: '按钮（权限 sys.attachment:manage；先预览数量再确认执行）。', purpose: '把早于本地保留年数的附件移到外部备份目录并标记已归档，释放磁盘', fill: '点「归档清理」→确认；无权限时该按钮不显示' } ] } diff --git a/bj_power_mes/frontend/src/layouts/MainLayout.vue b/bj_power_mes/frontend/src/layouts/MainLayout.vue index a11ec6d..574c728 100644 --- a/bj_power_mes/frontend/src/layouts/MainLayout.vue +++ b/bj_power_mes/frontend/src/layouts/MainLayout.vue @@ -132,6 +132,7 @@ const menuGroups = [ { code: 'produce.dailyplan', name: '日排产', path: '/daily-plan', icon: Calendar }, { code: 'produce.bom', name: '产品物料清单', path: '/bom', icon: Goods }, { code: 'produce.material', name: '备料单', path: '/material-request', icon: ShoppingCart }, + { code: 'produce.qty', name: '数量不符处理', path: '/qty-report', icon: Warning }, { code: 'produce.performance', name: '绩效报表', path: '/performance', icon: DataLine }, { code: 'produce.quality', name: '质量检验', path: '/quality', icon: CircleCheck } ] diff --git a/bj_power_mes/frontend/src/pages/AlertCenter.vue b/bj_power_mes/frontend/src/pages/AlertCenter.vue index 2369f4b..0129f31 100644 --- a/bj_power_mes/frontend/src/pages/AlertCenter.vue +++ b/bj_power_mes/frontend/src/pages/AlertCenter.vue @@ -14,6 +14,9 @@ + + + @@ -39,6 +42,9 @@ + + + @@ -70,6 +76,7 @@ const loading = ref(false) const unread = ref(0) const statusFilter = ref('all') const typeFilter = ref('') +const orderNo = ref('') const startDate = ref(todayStr()) // 开始时间默认当天 const endDate = ref('') // 结束时间默认空 @@ -108,6 +115,7 @@ async function loadAlerts() { const params = { status: statusFilter.value === 'all' ? '' : statusFilter.value, type: typeFilter.value, + orderNo: orderNo.value.trim(), from: startDate.value, to: endDate.value, page: page.value, @@ -129,6 +137,7 @@ function search() { function reset() { statusFilter.value = 'all' typeFilter.value = '' + orderNo.value = '' startDate.value = todayStr() endDate.value = '' page.value = 1 diff --git a/bj_power_mes/frontend/src/pages/Attachment.vue b/bj_power_mes/frontend/src/pages/Attachment.vue index b1f4f61..1a58535 100644 --- a/bj_power_mes/frontend/src/pages/Attachment.vue +++ b/bj_power_mes/frontend/src/pages/Attachment.vue @@ -8,8 +8,8 @@ @@ -42,7 +42,8 @@ 查询 重置 - 归档清理 + 归档清理 @@ -84,7 +85,8 @@ @@ -103,6 +105,7 @@ import { computed, onMounted, reactive, ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import request from '../utils/request' import { getToken } from '../utils/auth' +import { can } from '../utils/perm' import { fmtTime } from '../utils/format' import PageHelp from '../components/PageHelp.vue' import { helpAttachment } from '../help' diff --git a/bj_power_mes/frontend/src/pages/MaterialRequest.vue b/bj_power_mes/frontend/src/pages/MaterialRequest.vue index 45be478..c2bd253 100644 --- a/bj_power_mes/frontend/src/pages/MaterialRequest.vue +++ b/bj_power_mes/frontend/src/pages/MaterialRequest.vue @@ -12,10 +12,16 @@ + + + + + + - + @@ -23,6 +29,8 @@ 查询 按日排产生成备料 + 一键自动出库 + 物料去向对账 @@ -30,6 +38,12 @@ + + + @@ -41,9 +55,12 @@ - + + + + @@ -71,22 +161,102 @@ import { can } from '../utils/perm' import PageHelp from '../components/PageHelp.vue' import { helpMaterial } from '../help' -const query = reactive({ planDate: '', orderNo: '', status: '', materialCode: '', materialName: '', targetDock: '', stationNo: '' }) +const query = reactive({ planDate: '', orderNo: '', status: '', materialCode: '', materialName: '', targetDock: '', stationNo: '', source: '' }) const list = ref([]) const receiving = ref(false) const receivingNo = ref('') +const autoing = ref(false) +const progressing = ref(false) +const progressVisible = ref(false) +const progressRows = ref([]) -const statusText = (s) => (s === 'PENDING' ? '待备料' : s === 'LOCKED' ? '已锁定' : s === 'DELIVERING' ? '配送中' : s === 'DONE' ? '已接料完结' : s) +const statusText = (s) => (s === 'PENDING' ? '待备料' : s === 'LOCKED' ? '已备料(已出库)' : s === 'DELIVERING' ? '配送中' : s === 'DONE' ? '已接料完结' : s) function fmtQty(v) { const n = Number(v || 0) return Number.isInteger(n) ? String(n) : n.toFixed(2) } +// 进度按「已接料」计算：接料才是工位真正拿到料的节点（已发出只代表仓库发了） function progressPct(row) { const req = Number(row.reqQty || 0) - const sent = Number(row.sentQty || 0) + const got = Number(row.receivedQty || 0) if (req <= 0) return 0 - return Math.min(100, Math.round((sent / req) * 100)) + return Math.min(100, Math.round((got / req) * 100)) +} + +// ============ 物料去向对账（只读，后端 progress 接口 + 前端现算，不新增账本） ============ +// 口径：净领用 netOut = 已发出 − 已退回；在途 = 已发出 − 已接料；工位余 = 已接料 − 已消耗 − 已退回。 +// 异常判定只标三类硬异常（生产中的待发缺口属正常状态，不标色）： +// 超领：净领用 > 需求（超领原因在 WMS 出库单留痕，可查） +// 完结剩料：台账「领料完结」但工位仍压料（没耗也没退） +// 在途等待：已发出未接料（含已送达未扫码；是否已送达需 WMS 出库单状态，本页不跨系统拉取） +const expandMap = reactive({}) + +function lineSideOf(row) { + return Number(row.receivedQty || 0) - Number(row.consumedQty || 0) - Number(row.returnedQty || 0) +} +function anomalyOf(row) { + const netOut = Number(row.netOut ?? (Number(row.outQty || 0) - Number(row.returnedQty || 0))) + if (netOut > Number(row.totalQty || 0)) return { key: 'over', label: '超领', type: 'danger' } + if (row.status === '领料完结' && lineSideOf(row) > 0) return { key: 'left', label: '完结剩料', type: 'warning' } + if (Number(row.inTransit || 0) > 0) return { key: 'transit', label: '在途等待', type: 'warning' } + return { key: 'ok', label: '正常', type: 'success' } +} +function anomalyTip(row) { + const a = anomalyOf(row) + if (a.key === 'over') return '净领用超过工单需求：请到 WMS「出库管理」按工单号查超领原因与明细' + if (a.key === 'left') return '台账已领料完结，但工位仍压料未消耗也未退回：请催报工或发起退料' + if (a.key === 'transit') return '已发出尚未接料（含已送达未扫码）：请到 WMS「出库管理」看是否已送达，或催工位扫码接料' + return '在库 / 在途 / 线边 / 已消耗均在正常区间' +} + +// 展开行：懒加载该工单+图号的接料明细（备料单行即接料台账，含实收与确认人） +async function onExpandRow(row, expandedRows) { + const key = row.rowKey + if (!expandedRows.some((r) => r.rowKey === key) || expandMap[key]?.loaded) return + expandMap[key] = { loaded: false, receives: [] } + try { + const reqs = (await request.get('/material-requests', { params: { orderNo: row.orderNo } })) || [] + const receives = reqs.filter((r) => r.materialCode === row.materialCode) + expandMap[key] = { loaded: true, receives } + } catch { + expandMap[key] = { loaded: true, receives: [] } + } +} + +// 导出 CSV（带 BOM，Excel 直接打开中文不乱码；MES 前端无 xlsx 库，纯前端导出） +function exportLedgerCsv() { + const header = ['工单号', '图号', '物料名称', '目标工位', '需求', '已发出', '已退回', '已接料', '已消耗', '在途', '工位余', '待发缺口', '对账状态', '台账状态'] + const lines = [header.join(',')] + for (const r of progressRows.value) { + const cells = [ + r.orderNo, r.materialCode, r.materialName, r.targetStation, + r.totalQty, r.outQty, r.returnedQty, r.receivedQty, r.consumedQty, + r.inTransit, lineSideOf(r), r.gap, anomalyOf(r).label, r.status + ] + lines.push(cells.map((c) => '"' + String(c ?? '').replace(/"/g, '""') + '"').join(',')) + } + const blob = new Blob(['\ufeff' + lines.join('\r\n')], { type: 'text/csv;charset=utf-8' }) + const a = document.createElement('a') + a.href = URL.createObjectURL(blob) + a.download = '物料去向对账.csv' + a.click() + URL.revokeObjectURL(a.href) +} + +// 配送进度：WMS 台账（已发出/已退回/已消耗/缺口）+ 本系统已接料 → 在途/线边 +async function showProgress() { + progressing.value = true + try { + const data = await request.get('/material-requests/progress', { + params: { orderNo: query.orderNo, materialCode: query.materialCode, page: 1, pageSize: 100 } + }) + progressRows.value = (data?.list || []).map((r) => ({ ...r, rowKey: r.orderNo + '|' + r.materialCode })) + progressVisible.value = true + } catch { + // 拦截器已提示 + } + progressing.value = false } async function load() { @@ -129,8 +299,38 @@ async function generate() { ElMessage.success(`已生成 ${data?.count || 0} 条备料`) load() } +// 一键自动出库：按排产日（或指定工单）把未出齐的备料单从 WMS 合格库存 FIFO 自动领料。 +// 日常「按日排产生成备料」已自动执行本动作，此处用于库存补齐后的补出。 +async function autoOutbound() { + if (!query.planDate && !query.orderNo) return ElMessage.warning('请先选择排产日期或填写工单号') + try { + await ElMessageBox.confirm( + `将对 ${query.orderNo ? '工单 ' + query.orderNo : '排产日期 ' + query.planDate} 下未出齐的备料单，按 FIFO 从 WMS 合格库存自动领料出库。确认继续？`, + '一键自动出库', { type: 'warning' }) + } catch { + return + } + autoing.value = true + try { + const data = await request.post('/material-requests/auto-outbound', { + planDate: query.planDate, orderNo: query.orderNo + }) + const short = data?.short || [] + if (short.length) { + await ElMessageBox.alert( + `已出库达标 ${data?.done || 0} 条；以下仍未出齐（库存不足，等补货后可再次执行）：\n\n${short.join('\n')}`, + '自动出库结果', { type: 'warning', confirmButtonText: '知道了' }) + } else { + ElMessage.success(`自动出库完成：${data?.done || 0} 条已备料`) + } + load() + } catch { + // 拦截器已提示 + } + autoing.value = false +} + onMounted(() => { query.planDate = new Date().toISOString().slice(0, 10) load() -}) - +}) diff --git a/bj_power_mes/frontend/src/pages/Performance.vue b/bj_power_mes/frontend/src/pages/Performance.vue index ce36b36..f9a9944 100644 --- a/bj_power_mes/frontend/src/pages/Performance.vue +++ b/bj_power_mes/frontend/src/pages/Performance.vue @@ -9,6 +9,9 @@ + + + + + + + + +
{{ stats.pending }}
待处理
 + + +
{{ stats.replenished }}
已补发
 + + +
{{ stats.returned }}
已退库
 + + +
{{ stats.closed }}
已关闭
 + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bj_power_mes/frontend/src/pages/Trace.vue b/bj_power_mes/frontend/src/pages/Trace.vue index 00a7dae..4780585 100644 --- a/bj_power_mes/frontend/src/pages/Trace.vue +++ b/bj_power_mes/frontend/src/pages/Trace.vue @@ -4,12 +4,32 @@ + + + 追溯查询 + 按工单查询 打印流程卡 + + + + + + + + + + + + + +