feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫
- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集) - 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList - 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损) - 新增 AGV 车辆状态表 agv_vehicle_state 及查询 - 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
"bj_power_mes/ent/dailyplan"
|
||||
"bj_power_mes/ent/flowmaterial"
|
||||
"bj_power_mes/ent/inspectionrecord"
|
||||
"bj_power_mes/ent/lossledger"
|
||||
"bj_power_mes/ent/processflow"
|
||||
"bj_power_mes/ent/processstep"
|
||||
"bj_power_mes/ent/plcsendlog"
|
||||
@@ -932,11 +933,51 @@ func (s *Service) Workload(ctx context.Context, operator, stationNo, orderNo, fr
|
||||
// 上机记录:由开工签到+报工实绩推导(不受工单号筛选影响,前端在该页签禁用工单号)
|
||||
sessions := s.buildStationSessions(ctx, operator, stationNo, from, to, rows)
|
||||
|
||||
// R8(2026-11-03 拍板):绩效报表读工单损耗——按工单号聚合损耗台账(数据源=工单退料产生的损耗记录)。
|
||||
// 台账「主管批注」只写 comment/commenter,不改 lossQty,故改批注不影响工单损耗数(验收点)。
|
||||
lossQ := s.ctx.EntClient.LossLedger.Query()
|
||||
if from != "" {
|
||||
if f, perr := time.Parse("2006-01-02", from); perr == nil {
|
||||
lossQ = lossQ.Where(lossledger.CreatedAtGTE(f))
|
||||
}
|
||||
}
|
||||
if to != "" {
|
||||
if t, perr := time.Parse("2006-01-02", to); perr == nil {
|
||||
lossQ = lossQ.Where(lossledger.CreatedAtLT(t.Add(24 * time.Hour)))
|
||||
}
|
||||
}
|
||||
if orderNo != "" {
|
||||
lossQ = lossQ.Where(lossledger.WorkOrderNoContainsFold(orderNo))
|
||||
}
|
||||
lossByOrderMap := map[string]float64{}
|
||||
lossTotal := 0.0
|
||||
if lossRows, lerr := lossQ.All(ctx); lerr == nil {
|
||||
for _, l := range lossRows {
|
||||
if l.WorkOrderNo == "" {
|
||||
continue // 无工单归属的损耗(如普通退料整单退无差额)不进工单维度
|
||||
}
|
||||
lossByOrderMap[l.WorkOrderNo] += l.LossQty
|
||||
lossTotal += l.LossQty
|
||||
}
|
||||
}
|
||||
type lossRow struct {
|
||||
OrderNo string `json:"orderNo"`
|
||||
LossQty float64 `json:"lossQty"`
|
||||
}
|
||||
lossList := make([]lossRow, 0, len(lossByOrderMap))
|
||||
for k, v := range lossByOrderMap {
|
||||
lossList = append(lossList, lossRow{OrderNo: k, LossQty: v})
|
||||
}
|
||||
sort.Slice(lossList, func(i, j int) bool { return lossList[i].OrderNo < lossList[j].OrderNo })
|
||||
|
||||
return map[string]any{
|
||||
"byOperator": map[string]any{"total": opTotal, "list": byOpPage},
|
||||
"byStation": map[string]any{"total": stTotal, "list": byStPage},
|
||||
"detail": map[string]any{"total": detTotal, "list": detList},
|
||||
"sessions": map[string]any{"total": len(sessions), "list": sessions},
|
||||
// R8 工单损耗(绩效读工单损耗):lossTotal 总损耗 + lossList 按工单聚合
|
||||
"lossTotal": lossTotal,
|
||||
"lossByOrder": map[string]any{"total": len(lossList), "list": lossList},
|
||||
}, nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user