feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程

新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
SunYF
2026-10-14 17:24:59 +08:00
parent 8e6048c64b
commit f65a52d9e1
170 changed files with 15415 additions and 10572 deletions
+116 -202
View File
@@ -26,18 +26,6 @@ func (_c *MaterialRequestCreate) SetRequestNo(v string) *MaterialRequestCreate {
return _c
}
// SetOrderNo sets the "orderNo" field.
func (_c *MaterialRequestCreate) SetOrderNo(v string) *MaterialRequestCreate {
_c.mutation.SetOrderNo(v)
return _c
}
// SetPlanDate sets the "planDate" field.
func (_c *MaterialRequestCreate) SetPlanDate(v string) *MaterialRequestCreate {
_c.mutation.SetPlanDate(v)
return _c
}
// SetMaterialCode sets the "materialCode" field.
func (_c *MaterialRequestCreate) SetMaterialCode(v string) *MaterialRequestCreate {
_c.mutation.SetMaterialCode(v)
@@ -142,20 +130,6 @@ func (_c *MaterialRequestCreate) SetNillableStationNo(v *int) *MaterialRequestCr
return _c
}
// SetFlowId sets the "flowId" field.
func (_c *MaterialRequestCreate) SetFlowId(v int) *MaterialRequestCreate {
_c.mutation.SetFlowId(v)
return _c
}
// SetNillableFlowId sets the "flowId" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableFlowId(v *int) *MaterialRequestCreate {
if v != nil {
_c.SetFlowId(*v)
}
return _c
}
// SetSentQty sets the "sentQty" field.
func (_c *MaterialRequestCreate) SetSentQty(v float64) *MaterialRequestCreate {
_c.mutation.SetSentQty(v)
@@ -170,44 +144,16 @@ 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)
// SetReturnedQty sets the "returnedQty" field.
func (_c *MaterialRequestCreate) SetReturnedQty(v float64) *MaterialRequestCreate {
_c.mutation.SetReturnedQty(v)
return _c
}
// SetNillableReceivedQty sets the "receivedQty" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableReceivedQty(v *float64) *MaterialRequestCreate {
// SetNillableReturnedQty sets the "returnedQty" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableReturnedQty(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)
_c.SetReturnedQty(*v)
}
return _c
}
@@ -226,34 +172,6 @@ func (_c *MaterialRequestCreate) SetNillableSource(v *string) *MaterialRequestCr
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)
@@ -282,16 +200,58 @@ func (_c *MaterialRequestCreate) SetNillableNeedAgv(v *bool) *MaterialRequestCre
return _c
}
// SetBatchNo sets the "batchNo" field.
func (_c *MaterialRequestCreate) SetBatchNo(v string) *MaterialRequestCreate {
_c.mutation.SetBatchNo(v)
// SetAgvTaskNo sets the "agvTaskNo" field.
func (_c *MaterialRequestCreate) SetAgvTaskNo(v string) *MaterialRequestCreate {
_c.mutation.SetAgvTaskNo(v)
return _c
}
// SetNillableBatchNo sets the "batchNo" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableBatchNo(v *string) *MaterialRequestCreate {
// SetNillableAgvTaskNo sets the "agvTaskNo" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableAgvTaskNo(v *string) *MaterialRequestCreate {
if v != nil {
_c.SetBatchNo(*v)
_c.SetAgvTaskNo(*v)
}
return _c
}
// SetCrossDay sets the "crossDay" field.
func (_c *MaterialRequestCreate) SetCrossDay(v bool) *MaterialRequestCreate {
_c.mutation.SetCrossDay(v)
return _c
}
// SetNillableCrossDay sets the "crossDay" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableCrossDay(v *bool) *MaterialRequestCreate {
if v != nil {
_c.SetCrossDay(*v)
}
return _c
}
// SetOutboundNo sets the "outboundNo" field.
func (_c *MaterialRequestCreate) SetOutboundNo(v string) *MaterialRequestCreate {
_c.mutation.SetOutboundNo(v)
return _c
}
// SetNillableOutboundNo sets the "outboundNo" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableOutboundNo(v *string) *MaterialRequestCreate {
if v != nil {
_c.SetOutboundNo(*v)
}
return _c
}
// SetRejectReason sets the "rejectReason" field.
func (_c *MaterialRequestCreate) SetRejectReason(v string) *MaterialRequestCreate {
_c.mutation.SetRejectReason(v)
return _c
}
// SetNillableRejectReason sets the "rejectReason" field if the given value is not nil.
func (_c *MaterialRequestCreate) SetNillableRejectReason(v *string) *MaterialRequestCreate {
if v != nil {
_c.SetRejectReason(*v)
}
return _c
}
@@ -407,38 +367,18 @@ func (_c *MaterialRequestCreate) defaults() {
v := materialrequest.DefaultStationNo
_c.mutation.SetStationNo(v)
}
if _, ok := _c.mutation.FlowId(); !ok {
v := materialrequest.DefaultFlowId
_c.mutation.SetFlowId(v)
}
if _, ok := _c.mutation.SentQty(); !ok {
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.ReturnedQty(); !ok {
v := materialrequest.DefaultReturnedQty
_c.mutation.SetReturnedQty(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)
@@ -447,9 +387,21 @@ func (_c *MaterialRequestCreate) defaults() {
v := materialrequest.DefaultNeedAgv
_c.mutation.SetNeedAgv(v)
}
if _, ok := _c.mutation.BatchNo(); !ok {
v := materialrequest.DefaultBatchNo
_c.mutation.SetBatchNo(v)
if _, ok := _c.mutation.AgvTaskNo(); !ok {
v := materialrequest.DefaultAgvTaskNo
_c.mutation.SetAgvTaskNo(v)
}
if _, ok := _c.mutation.CrossDay(); !ok {
v := materialrequest.DefaultCrossDay
_c.mutation.SetCrossDay(v)
}
if _, ok := _c.mutation.OutboundNo(); !ok {
v := materialrequest.DefaultOutboundNo
_c.mutation.SetOutboundNo(v)
}
if _, ok := _c.mutation.RejectReason(); !ok {
v := materialrequest.DefaultRejectReason
_c.mutation.SetRejectReason(v)
}
if _, ok := _c.mutation.Operator(); !ok {
v := materialrequest.DefaultOperator
@@ -475,22 +427,6 @@ func (_c *MaterialRequestCreate) check() error {
return &ValidationError{Name: "requestNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.requestNo": %w`, err)}
}
}
if _, ok := _c.mutation.OrderNo(); !ok {
return &ValidationError{Name: "orderNo", err: errors.New(`ent: missing required field "MaterialRequest.orderNo"`)}
}
if v, ok := _c.mutation.OrderNo(); ok {
if err := materialrequest.OrderNoValidator(v); err != nil {
return &ValidationError{Name: "orderNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.orderNo": %w`, err)}
}
}
if _, ok := _c.mutation.PlanDate(); !ok {
return &ValidationError{Name: "planDate", err: errors.New(`ent: missing required field "MaterialRequest.planDate"`)}
}
if v, ok := _c.mutation.PlanDate(); ok {
if err := materialrequest.PlanDateValidator(v); err != nil {
return &ValidationError{Name: "planDate", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.planDate": %w`, err)}
}
}
if _, ok := _c.mutation.MaterialCode(); !ok {
return &ValidationError{Name: "materialCode", err: errors.New(`ent: missing required field "MaterialRequest.materialCode"`)}
}
@@ -540,25 +476,11 @@ func (_c *MaterialRequestCreate) check() error {
if _, ok := _c.mutation.StationNo(); !ok {
return &ValidationError{Name: "stationNo", err: errors.New(`ent: missing required field "MaterialRequest.stationNo"`)}
}
if _, ok := _c.mutation.FlowId(); !ok {
return &ValidationError{Name: "flowId", err: errors.New(`ent: missing required field "MaterialRequest.flowId"`)}
}
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.ReturnedQty(); !ok {
return &ValidationError{Name: "returnedQty", err: errors.New(`ent: missing required field "MaterialRequest.returnedQty"`)}
}
if _, ok := _c.mutation.Source(); !ok {
return &ValidationError{Name: "source", err: errors.New(`ent: missing required field "MaterialRequest.source"`)}
@@ -568,17 +490,6 @@ func (_c *MaterialRequestCreate) check() error {
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"`)}
}
@@ -590,12 +501,31 @@ func (_c *MaterialRequestCreate) check() error {
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"`)}
if _, ok := _c.mutation.AgvTaskNo(); !ok {
return &ValidationError{Name: "agvTaskNo", err: errors.New(`ent: missing required field "MaterialRequest.agvTaskNo"`)}
}
if v, ok := _c.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)}
if v, ok := _c.mutation.AgvTaskNo(); ok {
if err := materialrequest.AgvTaskNoValidator(v); err != nil {
return &ValidationError{Name: "agvTaskNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.agvTaskNo": %w`, err)}
}
}
if _, ok := _c.mutation.CrossDay(); !ok {
return &ValidationError{Name: "crossDay", err: errors.New(`ent: missing required field "MaterialRequest.crossDay"`)}
}
if _, ok := _c.mutation.OutboundNo(); !ok {
return &ValidationError{Name: "outboundNo", err: errors.New(`ent: missing required field "MaterialRequest.outboundNo"`)}
}
if v, ok := _c.mutation.OutboundNo(); ok {
if err := materialrequest.OutboundNoValidator(v); err != nil {
return &ValidationError{Name: "outboundNo", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.outboundNo": %w`, err)}
}
}
if _, ok := _c.mutation.RejectReason(); !ok {
return &ValidationError{Name: "rejectReason", err: errors.New(`ent: missing required field "MaterialRequest.rejectReason"`)}
}
if v, ok := _c.mutation.RejectReason(); ok {
if err := materialrequest.RejectReasonValidator(v); err != nil {
return &ValidationError{Name: "rejectReason", err: fmt.Errorf(`ent: validator failed for field "MaterialRequest.rejectReason": %w`, err)}
}
}
if _, ok := _c.mutation.Operator(); !ok {
@@ -650,14 +580,6 @@ func (_c *MaterialRequestCreate) createSpec() (*MaterialRequest, *sqlgraph.Creat
_spec.SetField(materialrequest.FieldRequestNo, field.TypeString, value)
_node.RequestNo = value
}
if value, ok := _c.mutation.OrderNo(); ok {
_spec.SetField(materialrequest.FieldOrderNo, field.TypeString, value)
_node.OrderNo = value
}
if value, ok := _c.mutation.PlanDate(); ok {
_spec.SetField(materialrequest.FieldPlanDate, field.TypeString, value)
_node.PlanDate = value
}
if value, ok := _c.mutation.MaterialCode(); ok {
_spec.SetField(materialrequest.FieldMaterialCode, field.TypeString, value)
_node.MaterialCode = value
@@ -690,38 +612,18 @@ func (_c *MaterialRequestCreate) createSpec() (*MaterialRequest, *sqlgraph.Creat
_spec.SetField(materialrequest.FieldStationNo, field.TypeInt, value)
_node.StationNo = value
}
if value, ok := _c.mutation.FlowId(); ok {
_spec.SetField(materialrequest.FieldFlowId, field.TypeInt, value)
_node.FlowId = value
}
if value, ok := _c.mutation.SentQty(); ok {
_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.ReturnedQty(); ok {
_spec.SetField(materialrequest.FieldReturnedQty, field.TypeFloat64, value)
_node.ReturnedQty = 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
@@ -730,9 +632,21 @@ func (_c *MaterialRequestCreate) createSpec() (*MaterialRequest, *sqlgraph.Creat
_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
if value, ok := _c.mutation.AgvTaskNo(); ok {
_spec.SetField(materialrequest.FieldAgvTaskNo, field.TypeString, value)
_node.AgvTaskNo = value
}
if value, ok := _c.mutation.CrossDay(); ok {
_spec.SetField(materialrequest.FieldCrossDay, field.TypeBool, value)
_node.CrossDay = value
}
if value, ok := _c.mutation.OutboundNo(); ok {
_spec.SetField(materialrequest.FieldOutboundNo, field.TypeString, value)
_node.OutboundNo = value
}
if value, ok := _c.mutation.RejectReason(); ok {
_spec.SetField(materialrequest.FieldRejectReason, field.TypeString, value)
_node.RejectReason = value
}
if value, ok := _c.mutation.Operator(); ok {
_spec.SetField(materialrequest.FieldOperator, field.TypeString, value)