feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程
新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
@@ -12,17 +12,13 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
)
|
||||
|
||||
// MaterialRequest 备料单:按日排产自动算料生成
|
||||
// MaterialRequest 叫料单:从叫料池发起,不绑工单/排产;七态状态机
|
||||
type MaterialRequest struct {
|
||||
config `json:"-"`
|
||||
// ID of the ent.
|
||||
ID int `json:"id,omitempty"`
|
||||
// 备料单号
|
||||
// 叫料单号
|
||||
RequestNo string `json:"requestNo,omitempty"`
|
||||
// 工单号
|
||||
OrderNo string `json:"orderNo,omitempty"`
|
||||
// 对应排产日
|
||||
PlanDate string `json:"planDate,omitempty"`
|
||||
// 物料编码
|
||||
MaterialCode string `json:"materialCode,omitempty"`
|
||||
// MaterialName holds the value of the "materialName" field.
|
||||
@@ -31,36 +27,32 @@ type MaterialRequest struct {
|
||||
Unit string `json:"unit,omitempty"`
|
||||
// SnMode holds the value of the "snMode" field.
|
||||
SnMode int `json:"snMode,omitempty"`
|
||||
// 需备数量
|
||||
// 请求量(发起时占用叫料池可用量)
|
||||
ReqQty float64 `json:"reqQty,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
Status string `json:"status,omitempty"`
|
||||
// 目标接驳台 DOCK01..20
|
||||
// 目标接驳台(GxR1/GxR2,一单一个托盘)
|
||||
TargetDock string `json:"targetDock,omitempty"`
|
||||
// 目标工位号(0=未指定)
|
||||
// 目标工位号
|
||||
StationNo int `json:"stationNo,omitempty"`
|
||||
// 该物料所属工艺ID(0=整线共用)
|
||||
FlowId int `json:"flowId,omitempty"`
|
||||
// 已发出量(分批出库累加;幂等基准,勿与已接料混用)
|
||||
// 实发量(仓库完成备料时确定,禁单内分批)
|
||||
SentQty float64 `json:"sentQty,omitempty"`
|
||||
// 已接料量(工位扫码接料累加)
|
||||
ReceivedQty float64 `json:"receivedQty,omitempty"`
|
||||
// 最近接料时间(unix 秒)
|
||||
ReceivedAt int64 `json:"receivedAt,omitempty"`
|
||||
// 接料人
|
||||
ReceiveBy string `json:"receiveBy,omitempty"`
|
||||
// 来源 PLAN/REFILL
|
||||
// 退库量(整单退;仓库确认收回后叫料池额度回补)
|
||||
ReturnedQty float64 `json:"returnedQty,omitempty"`
|
||||
// 来源 CALL/REFILL
|
||||
Source string `json:"source,omitempty"`
|
||||
// 超出 物料清单需求的数量
|
||||
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"`
|
||||
// AGV 任务号(派车成功后回写)
|
||||
AgvTaskNo string `json:"agvTaskNo,omitempty"`
|
||||
// 跨日标记:叫料池行含非今日排产(工位预警+仓库可驳回异常)
|
||||
CrossDay bool `json:"crossDay,omitempty"`
|
||||
// WMS 出库单号(完成备料回写,多个逗号分隔)
|
||||
OutboundNo string `json:"outboundNo,omitempty"`
|
||||
// 驳回理由(仓库拒发时必填)
|
||||
RejectReason string `json:"rejectReason,omitempty"`
|
||||
// Operator holds the value of the "operator" field.
|
||||
Operator string `json:"operator,omitempty"`
|
||||
// CreatedAt holds the value of the "createdAt" field.
|
||||
@@ -75,13 +67,13 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case materialrequest.FieldNeedAgv:
|
||||
case materialrequest.FieldNeedAgv, materialrequest.FieldCrossDay:
|
||||
values[i] = new(sql.NullBool)
|
||||
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReceivedQty, materialrequest.FieldOverQty:
|
||||
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReturnedQty:
|
||||
values[i] = new(sql.NullFloat64)
|
||||
case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo, materialrequest.FieldFlowId, materialrequest.FieldReceivedAt:
|
||||
case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo:
|
||||
values[i] = new(sql.NullInt64)
|
||||
case materialrequest.FieldRequestNo, materialrequest.FieldOrderNo, materialrequest.FieldPlanDate, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldReceiveBy, materialrequest.FieldSource, materialrequest.FieldOverReason, materialrequest.FieldRefReportNo, materialrequest.FieldBatchNo, materialrequest.FieldOperator:
|
||||
case materialrequest.FieldRequestNo, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldSource, materialrequest.FieldRefReportNo, materialrequest.FieldAgvTaskNo, materialrequest.FieldOutboundNo, materialrequest.FieldRejectReason, materialrequest.FieldOperator:
|
||||
values[i] = new(sql.NullString)
|
||||
case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt:
|
||||
values[i] = new(sql.NullTime)
|
||||
@@ -112,18 +104,6 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.RequestNo = value.String
|
||||
}
|
||||
case materialrequest.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 materialrequest.FieldPlanDate:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field planDate", values[i])
|
||||
} else if value.Valid {
|
||||
_m.PlanDate = value.String
|
||||
}
|
||||
case materialrequest.FieldMaterialCode:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field materialCode", values[i])
|
||||
@@ -172,35 +152,17 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.StationNo = int(value.Int64)
|
||||
}
|
||||
case materialrequest.FieldFlowId:
|
||||
if value, ok := values[i].(*sql.NullInt64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field flowId", values[i])
|
||||
} else if value.Valid {
|
||||
_m.FlowId = int(value.Int64)
|
||||
}
|
||||
case materialrequest.FieldSentQty:
|
||||
if value, ok := values[i].(*sql.NullFloat64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field sentQty", values[i])
|
||||
} else if value.Valid {
|
||||
_m.SentQty = value.Float64
|
||||
}
|
||||
case materialrequest.FieldReceivedQty:
|
||||
case materialrequest.FieldReturnedQty:
|
||||
if value, ok := values[i].(*sql.NullFloat64); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field receivedQty", values[i])
|
||||
return fmt.Errorf("unexpected type %T for field returnedQty", 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
|
||||
_m.ReturnedQty = value.Float64
|
||||
}
|
||||
case materialrequest.FieldSource:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
@@ -208,18 +170,6 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} 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])
|
||||
@@ -232,11 +182,29 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} else if value.Valid {
|
||||
_m.NeedAgv = value.Bool
|
||||
}
|
||||
case materialrequest.FieldBatchNo:
|
||||
case materialrequest.FieldAgvTaskNo:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field batchNo", values[i])
|
||||
return fmt.Errorf("unexpected type %T for field agvTaskNo", values[i])
|
||||
} else if value.Valid {
|
||||
_m.BatchNo = value.String
|
||||
_m.AgvTaskNo = value.String
|
||||
}
|
||||
case materialrequest.FieldCrossDay:
|
||||
if value, ok := values[i].(*sql.NullBool); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field crossDay", values[i])
|
||||
} else if value.Valid {
|
||||
_m.CrossDay = value.Bool
|
||||
}
|
||||
case materialrequest.FieldOutboundNo:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field outboundNo", values[i])
|
||||
} else if value.Valid {
|
||||
_m.OutboundNo = value.String
|
||||
}
|
||||
case materialrequest.FieldRejectReason:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
return fmt.Errorf("unexpected type %T for field rejectReason", values[i])
|
||||
} else if value.Valid {
|
||||
_m.RejectReason = value.String
|
||||
}
|
||||
case materialrequest.FieldOperator:
|
||||
if value, ok := values[i].(*sql.NullString); !ok {
|
||||
@@ -296,12 +264,6 @@ func (_m *MaterialRequest) String() string {
|
||||
builder.WriteString("requestNo=")
|
||||
builder.WriteString(_m.RequestNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("orderNo=")
|
||||
builder.WriteString(_m.OrderNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("planDate=")
|
||||
builder.WriteString(_m.PlanDate)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("materialCode=")
|
||||
builder.WriteString(_m.MaterialCode)
|
||||
builder.WriteString(", ")
|
||||
@@ -326,38 +288,32 @@ func (_m *MaterialRequest) String() string {
|
||||
builder.WriteString("stationNo=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.StationNo))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("flowId=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.FlowId))
|
||||
builder.WriteString(", ")
|
||||
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("returnedQty=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.ReturnedQty))
|
||||
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("agvTaskNo=")
|
||||
builder.WriteString(_m.AgvTaskNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("crossDay=")
|
||||
builder.WriteString(fmt.Sprintf("%v", _m.CrossDay))
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("outboundNo=")
|
||||
builder.WriteString(_m.OutboundNo)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("rejectReason=")
|
||||
builder.WriteString(_m.RejectReason)
|
||||
builder.WriteString(", ")
|
||||
builder.WriteString("operator=")
|
||||
builder.WriteString(_m.Operator)
|
||||
|
||||
Reference in New Issue
Block a user