- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页) - WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报 - AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典 - 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列 - 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等) - 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
83 lines
2.7 KiB
Go
83 lines
2.7 KiB
Go
package handler
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"bj_power_workstation/internal/svc"
|
|
)
|
|
|
|
// bindPanelHandler 代理 MES GET /api/internal/workpiece/bind-panel?sn=&flowId=。
|
|
// 工位终端扫码工件后按工位绑定工艺(flowId)拉取应装/已装物料清单(装机绑定引导),响应原样透传。
|
|
func bindPanelHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
sn := strings.TrimSpace(r.URL.Query().Get("sn"))
|
|
flowId := strings.TrimSpace(r.URL.Query().Get("flowId"))
|
|
if sn == "" || flowId == "" {
|
|
fail(w, http.StatusBadRequest, "缺少 sn / flowId 参数")
|
|
return
|
|
}
|
|
body, _, err := ctx.Mes.Get("/api/internal/workpiece/bind-panel",
|
|
url.Values{"sn": {sn}, "flowId": {flowId}})
|
|
if err != nil {
|
|
failMes(w, err, "MES 服务不可达:"+errString(err))
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
_, _ = w.Write(body)
|
|
}
|
|
}
|
|
|
|
// bindRecordHandler POST /api/bind/record —— 工位扫/录一个物料(SN/批次)→ MES 装机绑定。
|
|
// 透传原 body,MES 负责校验(料是否属于本工艺装配 / 电气件SN防重 / 幂等)。
|
|
// 请求体按定稿契约:{sn, flowId, stationNo, items:[{materialCode, bindValue}]}。
|
|
func bindRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var probe struct {
|
|
Sn string `json:"sn"`
|
|
FlowId int `json:"flowId"`
|
|
}
|
|
_ = json.Unmarshal(payload, &probe)
|
|
if probe.Sn == "" || probe.FlowId <= 0 {
|
|
fail(w, http.StatusBadRequest, "sn / flowId 必填")
|
|
return
|
|
}
|
|
body, _, err := ctx.Mes.Post("/api/internal/workpiece/binds", json.RawMessage(payload), bearerOf(r))
|
|
if err != nil {
|
|
failMes(w, err, "MES 服务不可达:"+errString(err))
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
_, _ = w.Write(body)
|
|
}
|
|
}
|
|
|
|
// bindRemoveHandler POST /api/bind/remove —— 撤销误绑(未报工前)
|
|
func bindRemoveHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
body, _, err := ctx.Mes.Post("/api/internal/workpiece/binds/remove", json.RawMessage(payload), bearerOf(r))
|
|
if err != nil {
|
|
failMes(w, err, "MES 服务不可达:"+errString(err))
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
_, _ = w.Write(body)
|
|
}
|
|
}
|