- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
229 lines
8.0 KiB
Go
229 lines
8.0 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"errors"
|
||
"io"
|
||
"net/http"
|
||
"net/url"
|
||
"strings"
|
||
|
||
"bj_power_workstation/internal/mes"
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// passJSON 原样透传 MES 的 {code,message,data} 响应体(不再二次包装)。
|
||
func passJSON(w http.ResponseWriter, body []byte) {
|
||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||
w.WriteHeader(http.StatusOK)
|
||
_, _ = w.Write(body)
|
||
}
|
||
|
||
// wipHandler GET /api/wip?stationNo= —— 代理 MES /api/internal/workpieces/in-process。
|
||
// 在制品默认展示(5.2):停在本工位/上线位(0)/下线位(13) 的未完工工件列表。
|
||
func wipHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if sn := strings.TrimSpace(r.URL.Query().Get("stationNo")); sn != "" {
|
||
params.Set("stationNo", sn)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/workpieces/in-process", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// bomHandler GET /api/bom?productCode=&bomName= —— 代理 MES /api/internal/bom。
|
||
// 上线建档「领料确认」按物料清单展示应领料。
|
||
func bomHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("productCode")); v != "" {
|
||
params.Set("productCode", v)
|
||
}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("bomName")); v != "" {
|
||
params.Set("bomName", v)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/bom", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// orderQueryHandler GET /api/order/query?orderNo= —— 代理 MES /api/internal/order/query。
|
||
// 上线建档选工单后带出产品编码/名称(用于查 BOM 应领料)。
|
||
func orderQueryHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("orderNo")); v != "" {
|
||
params.Set("orderNo", v)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/order/query", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// traceHandler GET /api/trace?sn= —— 代理 MES /api/internal/workpiece/trace。
|
||
// 下线完工面板扫 SN 后展示工件状态/工序时间线/拧紧等追溯信息。
|
||
func traceHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
sn := strings.TrimSpace(r.URL.Query().Get("sn"))
|
||
if sn == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn 参数")
|
||
return
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/workpiece/trace", url.Values{"sn": {sn}})
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// onlineHandler POST /api/workpiece/online —— 上线建档(StationNo=0)。
|
||
// {sn, orderNo, workOrderId, processSeq, operator};MES 不可达时写离线队列(kind=online_register)稍后重传。
|
||
func onlineHandler(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 req struct {
|
||
Sn string `json:"sn"`
|
||
OrderNo string `json:"orderNo"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
_ = json.Unmarshal(payload, &req)
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||
return
|
||
}
|
||
ctx.Syncer.RunOnce(r.Context())
|
||
// 录入时操作人(当前登录人),供离线队列按操作人隔离发送
|
||
opID := int64(0)
|
||
opName := req.Operator
|
||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||
opID = ss.UserID
|
||
if ss.Name != "" {
|
||
opName = ss.Name
|
||
}
|
||
}
|
||
q := url.Values{}
|
||
if req.Operator != "" {
|
||
q.Set("operator", req.Operator)
|
||
}
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload))
|
||
if err != nil {
|
||
// MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected",
|
||
"上线建档被MES拒绝 sn="+req.Sn+":"+msg)
|
||
logx.Errorf("上线建档被 MES 拒绝(不入队): %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
if qerr := ctx.Store.InsertQueueItem("online_register", string(payload), opID, opName); qerr != nil {
|
||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_queued", "上线建档离线排队 sn="+req.Sn)
|
||
logx.Errorf("上线建档失败已离线排队: %v", err)
|
||
ok(w, map[string]any{"queued": true})
|
||
return
|
||
}
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected",
|
||
"上线建档被MES拒绝 sn="+req.Sn+":"+msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register", "上线建档 sn="+req.Sn)
|
||
ok(w, map[string]any{"queued": false})
|
||
}
|
||
}
|
||
|
||
// doneHandler POST /api/workpiece/done —— 下线完工入库(StationNo=13)。
|
||
// {sn, batchItems, serialItems, operator};完工内部自动回流 WMS 成品库存;
|
||
// MES 不可达时写离线队列(kind=offline_finish)稍后重传。
|
||
func doneHandler(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 req struct {
|
||
Sn string `json:"sn"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
_ = json.Unmarshal(payload, &req)
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||
return
|
||
}
|
||
ctx.Syncer.RunOnce(r.Context())
|
||
// 录入时操作人(当前登录人),供离线队列按操作人隔离发送
|
||
opID := int64(0)
|
||
opName := req.Operator
|
||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||
opID = ss.UserID
|
||
if ss.Name != "" {
|
||
opName = ss.Name
|
||
}
|
||
}
|
||
q := url.Values{}
|
||
if req.Operator != "" {
|
||
q.Set("operator", req.Operator)
|
||
}
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload))
|
||
if err != nil {
|
||
// MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg)
|
||
logx.Errorf("下线完工被 MES 拒绝(不入队): %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
if qerr := ctx.Store.InsertQueueItem("offline_finish", string(payload), opID, opName); qerr != nil {
|
||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_queued", "下线完工离线排队 sn="+req.Sn)
|
||
logx.Errorf("下线完工上报失败已离线排队: %v", err)
|
||
ok(w, map[string]any{"queued": true})
|
||
return
|
||
}
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog("", opName, "offline_finish", "下线完工入库 sn="+req.Sn)
|
||
ok(w, map[string]any{"queued": false})
|
||
}
|
||
}
|