SunYF
47573e44b0
1. 调整物料编码字段为可空，优化注释说明 2. 修复Vite构建自动清空产物目录冲突问题 3. 优化前端提示文案与表单占位符 4. 为各前端项目添加内联SVG图标 5. 重构MES半成品流转逻辑，不再静默吞掉WMS错误并记录日志 6. 生成并添加空的WMS客户端静态文件 7. 完善Ent ORM模型的空值支持与查询谓词 8. 优化半成品入库接口，支持doneProcessCodes数组格式，新增SN反查物料编码逻辑 9. 更新帮助文档与操作手册
67 lines
2.3 KiB
Go
67 lines
2.3 KiB
Go
package logic
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"bj_power_mes/ent"
|
|
"bj_power_mes/ent/semiflow"
|
|
)
|
|
|
|
type SemiReq struct {
|
|
Sn string `json:"sn"`
|
|
OrderNo string `json:"orderNo"`
|
|
DoneProcessCodes []int `json:"doneProcessCodes"`
|
|
Action string `json:"action"` // INBOUND / OUTBOUND
|
|
TargetDock string `json:"targetDock"`
|
|
}
|
|
|
|
// SemiFlow 半成品流转：记录已完成工序，并调用 WMS /api/internal/semi/*
|
|
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"
|
|
}
|
|
_, err := s.ctx.EntClient.SemiFlow.Create().
|
|
SetSn(req.Sn).SetOrderNo(req.OrderNo).SetDoneProcessCodes(req.DoneProcessCodes).
|
|
SetAction(action).SetTargetDock(req.TargetDock).SetOperator(operator).Save(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// 调用 WMS 内部接口（本地 SemiFlow 已保存，下面把 WMS 同步结果如实返回，
|
|
// 不再静默吞掉——WMS 不可达或校验失败时必须让调用方感知，才能形成闭环）。
|
|
var wmsErr error
|
|
if action == "INBOUND" {
|
|
wmsErr = s.ctx.Wms.SemiInbound(ctx, req.Sn, req.OrderNo, req.DoneProcessCodes, operator)
|
|
} else {
|
|
wmsErr = s.ctx.Wms.SemiOutbound(ctx, req.Sn, req.OrderNo, req.DoneProcessCodes, operator)
|
|
}
|
|
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, "doneProcessCodes": req.DoneProcessCodes})
|
|
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 操作日志查询（按工单号/操作人）
|
|
func (s *Service) ListEventLogs(ctx context.Context, orderNo, operator, eventType string, page, pageSize int) ([]*ent.EventLog, int, error) {
|
|
return s.ctx.EventLog.Query(ctx, eventType, orderNo, operator, page, pageSize)
|
|
} |