Files
bj_power/bj_power_mes/internal/logic/semi.go
T
SunYF af554cea75 feat: 同步失败台账双向可重试 + 拧紧枪按工位配置 + 虚拟工位体系 + 去Redis与文档口径对齐
- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。
- 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。
- 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。
- AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。
- 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。
- 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。
- 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
2026-11-09 18:58:47 +08:00

113 lines
4.7 KiB
Go
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
package logic
import (
"context"
"errors"
"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("工件未上线,无法暂存退库")
}
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
}
_, err = s.ctx.EntClient.SemiFlow.Create().
SetSn(req.Sn).SetOrderNo(req.OrderNo).SetCompletedText(completedText).
SetAction(action).SetTargetDock(req.TargetDock).SetOperator(operator).Save(ctx)
if err != nil {
return err
}
// 调用 WMS 内部接口(本地 SemiFlow 已保存,下面把 WMS 同步结果如实返回,
// 不再静默吞掉——WMS 不可达或校验失败时必须让调用方感知,才能形成闭环)。
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
}
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)
}