feat: 两库对等物料管理及产品工号贯通全流程

- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步
- 全流程新增产品工号字段,贯通入库/库存/出库/检验环节
- 工单管理支持多工单混产,移除单工单互斥限制
- 新增批次号/SN 字段支持质量检验联动 WMS 库存处置
- 修复权限规则,仅内置管理员账号不允许修改删除
- 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
SunYF
2026-09-29 14:55:03 +08:00
parent a229b6727a
commit 76c9b6a7e2
103 changed files with 9412 additions and 1726 deletions
+96 -19
View File
@@ -1,19 +1,40 @@
package handler
import (
"context"
"net/http"
"strings"
"time"
"bj_power_wms/ent"
"bj_power_wms/ent/inventory"
"bj_power_wms/ent/material"
"bj_power_wms/internal/mesclient"
"bj_power_wms/internal/svc"
"github.com/xuri/excelize/v2"
"github.com/zeromicro/go-zero/core/logx"
)
// pushMaterialToMES 物料两库对等(需求一 M4):WMS 落库成功后异步推送 MES 本地副本(按 code 幂等)。
// 推送失败仅记日志——MES 侧有「本地为空全量拉取 + pending 重推」双兜底(M3/M7),不阻塞本请求。
func pushMaterialToMES(ctx *svc.ServiceContext, m *ent.Material) {
if ctx.Mes == nil {
return
}
go func() {
c, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
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,
SafetyStock: m.SafetyStock, IsActive: &active,
}); err != nil {
logx.Errorf("[material-sync] 推送 MES 失败 %s: %v", m.Code, err)
}
}()
}
// itemTypeLabel 物料品类标签:1原材料/3成品/4其他(半成品品类已下线,防御性保留 2 的显示)
func itemTypeLabel(t int) string {
switch t {
@@ -119,6 +140,7 @@ func createMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
ctx.EventLog.Write(ctx0(), "material.create", r.Header.Get("X-Username"), "material", req.Code,
"新增物料 "+req.Code+" "+req.Name, map[string]any{"manageMode": manageMode})
pushMaterialToMES(ctx, m) // 需求一 M4:异步推送 MES 本地副本
ok(w, m)
}
@@ -172,37 +194,86 @@ func updateMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
ctx.EventLog.Write(ctx0(), "material.update", r.Header.Get("X-Username"), "material", cur.Code,
"编辑物料 "+cur.Code+" "+cur.Name, nil)
pushMaterialToMES(ctx, m) // 需求一 M4:异步推送 MES 本地副本(含停用)
ok(w, m)
}
}
// deleteMaterialHandler 删除物料档案(全品类,供 MES 物料档案代理调用)
// 删除保护:库存仍引用该物料时禁删(与产品型号口径一致)。
func deleteMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
// upsertMaterialInternalHandler POST /api/internal/materials/upsert
// 物料两库对等(需求一 M3/M5 落点):MES→WMS 推送,按 code 幂等 upsert(存在→更新,不存在→校验必填后新建)。
// 两库均不物理删除:MES「删除」= isActive=false 停用,随本接口同步;本接口不回推 MES(改动源自 MES,防环)。
func upsertMaterialInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ID int `json:"id"`
Code string `json:"code"`
Name string `json:"name"`
Spec string `json:"spec"`
Unit string `json:"unit"`
Description string `json:"description"`
ItemType int `json:"itemType"`
ManageMode int `json:"manageMode"`
TemplateCode string `json:"templateCode"`
SafetyStock int `json:"safetyStock"`
IsActive *bool `json:"isActive"`
}
if err := parseJSON(r, &req); err != nil || req.ID <= 0 {
fail(w, http.StatusBadRequest, "参数错误")
if err := parseJSON(r, &req); err != nil || strings.TrimSpace(req.Code) == "" {
fail(w, http.StatusBadRequest, "code(图号)为必填项")
return
}
cur, err := ctx.EntClient.Material.Get(ctx0(), req.ID)
if err != nil {
fail(w, http.StatusNotFound, "物料不存在")
active := true
if req.IsActive != nil {
active = *req.IsActive
}
existing, gerr := ctx.EntClient.Material.Query().Where(material.CodeEQ(req.Code)).Only(ctx0())
if gerr == nil {
m, uerr := 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())
if uerr != nil {
fail(w, http.StatusInternalServerError, "更新物料失败: "+uerr.Error())
return
}
ctx.EventLog.Write(ctx0(), "material.sync", "MES", "material", req.Code,
"MES 同步更新物料 "+req.Code, nil)
ok(w, map[string]any{"created": false, "id": m.ID})
return
}
if n, _ := ctx.EntClient.Inventory.Query().Where(inventory.MaterialCodeEqualFold(cur.Code)).Count(ctx0()); n > 0 {
fail(w, http.StatusConflict, "该物料档案已有库存记录("+itoa(n)+"条),不可删除;建议停用(下架)")
// 不存在 → 新建(与 WMS 建档同口径:除说明外全部必填)
if msg := validateMaterialRequired(req.Name, req.Spec, req.Unit, req.ItemType, req.ManageMode); msg != "" {
fail(w, http.StatusBadRequest, msg)
return
}
if err := ctx.EntClient.Material.DeleteOneID(req.ID).Exec(ctx0()); err != nil {
fail(w, http.StatusInternalServerError, "删除物料失败:"+err.Error())
m, cerr := ctx.EntClient.Material.Create().
SetCode(req.Code).
SetName(req.Name).
SetSpec(req.Spec).
SetUnit(req.Unit).
SetNillableDescription(strPtr(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())
if cerr != nil {
fail(w, http.StatusInternalServerError, "创建物料失败: "+cerr.Error())
return
}
ctx.EventLog.Write(ctx0(), "material.delete", r.Header.Get("X-Username"), "material", cur.Code,
"删除物料档案 "+cur.Code, nil)
ok(w, nil)
ctx.EventLog.Write(ctx0(), "material.sync", "MES", "material", req.Code,
"MES 同步新建物料 "+req.Code+" "+req.Name, nil)
ok(w, map[string]any{"created": true, "id": m.ID})
}
}
@@ -687,6 +758,7 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}()
imported := make([]*ent.Material, 0, len(plans))
for _, pr := range plans {
mc := tx.Material.Create().
SetCode(pr.code).
@@ -700,10 +772,12 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
if pr.itemType > 0 {
mc = mc.SetItemType(pr.itemType)
}
if _, e = mc.Save(ctx0()); e != nil {
fail(w, http.StatusInternalServerError, "创建物料失败: "+e.Error())
m, e2 := mc.Save(ctx0())
if e2 != nil {
fail(w, http.StatusInternalServerError, "创建物料失败: "+e2.Error())
return
}
imported = append(imported, m)
}
if e = tx.Commit(); e != nil {
@@ -711,6 +785,9 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return
}
committed = true
for _, m := range imported {
pushMaterialToMES(ctx, m) // 需求一 M4:导入行逐条异步推送 MES 本地副本
}
ctx.EventLog.Write(ctx0(), "material.import", r.Header.Get("X-Username"), "material", "",
"Excel 导入物料", map[string]any{"success": len(plans)})
ok(w, map[string]any{"success": len(plans), "failed": 0, "errors": []importErr{}})