按模块说明
一、MES — 叫料单扩展(schema + 逻辑) material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。 新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。 新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。 internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。 二、WMS — 配送单(新功能,叫料与送料彻底拆开) 新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。 新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。 mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。 CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。 三、工位终端 — 叫料体验升级 MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。 InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。 web/static/index.html 构建刷新。 四、文档 案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。 客户问题.md:同步本轮拍板口径。 五、构建产物 / 同步 多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
This commit is contained in:
@@ -148,6 +148,78 @@ var (
|
||||
},
|
||||
},
|
||||
}
|
||||
// DeliveryOrderColumns holds the columns for the "delivery_order" table.
|
||||
DeliveryOrderColumns = []*schema.Column{
|
||||
{Name: "id", Type: field.TypeInt, Increment: true},
|
||||
{Name: "delivery_no", Type: field.TypeString, Size: 64, Comment: "配送单号"},
|
||||
{Name: "package_no", Type: field.TypeString, Size: 64, Comment: "关联叫料包号(material_request.packageNo)", Default: ""},
|
||||
{Name: "station_no", Type: field.TypeInt, Comment: "目标工位号", Default: 0},
|
||||
{Name: "target_dock", Type: field.TypeString, Size: 20, Comment: "配送接驳台(左右手必选,仅可选空台:传感器+在途任务)", Default: ""},
|
||||
{Name: "status", Type: field.TypeString, Size: 20, Default: "PENDING"},
|
||||
{Name: "operator", Type: field.TypeString, Size: 64, Comment: "创建人(库管)", Default: ""},
|
||||
{Name: "remark", Type: field.TypeString, Size: 255, Comment: "备注", Default: ""},
|
||||
{Name: "agv_task_no", Type: field.TypeString, Size: 64, Comment: "AGV 任务号(派车成功后回写)", Default: ""},
|
||||
{Name: "created_at", Type: field.TypeTime},
|
||||
{Name: "updated_at", Type: field.TypeTime, Nullable: true},
|
||||
}
|
||||
// DeliveryOrderTable holds the schema information for the "delivery_order" table.
|
||||
DeliveryOrderTable = &schema.Table{
|
||||
Name: "delivery_order",
|
||||
Comment: "DeliveryOrder 配送单:WMS 按叫料包创建,一包可拆多张;一单=一次托盘配送",
|
||||
Columns: DeliveryOrderColumns,
|
||||
PrimaryKey: []*schema.Column{DeliveryOrderColumns[0]},
|
||||
Indexes: []*schema.Index{
|
||||
{
|
||||
Name: "deliveryorder_package_no",
|
||||
Unique: false,
|
||||
Columns: []*schema.Column{DeliveryOrderColumns[2]},
|
||||
},
|
||||
{
|
||||
Name: "deliveryorder_status",
|
||||
Unique: false,
|
||||
Columns: []*schema.Column{DeliveryOrderColumns[5]},
|
||||
},
|
||||
{
|
||||
Name: "deliveryorder_station_no",
|
||||
Unique: false,
|
||||
Columns: []*schema.Column{DeliveryOrderColumns[3]},
|
||||
},
|
||||
},
|
||||
}
|
||||
// DeliveryOrderItemColumns holds the columns for the "delivery_order_item" table.
|
||||
DeliveryOrderItemColumns = []*schema.Column{
|
||||
{Name: "id", Type: field.TypeInt, Increment: true},
|
||||
{Name: "delivery_no", Type: field.TypeString, Size: 64, Comment: "配送单号"},
|
||||
{Name: "request_no", Type: field.TypeString, Size: 64, Comment: "关联叫料单号", Default: ""},
|
||||
{Name: "material_code", Type: field.TypeString, Size: 64, Comment: "物料编码"},
|
||||
{Name: "material_name", Type: field.TypeString, Size: 128, Comment: "物料名称", Default: ""},
|
||||
{Name: "unit", Type: field.TypeString, Size: 16, Comment: "单位", Default: ""},
|
||||
{Name: "qty", Type: field.TypeFloat64, Comment: "本次配送数量", Default: 0},
|
||||
{Name: "station_no", Type: field.TypeInt, Comment: "目标工位号", Default: 0},
|
||||
{Name: "order_no", Type: field.TypeString, Size: 64, Comment: "工单号(物料挂工单)", Default: ""},
|
||||
{Name: "flow_name", Type: field.TypeString, Size: 128, Comment: "工艺名", Default: ""},
|
||||
{Name: "plan_date", Type: field.TypeString, Size: 10, Comment: "排产日 yyyy-MM-dd", Default: ""},
|
||||
{Name: "sn_mode", Type: field.TypeInt, Comment: "序列号 1=是(逐件SN)/2=否", Default: 2},
|
||||
}
|
||||
// DeliveryOrderItemTable holds the schema information for the "delivery_order_item" table.
|
||||
DeliveryOrderItemTable = &schema.Table{
|
||||
Name: "delivery_order_item",
|
||||
Comment: "DeliveryOrderItem 配送单明细:物料×量×工位×工单×工艺×排产日",
|
||||
Columns: DeliveryOrderItemColumns,
|
||||
PrimaryKey: []*schema.Column{DeliveryOrderItemColumns[0]},
|
||||
Indexes: []*schema.Index{
|
||||
{
|
||||
Name: "deliveryorderitem_delivery_no",
|
||||
Unique: false,
|
||||
Columns: []*schema.Column{DeliveryOrderItemColumns[1]},
|
||||
},
|
||||
{
|
||||
Name: "deliveryorderitem_request_no",
|
||||
Unique: false,
|
||||
Columns: []*schema.Column{DeliveryOrderItemColumns[2]},
|
||||
},
|
||||
},
|
||||
}
|
||||
// EventLogColumns holds the columns for the "event_log" table.
|
||||
EventLogColumns = []*schema.Column{
|
||||
{Name: "id", Type: field.TypeInt, Increment: true},
|
||||
@@ -608,6 +680,7 @@ var (
|
||||
{Name: "contract_no", Type: field.TypeString, Nullable: true, Comment: "合同号(装箱选填)"},
|
||||
{Name: "borrow_from", Type: field.TypeJSON, Nullable: true, Comment: "跨工位借料来源 stationNo→借用量(call 备料出库专用);空=本工位自取"},
|
||||
{Name: "inspection_no", Type: field.TypeString, Nullable: true, Comment: "检测单号(溯源关联检验单据)"},
|
||||
{Name: "delivery_no", Type: field.TypeString, Comment: "关联配送单号(叫料配送出库回写)", Default: ""},
|
||||
{Name: "product_work_no", Type: field.TypeString, Nullable: true, Comment: "产品工号(随库存带入,出库记录展示/筛选)"},
|
||||
{Name: "voided", Type: field.TypeBool, Comment: "是否已作废", Default: false},
|
||||
{Name: "void_reason", Type: field.TypeString, Comment: "作废原因(必填留痕)", Default: ""},
|
||||
@@ -934,6 +1007,8 @@ var (
|
||||
AlertRulesTable,
|
||||
AttachmentsTable,
|
||||
BackupRecordTable,
|
||||
DeliveryOrderTable,
|
||||
DeliveryOrderItemTable,
|
||||
EventLogTable,
|
||||
InboundDetailsTable,
|
||||
InboundOrdersTable,
|
||||
@@ -970,6 +1045,12 @@ func init() {
|
||||
BackupRecordTable.Annotation = &entsql.Annotation{
|
||||
Table: "backup_record",
|
||||
}
|
||||
DeliveryOrderTable.Annotation = &entsql.Annotation{
|
||||
Table: "delivery_order",
|
||||
}
|
||||
DeliveryOrderItemTable.Annotation = &entsql.Annotation{
|
||||
Table: "delivery_order_item",
|
||||
}
|
||||
EventLogTable.Annotation = &entsql.Annotation{
|
||||
Table: "event_log",
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user