按模块说明
一、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:
@@ -67,6 +67,8 @@ const (
|
||||
FieldBorrowFrom = "borrow_from"
|
||||
// FieldInspectionNo holds the string denoting the inspection_no field in the database.
|
||||
FieldInspectionNo = "inspection_no"
|
||||
// FieldDeliveryNo holds the string denoting the delivery_no field in the database.
|
||||
FieldDeliveryNo = "delivery_no"
|
||||
// FieldProductWorkNo holds the string denoting the product_work_no field in the database.
|
||||
FieldProductWorkNo = "product_work_no"
|
||||
// FieldVoided holds the string denoting the voided field in the database.
|
||||
@@ -114,6 +116,7 @@ var Columns = []string{
|
||||
FieldContractNo,
|
||||
FieldBorrowFrom,
|
||||
FieldInspectionNo,
|
||||
FieldDeliveryNo,
|
||||
FieldProductWorkNo,
|
||||
FieldVoided,
|
||||
FieldVoidReason,
|
||||
@@ -145,6 +148,8 @@ var (
|
||||
DefaultSnMode int
|
||||
// DefaultQuantity holds the default value on creation for the "quantity" field.
|
||||
DefaultQuantity int
|
||||
// DefaultDeliveryNo holds the default value on creation for the "delivery_no" field.
|
||||
DefaultDeliveryNo string
|
||||
// DefaultVoided holds the default value on creation for the "voided" field.
|
||||
DefaultVoided bool
|
||||
// DefaultVoidReason holds the default value on creation for the "void_reason" field.
|
||||
@@ -298,6 +303,11 @@ func ByInspectionNo(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldInspectionNo, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByDeliveryNo orders the results by the delivery_no field.
|
||||
func ByDeliveryNo(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldDeliveryNo, opts...).ToFunc()
|
||||
}
|
||||
|
||||
// ByProductWorkNo orders the results by the product_work_no field.
|
||||
func ByProductWorkNo(opts ...sql.OrderTermOption) OrderOption {
|
||||
return sql.OrderByField(FieldProductWorkNo, opts...).ToFunc()
|
||||
|
||||
@@ -188,6 +188,11 @@ func InspectionNo(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEQ(FieldInspectionNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNo applies equality check predicate on the "delivery_no" field. It's identical to DeliveryNoEQ.
|
||||
func DeliveryNo(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEQ(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// ProductWorkNo applies equality check predicate on the "product_work_no" field. It's identical to ProductWorkNoEQ.
|
||||
func ProductWorkNo(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEQ(FieldProductWorkNo, v))
|
||||
@@ -2043,6 +2048,71 @@ func InspectionNoContainsFold(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldContainsFold(FieldInspectionNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoEQ applies the EQ predicate on the "delivery_no" field.
|
||||
func DeliveryNoEQ(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEQ(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoNEQ applies the NEQ predicate on the "delivery_no" field.
|
||||
func DeliveryNoNEQ(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldNEQ(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoIn applies the In predicate on the "delivery_no" field.
|
||||
func DeliveryNoIn(vs ...string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldIn(FieldDeliveryNo, vs...))
|
||||
}
|
||||
|
||||
// DeliveryNoNotIn applies the NotIn predicate on the "delivery_no" field.
|
||||
func DeliveryNoNotIn(vs ...string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldNotIn(FieldDeliveryNo, vs...))
|
||||
}
|
||||
|
||||
// DeliveryNoGT applies the GT predicate on the "delivery_no" field.
|
||||
func DeliveryNoGT(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldGT(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoGTE applies the GTE predicate on the "delivery_no" field.
|
||||
func DeliveryNoGTE(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldGTE(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoLT applies the LT predicate on the "delivery_no" field.
|
||||
func DeliveryNoLT(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldLT(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoLTE applies the LTE predicate on the "delivery_no" field.
|
||||
func DeliveryNoLTE(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldLTE(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoContains applies the Contains predicate on the "delivery_no" field.
|
||||
func DeliveryNoContains(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldContains(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoHasPrefix applies the HasPrefix predicate on the "delivery_no" field.
|
||||
func DeliveryNoHasPrefix(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldHasPrefix(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoHasSuffix applies the HasSuffix predicate on the "delivery_no" field.
|
||||
func DeliveryNoHasSuffix(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldHasSuffix(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoEqualFold applies the EqualFold predicate on the "delivery_no" field.
|
||||
func DeliveryNoEqualFold(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEqualFold(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// DeliveryNoContainsFold applies the ContainsFold predicate on the "delivery_no" field.
|
||||
func DeliveryNoContainsFold(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldContainsFold(FieldDeliveryNo, v))
|
||||
}
|
||||
|
||||
// ProductWorkNoEQ applies the EQ predicate on the "product_work_no" field.
|
||||
func ProductWorkNoEQ(v string) predicate.OutboundOrder {
|
||||
return predicate.OutboundOrder(sql.FieldEQ(FieldProductWorkNo, v))
|
||||
|
||||
Reference in New Issue
Block a user