Files
bj_power/bj_power_wms/ent/outboundorder.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

488 lines
18 KiB
Go

// Code generated by ent, DO NOT EDIT.
package ent
import (
"bj_power_wms/ent/outboundorder"
"encoding/json"
"fmt"
"strings"
"entgo.io/ent"
"entgo.io/ent/dialect/sql"
)
// OutboundOrder 出库统一主表
type OutboundOrder struct {
config `json:"-"`
// ID of the ent.
ID int `json:"id,omitempty"`
// 出库单号
OutboundNo string `json:"outboundNo,omitempty"`
// 出库类型
OutboundType string `json:"outboundType,omitempty"`
// 出库单状态 已出库/已送达
Status string `json:"status,omitempty"`
// 是否需要AGV配送到接驳台
NeedAgv bool `json:"needAgv,omitempty"`
// 出库类别 return/sample/scrap/deliver/other
OutboundCategory string `json:"outboundCategory,omitempty"`
// 归属类型 workorder/project/other
OwnershipType string `json:"ownershipType,omitempty"`
// 归属编号(工单号/科技项目号)
OwnershipNo string `json:"ownershipNo,omitempty"`
// 目标工位(装配工位号)
TargetStation string `json:"targetStation,omitempty"`
// 关联工单号(工单为唯一挂靠载体)
OrderNo string `json:"orderNo,omitempty"`
// 物料编码
MaterialCode string `json:"materialCode,omitempty"`
// 物料名称(冗余)
MaterialName string `json:"materialName,omitempty"`
// 类型 1结构件/2电气件/3其他
ManageMode int `json:"manageMode,omitempty"`
// 序列号 1=是(逐件SN)/2=否(按数量)/0未选择
SnMode int `json:"snMode,omitempty"`
// 批次号(结构件)
BatchNo string `json:"batchNo,omitempty"`
// 出库区域(大区)
ZoneCode string `json:"zoneCode,omitempty"`
// 货架号(与入库同口径)
ShelfNo string `json:"shelfNo,omitempty"`
// 第几层(与入库同口径)
LayerNo string `json:"layerNo,omitempty"`
// 位置号(与入库同口径)
PositionNo string `json:"positionNo,omitempty"`
// 本次出库总数量
Quantity int `json:"quantity,omitempty"`
// 操作人
Operator string `json:"operator,omitempty"`
// 复核人
Reviewer string `json:"reviewer,omitempty"`
// 目标接驳台(AGV配送)
TargetDock string `json:"targetDock,omitempty"`
// 备注
Remark string `json:"remark,omitempty"`
// 箱号(装箱出库时填写,用于整箱发货追溯)
BoxNo string `json:"boxNo,omitempty"`
// 装箱 SN 清单(JSON 数组字符串)
BoxSnList string `json:"boxSnList,omitempty"`
// 合同号(装箱选填)
ContractNo string `json:"contractNo,omitempty"`
// 跨工位借料来源 stationNo→借用量(call 备料出库专用);空=本工位自取
BorrowFrom map[string]int `json:"borrowFrom,omitempty"`
// 检测单号(溯源关联检验单据)
InspectionNo string `json:"inspectionNo,omitempty"`
// 关联配送单号(叫料配送出库回写)
DeliveryNo string `json:"deliveryNo,omitempty"`
// 产品工号(随库存带入,出库记录展示/筛选)
ProductWorkNo string `json:"productWorkNo,omitempty"`
// 是否已作废
Voided bool `json:"voided,omitempty"`
// 作废原因(必填留痕)
VoidReason string `json:"voidReason,omitempty"`
// 作废操作人
VoidedBy string `json:"voidedBy,omitempty"`
// 作废时间戳
VoidedAt *int64 `json:"voidedAt,omitempty"`
// 创建时间
CreatedAt int64 `json:"createdAt,omitempty"`
selectValues sql.SelectValues
}
// scanValues returns the types for scanning values from sql.Rows.
func (*OutboundOrder) scanValues(columns []string) ([]any, error) {
values := make([]any, len(columns))
for i := range columns {
switch columns[i] {
case outboundorder.FieldBorrowFrom:
values[i] = new([]byte)
case outboundorder.FieldNeedAgv, outboundorder.FieldVoided:
values[i] = new(sql.NullBool)
case outboundorder.FieldID, outboundorder.FieldManageMode, outboundorder.FieldSnMode, outboundorder.FieldQuantity, outboundorder.FieldVoidedAt, outboundorder.FieldCreatedAt:
values[i] = new(sql.NullInt64)
case outboundorder.FieldOutboundNo, outboundorder.FieldOutboundType, outboundorder.FieldStatus, outboundorder.FieldOutboundCategory, outboundorder.FieldOwnershipType, outboundorder.FieldOwnershipNo, outboundorder.FieldTargetStation, outboundorder.FieldOrderNo, outboundorder.FieldMaterialCode, outboundorder.FieldMaterialName, outboundorder.FieldBatchNo, outboundorder.FieldZoneCode, outboundorder.FieldShelfNo, outboundorder.FieldLayerNo, outboundorder.FieldPositionNo, outboundorder.FieldOperator, outboundorder.FieldReviewer, outboundorder.FieldTargetDock, outboundorder.FieldRemark, outboundorder.FieldBoxNo, outboundorder.FieldBoxSnList, outboundorder.FieldContractNo, outboundorder.FieldInspectionNo, outboundorder.FieldDeliveryNo, outboundorder.FieldProductWorkNo, outboundorder.FieldVoidReason, outboundorder.FieldVoidedBy:
values[i] = new(sql.NullString)
default:
values[i] = new(sql.UnknownType)
}
}
return values, nil
}
// assignValues assigns the values that were returned from sql.Rows (after scanning)
// to the OutboundOrder fields.
func (_m *OutboundOrder) 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 outboundorder.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 outboundorder.FieldOutboundNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field outbound_no", values[i])
} else if value.Valid {
_m.OutboundNo = value.String
}
case outboundorder.FieldOutboundType:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field outbound_type", values[i])
} else if value.Valid {
_m.OutboundType = value.String
}
case outboundorder.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 outboundorder.FieldNeedAgv:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field need_agv", values[i])
} else if value.Valid {
_m.NeedAgv = value.Bool
}
case outboundorder.FieldOutboundCategory:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field outbound_category", values[i])
} else if value.Valid {
_m.OutboundCategory = value.String
}
case outboundorder.FieldOwnershipType:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field ownership_type", values[i])
} else if value.Valid {
_m.OwnershipType = value.String
}
case outboundorder.FieldOwnershipNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field ownership_no", values[i])
} else if value.Valid {
_m.OwnershipNo = value.String
}
case outboundorder.FieldTargetStation:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field target_station", values[i])
} else if value.Valid {
_m.TargetStation = value.String
}
case outboundorder.FieldOrderNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field order_no", values[i])
} else if value.Valid {
_m.OrderNo = value.String
}
case outboundorder.FieldMaterialCode:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field material_code", values[i])
} else if value.Valid {
_m.MaterialCode = value.String
}
case outboundorder.FieldMaterialName:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field material_name", values[i])
} else if value.Valid {
_m.MaterialName = value.String
}
case outboundorder.FieldManageMode:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field manage_mode", values[i])
} else if value.Valid {
_m.ManageMode = int(value.Int64)
}
case outboundorder.FieldSnMode:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field sn_mode", values[i])
} else if value.Valid {
_m.SnMode = int(value.Int64)
}
case outboundorder.FieldBatchNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field batch_no", values[i])
} else if value.Valid {
_m.BatchNo = value.String
}
case outboundorder.FieldZoneCode:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field zone_code", values[i])
} else if value.Valid {
_m.ZoneCode = value.String
}
case outboundorder.FieldShelfNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field shelf_no", values[i])
} else if value.Valid {
_m.ShelfNo = value.String
}
case outboundorder.FieldLayerNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field layer_no", values[i])
} else if value.Valid {
_m.LayerNo = value.String
}
case outboundorder.FieldPositionNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field position_no", values[i])
} else if value.Valid {
_m.PositionNo = value.String
}
case outboundorder.FieldQuantity:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field quantity", values[i])
} else if value.Valid {
_m.Quantity = int(value.Int64)
}
case outboundorder.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 outboundorder.FieldReviewer:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field reviewer", values[i])
} else if value.Valid {
_m.Reviewer = value.String
}
case outboundorder.FieldTargetDock:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field target_dock", values[i])
} else if value.Valid {
_m.TargetDock = value.String
}
case outboundorder.FieldRemark:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field remark", values[i])
} else if value.Valid {
_m.Remark = value.String
}
case outboundorder.FieldBoxNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field box_no", values[i])
} else if value.Valid {
_m.BoxNo = value.String
}
case outboundorder.FieldBoxSnList:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field box_sn_list", values[i])
} else if value.Valid {
_m.BoxSnList = value.String
}
case outboundorder.FieldContractNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field contract_no", values[i])
} else if value.Valid {
_m.ContractNo = value.String
}
case outboundorder.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 outboundorder.FieldInspectionNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field inspection_no", values[i])
} else if value.Valid {
_m.InspectionNo = value.String
}
case outboundorder.FieldDeliveryNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field delivery_no", values[i])
} else if value.Valid {
_m.DeliveryNo = value.String
}
case outboundorder.FieldProductWorkNo:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field product_work_no", values[i])
} else if value.Valid {
_m.ProductWorkNo = value.String
}
case outboundorder.FieldVoided:
if value, ok := values[i].(*sql.NullBool); !ok {
return fmt.Errorf("unexpected type %T for field voided", values[i])
} else if value.Valid {
_m.Voided = value.Bool
}
case outboundorder.FieldVoidReason:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field void_reason", values[i])
} else if value.Valid {
_m.VoidReason = value.String
}
case outboundorder.FieldVoidedBy:
if value, ok := values[i].(*sql.NullString); !ok {
return fmt.Errorf("unexpected type %T for field voided_by", values[i])
} else if value.Valid {
_m.VoidedBy = value.String
}
case outboundorder.FieldVoidedAt:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field voided_at", values[i])
} else if value.Valid {
_m.VoidedAt = new(int64)
*_m.VoidedAt = value.Int64
}
case outboundorder.FieldCreatedAt:
if value, ok := values[i].(*sql.NullInt64); !ok {
return fmt.Errorf("unexpected type %T for field created_at", values[i])
} else if value.Valid {
_m.CreatedAt = value.Int64
}
default:
_m.selectValues.Set(columns[i], values[i])
}
}
return nil
}
// Value returns the ent.Value that was dynamically selected and assigned to the OutboundOrder.
// This includes values selected through modifiers, order, etc.
func (_m *OutboundOrder) Value(name string) (ent.Value, error) {
return _m.selectValues.Get(name)
}
// Update returns a builder for updating this OutboundOrder.
// Note that you need to call OutboundOrder.Unwrap() before calling this method if this OutboundOrder
// was returned from a transaction, and the transaction was committed or rolled back.
func (_m *OutboundOrder) Update() *OutboundOrderUpdateOne {
return NewOutboundOrderClient(_m.config).UpdateOne(_m)
}
// Unwrap unwraps the OutboundOrder 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 *OutboundOrder) Unwrap() *OutboundOrder {
_tx, ok := _m.config.driver.(*txDriver)
if !ok {
panic("ent: OutboundOrder is not a transactional entity")
}
_m.config.driver = _tx.drv
return _m
}
// String implements the fmt.Stringer.
func (_m *OutboundOrder) String() string {
var builder strings.Builder
builder.WriteString("OutboundOrder(")
builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID))
builder.WriteString("outbound_no=")
builder.WriteString(_m.OutboundNo)
builder.WriteString(", ")
builder.WriteString("outbound_type=")
builder.WriteString(_m.OutboundType)
builder.WriteString(", ")
builder.WriteString("status=")
builder.WriteString(_m.Status)
builder.WriteString(", ")
builder.WriteString("need_agv=")
builder.WriteString(fmt.Sprintf("%v", _m.NeedAgv))
builder.WriteString(", ")
builder.WriteString("outbound_category=")
builder.WriteString(_m.OutboundCategory)
builder.WriteString(", ")
builder.WriteString("ownership_type=")
builder.WriteString(_m.OwnershipType)
builder.WriteString(", ")
builder.WriteString("ownership_no=")
builder.WriteString(_m.OwnershipNo)
builder.WriteString(", ")
builder.WriteString("target_station=")
builder.WriteString(_m.TargetStation)
builder.WriteString(", ")
builder.WriteString("order_no=")
builder.WriteString(_m.OrderNo)
builder.WriteString(", ")
builder.WriteString("material_code=")
builder.WriteString(_m.MaterialCode)
builder.WriteString(", ")
builder.WriteString("material_name=")
builder.WriteString(_m.MaterialName)
builder.WriteString(", ")
builder.WriteString("manage_mode=")
builder.WriteString(fmt.Sprintf("%v", _m.ManageMode))
builder.WriteString(", ")
builder.WriteString("sn_mode=")
builder.WriteString(fmt.Sprintf("%v", _m.SnMode))
builder.WriteString(", ")
builder.WriteString("batch_no=")
builder.WriteString(_m.BatchNo)
builder.WriteString(", ")
builder.WriteString("zone_code=")
builder.WriteString(_m.ZoneCode)
builder.WriteString(", ")
builder.WriteString("shelf_no=")
builder.WriteString(_m.ShelfNo)
builder.WriteString(", ")
builder.WriteString("layer_no=")
builder.WriteString(_m.LayerNo)
builder.WriteString(", ")
builder.WriteString("position_no=")
builder.WriteString(_m.PositionNo)
builder.WriteString(", ")
builder.WriteString("quantity=")
builder.WriteString(fmt.Sprintf("%v", _m.Quantity))
builder.WriteString(", ")
builder.WriteString("operator=")
builder.WriteString(_m.Operator)
builder.WriteString(", ")
builder.WriteString("reviewer=")
builder.WriteString(_m.Reviewer)
builder.WriteString(", ")
builder.WriteString("target_dock=")
builder.WriteString(_m.TargetDock)
builder.WriteString(", ")
builder.WriteString("remark=")
builder.WriteString(_m.Remark)
builder.WriteString(", ")
builder.WriteString("box_no=")
builder.WriteString(_m.BoxNo)
builder.WriteString(", ")
builder.WriteString("box_sn_list=")
builder.WriteString(_m.BoxSnList)
builder.WriteString(", ")
builder.WriteString("contract_no=")
builder.WriteString(_m.ContractNo)
builder.WriteString(", ")
builder.WriteString("borrowFrom=")
builder.WriteString(fmt.Sprintf("%v", _m.BorrowFrom))
builder.WriteString(", ")
builder.WriteString("inspection_no=")
builder.WriteString(_m.InspectionNo)
builder.WriteString(", ")
builder.WriteString("delivery_no=")
builder.WriteString(_m.DeliveryNo)
builder.WriteString(", ")
builder.WriteString("product_work_no=")
builder.WriteString(_m.ProductWorkNo)
builder.WriteString(", ")
builder.WriteString("voided=")
builder.WriteString(fmt.Sprintf("%v", _m.Voided))
builder.WriteString(", ")
builder.WriteString("void_reason=")
builder.WriteString(_m.VoidReason)
builder.WriteString(", ")
builder.WriteString("voided_by=")
builder.WriteString(_m.VoidedBy)
builder.WriteString(", ")
if v := _m.VoidedAt; v != nil {
builder.WriteString("voided_at=")
builder.WriteString(fmt.Sprintf("%v", *v))
}
builder.WriteString(", ")
builder.WriteString("created_at=")
builder.WriteString(fmt.Sprintf("%v", _m.CreatedAt))
builder.WriteByte(')')
return builder.String()
}
// OutboundOrders is a parsable slice of OutboundOrder.
type OutboundOrders []*OutboundOrder