按模块说明

一、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:
SunYF
2026-11-05 19:18:18 +08:00
parent 46fcb59079
commit 1d1dc1bdd8
102 changed files with 12953 additions and 379 deletions
@@ -53,6 +53,12 @@ const (
FieldBorrowFrom = "borrow_from"
// FieldOperator holds the string denoting the operator field in the database.
FieldOperator = "operator"
// FieldPackageNo holds the string denoting the packageno field in the database.
FieldPackageNo = "package_no"
// FieldCallDate holds the string denoting the calldate field in the database.
FieldCallDate = "call_date"
// FieldPlanBreakdown holds the string denoting the planbreakdown field in the database.
FieldPlanBreakdown = "plan_breakdown"
// FieldWorkOrderNo holds the string denoting the workorderno field in the database.
FieldWorkOrderNo = "work_order_no"
// FieldReturnDock holds the string denoting the returndock field in the database.
@@ -100,6 +106,9 @@ var Columns = []string{
FieldRejectReason,
FieldBorrowFrom,
FieldOperator,
FieldPackageNo,
FieldCallDate,
FieldPlanBreakdown,
FieldWorkOrderNo,
FieldReturnDock,
FieldTheoryQty,
@@ -181,6 +190,14 @@ var (
DefaultOperator string
// OperatorValidator is a validator for the "operator" field. It is called by the builders before save.
OperatorValidator func(string) error
// DefaultPackageNo holds the default value on creation for the "packageNo" field.
DefaultPackageNo string
// PackageNoValidator is a validator for the "packageNo" field. It is called by the builders before save.
PackageNoValidator func(string) error
// DefaultCallDate holds the default value on creation for the "callDate" field.
DefaultCallDate string
// CallDateValidator is a validator for the "callDate" field. It is called by the builders before save.
CallDateValidator func(string) error
// DefaultWorkOrderNo holds the default value on creation for the "workOrderNo" field.
DefaultWorkOrderNo string
// WorkOrderNoValidator is a validator for the "workOrderNo" field. It is called by the builders before save.
@@ -310,6 +327,16 @@ func ByOperator(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldOperator, opts...).ToFunc()
}
// ByPackageNo orders the results by the packageNo field.
func ByPackageNo(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldPackageNo, opts...).ToFunc()
}
// ByCallDate orders the results by the callDate field.
func ByCallDate(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldCallDate, opts...).ToFunc()
}
// ByWorkOrderNo orders the results by the workOrderNo field.
func ByWorkOrderNo(opts ...sql.OrderTermOption) OrderOption {
return sql.OrderByField(FieldWorkOrderNo, opts...).ToFunc()
+150
View File
@@ -149,6 +149,16 @@ func Operator(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldOperator, v))
}
// PackageNo applies equality check predicate on the "packageNo" field. It's identical to PackageNoEQ.
func PackageNo(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldPackageNo, v))
}
// CallDate applies equality check predicate on the "callDate" field. It's identical to CallDateEQ.
func CallDate(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldCallDate, v))
}
// WorkOrderNo applies equality check predicate on the "workOrderNo" field. It's identical to WorkOrderNoEQ.
func WorkOrderNo(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldWorkOrderNo, v))
@@ -1209,6 +1219,146 @@ func OperatorContainsFold(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldContainsFold(FieldOperator, v))
}
// PackageNoEQ applies the EQ predicate on the "packageNo" field.
func PackageNoEQ(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldPackageNo, v))
}
// PackageNoNEQ applies the NEQ predicate on the "packageNo" field.
func PackageNoNEQ(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldNEQ(FieldPackageNo, v))
}
// PackageNoIn applies the In predicate on the "packageNo" field.
func PackageNoIn(vs ...string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldIn(FieldPackageNo, vs...))
}
// PackageNoNotIn applies the NotIn predicate on the "packageNo" field.
func PackageNoNotIn(vs ...string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldNotIn(FieldPackageNo, vs...))
}
// PackageNoGT applies the GT predicate on the "packageNo" field.
func PackageNoGT(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldGT(FieldPackageNo, v))
}
// PackageNoGTE applies the GTE predicate on the "packageNo" field.
func PackageNoGTE(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldGTE(FieldPackageNo, v))
}
// PackageNoLT applies the LT predicate on the "packageNo" field.
func PackageNoLT(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldLT(FieldPackageNo, v))
}
// PackageNoLTE applies the LTE predicate on the "packageNo" field.
func PackageNoLTE(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldLTE(FieldPackageNo, v))
}
// PackageNoContains applies the Contains predicate on the "packageNo" field.
func PackageNoContains(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldContains(FieldPackageNo, v))
}
// PackageNoHasPrefix applies the HasPrefix predicate on the "packageNo" field.
func PackageNoHasPrefix(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldHasPrefix(FieldPackageNo, v))
}
// PackageNoHasSuffix applies the HasSuffix predicate on the "packageNo" field.
func PackageNoHasSuffix(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldHasSuffix(FieldPackageNo, v))
}
// PackageNoEqualFold applies the EqualFold predicate on the "packageNo" field.
func PackageNoEqualFold(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEqualFold(FieldPackageNo, v))
}
// PackageNoContainsFold applies the ContainsFold predicate on the "packageNo" field.
func PackageNoContainsFold(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldContainsFold(FieldPackageNo, v))
}
// CallDateEQ applies the EQ predicate on the "callDate" field.
func CallDateEQ(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldCallDate, v))
}
// CallDateNEQ applies the NEQ predicate on the "callDate" field.
func CallDateNEQ(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldNEQ(FieldCallDate, v))
}
// CallDateIn applies the In predicate on the "callDate" field.
func CallDateIn(vs ...string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldIn(FieldCallDate, vs...))
}
// CallDateNotIn applies the NotIn predicate on the "callDate" field.
func CallDateNotIn(vs ...string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldNotIn(FieldCallDate, vs...))
}
// CallDateGT applies the GT predicate on the "callDate" field.
func CallDateGT(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldGT(FieldCallDate, v))
}
// CallDateGTE applies the GTE predicate on the "callDate" field.
func CallDateGTE(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldGTE(FieldCallDate, v))
}
// CallDateLT applies the LT predicate on the "callDate" field.
func CallDateLT(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldLT(FieldCallDate, v))
}
// CallDateLTE applies the LTE predicate on the "callDate" field.
func CallDateLTE(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldLTE(FieldCallDate, v))
}
// CallDateContains applies the Contains predicate on the "callDate" field.
func CallDateContains(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldContains(FieldCallDate, v))
}
// CallDateHasPrefix applies the HasPrefix predicate on the "callDate" field.
func CallDateHasPrefix(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldHasPrefix(FieldCallDate, v))
}
// CallDateHasSuffix applies the HasSuffix predicate on the "callDate" field.
func CallDateHasSuffix(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldHasSuffix(FieldCallDate, v))
}
// CallDateEqualFold applies the EqualFold predicate on the "callDate" field.
func CallDateEqualFold(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEqualFold(FieldCallDate, v))
}
// CallDateContainsFold applies the ContainsFold predicate on the "callDate" field.
func CallDateContainsFold(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldContainsFold(FieldCallDate, v))
}
// PlanBreakdownIsNil applies the IsNil predicate on the "planBreakdown" field.
func PlanBreakdownIsNil() predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldIsNull(FieldPlanBreakdown))
}
// PlanBreakdownNotNil applies the NotNil predicate on the "planBreakdown" field.
func PlanBreakdownNotNil() predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldNotNull(FieldPlanBreakdown))
}
// WorkOrderNoEQ applies the EQ predicate on the "workOrderNo" field.
func WorkOrderNoEQ(v string) predicate.MaterialRequest {
return predicate.MaterialRequest(sql.FieldEQ(FieldWorkOrderNo, v))