feat: 移除工艺物料与混产模板实体、新增产线清线与 PLC 监控实时推送、看板双屏增强
- 移除实体:MES 删除 FlowMaterial(工艺物料)与 MixProductionTemplate(混产模板)全套(schema/ent 生成码/handler/logic),清理关联路由与种子 - 新增功能:产线清线(line_clearance handler + logic)、PLC 监控 WebSocket 实时推送(ws/plc_monitor_hub + handler) - 看板增强:新增管理屏与 KPI 组件(BoardManage/BoardKpi),调整演示屏 Mock 与各看板面板 - MES 完善:PLC 匹配/扭矩扫描/签收、工艺卡 PDF 与工单、AGV 链路、叫料/备料/在制品/短料预测等逻辑与前端调整 - 工位终端:删除离线面板 OfflinePanel,调整主界面/物料面板与 api/store/handler/路由 - WMS:AGV 托盘、物料与 MES 客户端调整及前端帮助/基础数据/叫料/托盘页 - 文档:更新产线API/客户问题/案例/部署手册/问题记录
This commit is contained in:
@@ -6,11 +6,10 @@ import (
|
||||
"sort"
|
||||
|
||||
"bj_power_mes/ent"
|
||||
"bj_power_mes/ent/flowmaterial"
|
||||
"bj_power_mes/ent/workorder"
|
||||
)
|
||||
|
||||
// UsageRow 工单的单台用料行(物料清单已删除:用料唯一来源 = 工单工艺组合条目 × 工艺物料清单)。
|
||||
// UsageRow 工单的单台用料行(2026-11-18 工艺物料清单删除:用料唯一来源 = 来源产品工艺分账)。
|
||||
// 同一物料出现在组合中多个工艺时合并累加;同一成品不同工单可用不同工艺,物料跟着工单走。
|
||||
type UsageRow struct {
|
||||
MaterialCode string `json:"materialCode"`
|
||||
@@ -46,8 +45,9 @@ func (s *Service) GetOrderUsage(ctx context.Context, orderNo string) ([]UsageRow
|
||||
return s.WorkOrderUnitUsage(ctx, wo), nil
|
||||
}
|
||||
|
||||
// WorkOrderUnitUsage 汇总工单的单台用料:工艺组合条目×flow_material,同物料合并。
|
||||
// 组合为空或工艺均无物料时返回空切片。
|
||||
// WorkOrderUnitUsage 汇总工单的单台用料:按来源产品工艺分账,同物料合并。
|
||||
// WorkOrderUnitUsage 工单的单台用料行:按来源产品工艺分账逐物料合并(同一物料出现在多个工艺时累加;
|
||||
// 同一成品不同工单可用不同工艺,物料跟着工单走)。无来源产品工艺或分账为空 → 空切片。
|
||||
func (s *Service) WorkOrderUnitUsage(ctx context.Context, wo *ent.WorkOrder) []UsageRow {
|
||||
if wo == nil {
|
||||
return nil
|
||||
@@ -56,40 +56,44 @@ func (s *Service) WorkOrderUnitUsage(ctx context.Context, wo *ent.WorkOrder) []U
|
||||
if len(items) == 0 {
|
||||
return nil
|
||||
}
|
||||
idSet := map[int]bool{}
|
||||
fseen := map[int]bool{}
|
||||
ids := make([]int, 0, len(items))
|
||||
for _, it := range items {
|
||||
idSet[it.FlowId] = true
|
||||
if it.FlowId > 0 && !fseen[it.FlowId] {
|
||||
fseen[it.FlowId] = true
|
||||
ids = append(ids, it.FlowId)
|
||||
}
|
||||
}
|
||||
ids := make([]int, 0, len(idSet))
|
||||
for id := range idSet {
|
||||
ids = append(ids, id)
|
||||
if len(ids) == 0 {
|
||||
return nil
|
||||
}
|
||||
fms, err := s.ctx.EntClient.FlowMaterial.Query().
|
||||
Where(flowmaterial.FlowIdIn(ids...)).All(ctx)
|
||||
fmByFlow, err := s.MaterialsByFlowForWO(ctx, s.ctx.EntClient, wo, ids)
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
byCode := map[string]*UsageRow{}
|
||||
for _, fm := range fms {
|
||||
if fm.MaterialCode == "" {
|
||||
continue
|
||||
}
|
||||
r, ok := byCode[fm.MaterialCode]
|
||||
if !ok {
|
||||
r = &UsageRow{
|
||||
MaterialCode: fm.MaterialCode, MaterialName: fm.MaterialName,
|
||||
Spec: fm.Spec, Unit: fm.Unit, SnMode: fm.SnMode,
|
||||
for _, fms := range fmByFlow {
|
||||
for _, fm := range fms {
|
||||
if fm.MaterialCode == "" {
|
||||
continue
|
||||
}
|
||||
byCode[fm.MaterialCode] = r
|
||||
r, ok := byCode[fm.MaterialCode]
|
||||
if !ok {
|
||||
r = &UsageRow{
|
||||
MaterialCode: fm.MaterialCode, MaterialName: fm.MaterialName,
|
||||
Spec: fm.Spec, Unit: fm.Unit, SnMode: fm.SnMode,
|
||||
}
|
||||
byCode[fm.MaterialCode] = r
|
||||
}
|
||||
if r.MaterialName == "" {
|
||||
r.MaterialName = fm.MaterialName
|
||||
}
|
||||
if r.Unit == "" {
|
||||
r.Unit = fm.Unit
|
||||
}
|
||||
r.UnitQty += fm.UnitQty
|
||||
r.EffQty += fm.UnitQty * (1 + fm.LossRate/100)
|
||||
}
|
||||
if r.MaterialName == "" {
|
||||
r.MaterialName = fm.MaterialName
|
||||
}
|
||||
if r.Unit == "" {
|
||||
r.Unit = fm.Unit
|
||||
}
|
||||
r.UnitQty += fm.UnitQty
|
||||
r.EffQty += fm.UnitQty * (1 + fm.LossRate/100)
|
||||
}
|
||||
codes := make([]string, 0, len(byCode))
|
||||
for c := range byCode {
|
||||
|
||||
Reference in New Issue
Block a user