Files
bj_power/bj_power_mes/internal/logic/semi.go
T
SunYF c33acab9c8 feat: 解耦管理类型与SN管理方式,新增sn_mode字段实现全链路SN管理标准化
本次重构将原manage_mode字段拆分为独立的分类维度(manage_mode)和SN管理维度(sn_mode),实现全链路(MES/WMS/工位终端)的SN管理行为统一依据:
1. 新增sn_mode字段,定义1=序列号件、2=批次件、0=未选择,替代原manage_mode的SN判断逻辑
2. 移除冗余的manage_mode字段在多个实体中的使用,统一使用sn_mode决定业务行为
3. 新增工位接驳台配置,服务端固定接驳台,前端不可修改,确保AGV送达准确性
4. 优化检验记录导出,新增装配物料绑定明细,满足客户追溯需求
5. 修正前端提示文本,统一使用序列号件/批次件表述,与后端逻辑对齐
2026-09-30 17:33:11 +08:00

95 lines
3.8 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/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 {
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)
}
// ListEventLogs 操作日志查询(按工单号/操作人;operators 为候选列表,任一命中即算)
func (s *Service) ListEventLogs(ctx context.Context, orderNo string, operators []string, eventType string, fromMs, toMs int64, page, pageSize int) ([]*ent.EventLog, int, error) {
return s.ctx.EventLog.Query(ctx, eventType, orderNo, operators, fromMs, toMs, page, pageSize)
}