feat: 新增收集式校验错误弹窗及工位报警语音播报
新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。
This commit is contained in:
@@ -19,9 +19,6 @@ import (
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// 物料类别:4=其他(辅料/工装/试验设备),与 schema/material.go 的 item_type 保持一致
|
||||
const invItemOther = 4
|
||||
|
||||
// 类型(分类)第三值:3=其他(辅料/工装/试验设备),与结构件(1)/电气件(2) 同级。
|
||||
// 客户裁决(2026-09-21):结构件/电气件/其他 同属「类型」维度,独立于「物料类别」,编号 1/2/3。
|
||||
// 2026-09-30 解耦:类型仅用于分类统计/筛选/页签归属,SN 行为改读 sn_mode。
|
||||
|
||||
@@ -2,11 +2,16 @@ package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"sort"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/inboundorder"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/ent/outboundorder"
|
||||
"bj_power_wms/ent/zone"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
|
||||
@@ -46,6 +51,68 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
outToday, _ := ctx.EntClient.OutboundOrder.Query().
|
||||
Where(outboundorder.CreatedAtGTE(dayStart)).Count(ctx0())
|
||||
|
||||
// ---- 库位利用率:库位 = 货架(区域→货架→层→位置 中的「货架」物理存储单元)----
|
||||
locTotal := 0
|
||||
if n, e := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(2)).Count(ctx0()); e == nil {
|
||||
locTotal = n
|
||||
}
|
||||
usedKeys := map[string]bool{}
|
||||
if invs, e := ctx.EntClient.Inventory.Query().Where(inventory.QuantityGT(0)).All(ctx0()); e == nil {
|
||||
for _, iv := range invs {
|
||||
usedKeys[locKey(iv.ZoneCode, iv.ShelfNo, "", "")] = true
|
||||
}
|
||||
}
|
||||
locUsed := len(usedKeys)
|
||||
|
||||
// ---- 待处理出入库任务 ----
|
||||
// 入库待处理 = 入库检未闭环(质量状态 空/未检 且未作废);出库待处理 = 已出库待送达。
|
||||
pendingInbound := 0
|
||||
if n, e := ctx.EntClient.InboundOrder.Query().
|
||||
Where(inboundorder.Voided(false), inboundorder.QualityStatusIn("未检", "")).Count(ctx0()); e == nil {
|
||||
pendingInbound = n
|
||||
}
|
||||
pendingOutbound := 0
|
||||
if n, e := ctx.EntClient.OutboundOrder.Query().
|
||||
Where(outboundorder.StatusEQ("已出库")).Count(ctx0()); e == nil {
|
||||
pendingOutbound = n
|
||||
}
|
||||
|
||||
// ---- 出入库动态(带批次号,最近各 15 单合并取前 20)----
|
||||
movements := []map[string]any{}
|
||||
inb, _ := ctx.EntClient.InboundOrder.Query().Where(inboundorder.Voided(false)).
|
||||
Order(ent.Desc(inboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
|
||||
outb, _ := ctx.EntClient.OutboundOrder.Query().
|
||||
Order(ent.Desc(outboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
|
||||
type mv struct{ t int64; m map[string]any }
|
||||
all := make([]mv, 0, len(inb)+len(outb))
|
||||
for _, o := range inb {
|
||||
mat := o.MaterialName
|
||||
if mat == "" {
|
||||
mat = o.MaterialCode
|
||||
}
|
||||
all = append(all, mv{t: o.CreatedAt, m: map[string]any{
|
||||
"id": o.InboundNo, "time": time.Unix(o.CreatedAt, 0).Format("2006-01-02 15:04:05"),
|
||||
"type": "in", "material": mat, "qty": o.Quantity, "operator": o.Operator, "batch": o.BatchNo,
|
||||
}})
|
||||
}
|
||||
for _, o := range outb {
|
||||
mat := o.MaterialName
|
||||
if mat == "" {
|
||||
mat = o.MaterialCode
|
||||
}
|
||||
all = append(all, mv{t: o.CreatedAt, m: map[string]any{
|
||||
"id": o.OutboundNo, "time": time.Unix(o.CreatedAt, 0).Format("2006-01-02 15:04:05"),
|
||||
"type": "out", "material": mat, "qty": o.Quantity, "operator": o.Operator, "batch": o.BatchNo,
|
||||
}})
|
||||
}
|
||||
sort.Slice(all, func(i, j int) bool { return all[i].t > all[j].t })
|
||||
if len(all) > 20 {
|
||||
all = all[:20]
|
||||
}
|
||||
for _, x := range all {
|
||||
movements = append(movements, x.m)
|
||||
}
|
||||
|
||||
ok(w, map[string]any{
|
||||
"batchCount": batchCount,
|
||||
"totalQty": totalQty,
|
||||
@@ -58,11 +125,55 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
"inToday": inToday,
|
||||
"outToday": outToday,
|
||||
"zoneDetail": zones,
|
||||
"locationUsed": locUsed,
|
||||
"locationTotal": locTotal,
|
||||
"pendingInbound": pendingInbound,
|
||||
"pendingOutbound": pendingOutbound,
|
||||
"movements": movements,
|
||||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// materialQueryInternalHandler 物料档案 + 库存查询(看板物料追溯入口复用,X-API-TOKEN 内部接口)
|
||||
//
|
||||
// 入参:code(物料编码,必填)/ batch(批次号,可选)。
|
||||
// 返回:found(档案是否存在)+ material(档案字段)+ inventory(在库库存行,含批次/库位/质量状态)。
|
||||
func materialQueryInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
code := strings.TrimSpace(r.URL.Query().Get("code"))
|
||||
batch := strings.TrimSpace(r.URL.Query().Get("batch"))
|
||||
resp := map[string]any{"code": code, "found": false, "material": nil, "inventory": []map[string]any{}}
|
||||
if code == "" {
|
||||
ok(w, resp)
|
||||
return
|
||||
}
|
||||
if m, e := ctx.EntClient.Material.Query().Where(material.CodeEQ(code)).First(ctx0()); e == nil && m != nil {
|
||||
resp["found"] = true
|
||||
resp["material"] = map[string]any{
|
||||
"code": m.Code, "name": m.Name, "spec": m.Spec, "itemType": m.ItemType,
|
||||
"unit": m.Unit, "manageMode": m.ManageMode, "snMode": m.SnMode,
|
||||
}
|
||||
}
|
||||
iq := ctx.EntClient.Inventory.Query().Where(inventory.MaterialCodeEQ(code))
|
||||
if batch != "" {
|
||||
iq = iq.Where(inventory.BatchNoEQ(batch))
|
||||
}
|
||||
if invs, e := iq.Where(inventory.QuantityGT(0)).
|
||||
Order(ent.Desc(inventory.FieldCreatedAt)).Limit(50).All(ctx0()); e == nil {
|
||||
rows := make([]map[string]any, 0, len(invs))
|
||||
for _, iv := range invs {
|
||||
rows = append(rows, map[string]any{
|
||||
"zone": iv.ZoneCode, "shelf": iv.ShelfNo, "layer": iv.LayerNo, "position": iv.PositionNo,
|
||||
"quality": iv.QualityStatus, "qty": iv.Quantity, "batch": iv.BatchNo,
|
||||
})
|
||||
}
|
||||
resp["inventory"] = rows
|
||||
}
|
||||
ok(w, resp)
|
||||
}
|
||||
}
|
||||
|
||||
// finishedInboundRequest 成品入库请求(MES 完工回流内部接口 与 WMS 手工成品入库页 共用契约)
|
||||
// 定稿(2026-09-07):成品 SN 由 MES 系统生成(系统必发号,实物可不贴码,允许手填覆盖),
|
||||
// SN 与实物码解耦;完工品落 WMS 统一库存主表(sn_mode=1 序列号=是SN单件, category=3 成品)。
|
||||
|
||||
@@ -7,9 +7,12 @@ import (
|
||||
"time"
|
||||
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/ent/ordermaterialledger"
|
||||
"bj_power_wms/internal/mesclient"
|
||||
"bj_power_wms/internal/svc"
|
||||
"bj_power_wms/internal/verr"
|
||||
|
||||
"github.com/xuri/excelize/v2"
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
@@ -35,15 +38,14 @@ func pushMaterialToMES(ctx *svc.ServiceContext, m *ent.Material) {
|
||||
}()
|
||||
}
|
||||
|
||||
// itemTypeLabel 物料类别标签:1原材料/3成品/4其他(半成品类别已下线,防御性保留 2 的显示)
|
||||
// itemTypeLabel 物料类别标签:1原材料/3成品(「其他」类别已按 2026-10-19 裁决全项目移除,
|
||||
// 半成品类别早已下线,2 仅为历史存量数据防御性显示)
|
||||
func itemTypeLabel(t int) string {
|
||||
switch t {
|
||||
case invCatSemi:
|
||||
return "半成品"
|
||||
case invCatFinished:
|
||||
return "成品"
|
||||
case invItemOther:
|
||||
return "其他"
|
||||
default:
|
||||
return "原材料"
|
||||
}
|
||||
@@ -66,8 +68,8 @@ func validateMaterialRequired(name, spec, unit string, itemType, manageMode, snM
|
||||
case itemType == invCatSemi:
|
||||
// 2026-09-22 定稿:半成品是工件状态(由库存 category=2 承载),不再是物料类别
|
||||
return "半成品不再是物料类别,请选择成品档案并在库存中记录工序状态"
|
||||
case itemType != invCatRaw && itemType != invCatFinished && itemType != invItemOther:
|
||||
return "物料类别为必填项(原材料 / 成品 / 其他)"
|
||||
case itemType != invCatRaw && itemType != invCatFinished:
|
||||
return "物料类别为必填项(原材料 / 成品)"
|
||||
case manageMode != 1 && manageMode != 2 && manageMode != invManageOther:
|
||||
return "类型为必填项(结构件 / 电气件 / 其他)"
|
||||
case snMode != snModeSN && snMode != snModeBatch:
|
||||
@@ -85,6 +87,33 @@ func snModeByType(manageMode int) int {
|
||||
return snModeBatch
|
||||
}
|
||||
|
||||
// collectMaterialRequired 物料档案必填校验·收集式(2026-10-20 报错规范):
|
||||
// 逐条收集不短路,仅物料表单保存(新增/编辑)路径使用;MES 同步/Excel 导入仍用 validateMaterialRequired。
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填;图号(code) 由调用方单独校验。
|
||||
func collectMaterialRequired(ve *verr.ValidationError, name, spec, unit string, itemType, manageMode, snMode int) {
|
||||
if strings.TrimSpace(name) == "" {
|
||||
ve.Add("name", "名称为必填项", "请填写物料名称")
|
||||
}
|
||||
if strings.TrimSpace(spec) == "" {
|
||||
ve.Add("spec", "规格型号为必填项", "请填写规格型号")
|
||||
}
|
||||
if strings.TrimSpace(unit) == "" {
|
||||
ve.Add("unit", "单位为必填项", "请填写计量单位(如 件 / 个 / 米)")
|
||||
}
|
||||
if itemType == invCatSemi {
|
||||
// 2026-09-22 定稿:半成品是工件状态(由库存 category=2 承载),不再是物料类别
|
||||
ve.Add("itemType", "半成品不再是物料类别", "请选择「成品」档案;半成品在库存中记录工序状态")
|
||||
} else if itemType != invCatRaw && itemType != invCatFinished {
|
||||
ve.Add("itemType", "物料类别为必填项", "在「物料类别」里选择 原材料 或 成品")
|
||||
}
|
||||
if manageMode != 1 && manageMode != 2 && manageMode != invManageOther {
|
||||
ve.Add("manageMode", "类型为必填项", "在「类型」里选择 结构件 / 电气件 / 其他")
|
||||
}
|
||||
if snMode != snModeSN && snMode != snModeBatch {
|
||||
ve.Add("snMode", "请选择是否有序列号", "在「序列号」里选择 序列号=是 或 序列号=否")
|
||||
}
|
||||
}
|
||||
|
||||
// createMaterialHandler 创建物料档案
|
||||
func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -97,7 +126,7 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
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其他(半成品不是物料类别)
|
||||
ItemType int `json:"itemType"` // 1原材料/3成品(半成品不是物料类别)
|
||||
SafetyStock int `json:"safetyStock"` // 安全库存(低于触发缺货预警)
|
||||
IsActive *bool `json:"isActive"` // 启用状态(nil 视为启用)
|
||||
}
|
||||
@@ -105,32 +134,41 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
return
|
||||
}
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填。
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填 —— 收集式一次列全(2026-10-20 报错规范)
|
||||
ve := verr.New()
|
||||
if strings.TrimSpace(req.Code) == "" {
|
||||
fail(w, http.StatusBadRequest, "图号为必填项")
|
||||
return
|
||||
ve.Add("code", "图号为必填项", "请填写物料图号(图号即物料编码)")
|
||||
}
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode); msg != "" {
|
||||
fail(w, http.StatusBadRequest, msg)
|
||||
collectMaterialRequired(ve, req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode)
|
||||
if req.ItemType == invCatFinished && req.SnMode != snModeSN {
|
||||
ve.Add("snMode", "成品物料的序列号必须为「是」", "成品逐件追溯、SN 由系统兜底生成;把序列号改为「序列号=是」")
|
||||
}
|
||||
// 校验编码唯一(与其他校验相互独立,一并收集)
|
||||
if strings.TrimSpace(req.Code) != "" {
|
||||
exists, err := ctx.EntClient.Material.Query().
|
||||
Where(material.CodeEQ(req.Code)).
|
||||
Exist(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if exists {
|
||||
ve.AddAction("code", "图号 "+req.Code+" 已存在", "改用其他图号;或到物料列表搜索该图号查看已有档案", "查看物料列表", "/material")
|
||||
}
|
||||
}
|
||||
if err := ve.OrNil(); err != nil {
|
||||
FailErr(w, err)
|
||||
return
|
||||
}
|
||||
|
||||
// 校验编码唯一
|
||||
exists, err := ctx.EntClient.Material.Query().
|
||||
Where(material.CodeEQ(req.Code)).
|
||||
Exist(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
if exists {
|
||||
fail(w, http.StatusConflict, "图号已存在: "+req.Code)
|
||||
return
|
||||
}
|
||||
|
||||
// 物料类别/类型已在上方校验,原样落库(类型 1结构件/2电气件/3其他 相互独立,不再由物料类别收敛)
|
||||
manageMode := req.ManageMode
|
||||
itemType := req.ItemType
|
||||
// 物料类别/类型已在上方校验,原样落库(类型 1结构件/2电气件/3其他 相互独立,不再由物料类别收敛)
|
||||
manageMode := req.ManageMode
|
||||
itemType := req.ItemType
|
||||
// 成品(item_type=3)序列号强制「是」(2026-10-19 拍板:成品 SN 系统兜底生成、逐件追溯)
|
||||
snMode := req.SnMode
|
||||
if itemType == invCatFinished {
|
||||
snMode = snModeSN
|
||||
}
|
||||
|
||||
m, err := ctx.EntClient.Material.Create().
|
||||
SetCode(req.Code).
|
||||
@@ -138,11 +176,11 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableSpec(strPtr(req.Spec)).
|
||||
SetNillableUnit(strPtr(req.Unit)).
|
||||
SetNillableDescription(strPtr(req.Description)).
|
||||
SetManageMode(manageMode).
|
||||
SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetManageMode(manageMode).
|
||||
SetSnMode(snMode).
|
||||
SetIsBatchManaged(snMode == snModeBatch).
|
||||
SetIsSerialManaged(snMode == snModeSN).
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetItemType(itemType).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(req.IsActive == nil || *req.IsActive).
|
||||
@@ -179,17 +217,57 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
return
|
||||
}
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode); msg != "" {
|
||||
fail(w, http.StatusBadRequest, msg)
|
||||
return
|
||||
}
|
||||
// 必填口径(2026-09-19 用户裁决):除「说明」外全部必填 —— 收集式一次列全(2026-10-20 报错规范)
|
||||
ve := verr.New()
|
||||
collectMaterialRequired(ve, req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, req.SnMode)
|
||||
cur, gerr := ctx.EntClient.Material.Get(ctx0(), req.ID)
|
||||
if gerr != nil {
|
||||
fail(w, http.StatusNotFound, "物料不存在")
|
||||
return
|
||||
}
|
||||
|
||||
// ---------- 物料类别/序列号规则(2026-10-19 用户拍板;收集式并列校验 2026-10-20) ----------
|
||||
// ① 成品(item_type=3)序列号强制为「是」且不可改(成品 SN 系统兜底生成、逐件追溯);
|
||||
// ② 已有工件引用(库存存在 SN 记账行=已有实物按件流转)→ 序列号锁死,禁止改;
|
||||
// ③ 已有工单引用(工单用料台账有该物料行)→ 物料类别锁死,禁止改;
|
||||
// ④ 类型(结构件/电气件/其他)已被库存引用 → 锁死(2026-10-20 拍板:三字段已使用不可修改)。
|
||||
if req.ItemType == invCatFinished && req.SnMode != snModeSN {
|
||||
ve.Add("snMode", "成品物料的序列号必须为「是」,不可修改", "成品逐件追溯、SN 由系统兜底生成;把序列号改回「序列号=是」")
|
||||
}
|
||||
if req.SnMode != cur.SnMode {
|
||||
snRef, cerr := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.MaterialCodeEQ(cur.Code), inventory.SnModeEQ(snModeSN)).
|
||||
Exist(ctx0())
|
||||
if cerr == nil && snRef {
|
||||
ve.Add("snMode", "该物料已有工件按序列号引用,序列号不可修改", "已有库存实物按「序列号=是」流转;保持原序列号设置不变")
|
||||
}
|
||||
}
|
||||
if req.ItemType != cur.ItemType {
|
||||
woRef, werr := ctx.EntClient.OrderMaterialLedger.Query().
|
||||
Where(ordermaterialledger.MaterialCodeEQ(cur.Code)).
|
||||
Exist(ctx0())
|
||||
if werr == nil && woRef {
|
||||
ve.Add("itemType", "该物料已被工单用料引用,物料类别不可修改", "先清理相关工单用料记录;或保持原物料类别不变")
|
||||
}
|
||||
}
|
||||
if req.ManageMode != cur.ManageMode {
|
||||
invRef, ierr := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.MaterialCodeEQ(cur.Code)).
|
||||
Exist(ctx0())
|
||||
if ierr == nil && invRef {
|
||||
ve.Add("manageMode", "该物料已有库存记录,类型不可修改", "已有库存按原类型记账;保持原类型不变,或先处理完库存再调整")
|
||||
}
|
||||
}
|
||||
if err := ve.OrNil(); err != nil {
|
||||
FailErr(w, err)
|
||||
return
|
||||
}
|
||||
// 成品强制落「序列号=是」(防历史脏值经本接口翻案)
|
||||
snMode := req.SnMode
|
||||
if req.ItemType == invCatFinished {
|
||||
snMode = snModeSN
|
||||
}
|
||||
|
||||
manageMode := req.ManageMode
|
||||
m, err := ctx.EntClient.Material.UpdateOneID(req.ID).
|
||||
SetName(req.Name).
|
||||
@@ -200,9 +278,9 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(req.IsActive == nil || *req.IsActive).
|
||||
SetManageMode(manageMode).
|
||||
SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN).
|
||||
SetSnMode(snMode).
|
||||
SetIsBatchManaged(snMode == snModeBatch).
|
||||
SetIsSerialManaged(snMode == snModeSN).
|
||||
Save(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "更新物料失败: "+err.Error())
|
||||
@@ -264,6 +342,43 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
existing, gerr := ctx.EntClient.Material.Query().Where(material.CodeEQ(req.Code)).Only(ctx0())
|
||||
if gerr == nil {
|
||||
// ---------- 类别/序列号规则(2026-10-19 拍板,与编辑接口同口径) ----------
|
||||
// 成品(3)序列号强制「是」;已有工件引用(inventory SN 行)→序列号锁死;
|
||||
// 已有工单引用(order_material_ledgers)→类别锁死。
|
||||
if req.ItemType == invCatFinished && req.SnMode != snModeSN && req.SnMode != 0 {
|
||||
fail(w, http.StatusBadRequest, "成品物料的序列号必须为「是」")
|
||||
return
|
||||
}
|
||||
if req.SnMode == snModeSN || req.SnMode == snModeBatch {
|
||||
if req.SnMode != existing.SnMode {
|
||||
snRef, cerr := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.MaterialCodeEQ(existing.Code), inventory.SnModeEQ(snModeSN)).
|
||||
Exist(ctx0())
|
||||
if cerr == nil && snRef {
|
||||
fail(w, http.StatusBadRequest, "该物料已有工件按序列号引用,序列号不可修改")
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
if req.ItemType != existing.ItemType {
|
||||
woRef, werr := ctx.EntClient.OrderMaterialLedger.Query().
|
||||
Where(ordermaterialledger.MaterialCodeEQ(existing.Code)).
|
||||
Exist(ctx0())
|
||||
if werr == nil && woRef {
|
||||
fail(w, http.StatusBadRequest, "该物料已被工单用料引用,物料类别不可修改")
|
||||
return
|
||||
}
|
||||
}
|
||||
// 类型已被库存引用 → 锁死(与编辑接口同口径,2026-10-20)
|
||||
if req.ManageMode != existing.ManageMode {
|
||||
invRef, ierr := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.MaterialCodeEQ(existing.Code)).
|
||||
Exist(ctx0())
|
||||
if ierr == nil && invRef {
|
||||
fail(w, http.StatusBadRequest, "该物料已有库存记录,类型不可修改")
|
||||
return
|
||||
}
|
||||
}
|
||||
// sn_mode(2026-09-30 契约对齐):MES 传 1/2 时同步落库;传 0(未选择)保留现值防清零
|
||||
upd := ctx.EntClient.Material.UpdateOneID(existing.ID).
|
||||
SetName(req.Name).
|
||||
@@ -275,7 +390,12 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableTemplateCode(strPtr(req.TemplateCode)).
|
||||
SetSafetyStock(req.SafetyStock).
|
||||
SetIsActive(active)
|
||||
if req.SnMode == snModeSN || req.SnMode == snModeBatch {
|
||||
if req.ItemType == invCatFinished {
|
||||
// 成品强制「序列号=是」(防历史脏值经同步翻案)
|
||||
upd = upd.SetSnMode(snModeSN).
|
||||
SetIsBatchManaged(false).
|
||||
SetIsSerialManaged(true)
|
||||
} else if req.SnMode == snModeSN || req.SnMode == snModeBatch {
|
||||
upd = upd.SetSnMode(req.SnMode).
|
||||
SetIsBatchManaged(req.SnMode == snModeBatch).
|
||||
SetIsSerialManaged(req.SnMode == snModeSN)
|
||||
@@ -290,9 +410,12 @@ func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ok(w, map[string]any{"created": false, "id": m.ID})
|
||||
return
|
||||
}
|
||||
// sn_mode:MES 传 1/2 用 MES 值;未传(0)按类型默认联动派生(电气件→序列号=是,其余→序列号=否)
|
||||
// sn_mode:MES 传 1/2 用 MES 值;未传(0)按类型默认联动派生(电气件→序列号=是,其余→序列号=否);
|
||||
// 成品(3)强制「序列号=是」(2026-10-19 拍板)
|
||||
newSnMode := req.SnMode
|
||||
if newSnMode != snModeSN && newSnMode != snModeBatch {
|
||||
if req.ItemType == invCatFinished {
|
||||
newSnMode = snModeSN
|
||||
} else if newSnMode != snModeSN && newSnMode != snModeBatch {
|
||||
newSnMode = snModeByType(req.ManageMode)
|
||||
}
|
||||
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode, newSnMode); msg != "" {
|
||||
@@ -334,8 +457,8 @@ func queryMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
spec := r.URL.Query().Get("spec")
|
||||
manageMode := atoi(r.URL.Query().Get("manageMode"), 0)
|
||||
itemType := atoi(r.URL.Query().Get("itemType"), 0)
|
||||
// 排除物料类别:入库各页签按管理粒度过滤时,需把「其他」类别(item_type=4)排除,
|
||||
// 否则档案里选「其他」时 manage_mode 保留默认值 1,会漏进结构件入库的下拉。
|
||||
// 排除物料类别:入库各页签按管理粒度过滤时可按需排除指定物料类别,
|
||||
// 避免档案里某类别混进其他管理粒度的下拉。
|
||||
excludeItemType := atoi(r.URL.Query().Get("excludeItemType"), 0)
|
||||
startDate := r.URL.Query().Get("startDate")
|
||||
endDate := r.URL.Query().Get("endDate")
|
||||
@@ -665,8 +788,9 @@ func parseManageMode(s string) int {
|
||||
return 0
|
||||
}
|
||||
|
||||
// parseItemType 解析导入模板"物料类别"列(兼容旧模板"品类"列名):原材料/成品/其他(兼容 1/3/4);无法识别返回 0。
|
||||
// 注意:"半成品"不再是物料类别(2026-09-22),且含"成品"子串,必须先排除再判成品。
|
||||
// parseItemType 解析导入模板"物料类别"列(兼容旧模板"品类"列名):原材料/成品(兼容 1/3);无法识别返回 0。
|
||||
// 注意:"半成品"不再是物料类别(2026-09-22),且含"成品"子串,必须先排除再判成品;
|
||||
// 「其他」类别已按 2026-10-19 裁决全项目移除,历史含"其他"的导入行按无法识别整体拒绝。
|
||||
func parseItemType(s string) int {
|
||||
s = strings.TrimSpace(s)
|
||||
if s == "" {
|
||||
@@ -679,10 +803,8 @@ func parseItemType(s string) int {
|
||||
return 0 // 半成品已不是物料类别,导入该行按"物料类别无法识别"整体拒绝
|
||||
case strings.Contains(s, "成品"):
|
||||
return 3
|
||||
case strings.Contains(s, "其他"):
|
||||
return 4
|
||||
}
|
||||
if n := atoi(s, 0); n == 1 || n == 3 || n == 4 {
|
||||
if n := atoi(s, 0); n == 1 || n == 3 {
|
||||
return n
|
||||
}
|
||||
return 0
|
||||
@@ -795,8 +917,11 @@ 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.snMode = snModeByType(pr.manageMode)
|
||||
if pr.itemType == invCatFinished {
|
||||
pr.snMode = snModeSN // 成品强制「序列号=是」(与编辑/同步同口径,2026-10-19 拍板)
|
||||
}
|
||||
pr.description = cell(descCol)
|
||||
|
||||
if pr.code == "" {
|
||||
@@ -820,7 +945,7 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
continue
|
||||
}
|
||||
if catCol >= 0 && cell(catCol) != "" && pr.itemType == 0 {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品/其他」(兼容 1/3/4;半成品不是物料类别)"})
|
||||
errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品」(兼容 1/3;半成品不是物料类别,「其他」已取消)"})
|
||||
continue
|
||||
}
|
||||
exists, _ := ctx.EntClient.Material.Query().
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"bj_power_wms/internal/verr"
|
||||
|
||||
"github.com/zeromicro/go-zero/rest/httpx"
|
||||
)
|
||||
|
||||
@@ -24,3 +28,23 @@ func fail(w http.ResponseWriter, httpStatus int, message string) {
|
||||
func failCode(w http.ResponseWriter, httpStatus, code int, message string) {
|
||||
httpx.WriteJson(w, httpStatus, Response{Code: code, Message: message})
|
||||
}
|
||||
|
||||
// FailValidation 收集式校验失败(2026-10-20 报错规范):HTTP 200,code=3015,
|
||||
// data.errors 结构化清单;前端拦截器识别 3015 后用 ErrorListDialog 一次弹全,不用 ElMessage 单条。
|
||||
func FailValidation(w http.ResponseWriter, errs []verr.FieldError) {
|
||||
httpx.WriteJson(w, http.StatusOK, Response{
|
||||
Code: 3015,
|
||||
Message: fmt.Sprintf("保存失败,共 %d 项需要处理", len(errs)),
|
||||
Data: map[string]any{"errors": errs},
|
||||
})
|
||||
}
|
||||
|
||||
// FailErr 统一错误出口:*verr.ValidationError → FailValidation 结构化;其他 error → 普通 fail(500)。
|
||||
func FailErr(w http.ResponseWriter, err error) {
|
||||
var ve *verr.ValidationError
|
||||
if errors.As(err, &ve) {
|
||||
FailValidation(w, ve.Errors)
|
||||
return
|
||||
}
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
}
|
||||
|
||||
@@ -247,8 +247,10 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/internal/product-types/export", Handler: wrapInternal(ctx)(exportProductTypesInternalHandler(ctx))},
|
||||
// 物料两库对等(需求一 M3/M5):MES→WMS 推送落点,按 code 幂等 upsert(删除=停用 isActive=false)
|
||||
{Method: http.MethodPost, Path: "/api/internal/materials/upsert", Handler: wrapInternal(ctx)(upsertMaterialInternalHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/material/exists", Handler: wrapInternal(ctx)(materialExistsHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/material/types", Handler: wrapInternal(ctx)(materialTypesHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/material/exists", Handler: wrapInternal(ctx)(materialExistsHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/material/types", Handler: wrapInternal(ctx)(materialTypesHandler(ctx))},
|
||||
// 看板物料追溯入口复用:物料档案 + 库存查询(按编码/批次)
|
||||
{Method: http.MethodGet, Path: "/api/internal/material/query", Handler: wrapInternal(ctx)(materialQueryInternalHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/material/manage-modes", Handler: wrapInternal(ctx)(materialManageModesHandler(ctx))},
|
||||
// 物料分页查询(需求一 M7:MES 冷启动全量拉取用;MES 推送走上方 /upsert)
|
||||
{Method: http.MethodGet, Path: "/api/internal/materials", Handler: wrapInternal(ctx)(queryMaterialsHandler(ctx))},
|
||||
|
||||
Reference in New Issue
Block a user