一、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 更新重新生成。
216 lines
7.5 KiB
Go
216 lines
7.5 KiB
Go
// Code generated by ent, DO NOT EDIT.
|
|
|
|
package ent
|
|
|
|
import (
|
|
"bj_power_wms/ent/deliveryorderitem"
|
|
"fmt"
|
|
"strings"
|
|
|
|
"entgo.io/ent"
|
|
"entgo.io/ent/dialect/sql"
|
|
)
|
|
|
|
// DeliveryOrderItem 配送单明细:物料×量×工位×工单×工艺×排产日
|
|
type DeliveryOrderItem struct {
|
|
config `json:"-"`
|
|
// ID of the ent.
|
|
ID int `json:"id,omitempty"`
|
|
// 配送单号
|
|
DeliveryNo string `json:"deliveryNo,omitempty"`
|
|
// 关联叫料单号
|
|
RequestNo string `json:"requestNo,omitempty"`
|
|
// 物料编码
|
|
MaterialCode string `json:"materialCode,omitempty"`
|
|
// 物料名称
|
|
MaterialName string `json:"materialName,omitempty"`
|
|
// 单位
|
|
Unit string `json:"unit,omitempty"`
|
|
// 本次配送数量
|
|
Qty float64 `json:"qty,omitempty"`
|
|
// 目标工位号
|
|
StationNo int `json:"stationNo,omitempty"`
|
|
// 工单号(物料挂工单)
|
|
OrderNo string `json:"orderNo,omitempty"`
|
|
// 工艺名
|
|
FlowName string `json:"flowName,omitempty"`
|
|
// 排产日 yyyy-MM-dd
|
|
PlanDate string `json:"planDate,omitempty"`
|
|
// 序列号 1=是(逐件SN)/2=否
|
|
SnMode int `json:"snMode,omitempty"`
|
|
selectValues sql.SelectValues
|
|
}
|
|
|
|
// scanValues returns the types for scanning values from sql.Rows.
|
|
func (*DeliveryOrderItem) scanValues(columns []string) ([]any, error) {
|
|
values := make([]any, len(columns))
|
|
for i := range columns {
|
|
switch columns[i] {
|
|
case deliveryorderitem.FieldQty:
|
|
values[i] = new(sql.NullFloat64)
|
|
case deliveryorderitem.FieldID, deliveryorderitem.FieldStationNo, deliveryorderitem.FieldSnMode:
|
|
values[i] = new(sql.NullInt64)
|
|
case deliveryorderitem.FieldDeliveryNo, deliveryorderitem.FieldRequestNo, deliveryorderitem.FieldMaterialCode, deliveryorderitem.FieldMaterialName, deliveryorderitem.FieldUnit, deliveryorderitem.FieldOrderNo, deliveryorderitem.FieldFlowName, deliveryorderitem.FieldPlanDate:
|
|
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 DeliveryOrderItem fields.
|
|
func (_m *DeliveryOrderItem) 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 deliveryorderitem.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 deliveryorderitem.FieldDeliveryNo:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field deliveryNo", values[i])
|
|
} else if value.Valid {
|
|
_m.DeliveryNo = value.String
|
|
}
|
|
case deliveryorderitem.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 deliveryorderitem.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 deliveryorderitem.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 deliveryorderitem.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 deliveryorderitem.FieldQty:
|
|
if value, ok := values[i].(*sql.NullFloat64); !ok {
|
|
return fmt.Errorf("unexpected type %T for field qty", values[i])
|
|
} else if value.Valid {
|
|
_m.Qty = value.Float64
|
|
}
|
|
case deliveryorderitem.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 deliveryorderitem.FieldOrderNo:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field orderNo", values[i])
|
|
} else if value.Valid {
|
|
_m.OrderNo = value.String
|
|
}
|
|
case deliveryorderitem.FieldFlowName:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field flowName", values[i])
|
|
} else if value.Valid {
|
|
_m.FlowName = value.String
|
|
}
|
|
case deliveryorderitem.FieldPlanDate:
|
|
if value, ok := values[i].(*sql.NullString); !ok {
|
|
return fmt.Errorf("unexpected type %T for field planDate", values[i])
|
|
} else if value.Valid {
|
|
_m.PlanDate = value.String
|
|
}
|
|
case deliveryorderitem.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)
|
|
}
|
|
default:
|
|
_m.selectValues.Set(columns[i], values[i])
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Value returns the ent.Value that was dynamically selected and assigned to the DeliveryOrderItem.
|
|
// This includes values selected through modifiers, order, etc.
|
|
func (_m *DeliveryOrderItem) Value(name string) (ent.Value, error) {
|
|
return _m.selectValues.Get(name)
|
|
}
|
|
|
|
// Update returns a builder for updating this DeliveryOrderItem.
|
|
// Note that you need to call DeliveryOrderItem.Unwrap() before calling this method if this DeliveryOrderItem
|
|
// was returned from a transaction, and the transaction was committed or rolled back.
|
|
func (_m *DeliveryOrderItem) Update() *DeliveryOrderItemUpdateOne {
|
|
return NewDeliveryOrderItemClient(_m.config).UpdateOne(_m)
|
|
}
|
|
|
|
// Unwrap unwraps the DeliveryOrderItem 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 *DeliveryOrderItem) Unwrap() *DeliveryOrderItem {
|
|
_tx, ok := _m.config.driver.(*txDriver)
|
|
if !ok {
|
|
panic("ent: DeliveryOrderItem is not a transactional entity")
|
|
}
|
|
_m.config.driver = _tx.drv
|
|
return _m
|
|
}
|
|
|
|
// String implements the fmt.Stringer.
|
|
func (_m *DeliveryOrderItem) String() string {
|
|
var builder strings.Builder
|
|
builder.WriteString("DeliveryOrderItem(")
|
|
builder.WriteString(fmt.Sprintf("id=%v, ", _m.ID))
|
|
builder.WriteString("deliveryNo=")
|
|
builder.WriteString(_m.DeliveryNo)
|
|
builder.WriteString(", ")
|
|
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("qty=")
|
|
builder.WriteString(fmt.Sprintf("%v", _m.Qty))
|
|
builder.WriteString(", ")
|
|
builder.WriteString("stationNo=")
|
|
builder.WriteString(fmt.Sprintf("%v", _m.StationNo))
|
|
builder.WriteString(", ")
|
|
builder.WriteString("orderNo=")
|
|
builder.WriteString(_m.OrderNo)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("flowName=")
|
|
builder.WriteString(_m.FlowName)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("planDate=")
|
|
builder.WriteString(_m.PlanDate)
|
|
builder.WriteString(", ")
|
|
builder.WriteString("snMode=")
|
|
builder.WriteString(fmt.Sprintf("%v", _m.SnMode))
|
|
builder.WriteByte(')')
|
|
return builder.String()
|
|
}
|
|
|
|
// DeliveryOrderItems is a parsable slice of DeliveryOrderItem.
|
|
type DeliveryOrderItems []*DeliveryOrderItem
|