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
+111 -22
View File
@@ -9,6 +9,52 @@ import (
)
var (
// AgvTasksColumns holds the columns for the "agv_tasks" table.
AgvTasksColumns = []*schema.Column{
{Name: "id", Type: field.TypeInt, Increment: true},
{Name: "task_no", Type: field.TypeString, Unique: true, Size: 64, Comment: "我方任务号(内部)"},
{Name: "hik_task_code", Type: field.TypeString, Size: 64, Comment: "海康返回 robotTaskCode(MOCK- 开头为模拟)", Default: ""},
{Name: "source_dock", Type: field.TypeString, Size: 20, Comment: "起点接驳台(常为 DOCK21 库房)", Default: ""},
{Name: "target_dock", Type: field.TypeString, Size: 20, Comment: "终点接驳台 DOCK01..20", Default: ""},
{Name: "materials_json", Type: field.TypeString, Size: 4000, Comment: "物料清单 JSON", Default: ""},
{Name: "related_request_no", Type: field.TypeString, Nullable: true, Size: 64, Comment: "关联叫料单号(MES material_request.requestNo)", Default: ""},
{Name: "related_outbound_no", Type: field.TypeString, Nullable: true, Size: 64, Comment: "关联出库单号(可选, WMS 回传)", Default: ""},
{Name: "status", Type: field.TypeString, Size: 20, Comment: "PENDING/DISPATCHED/DELIVERING/DONE/FAILED/CANCELLED", Default: "PENDING"},
{Name: "operator", Type: field.TypeString, Size: 64, Comment: "下发人", Default: ""},
{Name: "dispatched_at", Type: field.TypeInt64, Comment: "下发时间 unix秒", Default: 0},
{Name: "arrived_at", Type: field.TypeInt64, Comment: "到位时间 unix秒", Default: 0},
{Name: "remark", Type: field.TypeString, Nullable: true, Size: 500, Comment: "备注/失败原因", Default: ""},
{Name: "created_at", Type: field.TypeInt64, Comment: "创建时间"},
}
// AgvTasksTable holds the schema information for the "agv_tasks" table.
AgvTasksTable = &schema.Table{
Name: "agv_tasks",
Comment: "AgvTask AGV 搬运任务记录:MES 调度海康 RCS 派车后落库,用于状态跟踪/追溯。",
Columns: AgvTasksColumns,
PrimaryKey: []*schema.Column{AgvTasksColumns[0]},
Indexes: []*schema.Index{
{
Name: "agvtask_task_no",
Unique: true,
Columns: []*schema.Column{AgvTasksColumns[1]},
},
{
Name: "agvtask_target_dock",
Unique: false,
Columns: []*schema.Column{AgvTasksColumns[4]},
},
{
Name: "agvtask_status",
Unique: false,
Columns: []*schema.Column{AgvTasksColumns[8]},
},
{
Name: "agvtask_hik_task_code",
Unique: false,
Columns: []*schema.Column{AgvTasksColumns[2]},
},
},
}
// AlertColumns holds the columns for the "alert" table.
AlertColumns = []*schema.Column{
{Name: "id", Type: field.TypeInt, Increment: true},
@@ -16,7 +62,7 @@ var (
{Name: "type", Type: field.TypeString, Size: 40, Comment: "预警类型"},
{Name: "level", Type: field.TypeString, Size: 20, Comment: "级别:信息/警告/严重(空=历史数据未分级)", Default: ""},
{Name: "target", Type: field.TypeString, Size: 128, Comment: "目标对象(工位/库房/SN 等)", Default: ""},
{Name: "title", Type: field.TypeString, Size: 120, Comment: "标题"},
{Name: "title", Type: field.TypeString, Size: 255, Comment: "标题"},
{Name: "content", Type: field.TypeString, Size: 500, Comment: "内容", Default: ""},
{Name: "ref_type", Type: field.TypeString, Size: 40, Comment: "关联业务类型", Default: ""},
{Name: "ref_id", Type: field.TypeString, Size: 64, Comment: "关联业务ID", Default: ""},
@@ -155,6 +201,42 @@ var (
},
},
}
// CallPoolColumns holds the columns for the "call_pool" table.
CallPoolColumns = []*schema.Column{
{Name: "id", Type: field.TypeInt, Increment: true},
{Name: "station_no", Type: field.TypeInt, Comment: "工位号"},
{Name: "material_code", Type: field.TypeString, Size: 64, Comment: "物料编码(图号)"},
{Name: "material_name", Type: field.TypeString, Size: 128, Default: ""},
{Name: "unit", Type: field.TypeString, Size: 16, Default: ""},
{Name: "sn_mode", Type: field.TypeInt, Default: 2},
{Name: "req_qty", Type: field.TypeInt, Comment: "需求量(启用排产派生,逐行向上取整后合计)", Default: 0},
{Name: "adj_qty", Type: field.TypeInt, Comment: "人工调整量(可正可负;改动留痕 event_log)", Default: 0},
{Name: "sent_qty", Type: field.TypeInt, Comment: "已发净额(完成备料实发累加;退库收回扣减回补)", Default: 0},
{Name: "reserved_qty", Type: field.TypeInt, Comment: "占用中(待备料叫料单请求量合计)", Default: 0},
{Name: "cross_day", Type: field.TypeBool, Comment: "是否含非今日排产(跨日叫料预警/仓库驳回异常标记)", Default: false},
{Name: "plan_dates", Type: field.TypeString, Size: 255, Comment: "派生快照:贡献需求的排产日期(逗号分隔,可空)", Default: ""},
{Name: "created_at", Type: field.TypeTime},
{Name: "updated_at", Type: field.TypeTime},
}
// CallPoolTable holds the schema information for the "call_pool" table.
CallPoolTable = &schema.Table{
Name: "call_pool",
Comment: "CallPool 叫料池:工位级物料行四数账(需求/调整/已发/占用),来源=启用状态日排产",
Columns: CallPoolColumns,
PrimaryKey: []*schema.Column{CallPoolColumns[0]},
Indexes: []*schema.Index{
{
Name: "callpool_station_no_material_code",
Unique: true,
Columns: []*schema.Column{CallPoolColumns[1], CallPoolColumns[2]},
},
{
Name: "callpool_station_no",
Unique: false,
Columns: []*schema.Column{CallPoolColumns[1]},
},
},
}
// DailyPlanColumns holds the columns for the "daily_plan" table.
DailyPlanColumns = []*schema.Column{
{Name: "id", Type: field.TypeInt, Increment: true},
@@ -473,28 +555,24 @@ var (
// MaterialRequestColumns holds the columns for the "material_request" table.
MaterialRequestColumns = []*schema.Column{
{Name: "id", Type: field.TypeInt, Increment: true},
{Name: "request_no", Type: field.TypeString, Size: 64, Comment: "备料单号"},
{Name: "order_no", Type: field.TypeString, Size: 64, Comment: "工单号"},
{Name: "plan_date", Type: field.TypeString, Size: 10, Comment: "对应排产日"},
{Name: "request_no", Type: field.TypeString, Size: 64, Comment: "叫料单号"},
{Name: "material_code", Type: field.TypeString, Size: 64, Comment: "物料编码"},
{Name: "material_name", Type: field.TypeString, Size: 128, Default: ""},
{Name: "unit", Type: field.TypeString, Size: 16, Default: ""},
{Name: "sn_mode", Type: field.TypeInt, Default: 2},
{Name: "req_qty", Type: field.TypeFloat64, Comment: "需备数量", Default: 0},
{Name: "req_qty", Type: field.TypeFloat64, Comment: "请求量(发起时占用叫料池可用量)", Default: 0},
{Name: "status", Type: field.TypeString, Size: 20, Default: "PENDING"},
{Name: "target_dock", Type: field.TypeString, Size: 20, Comment: "目标接驳台 DOCK01..20", Default: ""},
{Name: "station_no", Type: field.TypeInt, Comment: "目标工位号(0=未指定)", Default: 0},
{Name: "flow_id", Type: field.TypeInt, Comment: "该物料所属工艺ID(0=整线共用)", Default: 0},
{Name: "sent_qty", Type: field.TypeFloat64, Comment: "已发出量(分批出库累加;幂等基准,勿与已接料混用)", Default: 0},
{Name: "received_qty", Type: field.TypeFloat64, Comment: "已接料量(工位扫码接料累加)", Default: 0},
{Name: "received_at", Type: field.TypeInt64, Comment: "最近接料时间(unix 秒)", Default: 0},
{Name: "receive_by", Type: field.TypeString, Size: 64, Comment: "接料人", Default: ""},
{Name: "source", Type: field.TypeString, Size: 16, Comment: "来源 PLAN/REFILL", Default: "PLAN"},
{Name: "over_qty", Type: field.TypeFloat64, Comment: "超出 物料清单需求的数量", Default: 0},
{Name: "over_reason", Type: field.TypeString, Size: 64, Comment: "超领原因 损耗/报废/返修/其他", Default: ""},
{Name: "target_dock", Type: field.TypeString, Size: 20, Comment: "目标接驳台(GxR1/GxR2,一单一个托盘)", Default: ""},
{Name: "station_no", Type: field.TypeInt, Comment: "目标工位号", Default: 0},
{Name: "sent_qty", Type: field.TypeFloat64, Comment: "实发量(仓库完成备料时确定,禁单内分批)", Default: 0},
{Name: "returned_qty", Type: field.TypeFloat64, Comment: "退库量(整单退;仓库确认收回后叫料池额度回补)", Default: 0},
{Name: "source", Type: field.TypeString, Size: 16, Comment: "来源 CALL/REFILL", Default: "CALL"},
{Name: "ref_report_no", Type: field.TypeString, Size: 64, Comment: "关联数量不符单号", Default: ""},
{Name: "need_agv", Type: field.TypeBool, Comment: "是否需要AGV配送到接驳台", Default: false},
{Name: "batch_no", Type: field.TypeString, Size: 64, Comment: "发料批次号(分批出库时填写)", Default: ""},
{Name: "need_agv", Type: field.TypeBool, Comment: "是否需要AGV配送到接驳台", Default: true},
{Name: "agv_task_no", Type: field.TypeString, Size: 64, Comment: "AGV 任务号(派车成功后回写)", Default: ""},
{Name: "cross_day", Type: field.TypeBool, Comment: "跨日标记:叫料池行含非今日排产(工位预警+仓库可驳回异常)", Default: false},
{Name: "outbound_no", Type: field.TypeString, Size: 255, Comment: "WMS 出库单号(完成备料回写,多个逗号分隔)", Default: ""},
{Name: "reject_reason", Type: field.TypeString, Size: 128, Comment: "驳回理由(仓库拒发时必填)", Default: ""},
{Name: "operator", Type: field.TypeString, Size: 64, Default: ""},
{Name: "created_at", Type: field.TypeTime},
{Name: "updated_at", Type: field.TypeTime, Nullable: true},
@@ -502,24 +580,24 @@ var (
// MaterialRequestTable holds the schema information for the "material_request" table.
MaterialRequestTable = &schema.Table{
Name: "material_request",
Comment: "MaterialRequest 备料单:按日排产自动算料生成",
Comment: "MaterialRequest 叫料单:从叫料池发起,不绑工单/排产;七态状态机",
Columns: MaterialRequestColumns,
PrimaryKey: []*schema.Column{MaterialRequestColumns[0]},
Indexes: []*schema.Index{
{
Name: "materialrequest_order_no",
Name: "materialrequest_station_no",
Unique: false,
Columns: []*schema.Column{MaterialRequestColumns[2]},
Columns: []*schema.Column{MaterialRequestColumns[9]},
},
{
Name: "materialrequest_material_code",
Unique: false,
Columns: []*schema.Column{MaterialRequestColumns[4]},
Columns: []*schema.Column{MaterialRequestColumns[2]},
},
{
Name: "materialrequest_status",
Unique: false,
Columns: []*schema.Column{MaterialRequestColumns[9]},
Columns: []*schema.Column{MaterialRequestColumns[7]},
},
},
}
@@ -1104,6 +1182,9 @@ var (
{Name: "done_at", Type: field.TypeTime, Nullable: true, Comment: "完工时间"},
{Name: "created_at", Type: field.TypeTime},
{Name: "updated_at", Type: field.TypeTime, Nullable: true},
{Name: "torque_ng_pending", Type: field.TypeBool, Comment: "拧紧扭矩不合格待人工处置标记", Default: false},
{Name: "torque_ng_at", Type: field.TypeTime, Nullable: true, Comment: "拧紧不合格标记时间"},
{Name: "torque_ng_by", Type: field.TypeString, Nullable: true, Size: 64, Comment: "拧紧不合格标记操作人"},
}
// WorkpieceTable holds the schema information for the "workpiece" table.
WorkpieceTable = &schema.Table{
@@ -1273,10 +1354,12 @@ var (
}
// Tables holds all the tables in the schema.
Tables = []*schema.Table{
AgvTasksTable,
AlertTable,
AlertRuleTable,
AssociationTraceTable,
AttachmentTable,
CallPoolTable,
DailyPlanTable,
DockTable,
EventLogTable,
@@ -1312,6 +1395,9 @@ var (
)
func init() {
AgvTasksTable.Annotation = &entsql.Annotation{
Table: "agv_tasks",
}
AlertTable.Annotation = &entsql.Annotation{
Table: "alert",
}
@@ -1324,6 +1410,9 @@ func init() {
AttachmentTable.Annotation = &entsql.Annotation{
Table: "attachment",
}
CallPoolTable.Annotation = &entsql.Annotation{
Table: "call_pool",
}
DailyPlanTable.Annotation = &entsql.Annotation{
Table: "daily_plan",
}