feat: 新增收集式校验错误弹窗及工位报警语音播报
新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。
This commit is contained in:
@@ -64,42 +64,53 @@ func (s *Service) UpsertLocalMaterial(ctx context.Context, req MaterialUpsertReq
|
||||
}
|
||||
existing, err := s.ctx.EntClient.Material.Query().Where(material.CodeEQ(req.Code)).Only(ctx)
|
||||
if err == nil {
|
||||
snMode := existing.SnMode
|
||||
if req.SnMode == 1 || req.SnMode == 2 {
|
||||
snMode = req.SnMode
|
||||
}
|
||||
// 物料类别防落 0:显式合法值(1原材料/2半成品/3成品/4其他)才覆盖,否则保留本地值(与 snMode 禁止落 0 同款口径)。
|
||||
// 物料类别防落 0:显式合法值(1原材料/3成品)才覆盖,否则保留本地值(与 snMode 禁止落 0 同款口径)。
|
||||
// 「其他」类别已按 2026-10-19 裁决全项目移除(WMS 端不再产出 4,合法值收缩为 1/3)。
|
||||
itemType := existing.ItemType
|
||||
if req.ItemType >= 1 && req.ItemType <= 4 {
|
||||
if req.ItemType == 1 || req.ItemType == 3 {
|
||||
itemType = req.ItemType
|
||||
}
|
||||
// sn_mode 属行为字段:成品(item_type=3)序列号强制「是」(2026-10-19 拍板);
|
||||
// 其余显式 1/2 采纳,未传(0)保留本地值,禁止落 0。
|
||||
snMode := existing.SnMode
|
||||
if itemType == 3 {
|
||||
snMode = 1
|
||||
} else if req.SnMode == 1 || req.SnMode == 2 {
|
||||
snMode = req.SnMode
|
||||
}
|
||||
_, err = s.ctx.EntClient.Material.UpdateOneID(existing.ID).
|
||||
SetName(req.Name).
|
||||
SetSpec(req.Spec).
|
||||
SetUnit(req.Unit).
|
||||
SetDescription(req.Description).
|
||||
SetItemType(itemType).
|
||||
SetManageMode(req.ManageMode).
|
||||
SetSnMode(snMode).
|
||||
SetTemplateCode(req.TemplateCode).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active).
|
||||
SetSyncPending(false).
|
||||
Save(ctx)
|
||||
SetName(req.Name).
|
||||
SetSpec(req.Spec).
|
||||
SetUnit(req.Unit).
|
||||
SetDescription(req.Description).
|
||||
SetItemType(itemType).
|
||||
SetManageMode(req.ManageMode).
|
||||
SetSnMode(snMode).
|
||||
SetTemplateCode(req.TemplateCode).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active).
|
||||
SetSyncPending(false).
|
||||
Save(ctx)
|
||||
return false, err
|
||||
}
|
||||
if !ent.IsNotFound(err) {
|
||||
return false, err
|
||||
}
|
||||
// 新建:成品(item_type=3)序列号强制「是」(2026-10-19 拍板)
|
||||
newItemType := resolveItemType(req.ItemType)
|
||||
newSn := resolveSnMode(req.SnMode, req.ManageMode)
|
||||
if newItemType == 3 {
|
||||
newSn = 1
|
||||
}
|
||||
_, err = s.ctx.EntClient.Material.Create().
|
||||
SetCode(req.Code).
|
||||
SetName(req.Name).
|
||||
SetSpec(req.Spec).
|
||||
SetUnit(req.Unit).
|
||||
SetDescription(req.Description).
|
||||
SetItemType(resolveItemType(req.ItemType)).
|
||||
SetItemType(newItemType).
|
||||
SetManageMode(req.ManageMode).
|
||||
SetSnMode(resolveSnMode(req.SnMode, req.ManageMode)).
|
||||
SetSnMode(newSn).
|
||||
SetTemplateCode(req.TemplateCode).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active).
|
||||
@@ -108,10 +119,11 @@ func (s *Service) UpsertLocalMaterial(ctx context.Context, req MaterialUpsertReq
|
||||
return err == nil, err
|
||||
}
|
||||
|
||||
// resolveItemType 物料类别兜底:MES 物料档案=WMS 成品物料视图,来源未带合法类别(1原材料/2半成品/3成品/4其他)
|
||||
// resolveItemType 物料类别兜底:MES 物料档案=WMS 成品物料视图,来源未带合法类别(1原材料/3成品)
|
||||
// 时兜底 3 成品,避免落 0/1 导致列表误显示「原材料」(问题.md 待办3,2026-10-12)。
|
||||
// 「其他」类别已按 2026-10-19 裁决全项目移除,合法值收缩为 1/3。
|
||||
func resolveItemType(v int) int {
|
||||
if v >= 1 && v <= 4 {
|
||||
if v == 1 || v == 3 {
|
||||
return v
|
||||
}
|
||||
return 3
|
||||
|
||||
Reference in New Issue
Block a user