Files
bj_power/bj_power_wms/ent/tx.go
T
SunYF 1d1dc1bdd8 按模块说明
一、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 更新重新生成。
2026-11-05 19:18:18 +08:00

286 lines
10 KiB
Go

// Code generated by ent, DO NOT EDIT.
package ent
import (
"context"
"sync"
"entgo.io/ent/dialect"
)
// Tx is a transactional client that is created by calling Client.Tx().
type Tx struct {
config
// Alert is the client for interacting with the Alert builders.
Alert *AlertClient
// AlertRule is the client for interacting with the AlertRule builders.
AlertRule *AlertRuleClient
// Attachment is the client for interacting with the Attachment builders.
Attachment *AttachmentClient
// BackupRecord is the client for interacting with the BackupRecord builders.
BackupRecord *BackupRecordClient
// DeliveryOrder is the client for interacting with the DeliveryOrder builders.
DeliveryOrder *DeliveryOrderClient
// DeliveryOrderItem is the client for interacting with the DeliveryOrderItem builders.
DeliveryOrderItem *DeliveryOrderItemClient
// EventLog is the client for interacting with the EventLog builders.
EventLog *EventLogClient
// InboundDetail is the client for interacting with the InboundDetail builders.
InboundDetail *InboundDetailClient
// InboundOrder is the client for interacting with the InboundOrder builders.
InboundOrder *InboundOrderClient
// InspectionRecord is the client for interacting with the InspectionRecord builders.
InspectionRecord *InspectionRecordClient
// Inventory is the client for interacting with the Inventory builders.
Inventory *InventoryClient
// InventoryLock is the client for interacting with the InventoryLock builders.
InventoryLock *InventoryLockClient
// Material is the client for interacting with the Material builders.
Material *MaterialClient
// MaterialDemand is the client for interacting with the MaterialDemand builders.
MaterialDemand *MaterialDemandClient
// OrderMaterialLedger is the client for interacting with the OrderMaterialLedger builders.
OrderMaterialLedger *OrderMaterialLedgerClient
// OutboundDetail is the client for interacting with the OutboundDetail builders.
OutboundDetail *OutboundDetailClient
// OutboundOrder is the client for interacting with the OutboundOrder builders.
OutboundOrder *OutboundOrderClient
// Permission is the client for interacting with the Permission builders.
Permission *PermissionClient
// ReturnOrder is the client for interacting with the ReturnOrder builders.
ReturnOrder *ReturnOrderClient
// Role is the client for interacting with the Role builders.
Role *RoleClient
// SemiFinished is the client for interacting with the SemiFinished builders.
SemiFinished *SemiFinishedClient
// StocktakeItem is the client for interacting with the StocktakeItem builders.
StocktakeItem *StocktakeItemClient
// StocktakeOrder is the client for interacting with the StocktakeOrder builders.
StocktakeOrder *StocktakeOrderClient
// SysConfig is the client for interacting with the SysConfig builders.
SysConfig *SysConfigClient
// User is the client for interacting with the User builders.
User *UserClient
// Zone is the client for interacting with the Zone builders.
Zone *ZoneClient
// lazily loaded.
client *Client
clientOnce sync.Once
// ctx lives for the life of the transaction. It is
// the same context used by the underlying connection.
ctx context.Context
}
type (
// Committer is the interface that wraps the Commit method.
Committer interface {
Commit(context.Context, *Tx) error
}
// The CommitFunc type is an adapter to allow the use of ordinary
// function as a Committer. If f is a function with the appropriate
// signature, CommitFunc(f) is a Committer that calls f.
CommitFunc func(context.Context, *Tx) error
// CommitHook defines the "commit middleware". A function that gets a Committer
// and returns a Committer. For example:
//
// hook := func(next ent.Committer) ent.Committer {
// return ent.CommitFunc(func(ctx context.Context, tx *ent.Tx) error {
// // Do some stuff before.
// if err := next.Commit(ctx, tx); err != nil {
// return err
// }
// // Do some stuff after.
// return nil
// })
// }
//
CommitHook func(Committer) Committer
)
// Commit calls f(ctx, m).
func (f CommitFunc) Commit(ctx context.Context, tx *Tx) error {
return f(ctx, tx)
}
// Commit commits the transaction.
func (tx *Tx) Commit() error {
txDriver := tx.config.driver.(*txDriver)
var fn Committer = CommitFunc(func(context.Context, *Tx) error {
return txDriver.tx.Commit()
})
txDriver.mu.Lock()
hooks := append([]CommitHook(nil), txDriver.onCommit...)
txDriver.mu.Unlock()
for i := len(hooks) - 1; i >= 0; i-- {
fn = hooks[i](fn)
}
return fn.Commit(tx.ctx, tx)
}
// OnCommit adds a hook to call on commit.
func (tx *Tx) OnCommit(f CommitHook) {
txDriver := tx.config.driver.(*txDriver)
txDriver.mu.Lock()
txDriver.onCommit = append(txDriver.onCommit, f)
txDriver.mu.Unlock()
}
type (
// Rollbacker is the interface that wraps the Rollback method.
Rollbacker interface {
Rollback(context.Context, *Tx) error
}
// The RollbackFunc type is an adapter to allow the use of ordinary
// function as a Rollbacker. If f is a function with the appropriate
// signature, RollbackFunc(f) is a Rollbacker that calls f.
RollbackFunc func(context.Context, *Tx) error
// RollbackHook defines the "rollback middleware". A function that gets a Rollbacker
// and returns a Rollbacker. For example:
//
// hook := func(next ent.Rollbacker) ent.Rollbacker {
// return ent.RollbackFunc(func(ctx context.Context, tx *ent.Tx) error {
// // Do some stuff before.
// if err := next.Rollback(ctx, tx); err != nil {
// return err
// }
// // Do some stuff after.
// return nil
// })
// }
//
RollbackHook func(Rollbacker) Rollbacker
)
// Rollback calls f(ctx, m).
func (f RollbackFunc) Rollback(ctx context.Context, tx *Tx) error {
return f(ctx, tx)
}
// Rollback rollbacks the transaction.
func (tx *Tx) Rollback() error {
txDriver := tx.config.driver.(*txDriver)
var fn Rollbacker = RollbackFunc(func(context.Context, *Tx) error {
return txDriver.tx.Rollback()
})
txDriver.mu.Lock()
hooks := append([]RollbackHook(nil), txDriver.onRollback...)
txDriver.mu.Unlock()
for i := len(hooks) - 1; i >= 0; i-- {
fn = hooks[i](fn)
}
return fn.Rollback(tx.ctx, tx)
}
// OnRollback adds a hook to call on rollback.
func (tx *Tx) OnRollback(f RollbackHook) {
txDriver := tx.config.driver.(*txDriver)
txDriver.mu.Lock()
txDriver.onRollback = append(txDriver.onRollback, f)
txDriver.mu.Unlock()
}
// Client returns a Client that binds to current transaction.
func (tx *Tx) Client() *Client {
tx.clientOnce.Do(func() {
tx.client = &Client{config: tx.config}
tx.client.init()
})
return tx.client
}
func (tx *Tx) init() {
tx.Alert = NewAlertClient(tx.config)
tx.AlertRule = NewAlertRuleClient(tx.config)
tx.Attachment = NewAttachmentClient(tx.config)
tx.BackupRecord = NewBackupRecordClient(tx.config)
tx.DeliveryOrder = NewDeliveryOrderClient(tx.config)
tx.DeliveryOrderItem = NewDeliveryOrderItemClient(tx.config)
tx.EventLog = NewEventLogClient(tx.config)
tx.InboundDetail = NewInboundDetailClient(tx.config)
tx.InboundOrder = NewInboundOrderClient(tx.config)
tx.InspectionRecord = NewInspectionRecordClient(tx.config)
tx.Inventory = NewInventoryClient(tx.config)
tx.InventoryLock = NewInventoryLockClient(tx.config)
tx.Material = NewMaterialClient(tx.config)
tx.MaterialDemand = NewMaterialDemandClient(tx.config)
tx.OrderMaterialLedger = NewOrderMaterialLedgerClient(tx.config)
tx.OutboundDetail = NewOutboundDetailClient(tx.config)
tx.OutboundOrder = NewOutboundOrderClient(tx.config)
tx.Permission = NewPermissionClient(tx.config)
tx.ReturnOrder = NewReturnOrderClient(tx.config)
tx.Role = NewRoleClient(tx.config)
tx.SemiFinished = NewSemiFinishedClient(tx.config)
tx.StocktakeItem = NewStocktakeItemClient(tx.config)
tx.StocktakeOrder = NewStocktakeOrderClient(tx.config)
tx.SysConfig = NewSysConfigClient(tx.config)
tx.User = NewUserClient(tx.config)
tx.Zone = NewZoneClient(tx.config)
}
// txDriver wraps the given dialect.Tx with a nop dialect.Driver implementation.
// The idea is to support transactions without adding any extra code to the builders.
// When a builder calls to driver.Tx(), it gets the same dialect.Tx instance.
// Commit and Rollback are nop for the internal builders and the user must call one
// of them in order to commit or rollback the transaction.
//
// If a closed transaction is embedded in one of the generated entities, and the entity
// applies a query, for example: Alert.QueryXXX(), the query will be executed
// through the driver which created this transaction.
//
// Note that txDriver is not goroutine safe.
type txDriver struct {
// the driver we started the transaction from.
drv dialect.Driver
// tx is the underlying transaction.
tx dialect.Tx
// completion hooks.
mu sync.Mutex
onCommit []CommitHook
onRollback []RollbackHook
}
// newTx creates a new transactional driver.
func newTx(ctx context.Context, drv dialect.Driver) (*txDriver, error) {
tx, err := drv.Tx(ctx)
if err != nil {
return nil, err
}
return &txDriver{tx: tx, drv: drv}, nil
}
// Tx returns the transaction wrapper (txDriver) to avoid Commit or Rollback calls
// from the internal builders. Should be called only by the internal builders.
func (tx *txDriver) Tx(context.Context) (dialect.Tx, error) { return tx, nil }
// Dialect returns the dialect of the driver we started the transaction from.
func (tx *txDriver) Dialect() string { return tx.drv.Dialect() }
// Close is a nop close.
func (*txDriver) Close() error { return nil }
// Commit is a nop commit for the internal builders.
// User must call `Tx.Commit` in order to commit the transaction.
func (*txDriver) Commit() error { return nil }
// Rollback is a nop rollback for the internal builders.
// User must call `Tx.Rollback` in order to rollback the transaction.
func (*txDriver) Rollback() error { return nil }
// Exec calls tx.Exec.
func (tx *txDriver) Exec(ctx context.Context, query string, args, v any) error {
return tx.tx.Exec(ctx, query, args, v)
}
// Query calls tx.Query.
func (tx *txDriver) Query(ctx context.Context, query string, args, v any) error {
return tx.tx.Query(ctx, query, args, v)
}
var _ dialect.Driver = (*txDriver)(nil)