Files
bj_power/bj_power_mes/ent/materialrequest.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

486 lines
19 KiB
Go

// Code generated by ent, DO NOT EDIT.
package ent
import (
"bj_power_mes/ent/materialrequest"
"bj_power_mes/schema"
"encoding/json"
"fmt"
"strings"
"time"
"entgo.io/ent"
"entgo.io/ent/dialect/sql"
)
// MaterialRequest 叫料单:从叫料池发起,不绑工单/排产;七态状态机
type MaterialRequest struct {
config `json:"-"`
// ID of the ent.
ID int `json:"id,omitempty"`
// 叫料单号
RequestNo string `json:"requestNo,omitempty"`
// 物料编码
MaterialCode string `json:"materialCode,omitempty"`
// MaterialName holds the value of the "materialName" field.
MaterialName string `json:"materialName,omitempty"`
// Unit holds the value of the "unit" field.
Unit string `json:"unit,omitempty"`
// SnMode holds the value of the "snMode" field.
SnMode int `json:"snMode,omitempty"`
// 请求量(发起时占用叫料池可用量)
ReqQty float64 `json:"reqQty,omitempty"`
// Status holds the value of the "status" field.
Status string `json:"status,omitempty"`
// 期望接驳台(可空;配送时 WMS 确定实际接驳台,2026-11-05 降级)
TargetDock string `json:"targetDock,omitempty"`
// 目标工位号
StationNo int `json:"stationNo,omitempty"`
// 实发量(仓库完成备料时确定,禁单内分批)
SentQty float64 `json:"sentQty,omitempty"`
// 退库量(整单退;仓库确认收回后叫料池额度回补)
ReturnedQty float64 `json:"returnedQty,omitempty"`
// 来源 CALL/REFILL
Source string `json:"source,omitempty"`
// 关联数量不符单号
RefReportNo string `json:"refReportNo,omitempty"`
// 是否需要AGV配送到接驳台
NeedAgv bool `json:"needAgv,omitempty"`
// AGV 任务号(派车成功后回写)
AgvTaskNo string `json:"agvTaskNo,omitempty"`
// 跨日标记:叫料池行含非今日排产(工位预警+仓库可驳回异常)
CrossDay bool `json:"crossDay,omitempty"`
// WMS 出库单号(完成备料回写,多个逗号分隔)
OutboundNo string `json:"outboundNo,omitempty"`
// 驳回理由(仓库拒发时必填)
RejectReason string `json:"rejectReason,omitempty"`
// 跨工位借料来源 stationNo→借用量;空=本工位自取
BorrowFrom map[string]int `json:"borrowFrom,omitempty"`
// Operator holds the value of the "operator" field.
Operator string `json:"operator,omitempty"`
// 叫料包号(同批提交同号;空=存量单包)
PackageNo string `json:"packageNo,omitempty"`
// 叫料日(所选排产日 yyyy-MM-dd;默认当天)
CallDate string `json:"callDate,omitempty"`
// 工单×排产日明细 [{orderNo,planDate,flowId,flowName,qty}]
PlanBreakdown []schema.CallPlanBreakdown `json:"planBreakdown,omitempty"`
// 关联工单号(转产按工单精确退料;普通叫料单为空)
WorkOrderNo string `json:"workOrderNo,omitempty"`
// 退料接驳台(退料/还库时指定从哪个接驳台拉走,AGV 派车依据)
ReturnDock string `json:"returnDock,omitempty"`
// 理论应退量(转产/下班退料按 BOM 计算;实际<理论差额=损耗)
TheoryQty *float64 `json:"theoryQty,omitempty"`
// 损耗量(理论应退-实际退回>0 时记录)
LossQty *float64 `json:"lossQty,omitempty"`
// 损耗原因(有损耗时必填,主管在损耗台账批注)
LossReason string `json:"lossReason,omitempty"`
// 库管实收量(WMS 确认收货回写)
ReceiveQty *float64 `json:"receiveQty,omitempty"`
// 收货差异=应退-实收(>0 为少收,记待核,不自动进损耗台账)
ReceiveDiff *float64 `json:"receiveDiff,omitempty"`
// 收货差异备注(库管填写,说明差异原因)
ReceiveNote string `json:"receiveNote,omitempty"`
// CreatedAt holds the value of the "createdAt" field.
CreatedAt time.Time `json:"createdAt,omitempty"`
// UpdatedAt holds the value of the "updatedAt" field.
UpdatedAt *time.Time `json:"updatedAt,omitempty"`
selectValues sql.SelectValues
}
// scanValues returns the types for scanning values from sql.Rows.
func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
values := make([]any, len(columns))
for i := range columns {
switch columns[i] {
case materialrequest.FieldBorrowFrom, materialrequest.FieldPlanBreakdown:
values[i] = new([]byte)
case materialrequest.FieldNeedAgv, materialrequest.FieldCrossDay:
values[i] = new(sql.NullBool)
case materialrequest.FieldReqQty, materialrequest.FieldSentQty, materialrequest.FieldReturnedQty, materialrequest.FieldTheoryQty, materialrequest.FieldLossQty, materialrequest.FieldReceiveQty, materialrequest.FieldReceiveDiff:
values[i] = new(sql.NullFloat64)
case materialrequest.FieldID, materialrequest.FieldSnMode, materialrequest.FieldStationNo:
values[i] = new(sql.NullInt64)
case materialrequest.FieldRequestNo, materialrequest.FieldMaterialCode, materialrequest.FieldMaterialName, materialrequest.FieldUnit, materialrequest.FieldStatus, materialrequest.FieldTargetDock, materialrequest.FieldSource, materialrequest.FieldRefReportNo, materialrequest.FieldAgvTaskNo, materialrequest.FieldOutboundNo, materialrequest.FieldRejectReason, materialrequest.FieldOperator, materialrequest.FieldPackageNo, materialrequest.FieldCallDate, materialrequest.FieldWorkOrderNo, materialrequest.FieldReturnDock, materialrequest.FieldLossReason, materialrequest.FieldReceiveNote:
values[i] = new(sql.NullString)
case materialrequest.FieldCreatedAt, materialrequest.FieldUpdatedAt:
values[i] = new(sql.NullTime)
default:
values[i] = new(sql.UnknownType)
}
}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the MaterialRequest fields.
func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
if m, n := len(values), len(columns); m < n {
return fmt.Errorf("mismatch number of scan values: %d != %d", m, n)
}
for i := range columns {
switch columns[i] {
case materialrequest.FieldID:
value, ok := values[i].(*sql.NullInt64)
if !ok {
return fmt.Errorf("unexpected type %T for field id", value)
}
_m.ID = int(value.Int64)
case materialrequest.FieldRequestNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field requestNo", values[i])
} else if value.Valid {
_m.RequestNo = value.String
}
case materialrequest.FieldMaterialCode:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field materialCode", values[i])
} else if value.Valid {
_m.MaterialCode = value.String
}
case materialrequest.FieldMaterialName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field materialName", values[i])
} else if value.Valid {
_m.MaterialName = value.String
}
case materialrequest.FieldUnit:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field unit", values[i])
} else if value.Valid {
_m.Unit = value.String
}
case materialrequest.FieldSnMode:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field snMode", values[i])
} else if value.Valid {
_m.SnMode = int(value.Int64)
}
case materialrequest.FieldReqQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field reqQty", values[i])
} else if value.Valid {
_m.ReqQty = value.Float64
}
case materialrequest.FieldStatus:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field status", values[i])
} else if value.Valid {
_m.Status = value.String
}
case materialrequest.FieldTargetDock:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field targetDock", values[i])
} else if value.Valid {
_m.TargetDock = value.String
}
case materialrequest.FieldStationNo:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field stationNo", values[i])
} else if value.Valid {
_m.StationNo = int(value.Int64)
}
case materialrequest.FieldSentQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field sentQty", values[i])
} else if value.Valid {
_m.SentQty = value.Float64
}
case materialrequest.FieldReturnedQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field returnedQty", values[i])
} else if value.Valid {
_m.ReturnedQty = value.Float64
}
case materialrequest.FieldSource:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field source", values[i])
} else if value.Valid {
_m.Source = value.String
}
case materialrequest.FieldRefReportNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field refReportNo", values[i])
} else if value.Valid {
_m.RefReportNo = value.String
}
case materialrequest.FieldNeedAgv:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field needAgv", values[i])
} else if value.Valid {
_m.NeedAgv = value.Bool
}
case materialrequest.FieldAgvTaskNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field agvTaskNo", values[i])
} else if value.Valid {
_m.AgvTaskNo = value.String
}
case materialrequest.FieldCrossDay:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field crossDay", values[i])
} else if value.Valid {
_m.CrossDay = value.Bool
}
case materialrequest.FieldOutboundNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field outboundNo", values[i])
} else if value.Valid {
_m.OutboundNo = value.String
}
case materialrequest.FieldRejectReason:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field rejectReason", values[i])
} else if value.Valid {
_m.RejectReason = value.String
}
case materialrequest.FieldBorrowFrom:
if value, ok := values[i].(*[]byte); !ok {
return fmt.Errorf("unexpected type %T for field borrowFrom", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &_m.BorrowFrom); err != nil {
return fmt.Errorf("unmarshal field borrowFrom: %w", err)
}
}
case materialrequest.FieldOperator:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field operator", values[i])
} else if value.Valid {
_m.Operator = value.String
}
case materialrequest.FieldPackageNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field packageNo", values[i])
} else if value.Valid {
_m.PackageNo = value.String
}
case materialrequest.FieldCallDate:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field callDate", values[i])
} else if value.Valid {
_m.CallDate = value.String
}
case materialrequest.FieldPlanBreakdown:
if value, ok := values[i].(*[]byte); !ok {
return fmt.Errorf("unexpected type %T for field planBreakdown", values[i])
} else if value != nil && len(*value) > 0 {
if err := json.Unmarshal(*value, &_m.PlanBreakdown); err != nil {
return fmt.Errorf("unmarshal field planBreakdown: %w", err)
}
}
case materialrequest.FieldWorkOrderNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field workOrderNo", values[i])
} else if value.Valid {
_m.WorkOrderNo = value.String
}
case materialrequest.FieldReturnDock:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field returnDock", values[i])
} else if value.Valid {
_m.ReturnDock = value.String
}
case materialrequest.FieldTheoryQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field theoryQty", values[i])
} else if value.Valid {
_m.TheoryQty = new(float64)
*_m.TheoryQty = value.Float64
}
case materialrequest.FieldLossQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field lossQty", values[i])
} else if value.Valid {
_m.LossQty = new(float64)
*_m.LossQty = value.Float64
}
case materialrequest.FieldLossReason:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field lossReason", values[i])
} else if value.Valid {
_m.LossReason = value.String
}
case materialrequest.FieldReceiveQty:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field receiveQty", values[i])
} else if value.Valid {
_m.ReceiveQty = new(float64)
*_m.ReceiveQty = value.Float64
}
case materialrequest.FieldReceiveDiff:
if value, ok := values[i].(*sql.NullFloat64); !ok {
return fmt.Errorf("unexpected type %T for field receiveDiff", values[i])
} else if value.Valid {
_m.ReceiveDiff = new(float64)
*_m.ReceiveDiff = value.Float64
}
case materialrequest.FieldReceiveNote:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field receiveNote", values[i])
} else if value.Valid {
_m.ReceiveNote = value.String
}
case materialrequest.FieldCreatedAt:
if value, ok := values[i].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field createdAt", values[i])
} else if value.Valid {
_m.CreatedAt = value.Time
}
case materialrequest.FieldUpdatedAt:
if value, ok := values[i].(*sql.NullTime); !ok {
return fmt.Errorf("unexpected type %T for field updatedAt", values[i])
} else if value.Valid {
_m.UpdatedAt = new(time.Time)
*_m.UpdatedAt = value.Time
}
default:
_m.selectValues.Set(columns[i], values[i])
}
}
return nil
}
// Value returns the ent.Value that was dynamically selected and assigned to the MaterialRequest.
// This includes values selected through modifiers, order, etc.
func (_m *MaterialRequest) Value(name string) (ent.Value, error) {
return _m.selectValues.Get(name)
}
// Update returns a builder for updating this MaterialRequest.
// Note that you need to call MaterialRequest.Unwrap() before calling this method if this MaterialRequest
// was returned from a transaction, and the transaction was committed or rolled back.
func (_m *MaterialRequest) Update() *MaterialRequestUpdateOne {
return NewMaterialRequestClient(_m.config).UpdateOne(_m)
}
// Unwrap unwraps the MaterialRequest entity that was returned from a transaction after it was closed,
// so that all future queries will be executed through the driver which created the transaction.
func (_m *MaterialRequest) Unwrap() *MaterialRequest {
_tx, ok := _m.config.driver.(*txDriver)
if !ok {
panic("ent: MaterialRequest is not a transactional entity")
}
_m.config.driver = _tx.drv
return _m
}
// String implements the fmt.Stringer.
func (_m *MaterialRequest) String() string {
var builder strings.Builder
builder.WriteString("MaterialRequest(")
builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID))
builder.WriteString("requestNo=")
builder.WriteString(_m.RequestNo)
builder.WriteString(", ")
builder.WriteString("materialCode=")
builder.WriteString(_m.MaterialCode)
builder.WriteString(", ")
builder.WriteString("materialName=")
builder.WriteString(_m.MaterialName)
builder.WriteString(", ")
builder.WriteString("unit=")
builder.WriteString(_m.Unit)
builder.WriteString(", ")
builder.WriteString("snMode=")
builder.WriteString(fmt.Sprintf("%v", _m.SnMode))
builder.WriteString(", ")
builder.WriteString("reqQty=")
builder.WriteString(fmt.Sprintf("%v", _m.ReqQty))
builder.WriteString(", ")
builder.WriteString("status=")
builder.WriteString(_m.Status)
builder.WriteString(", ")
builder.WriteString("targetDock=")
builder.WriteString(_m.TargetDock)
builder.WriteString(", ")
builder.WriteString("stationNo=")
builder.WriteString(fmt.Sprintf("%v", _m.StationNo))
builder.WriteString(", ")
builder.WriteString("sentQty=")
builder.WriteString(fmt.Sprintf("%v", _m.SentQty))
builder.WriteString(", ")
builder.WriteString("returnedQty=")
builder.WriteString(fmt.Sprintf("%v", _m.ReturnedQty))
builder.WriteString(", ")
builder.WriteString("source=")
builder.WriteString(_m.Source)
builder.WriteString(", ")
builder.WriteString("refReportNo=")
builder.WriteString(_m.RefReportNo)
builder.WriteString(", ")
builder.WriteString("needAgv=")
builder.WriteString(fmt.Sprintf("%v", _m.NeedAgv))
builder.WriteString(", ")
builder.WriteString("agvTaskNo=")
builder.WriteString(_m.AgvTaskNo)
builder.WriteString(", ")
builder.WriteString("crossDay=")
builder.WriteString(fmt.Sprintf("%v", _m.CrossDay))
builder.WriteString(", ")
builder.WriteString("outboundNo=")
builder.WriteString(_m.OutboundNo)
builder.WriteString(", ")
builder.WriteString("rejectReason=")
builder.WriteString(_m.RejectReason)
builder.WriteString(", ")
builder.WriteString("borrowFrom=")
builder.WriteString(fmt.Sprintf("%v", _m.BorrowFrom))
builder.WriteString(", ")
builder.WriteString("operator=")
builder.WriteString(_m.Operator)
builder.WriteString(", ")
builder.WriteString("packageNo=")
builder.WriteString(_m.PackageNo)
builder.WriteString(", ")
builder.WriteString("callDate=")
builder.WriteString(_m.CallDate)
builder.WriteString(", ")
builder.WriteString("planBreakdown=")
builder.WriteString(fmt.Sprintf("%v", _m.PlanBreakdown))
builder.WriteString(", ")
builder.WriteString("workOrderNo=")
builder.WriteString(_m.WorkOrderNo)
builder.WriteString(", ")
builder.WriteString("returnDock=")
builder.WriteString(_m.ReturnDock)
builder.WriteString(", ")
if v := _m.TheoryQty; v != nil {
builder.WriteString("theoryQty=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
if v := _m.LossQty; v != nil {
builder.WriteString("lossQty=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
builder.WriteString("lossReason=")
builder.WriteString(_m.LossReason)
builder.WriteString(", ")
if v := _m.ReceiveQty; v != nil {
builder.WriteString("receiveQty=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
if v := _m.ReceiveDiff; v != nil {
builder.WriteString("receiveDiff=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
builder.WriteString("receiveNote=")
builder.WriteString(_m.ReceiveNote)
builder.WriteString(", ")
builder.WriteString("createdAt=")
builder.WriteString(_m.CreatedAt.Format(time.ANSIC))
builder.WriteString(", ")
if v := _m.UpdatedAt; v != nil {
builder.WriteString("updatedAt=")
builder.WriteString(v.Format(time.ANSIC))
}
builder.WriteByte(')')
return builder.String()
}
// MaterialRequests is a parsable slice of MaterialRequest.
type MaterialRequests []*MaterialRequest