1. 新增装机绑定实体与相关CRUD逻辑,支持工件工序物料绑定/解绑 2. 为BOM物料新增装配工序字段,支持按工序校验绑定 3. 扩展权限表,新增父权限码字段支持菜单按钮关联 4. 统一各页面帮助弹窗参数,新增角色管理帮助文档 5. 新增公共格式化工具函数,优化侧边栏菜单展开逻辑 6. 新增工位终端绑定代理接口与MES内部绑定API 7. 修复主入口数据库连接与schema初始化逻辑,新增一键迁移工具
166 lines
5.5 KiB
Go
166 lines
5.5 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"fmt"
|
||
"net/http"
|
||
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// mesRespCode 解析 MES 统一响应 {code,message}。
|
||
// MES 业务失败约定为 HTTP 200 + code!=0(httpx.Fail),HTTP 层无法区分,必须显式解析业务码。
|
||
// code==0 返回空串;code!=0 返回 message(供调用方直接透传给前端)。
|
||
func mesRespCode(respBody []byte) string {
|
||
if len(respBody) == 0 {
|
||
return ""
|
||
}
|
||
var mr struct {
|
||
Code int `json:"code"`
|
||
Message string `json:"message"`
|
||
}
|
||
if err := json.Unmarshal(respBody, &mr); err != nil {
|
||
return ""
|
||
}
|
||
if mr.Code == 0 {
|
||
return ""
|
||
}
|
||
if mr.Message != "" {
|
||
return mr.Message
|
||
}
|
||
return fmt.Sprintf("MES 拒绝本次操作(业务码 %d)", mr.Code)
|
||
}
|
||
|
||
// processDoneHandler POST /api/report/process-done
|
||
// {sn, orderNo, processCode, stationNo, steps:[{stepId,name,value,text}], binds:[{materialCode,bindValue}], operator}
|
||
// 流程:先冲刷一轮积压 → 实时报 MES /api/internal/station/report;
|
||
// MES 不可达则写入 report_queue(kind=process_done) 并返回 data.queued=true(离线缓存稍后自动重传);
|
||
// MES 业务拒绝(HTTP200+code!=0,如装配物料未绑齐/精密件SN重复)直接失败回前端,绝不入离线队。
|
||
// binds 为本次工序的装机绑定(结构件批次/精密件SN),MES 端落库 + 齐套强校验;离线重传时原样携带。
|
||
func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req struct {
|
||
Sn string `json:"sn"`
|
||
OrderNo string `json:"orderNo"`
|
||
ProcessCode int `json:"processCode"`
|
||
StationNo int `json:"stationNo"`
|
||
Steps []struct {
|
||
StepId int `json:"stepId"`
|
||
Name string `json:"name"`
|
||
Value float64 `json:"value"`
|
||
Text string `json:"text"`
|
||
} `json:"steps"`
|
||
Binds []struct {
|
||
MaterialCode string `json:"materialCode"`
|
||
BindValue string `json:"bindValue"`
|
||
} `json:"binds"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "参数错误")
|
||
return
|
||
}
|
||
if req.Sn == "" || req.ProcessCode <= 0 || req.StationNo <= 0 {
|
||
fail(w, http.StatusBadRequest, "sn/processCode/stationNo 必填")
|
||
return
|
||
}
|
||
|
||
// 先尽力冲刷历史积压,失败不影响本次上报
|
||
ctx.Syncer.RunOnce(r.Context())
|
||
|
||
body := map[string]any{
|
||
"sn": req.Sn,
|
||
"orderNo": req.OrderNo,
|
||
"processCode": req.ProcessCode,
|
||
"stationNo": req.StationNo,
|
||
"steps": req.Steps,
|
||
"operator": req.Operator,
|
||
}
|
||
if len(req.Binds) > 0 {
|
||
body["binds"] = req.Binds
|
||
}
|
||
payloadBytes, _ := json.Marshal(body)
|
||
|
||
ctx.Store.AddEventLog(req.OrderNo, req.Operator, "process_done",
|
||
"工序完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" processCode="+itoa(req.ProcessCode)+" binds="+itoa(len(req.Binds)))
|
||
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/station/report", json.RawMessage(payloadBytes))
|
||
if err != nil {
|
||
if qerr := ctx.Store.InsertQueueItem("process_done", string(payloadBytes)); qerr != nil {
|
||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||
return
|
||
}
|
||
logx.Errorf("工序完成上报失败已离线排队: %v", err)
|
||
ok(w, map[string]any{"queued": true})
|
||
return
|
||
}
|
||
// MES 业务拒绝(HTTP200+code!=0):缺料/SN冲突等,直接失败,不入队
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
logx.Errorf("工序完成上报被 MES 拒绝: %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
|
||
ok(w, map[string]any{"queued": false})
|
||
}
|
||
}
|
||
|
||
// tempStoreHandler POST /api/report/temp-store
|
||
// {sn, orderNo, stationNo, processCode, operator} → 调 MES /api/internal/station/checkin(半成品入库)。
|
||
// 不可达时以同样 payload 写入 report_queue(kind=temp_store)。
|
||
func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req struct {
|
||
Sn string `json:"sn"`
|
||
OrderNo string `json:"orderNo"`
|
||
StationNo int `json:"stationNo"`
|
||
ProcessCode int `json:"processCode"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "参数错误")
|
||
return
|
||
}
|
||
if req.Sn == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||
return
|
||
}
|
||
|
||
// 先尽力冲刷历史积压,失败不影响本次上报
|
||
ctx.Syncer.RunOnce(r.Context())
|
||
|
||
body := map[string]any{
|
||
"sn": req.Sn,
|
||
"orderNo": req.OrderNo,
|
||
"stationNo": req.StationNo,
|
||
"processCode": req.ProcessCode,
|
||
"operator": req.Operator,
|
||
}
|
||
payloadBytes, _ := json.Marshal(body)
|
||
|
||
ctx.Store.AddEventLog(req.OrderNo, req.Operator, "temp_store",
|
||
"暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/station/checkin", json.RawMessage(payloadBytes))
|
||
if err != nil {
|
||
if qerr := ctx.Store.InsertQueueItem("temp_store", string(payloadBytes)); qerr != nil {
|
||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||
return
|
||
}
|
||
logx.Errorf("暂存退库上报失败已离线排队: %v", err)
|
||
ok(w, map[string]any{"queued": true})
|
||
return
|
||
}
|
||
// MES 业务拒绝(HTTP200+code!=0)→ 直接失败,不入队
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
logx.Errorf("暂存退库被 MES 拒绝: %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
|
||
ok(w, map[string]any{"queued": false})
|
||
}
|
||
}
|