- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页) - WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报 - AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典 - 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列 - 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等) - 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
123 lines
5.5 KiB
Go
123 lines
5.5 KiB
Go
package logic
|
||
|
||
import (
|
||
"context"
|
||
"errors"
|
||
"fmt"
|
||
|
||
"bj_power_mes/ent"
|
||
"bj_power_mes/ent/semiflow"
|
||
"bj_power_mes/ent/workpiece"
|
||
"bj_power_mes/ent/workpiecelifecyclelog"
|
||
"bj_power_mes/internal/wmsclient"
|
||
)
|
||
|
||
type SemiReq struct {
|
||
Sn string `json:"sn"`
|
||
OrderNo string `json:"orderNo"`
|
||
Action string `json:"action"` // INBOUND / OUTBOUND
|
||
TargetDock string `json:"targetDock"`
|
||
}
|
||
|
||
// SemiFlow 在制品流转:进度唯一权威源=workpiece.currentStationNo(最后报工工位号),
|
||
// 服务端按 sn 自取进度生成 completedText("已完成至工位N";未报工传空串),
|
||
// 并调用 WMS /api/internal/semi/*(payload={sn,orderNo,completedText,operator,ownershipType,ownershipNo,productWorkNo},
|
||
// 旧 doneProcessCodes 已废除)。
|
||
// 归属自动继承(2026-09-30 定稿):在制品归属=其产品工号的工单归属(合同号/科技项目号 二选一),
|
||
// 从工单自动带出传给 WMS,不做人工手选;工单缺失时归属字段传空,由 WMS 侧按其规则兜底。
|
||
func (s *Service) SemiFlow(ctx context.Context, req SemiReq, operator string) error {
|
||
if req.Sn == "" {
|
||
return errors.New("sn 不能为空")
|
||
}
|
||
action := req.Action
|
||
if action == "" {
|
||
action = "INBOUND"
|
||
}
|
||
// 服务端自取进度:工件未上线(无 workpiece 记录)一律拒绝流转
|
||
wp, err := s.ctx.EntClient.Workpiece.Query().Where(workpiece.Sn(req.Sn)).First(ctx)
|
||
if err != nil {
|
||
return errors.New("工件未上线,无法暂存退库")
|
||
}
|
||
// 2026-11-13 防重修复(在制品接口契约):同一 SN 不允许连续重复同一动作。
|
||
// 防的是「重复点击暂存/重上线」以及网络重试导致的重复回流;WMS 侧已有 SN 唯一与状态守卫,
|
||
// 这里补上 MES 侧的动作链守卫,避免产生半截流转记录。
|
||
last, _ := s.ctx.EntClient.SemiFlow.Query().
|
||
Where(semiflow.Sn(req.Sn)).Order(ent.Desc(semiflow.FieldID)).First(ctx)
|
||
if last != nil && last.Action == action {
|
||
return fmt.Errorf("请勿重复操作:%s 上一次流转已经是 %s(要继续请走相反动作)", req.Sn, action)
|
||
}
|
||
completedText := ""
|
||
if wp.CurrentStationNo != 0 {
|
||
completedText = "已完成至工位" + itoa(wp.CurrentStationNo)
|
||
}
|
||
// 归属随产品工号自动继承:工件 → 工单 → 归属类型/归属编号/产品工号
|
||
ownershipType, ownershipNo, productWorkNo := "", "", ""
|
||
if wo := s.workpieceWorkOrder(ctx, wp); wo != nil {
|
||
ownershipType = wo.OwnershipType
|
||
ownershipNo = wo.ContractNo
|
||
productWorkNo = wo.WorkOrderNo
|
||
}
|
||
// 调用 WMS 内部接口:WMS 不可达或校验失败时如实返回,
|
||
// 且本地不落流转记录(旧版先写本地再调 WMS,失败后会留下一条「假成功」记录,
|
||
// 重试又被 WMS 409 拒绝,形成半截数据——2026-11-13 防重修复)。
|
||
payload := wmsclient.SemiPayload{
|
||
Sn: req.Sn, OrderNo: req.OrderNo, CompletedText: completedText, Operator: operator,
|
||
OwnershipType: ownershipType, OwnershipNo: ownershipNo, ProductWorkNo: productWorkNo,
|
||
}
|
||
var wmsErr error
|
||
if action == "INBOUND" {
|
||
wmsErr = s.ctx.Wms.SemiInbound(ctx, payload)
|
||
} else {
|
||
wmsErr = s.ctx.Wms.SemiOutbound(ctx, payload)
|
||
}
|
||
if wmsErr != nil {
|
||
endpoint := "/api/internal/semi/inbound"
|
||
if action != "INBOUND" {
|
||
endpoint = "/api/internal/semi/outbound"
|
||
}
|
||
s.recordSyncFailure("semi.flow", req.Sn+"|"+action, endpoint, payload, wmsErr)
|
||
s.ctx.EventLog.Write(ctx, "semi.flow.wms_error", req.OrderNo, operator, "semi_flow", req.Sn,
|
||
"WMS 同步失败", map[string]any{"action": action, "error": wmsErr.Error()})
|
||
return wmsErr
|
||
}
|
||
// WMS 成功后才落 MES 流转记录,保证两边一致
|
||
if _, err = s.ctx.EntClient.SemiFlow.Create().
|
||
SetSn(req.Sn).SetOrderNo(req.OrderNo).SetCompletedText(completedText).
|
||
SetAction(action).SetTargetDock(req.TargetDock).SetOperator(operator).Save(ctx); err != nil {
|
||
return err
|
||
}
|
||
s.ctx.EventLog.Write(ctx, "semi.flow", req.OrderNo, operator, "semi_flow", req.Sn, "在制品流转",
|
||
map[string]any{"action": action, "completedText": completedText,
|
||
"ownershipType": ownershipType, "ownershipNo": ownershipNo, "productWorkNo": productWorkNo})
|
||
return nil
|
||
}
|
||
|
||
// ListSemiFlows 查询在制品流转记录
|
||
func (s *Service) ListSemiFlows(ctx context.Context, sn, orderNo string) ([]*ent.SemiFlow, error) {
|
||
q := s.ctx.EntClient.SemiFlow.Query()
|
||
if sn != "" {
|
||
q = q.Where(semiflow.Sn(sn))
|
||
}
|
||
if orderNo != "" {
|
||
q = q.Where(semiflow.OrderNo(orderNo))
|
||
}
|
||
return q.Order(ent.Desc(semiflow.FieldID)).All(ctx)
|
||
}
|
||
|
||
// CountSemiIn 在制品入库次数 = workpiece_lifecycle_log.action='SEMI_IN' 记录数(见业务定稿·一.5 入库次数可追溯;替代原 CountSemiStored)。
|
||
// 业务定稿·一.5:上线次数=状态驱动、入库一次解锁一次、入库次数有记录可追溯;
|
||
// 入库次数统一以 lifecycle 状态流水为权威源,不再依赖 semiflow 业务流水。
|
||
func (s *Service) CountSemiIn(ctx context.Context, sn string) int {
|
||
n, err := s.ctx.EntClient.WorkpieceLifecycleLog.Query().
|
||
Where(workpiecelifecyclelog.Sn(sn), workpiecelifecyclelog.Action("SEMI_IN")).Count(ctx)
|
||
if err != nil {
|
||
return 0
|
||
}
|
||
return n
|
||
}
|
||
|
||
// ListEventLogs 操作日志查询(按工单号/操作人;operators 为候选列表,任一命中即算)
|
||
func (s *Service) ListEventLogs(ctx context.Context, orderNo string, operators []string, eventType, entityType string, fromMs, toMs int64, page, pageSize int) ([]*ent.EventLog, int, error) {
|
||
return s.ctx.EventLog.Query(ctx, eventType, orderNo, operators, entityType, fromMs, toMs, page, pageSize)
|
||
}
|