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"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"bj_power_workstation/internal/auth"
|
||||
"bj_power_workstation/internal/mes"
|
||||
"bj_power_workstation/internal/svc"
|
||||
)
|
||||
|
||||
@@ -49,6 +51,12 @@ func loginHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
"stationNo": req.StationNo,
|
||||
})
|
||||
if err != nil {
|
||||
var bizErr *mes.BizError
|
||||
if errors.As(err, &bizErr) {
|
||||
// MES 明确拒绝(密码错误/账号停用/工位不符等):透传拒绝原因,不伪装成服务不可达
|
||||
fail(w, http.StatusUnauthorized, bizErr.Message)
|
||||
return
|
||||
}
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -2,9 +2,11 @@ package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"bj_power_workstation/internal/mes"
|
||||
"bj_power_workstation/internal/svc"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
@@ -34,11 +36,12 @@ func mesRespCode(respBody []byte) string {
|
||||
}
|
||||
|
||||
// processDoneHandler POST /api/report/process-done
|
||||
// {sn, orderNo, flowId, stationNo, steps:[{stepId,name,value,text}], binds:[{materialCode,bindValue}], operator}
|
||||
// {sn, orderNo, flowId, stationNo, steps:[{stepId,name,value,text}], signs:[{stepId,signRole,signer,remark}], 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 端落库 + 齐套强校验;离线重传时原样携带。
|
||||
// signs 为 needOperatorSign 步骤的操作工签字(需求B 双签),原样转发 MES 强校验落库;离线重传时随 payload 保留。
|
||||
func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
@@ -58,6 +61,13 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
MaterialCode string `json:"materialCode"`
|
||||
BindValue string `json:"bindValue"`
|
||||
} `json:"binds"`
|
||||
// 签字确认(需求B 双签):needOperatorSign 步骤的操作工签字,原样转发 MES 强校验落库
|
||||
Signs []struct {
|
||||
StepId int `json:"stepId"`
|
||||
SignRole string `json:"signRole"`
|
||||
Signer string `json:"signer"`
|
||||
Remark string `json:"remark"`
|
||||
} `json:"signs"`
|
||||
Operator string `json:"operator"`
|
||||
// 作业时长采集(P0-3):上料时刻/报工时刻(ISO8601),原样转发 MES 算 durationSec;离线重传时同 payload 保留
|
||||
StartedAt string `json:"startedAt"`
|
||||
@@ -96,6 +106,9 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if len(req.Binds) > 0 {
|
||||
body["binds"] = req.Binds
|
||||
}
|
||||
if len(req.Signs) > 0 {
|
||||
body["signs"] = req.Signs
|
||||
}
|
||||
if req.StartedAt != "" {
|
||||
body["startedAt"] = req.StartedAt
|
||||
}
|
||||
@@ -104,25 +117,43 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
payloadBytes, _ := json.Marshal(body)
|
||||
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done",
|
||||
"工艺完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" flowId="+itoa(req.FlowId)+" binds="+itoa(len(req.Binds)))
|
||||
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/station/report", json.RawMessage(payloadBytes))
|
||||
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, op, "process_done_rejected",
|
||||
"报工被MES拒绝 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+":"+msg)
|
||||
logx.Errorf("工序完成上报被 MES 拒绝(不入队): %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("process_done", string(payloadBytes), opID, op); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_queued",
|
||||
"报工离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("工序完成上报失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
return
|
||||
}
|
||||
// MES 业务拒绝(HTTP200+code!=0):缺料/SN冲突等,直接失败,不入队
|
||||
// MES 业务拒绝兜底(理论上已由 BizError 分支处理):缺料/SN冲突等,直接失败,不入队
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_rejected",
|
||||
"报工被MES拒绝 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+":"+msg)
|
||||
logx.Errorf("工序完成上报被 MES 拒绝: %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done",
|
||||
"工艺完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" flowId="+itoa(req.FlowId)+" binds="+itoa(len(req.Binds)))
|
||||
|
||||
ok(w, map[string]any{"queued": false})
|
||||
}
|
||||
@@ -172,25 +203,41 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
payloadBytes, _ := json.Marshal(body)
|
||||
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store",
|
||||
"暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/station/checkin", json.RawMessage(payloadBytes))
|
||||
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, op, "temp_store_rejected",
|
||||
"暂存退库被MES拒绝 sn="+req.Sn+":"+msg)
|
||||
logx.Errorf("暂存退库被 MES 拒绝(不入队): %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("temp_store", string(payloadBytes), opID, op); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_queued",
|
||||
"暂存退库离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("暂存退库上报失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
return
|
||||
}
|
||||
// MES 业务拒绝(HTTP200+code!=0)→ 直接失败,不入队
|
||||
// 兜底:MES 以 HTTP200+code≠0 拒绝却未被 BizError 捕获(理论不可达),按拒绝处理
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_rejected",
|
||||
"暂存退库被MES拒绝 sn="+req.Sn+":"+msg)
|
||||
logx.Errorf("暂存退库被 MES 拒绝: %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store",
|
||||
"暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
|
||||
ok(w, map[string]any{"queued": false})
|
||||
}
|
||||
|
||||
@@ -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})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,19 @@ import (
|
||||
// 调用方(离线 syncer)据此跳过该条,数据留在本地 SQLite,待同一操作人重新登录后继续发送。
|
||||
var ErrAuth = errors.New("station auth expired or invalid")
|
||||
|
||||
// BizError MES 业务拒绝(HTTP 2xx + code≠0):请求已送达且被明确拒绝,数据本身不合法,
|
||||
// 原样重传不可能成功。调用方应把拒绝原因直接回前端(不写离线队列);
|
||||
// 离线 syncer 据此把队列条目标记死信(synced=2),停止自动重传,保留记录供人工排查。
|
||||
type BizError struct {
|
||||
Body []byte // MES 原始响应体
|
||||
Code int // 业务码
|
||||
Message string // 业务消息
|
||||
}
|
||||
|
||||
func (e *BizError) Error() string {
|
||||
return fmt.Sprintf("MES 业务拒绝(code=%d): %s", e.Code, truncate(e.Message, 200))
|
||||
}
|
||||
|
||||
// Client MES 内部 API HTTP 客户端。
|
||||
// 自动携带请求头:X-API-TOKEN(项目间 token)、Content-Type: application/json。
|
||||
// 任何非 2xx 状态返回包含响应体的错误信息。
|
||||
@@ -112,14 +125,14 @@ func (c *Client) do(method, u string, body io.Reader) ([]byte, http.Header, erro
|
||||
}
|
||||
// W2(安全审计):MES 内部接口常以 HTTP 200 + {code≠0} 返回业务失败(如数据校验不通过、
|
||||
// 重复提交被拒)。仅看 HTTP 状态会误判成功,导致离线队列数据被标记 synced=1 永久丢失。
|
||||
// 此处解析业务码,code≠0 一律视为失败,交由调用方保留重试(retry_count 达上限后仍继续尝试,不丢弃)。
|
||||
// 此处解析业务码,code≠0 一律视为失败;但与网络失败不同——业务拒绝返回 BizError
|
||||
//(调用方直接回前端/死信,不进离线队列无限重传),网络失败返回普通 error(可重试,入离线队列)。
|
||||
var br struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
}
|
||||
if err := json.Unmarshal(respBody, &br); err == nil && br.Code != 0 {
|
||||
return respBody, resp.Header, fmt.Errorf("MES %s %s 业务失败(code=%d):%s",
|
||||
method, u, br.Code, truncate(br.Message, 200))
|
||||
return respBody, resp.Header, &BizError{Body: respBody, Code: br.Code, Message: br.Message}
|
||||
}
|
||||
return respBody, resp.Header, nil
|
||||
}
|
||||
|
||||
@@ -409,6 +409,7 @@ type TorqueResult struct {
|
||||
Operator string `json:"operator"`
|
||||
OperatorID int64 `json:"operatorId"` // 录入时操作人 ID(当前登录人),按操作人隔离发送
|
||||
Synced bool `json:"synced"`
|
||||
Dead bool `json:"dead"` // 死信(synced=2):MES 业务拒绝、停止重传,前端可提示人工排查
|
||||
RetryCount int64 `json:"retryCount"` // 上报失败累计次数
|
||||
CreatedAt int64 `json:"createdAt"` // 毫秒时间戳
|
||||
}
|
||||
@@ -459,6 +460,7 @@ func (s *Store) ListTorqueResults(sn string, onlyPending bool, limit int) ([]Tor
|
||||
return nil, err
|
||||
}
|
||||
t.Synced = synced == 1
|
||||
t.Dead = synced == 2
|
||||
t.CreatedAt = createdAt * 1000 // 秒 → 毫秒
|
||||
list = append(list, t)
|
||||
}
|
||||
@@ -486,6 +488,7 @@ func (s *Store) PendingTorqueResultsForOperator(opID int64, limit int) ([]Torque
|
||||
return nil, err
|
||||
}
|
||||
t.Synced = synced == 1
|
||||
t.Dead = synced == 2
|
||||
t.CreatedAt = createdAt * 1000
|
||||
list = append(list, t)
|
||||
}
|
||||
@@ -583,6 +586,19 @@ func (s *Store) MarkQueueSynced(id int64) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// MarkQueueDead 标记队列条目为死信(synced=2):MES 业务拒绝(HTTP 2xx+code≠0)说明
|
||||
// 数据本身不合法,原样重传不可能成功;停止自动重传,保留记录供人工排查。
|
||||
func (s *Store) MarkQueueDead(id int64) error {
|
||||
_, err := s.db.Exec(`UPDATE report_queue SET synced=2 WHERE id=?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
// MarkTorqueDead 标记拧紧结果为死信(synced=2):同 MarkQueueDead,MES 业务拒绝后不再重传。
|
||||
func (s *Store) MarkTorqueDead(id int64) error {
|
||||
_, err := s.db.Exec(`UPDATE torque_results SET synced=2 WHERE id=?`, id)
|
||||
return err
|
||||
}
|
||||
|
||||
// BumpQueueRetry 失败累计重试次数(synced 保持 0)。
|
||||
func (s *Store) BumpQueueRetry(id int64) error {
|
||||
_, err := s.db.Exec(`UPDATE report_queue SET retry_count=retry_count+1 WHERE id=?`, id)
|
||||
|
||||
@@ -166,6 +166,13 @@ func (s *Syncer) flushTorque(ctx context.Context) int {
|
||||
// 当前登录态失效(理论上 currentSession 已拦截):跳过,等待重新登录后续传。
|
||||
continue
|
||||
}
|
||||
var bizErr *mes.BizError
|
||||
if errors.As(err, &bizErr) {
|
||||
// MES 业务拒绝:数据本身不合法,重传不可能成功 → 标记死信(synced=2)停止重传
|
||||
logx.Errorf("拧紧结果被 MES 拒绝已死信(id=%d sn=%s): %v", t.ID, t.Sn, err)
|
||||
_ = s.st.MarkTorqueDead(t.ID)
|
||||
continue
|
||||
}
|
||||
logx.Errorf("上报拧紧结果失败(id=%d sn=%s 第 %d 次): %v", t.ID, t.Sn, t.RetryCount+1, err)
|
||||
if t.RetryCount+1 < maxTorqueRetry {
|
||||
_ = s.st.BumpTorqueRetry(t.ID)
|
||||
@@ -230,6 +237,13 @@ func (s *Syncer) flushQueue(ctx context.Context) int {
|
||||
if errors.Is(err, mes.ErrAuth) {
|
||||
continue
|
||||
}
|
||||
var bizErr *mes.BizError
|
||||
if errors.As(err, &bizErr) {
|
||||
// MES 业务拒绝:数据本身不合法,重传不可能成功 → 标记死信(synced=2)停止重传
|
||||
logx.Errorf("队列条目被 MES 拒绝已死信(kind=%s id=%d): %v", it.Kind, it.ID, err)
|
||||
_ = s.st.MarkQueueDead(it.ID)
|
||||
continue
|
||||
}
|
||||
logx.Errorf("上报队列失败(kind=%s id=%d 第 %d 次): %v", it.Kind, it.ID, it.RetryCount+1, err)
|
||||
if it.RetryCount+1 < maxQueueRetry {
|
||||
_ = s.st.BumpQueueRetry(it.ID)
|
||||
|
||||
Reference in New Issue
Block a user