按模块说明
一、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:
@@ -4,6 +4,7 @@ package ent
|
||||
|
||||
import (
|
||||
"bj_power_mes/ent/materialrequest"
|
||||
"bj_power_mes/schema"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
@@ -32,7 +33,7 @@ type MaterialRequest struct {
|
||||
ReqQty float64 `json:"reqQty,omitempty"`
|
||||
// Status holds the value of the "status" field.
|
||||
Status string `json:"status,omitempty"`
|
||||
// 目标接驳台(GxR1/GxR2,一单一个托盘)
|
||||
// 期望接驳台(可空;配送时 WMS 确定实际接驳台,2026-11-05 降级)
|
||||
TargetDock string `json:"targetDock,omitempty"`
|
||||
// 目标工位号
|
||||
StationNo int `json:"stationNo,omitempty"`
|
||||
@@ -58,6 +59,12 @@ type MaterialRequest struct {
|
||||
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 派车依据)
|
||||
@@ -86,7 +93,7 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
|
||||
values := make([]any, len(columns))
|
||||
for i := range columns {
|
||||
switch columns[i] {
|
||||
case materialrequest.FieldBorrowFrom:
|
||||
case materialrequest.FieldBorrowFrom, materialrequest.FieldPlanBreakdown:
|
||||
values[i] = new([]byte)
|
||||
case materialrequest.FieldNeedAgv, materialrequest.FieldCrossDay:
|
||||
values[i] = new(sql.NullBool)
|
||||
@@ -94,7 +101,7 @@ func (*MaterialRequest) scanValues(columns []string) ([]any, error) {
|
||||
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.FieldWorkOrderNo, materialrequest.FieldReturnDock, materialrequest.FieldLossReason, materialrequest.FieldReceiveNote:
|
||||
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)
|
||||
@@ -241,6 +248,26 @@ func (_m *MaterialRequest) assignValues(columns []string, values []any) error {
|
||||
} 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])
|
||||
@@ -402,6 +429,15 @@ func (_m *MaterialRequest) String() string {
|
||||
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(", ")
|
||||
|
||||
Reference in New Issue
Block a user