按模块说明
一、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:
@@ -8,6 +8,7 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strconv"
|
||||
@@ -99,6 +100,167 @@ type MaterialRequest struct {
|
||||
Operator string `json:"operator"`
|
||||
CreatedAt string `json:"createdAt"` // RFC3339(MES ent 序列化),大屏叫料池显示 HH:MM 用
|
||||
BorrowFrom map[string]int `json:"borrowFrom"` // 跨工位借料来源(MES 记账):stationNo→借用量;含本工位自取
|
||||
// 2026-11-05 叫料包拍板:一次提交=一包;物料挂工单(工单×排产日明细)
|
||||
PackageNo string `json:"packageNo"`
|
||||
CallDate string `json:"callDate"`
|
||||
WorkOrderNo string `json:"workOrderNo"`
|
||||
PlanBreakdown []CallPlanBreakdown `json:"planBreakdown"`
|
||||
}
|
||||
|
||||
// CallPlanBreakdown 叫料单的 工单×排产日 明细行(MES schema.CallPlanBreakdown 同构)
|
||||
type CallPlanBreakdown struct {
|
||||
OrderNo string `json:"orderNo"`
|
||||
PlanDate string `json:"planDate"`
|
||||
FlowID int `json:"flowId"`
|
||||
FlowName string `json:"flowName"`
|
||||
Qty float64 `json:"qty"`
|
||||
}
|
||||
|
||||
// PoolRow 叫料池行(工位×物料 四数账;WMS 代叫料对话框数据源)
|
||||
type PoolRow struct {
|
||||
StationNo int `json:"stationNo"`
|
||||
MaterialCode string `json:"materialCode"`
|
||||
MaterialName string `json:"materialName"`
|
||||
Unit string `json:"unit"`
|
||||
SnMode int `json:"snMode"`
|
||||
ReqQty int `json:"reqQty"`
|
||||
AdjQty int `json:"adjQty"`
|
||||
SentQty int `json:"sentQty"`
|
||||
ReservedQty int `json:"reservedQty"`
|
||||
AvailQty int `json:"availQty"`
|
||||
CrossDay bool `json:"crossDay"`
|
||||
PlanDates string `json:"planDates"`
|
||||
}
|
||||
|
||||
// DockPalletState 接驳台托盘状态(实时传感器为准;plcOk=false 为台账回退值)
|
||||
type DockPalletState struct {
|
||||
DockCode string `json:"dockCode"`
|
||||
Name string `json:"name"`
|
||||
Side string `json:"side"`
|
||||
HasPallet bool `json:"hasPallet"`
|
||||
LedgerPallet bool `json:"ledgerPallet"`
|
||||
PlcOk bool `json:"plcOk"`
|
||||
}
|
||||
|
||||
// DeliveryAgvItem 配送单派车物料行(转发 MES /api/internal/delivery/dispatch)
|
||||
type DeliveryAgvItem struct {
|
||||
RequestNo string `json:"requestNo"`
|
||||
MaterialCode string `json:"materialCode"`
|
||||
MaterialName string `json:"materialName"`
|
||||
Unit string `json:"unit"`
|
||||
Qty float64 `json:"qty"`
|
||||
}
|
||||
|
||||
// getJSON MES GET 通用(带 token;返回 body 的 data 字段)
|
||||
func (c *Client) getJSON(ctx context.Context, path string, out any) error {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.baseURL+path, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("X-API-TOKEN", c.token)
|
||||
resp, err := c.hc.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
raw, _ := io.ReadAll(resp.Body)
|
||||
if resp.StatusCode >= 300 {
|
||||
var br struct {
|
||||
Message string `json:"message"`
|
||||
}
|
||||
_ = json.Unmarshal(raw, &br)
|
||||
if br.Message != "" {
|
||||
return errors.New(br.Message)
|
||||
}
|
||||
return fmt.Errorf("MES 返回 HTTP %d", resp.StatusCode)
|
||||
}
|
||||
var env struct {
|
||||
Code int `json:"code"`
|
||||
Data json.RawMessage `json:"data"`
|
||||
}
|
||||
if err := json.Unmarshal(raw, &env); err != nil {
|
||||
return err
|
||||
}
|
||||
if out != nil && len(env.Data) > 0 {
|
||||
return json.Unmarshal(env.Data, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// postJSON MES POST 通用(带 token;非 2xx 透出业务错误原文)
|
||||
func (c *Client) postJSON(ctx context.Context, path string, body any) error {
|
||||
b, _ := json.Marshal(body)
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.baseURL+path, bytes.NewReader(b))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("X-API-TOKEN", c.token)
|
||||
resp, err := c.hc.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
raw, _ := io.ReadAll(resp.Body)
|
||||
if resp.StatusCode >= 300 {
|
||||
var br struct {
|
||||
Message string `json:"message"`
|
||||
}
|
||||
_ = json.Unmarshal(raw, &br)
|
||||
if br.Message != "" {
|
||||
return errors.New(br.Message)
|
||||
}
|
||||
return fmt.Errorf("MES 返回 HTTP %d", resp.StatusCode)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ListMaterialRequestsByPackage 按叫料包号查叫料单(WMS 建配送单数据源,含工单×排产明细)
|
||||
func (c *Client) ListMaterialRequestsByPackage(ctx context.Context, packageNo string) ([]MaterialRequest, error) {
|
||||
out := []MaterialRequest{}
|
||||
if err := c.getJSON(ctx, "/api/internal/call/package?packageNo="+url.QueryEscape(packageNo), &out); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// StationPoolRaw 拉取叫料池原始行(WMS 代叫料对话框)
|
||||
func (c *Client) StationPoolRaw(ctx context.Context, stationNo int) ([]PoolRow, error) {
|
||||
out := []PoolRow{}
|
||||
if err := c.getJSON(ctx, "/api/internal/call/pool-raw?stationNo="+strconv.Itoa(stationNo), &out); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// StationDockPallets 按工位批量读左右接驳台实时传感器(配送空台校验)
|
||||
func (c *Client) StationDockPallets(ctx context.Context, stationNo int) ([]DockPalletState, error) {
|
||||
out := []DockPalletState{}
|
||||
if err := c.getJSON(ctx, "/api/internal/dock/station-pallets?stationNo="+strconv.Itoa(stationNo), &out); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// DispatchDelivery 配送单派车(转发 MES:AGV 派车改配送单驱动)
|
||||
func (c *Client) DispatchDelivery(ctx context.Context, deliveryNo, targetDock, operator string, items []DeliveryAgvItem) error {
|
||||
return c.postJSON(ctx, "/api/internal/delivery/dispatch", map[string]any{
|
||||
"deliveryNo": deliveryNo, "targetDock": targetDock, "operator": operator, "items": items,
|
||||
})
|
||||
}
|
||||
|
||||
// CreateCall WMS 代叫料(与工位终端同一套 CreateCallOrders 逻辑)
|
||||
func (c *Client) CreateCall(ctx context.Context, stationNo int, callDate string, force bool, items []map[string]any, operator string) error {
|
||||
return c.postJSON(ctx, "/api/internal/call/create-internal", map[string]any{
|
||||
"stationNo": stationNo, "callDate": callDate, "force": force, "items": items, "operator": operator, "source": "CALL",
|
||||
})
|
||||
}
|
||||
|
||||
// DockClear 人工清台(托盘被人工卸走后台账卡死兜底)
|
||||
func (c *Client) DockClear(ctx context.Context, dockCode, operator, reason string) error {
|
||||
return c.postJSON(ctx, "/api/internal/dock/clear", map[string]any{
|
||||
"dockCode": dockCode, "operator": operator, "reason": reason,
|
||||
})
|
||||
}
|
||||
|
||||
// ListMaterialRequests 拉取备料单(含 target_dock)
|
||||
|
||||
Reference in New Issue
Block a user