一、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 更新重新生成。
86 lines
2.8 KiB
Go
86 lines
2.8 KiB
Go
// Code generated by ent, DO NOT EDIT.
|
|
|
|
package predicate
|
|
|
|
import (
|
|
"entgo.io/ent/dialect/sql"
|
|
)
|
|
|
|
// Alert is the predicate function for alert builders.
|
|
type Alert func(*sql.Selector)
|
|
|
|
// AlertRule is the predicate function for alertrule builders.
|
|
type AlertRule func(*sql.Selector)
|
|
|
|
// Attachment is the predicate function for attachment builders.
|
|
type Attachment func(*sql.Selector)
|
|
|
|
// BackupRecord is the predicate function for backuprecord builders.
|
|
type BackupRecord func(*sql.Selector)
|
|
|
|
// DeliveryOrder is the predicate function for deliveryorder builders.
|
|
type DeliveryOrder func(*sql.Selector)
|
|
|
|
// DeliveryOrderItem is the predicate function for deliveryorderitem builders.
|
|
type DeliveryOrderItem func(*sql.Selector)
|
|
|
|
// EventLog is the predicate function for eventlog builders.
|
|
type EventLog func(*sql.Selector)
|
|
|
|
// InboundDetail is the predicate function for inbounddetail builders.
|
|
type InboundDetail func(*sql.Selector)
|
|
|
|
// InboundOrder is the predicate function for inboundorder builders.
|
|
type InboundOrder func(*sql.Selector)
|
|
|
|
// InspectionRecord is the predicate function for inspectionrecord builders.
|
|
type InspectionRecord func(*sql.Selector)
|
|
|
|
// Inventory is the predicate function for inventory builders.
|
|
type Inventory func(*sql.Selector)
|
|
|
|
// InventoryLock is the predicate function for inventorylock builders.
|
|
type InventoryLock func(*sql.Selector)
|
|
|
|
// Material is the predicate function for material builders.
|
|
type Material func(*sql.Selector)
|
|
|
|
// MaterialDemand is the predicate function for materialdemand builders.
|
|
type MaterialDemand func(*sql.Selector)
|
|
|
|
// OrderMaterialLedger is the predicate function for ordermaterialledger builders.
|
|
type OrderMaterialLedger func(*sql.Selector)
|
|
|
|
// OutboundDetail is the predicate function for outbounddetail builders.
|
|
type OutboundDetail func(*sql.Selector)
|
|
|
|
// OutboundOrder is the predicate function for outboundorder builders.
|
|
type OutboundOrder func(*sql.Selector)
|
|
|
|
// Permission is the predicate function for permission builders.
|
|
type Permission func(*sql.Selector)
|
|
|
|
// ReturnOrder is the predicate function for returnorder builders.
|
|
type ReturnOrder func(*sql.Selector)
|
|
|
|
// Role is the predicate function for role builders.
|
|
type Role func(*sql.Selector)
|
|
|
|
// SemiFinished is the predicate function for semifinished builders.
|
|
type SemiFinished func(*sql.Selector)
|
|
|
|
// StocktakeItem is the predicate function for stocktakeitem builders.
|
|
type StocktakeItem func(*sql.Selector)
|
|
|
|
// StocktakeOrder is the predicate function for stocktakeorder builders.
|
|
type StocktakeOrder func(*sql.Selector)
|
|
|
|
// SysConfig is the predicate function for sysconfig builders.
|
|
type SysConfig func(*sql.Selector)
|
|
|
|
// User is the predicate function for user builders.
|
|
type User func(*sql.Selector)
|
|
|
|
// Zone is the predicate function for zone builders.
|
|
type Zone func(*sql.Selector)
|