SunYF
6ee131a4bd
1. 新增装机绑定实体与相关CRUD逻辑，支持工件工序物料绑定/解绑 2. 为BOM物料新增装配工序字段，支持按工序校验绑定 3. 扩展权限表，新增父权限码字段支持菜单按钮关联 4. 统一各页面帮助弹窗参数，新增角色管理帮助文档 5. 新增公共格式化工具函数，优化侧边栏菜单展开逻辑 6. 新增工位终端绑定代理接口与MES内部绑定API 7. 修复主入口数据库连接与schema初始化逻辑，新增一键迁移工具
82 lines
2.7 KiB
Go
82 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=&processCode=。
|
|
// 工位终端扫码工件后拉取本工序应装/已装物料清单（装机绑定引导），响应原样透传。
|
|
func bindPanelHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
sn := strings.TrimSpace(r.URL.Query().Get("sn"))
|
|
processCode := strings.TrimSpace(r.URL.Query().Get("processCode"))
|
|
if sn == "" || processCode == "" {
|
|
fail(w, http.StatusBadRequest, "缺少 sn / processCode 参数")
|
|
return
|
|
}
|
|
body, _, err := ctx.Mes.Get("/api/internal/workpiece/bind-panel",
|
|
url.Values{"sn": {sn}, "processCode": {processCode}})
|
|
if err != nil {
|
|
fail(w, http.StatusBadGateway, "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防重 / 幂等）。
|
|
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"`
|
|
ProcessCode int `json:"processCode"`
|
|
}
|
|
_ = json.Unmarshal(payload, &probe)
|
|
if probe.Sn == "" || probe.ProcessCode <= 0 {
|
|
fail(w, http.StatusBadRequest, "sn / processCode 必填")
|
|
return
|
|
}
|
|
body, _, err := ctx.Mes.Post("/api/internal/workpiece/binds", json.RawMessage(payload))
|
|
if err != nil {
|
|
fail(w, http.StatusBadGateway, "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))
|
|
if err != nil {
|
|
fail(w, http.StatusBadGateway, "MES 服务不可达："+errString(err))
|
|
return
|
|
}
|
|
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
w.WriteHeader(http.StatusOK)
|
|
_, _ = w.Write(body)
|
|
}
|
|
}
|