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:
@@ -74,8 +74,8 @@ func ledgerSyncHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// internalDisplayHandler 库存总览(55寸大屏免登录用)
|
||||
func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
// 批次库存(结构件)总量(按质量状态)
|
||||
batches, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(1)).All(ctx0())
|
||||
// 批次库存(批次件)总量(按质量状态)
|
||||
batches, _ := ctx.EntClient.Inventory.Query().Where(inventory.SnModeEQ(snModeBatch)).All(ctx0())
|
||||
totalQty := 0
|
||||
lockedQty := 0
|
||||
type zoneRow struct {
|
||||
@@ -93,8 +93,8 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
zones[zc+"/"+b.QualityStatus] += b.Quantity
|
||||
}
|
||||
snInStock, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(2), inventory.StatusIn("在库", "锁定")).Count(ctx0())
|
||||
snOut, _ := ctx.EntClient.Inventory.Query().Where(inventory.ManageModeEQ(2), inventory.StatusEQ("出库")).Count(ctx0())
|
||||
snInStock, _ := ctx.EntClient.Inventory.Query().Where(inventory.SnModeEQ(snModeSN), inventory.StatusIn("在库", "锁定")).Count(ctx0())
|
||||
snOut, _ := ctx.EntClient.Inventory.Query().Where(inventory.SnModeEQ(snModeSN), inventory.StatusEQ("出库")).Count(ctx0())
|
||||
// 半成品统计:统一库存主表 category=2(semi_finisheds 已收编废弃)
|
||||
semiInStock, _ := ctx.EntClient.Inventory.Query().Where(inventory.CategoryEQ(invCatSemi), inventory.StatusEQ("在库")).Count(ctx0())
|
||||
// 成品在库统计:category=3
|
||||
@@ -108,25 +108,25 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
Where(outboundorder.CreatedAtGTE(dayStart)).Count(ctx0())
|
||||
|
||||
ok(w, map[string]any{
|
||||
"batchCount": batchCount,
|
||||
"totalQty": totalQty,
|
||||
"lockedQty": lockedQty,
|
||||
"snInStock": snInStock,
|
||||
"snOut": snOut,
|
||||
"semiInStock": semiInStock,
|
||||
"batchCount": batchCount,
|
||||
"totalQty": totalQty,
|
||||
"lockedQty": lockedQty,
|
||||
"snInStock": snInStock,
|
||||
"snOut": snOut,
|
||||
"semiInStock": semiInStock,
|
||||
"finishedInStock": finishedInStock,
|
||||
"packageCount": pkgCount,
|
||||
"inToday": inToday,
|
||||
"outToday": outToday,
|
||||
"zoneDetail": zones,
|
||||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||||
"packageCount": pkgCount,
|
||||
"inToday": inToday,
|
||||
"outToday": outToday,
|
||||
"zoneDetail": zones,
|
||||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// finishedInboundRequest 成品完工回流入库请求(MES 完工后调用,X-API-TOKEN 内部接口)
|
||||
// 定稿(2026-09-07):成品 SN 由 MES 系统生成(系统必发号,实物可不贴码,允许手填覆盖),
|
||||
// SN 与实物码解耦;完工品经本接口自动回流 WMS 统一库存主表(manage_mode=2 SN单件, category=3 成品)。
|
||||
// SN 与实物码解耦;完工品经本接口自动回流 WMS 统一库存主表(sn_mode=1 序列号件SN单件, category=3 成品)。
|
||||
type finishedInboundRequest struct {
|
||||
ProductCode string `json:"productCode"` // 产品编码(成品物料编码)
|
||||
ProductName string `json:"productName"` // 产品名称(档案缺失时兜底展示)
|
||||
@@ -157,9 +157,9 @@ func finishedInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
quality = "合格"
|
||||
}
|
||||
|
||||
// SN 全局防重(同品类成品 + 半成品 + 电气件 SN 都不允许撞号)
|
||||
// SN 全局防重(同品类成品 + 半成品 + 序列号件 SN 都不允许撞号)
|
||||
dup, err := ctx.EntClient.Inventory.Query().
|
||||
Where(inventory.ManageModeEQ(2), inventory.SnCodeEQ(req.Sn)).Exist(ctx0())
|
||||
Where(inventory.SnModeEQ(snModeSN), inventory.SnCodeEQ(req.Sn)).Exist(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
@@ -169,17 +169,20 @@ func finishedInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
// 物料档案补名称;缺失时记日志(不阻塞回流)
|
||||
// 物料档案补名称/类型;缺失时记日志(不阻塞回流)
|
||||
materialName := req.ProductName
|
||||
matType := 1
|
||||
archiveMiss := false
|
||||
if m, err := ctx.EntClient.Material.Query().Where(material.CodeEQ(req.ProductCode)).First(ctx0()); err == nil && m != nil {
|
||||
materialName = m.Name
|
||||
matType = m.ManageMode
|
||||
} else {
|
||||
archiveMiss = true
|
||||
}
|
||||
|
||||
rec, err := ctx.EntClient.Inventory.Create().
|
||||
SetManageMode(2).
|
||||
SetManageMode(matType).
|
||||
SetSnMode(snModeSN).
|
||||
SetCategory(invCatFinished).
|
||||
SetMaterialCode(req.ProductCode).
|
||||
SetMaterialName(materialName).
|
||||
|
||||
Reference in New Issue
Block a user