SunYF
4ec6784629
本次提交包含以下核心变更： 1. 新增按钮级权限控制框架与前端权限校验 2. 新增工位管理、工艺流程、巡检终端等核心业务模块 3. 完善用户体系，支持工位终端专属登录权限 4. 新增文件上传下载、报表查询等配套功能 5. 修复多系统兼容性与交互体验问题 6. 完成所有文档与配置项的规范化更新
119 lines
3.9 KiB
Go
119 lines
3.9 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"net/http"
|
||
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// processDoneHandler POST /api/report/process-done
|
||
// {sn, processCode, stationNo, steps:[{stepId,name,value,text}]}
|
||
// 流程：先冲刷一轮积压 → 实时报 MES /api/internal/station/report；
|
||
// MES 不可达则写入 report_queue(kind=process_done) 并返回 data.queued=true（离线缓存稍后自动重传）。
|
||
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"`
|
||
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,
|
||
}
|
||
payloadBytes, _ := json.Marshal(body)
|
||
|
||
ctx.Store.AddEventLog(req.OrderNo, req.Operator, "process_done",
|
||
"工序完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" processCode="+itoa(req.ProcessCode))
|
||
|
||
if _, _, err := ctx.Mes.Post("/api/internal/station/report", json.RawMessage(payloadBytes)); 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
|
||
}
|
||
|
||
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))
|
||
|
||
if _, _, err := ctx.Mes.Post("/api/internal/station/checkin", json.RawMessage(payloadBytes)); 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
|
||
}
|
||
|
||
ok(w, map[string]any{"queued": false})
|
||
}
|
||
}
|