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. 修正前端提示文本,统一使用序列号件/批次件表述,与后端逻辑对齐
This commit is contained in:
@@ -27,7 +27,7 @@ func pushMaterialToMES(ctx *svc.ServiceContext, m *ent.Material) {
|
||||
active := m.IsActive
|
||||
if err := ctx.Mes.UpsertMaterial(c, mesclient.MaterialUpsert{
|
||||
Code: m.Code, Name: m.Name, Spec: m.Spec, Unit: m.Unit, Description: m.Description,
|
||||
ItemType: m.ItemType, ManageMode: m.ManageMode, TemplateCode: m.TemplateCode,
|
||||
ItemType: m.ItemType, ManageMode: m.ManageMode, SnMode: m.SnMode, TemplateCode: m.TemplateCode,
|
||||
SafetyStock: m.SafetyStock, IsActive: &active,
|
||||
}); err != nil {
|
||||
logx.Errorf("[material-sync] 推送 MES 失败 %s: %v", m.Code, err)
|
||||
@@ -53,8 +53,9 @@ func itemTypeLabel(t int) string {
|
||||
// 新增/编辑表单除「说明」外全部必填)。返回空串表示通过,否则返回中文错误文案。
|
||||
//
|
||||
// 说明:图号 code 只在新增时必填(编辑不可改),由调用方单独校验;
|
||||
// 「类型」= 管理粒度 1结构件/2电气件/3其他,与「品类」相互独立,均必填。
|
||||
func validateMaterialRequired(name, spec, unit string, itemType, manageMode int) string {
|
||||
// 「类型」= 分类 1结构件/2电气件/3其他,与「品类」相互独立,均必填;
|
||||
// 「序列号件」= sn_mode 1序列号件/2批次件(2026-09-30 解耦定稿,0未选择不可保存)。
|
||||
func validateMaterialRequired(name, spec, unit string, itemType, manageMode, snMode int) string {
|
||||
switch {
|
||||
case strings.TrimSpace(name) == "":
|
||||
return "名称为必填项"
|
||||
@@ -69,10 +70,21 @@ func validateMaterialRequired(name, spec, unit string, itemType, manageMode int)
|
||||
return "品类为必填项(原材料 / 成品 / 其他)"
|
||||
case manageMode != 1 && manageMode != 2 && manageMode != invManageOther:
|
||||
return "类型为必填项(结构件 / 电气件 / 其他)"
|
||||
case snMode != snModeSN && snMode != snModeBatch:
|
||||
return "请选择序列号件(序列号件 / 批次件)"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// snModeByType 类型默认联动(2026-09-30 解耦定稿):电气件→序列号件(1),结构件/其他→批次件(2)。
|
||||
// 用于 MES 同步/Excel 导入等无 sn_mode 入参的建档路径;WMS 表单端用户可手动改。
|
||||
func snModeByType(manageMode int) int {
|
||||
if manageMode == 2 {
|
||||
return snModeSN
|
||||
}
|
||||
return snModeBatch
|
||||
}
|
||||
|
||||
// createMaterialHandler 创建物料档案
|
||||
func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -82,7 +94,8 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Spec string `json:"spec"`
|
||||
Unit string `json:"unit"`
|
||||
Description string `json:"description"`
|
||||
ManageMode int `json:"manageMode"` // 1批次/2序列号
|
||||
ManageMode int `json:"manageMode"` // 类型 1结构件/2电气件/3其他
|
||||
SnMode int `json:"snMode"` // 序列号件 1序列号件/2批次件(0未选择不可保存)
|
||||
TemplateCode string `json:"templateCode"`
|
||||
ItemType int `json:"itemType"` // 1原材料/3成品/4其他(半成品不是物料品类)
|
||||
SafetyStock int `json:"safetyStock"` // 安全库存(低于触发缺货预警)
|
||||
@@ -97,7 +110,7 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "图号为必填项")
|
||||
return
|
||||
}
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode); msg != "" {
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode); msg != "" {
|
||||
fail(w, http.StatusBadRequest, msg)
|
||||
return
|
||||
}
|
||||
@@ -126,8 +139,9 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableUnit(strPtr(req.Unit)).
|
||||
SetNillableDescription(strPtr(req.Description)).
|
||||
SetManageMode(manageMode).
|
||||
SetIsBatchManaged(manageMode == 1 || manageMode == invManageOther).
|
||||
SetIsSerialManaged(manageMode == 2).
|
||||
SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetItemType(itemType).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
@@ -155,7 +169,8 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Spec string `json:"spec"`
|
||||
Unit string `json:"unit"`
|
||||
Description string `json:"description"`
|
||||
ManageMode int `json:"manageMode"`
|
||||
ManageMode int `json:"manageMode"` // 类型 1结构件/2电气件/3其他
|
||||
SnMode int `json:"snMode"` // 序列号件 1序列号件/2批次件(0未选择不可保存)
|
||||
ItemType int `json:"itemType"`
|
||||
SafetyStock int `json:"safetyStock"`
|
||||
IsActive *bool `json:"isActive"`
|
||||
@@ -165,7 +180,7 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode); msg != "" {
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode); msg != "" {
|
||||
fail(w, http.StatusBadRequest, msg)
|
||||
return
|
||||
}
|
||||
@@ -185,8 +200,9 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(req.IsActive == nil || *req.IsActive).
|
||||
SetManageMode(manageMode).
|
||||
SetIsBatchManaged(manageMode == 1 || manageMode == invManageOther).
|
||||
SetIsSerialManaged(manageMode == 2).
|
||||
SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN).
|
||||
Save(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "更新物料失败: "+err.Error())
|
||||
@@ -212,6 +228,7 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Description string `json:"description"`
|
||||
ItemType int `json:"itemType"`
|
||||
ManageMode int `json:"manageMode"`
|
||||
SnMode int `json:"snMode"` // 2026-09-30 与 MES 契约一致:0未选择/1序列号件/2批次件;0=更新时保留现值、新建时按类型派生
|
||||
TemplateCode string `json:"templateCode"`
|
||||
SafetyStock int `json:"safetyStock"`
|
||||
IsActive *bool `json:"isActive"`
|
||||
@@ -226,19 +243,23 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
existing, gerr := ctx.EntClient.Material.Query().Where(material.CodeEQ(req.Code)).Only(ctx0())
|
||||
if gerr == nil {
|
||||
m, uerr := ctx.EntClient.Material.UpdateOneID(existing.ID).
|
||||
// sn_mode(2026-09-30 契约对齐):MES 传 1/2 时同步落库;传 0(未选择)保留现值防清零
|
||||
upd := ctx.EntClient.Material.UpdateOneID(existing.ID).
|
||||
SetName(req.Name).
|
||||
SetSpec(req.Spec).
|
||||
SetUnit(req.Unit).
|
||||
SetDescription(req.Description).
|
||||
SetItemType(req.ItemType).
|
||||
SetManageMode(req.ManageMode).
|
||||
SetIsBatchManaged(req.ManageMode == 1 || req.ManageMode == invManageOther).
|
||||
SetIsSerialManaged(req.ManageMode == 2).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active).
|
||||
Save(ctx0())
|
||||
SetIsActive(active)
|
||||
if req.SnMode == snModeSN || req.SnMode == snModeBatch {
|
||||
upd = upd.SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN)
|
||||
}
|
||||
m, uerr := upd.Save(ctx0())
|
||||
if uerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "更新物料失败: "+uerr.Error())
|
||||
return
|
||||
@@ -248,8 +269,12 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ok(w, map[string]any{"created": false, "id": m.ID})
|
||||
return
|
||||
}
|
||||
// 不存在 → 新建(与 WMS 建档同口径:除说明外全部必填)
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode); msg != "" {
|
||||
// sn_mode:MES 传 1/2 用 MES 值;未传(0)按类型默认联动派生(电气件→序列号件,其余→批次件)
|
||||
newSnMode := req.SnMode
|
||||
if newSnMode != snModeSN && newSnMode != snModeBatch {
|
||||
newSnMode = snModeByType(req.ManageMode)
|
||||
}
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, newSnMode); msg != "" {
|
||||
fail(w, http.StatusBadRequest, msg)
|
||||
return
|
||||
}
|
||||
@@ -261,8 +286,9 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableDescription(strPtr(req.Description)).
|
||||
SetItemType(req.ItemType).
|
||||
SetManageMode(req.ManageMode).
|
||||
SetIsBatchManaged(req.ManageMode == 1 || req.ManageMode == invManageOther).
|
||||
SetIsSerialManaged(req.ManageMode == 2).
|
||||
SetSnMode(newSnMode).
|
||||
SetIsBatchManaged(newSnMode == snModeBatch).
|
||||
SetIsSerialManaged(newSnMode == snModeSN).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active).
|
||||
@@ -522,6 +548,7 @@ func exportMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Unit string
|
||||
ItemType int
|
||||
ManageMode int
|
||||
SnMode int
|
||||
Description string
|
||||
CreatedAt int64
|
||||
}
|
||||
@@ -530,19 +557,19 @@ func exportMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
rows = append(rows, exportRow{
|
||||
ID: m.ID, Code: m.Code, Name: m.Name, Spec: m.Spec,
|
||||
Unit: m.Unit, ItemType: m.ItemType, ManageMode: m.ManageMode,
|
||||
Description: m.Description, CreatedAt: m.CreatedAt,
|
||||
SnMode: m.SnMode, Description: m.Description, CreatedAt: m.CreatedAt,
|
||||
})
|
||||
}
|
||||
|
||||
if r.URL.Query().Get("format") == "xlsx" {
|
||||
// 图号=物料编码(问题记录 L18 合并裁决):导出表头统一叫「图号」
|
||||
// 「简称」已按 2026-09-19 用户裁决整体删除,导出列同步移除
|
||||
headers := []string{"ID", "图号", "名称", "规格", "单位", "品类", "类型", "说明", "创建时间"}
|
||||
headers := []string{"ID", "图号", "名称", "规格", "单位", "品类", "类型", "序列号件", "说明", "创建时间"}
|
||||
matrix := make([][]any, 0, len(rows))
|
||||
for _, rr := range rows {
|
||||
matrix = append(matrix, []any{
|
||||
rr.ID, rr.Code, rr.Name, rr.Spec, rr.Unit,
|
||||
itemTypeLabel(rr.ItemType), manageModeLabel(rr.ManageMode),
|
||||
itemTypeLabel(rr.ItemType), manageModeLabel(rr.ManageMode), snModeLabel(rr.SnMode),
|
||||
rr.Description, unixFmt(rr.CreatedAt),
|
||||
})
|
||||
}
|
||||
@@ -640,6 +667,7 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
spec string
|
||||
unit string
|
||||
manageMode int
|
||||
snMode int // 序列号件:按类型默认联动派生(电气件→1,其余→2)
|
||||
itemType int
|
||||
description string
|
||||
}
|
||||
@@ -703,6 +731,7 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
pr.spec = cell(specCol)
|
||||
pr.unit = cell(unitCol)
|
||||
pr.manageMode = parseManageMode(cell(typeCol))
|
||||
pr.snMode = snModeByType(pr.manageMode)
|
||||
pr.itemType = parseItemType(cell(catCol))
|
||||
pr.description = cell(descCol)
|
||||
|
||||
@@ -767,8 +796,9 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableUnit(strPtr(pr.unit)).
|
||||
SetNillableDescription(strPtr(pr.description)).
|
||||
SetManageMode(pr.manageMode).
|
||||
SetIsBatchManaged(pr.manageMode == 1 || pr.manageMode == invManageOther).
|
||||
SetIsSerialManaged(pr.manageMode == 2)
|
||||
SetSnMode(pr.snMode).
|
||||
SetIsBatchManaged(pr.snMode == snModeBatch).
|
||||
SetIsSerialManaged(pr.snMode == snModeSN)
|
||||
if pr.itemType > 0 {
|
||||
mc = mc.SetItemType(pr.itemType)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user