feat: 新增产品工艺管理与工序审核功能
- 新增产品工艺(product_process)及明细(product_process_item)数据模型 - 新增工序审核开关(need_audit)与审核角色(audit_role)字段 - 新增待审核签字页面与路由 - 优化 WMS/MES 接口交互,增加业务错误处理与友好提示 - 补充库存过滤逻辑,避免返回已出库 SN 数据 - 调整默认查询时间范围为近一个月,优化用户体验
This commit is contained in:
@@ -2,11 +2,13 @@ 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"
|
||||
@@ -120,26 +122,41 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
opName = ss.Name
|
||||
}
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, req.Operator, "online_register", "上线建档 sn="+req.Sn)
|
||||
|
||||
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})
|
||||
}
|
||||
}
|
||||
@@ -173,26 +190,39 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
opName = ss.Name
|
||||
}
|
||||
}
|
||||
ctx.Store.AddEventLog("", req.Operator, "offline_finish", "下线完工入库 sn="+req.Sn)
|
||||
|
||||
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})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user