本次 commit 统一修正了全项目范围内关于 SN 管理的术语表述,将原“SN管理”、“序列号件”、“批次件”等表述调整为“序列号”、“序列号=是”、“序列号=否”,同时同步更新了相关文档、代码注释、前端提示文本、数据库 schema 注释、API 文档等,确保全链路术语统一,消除理解歧义。
181 lines
7.8 KiB
Go
181 lines
7.8 KiB
Go
package handler
|
||
|
||
import (
|
||
"net/http"
|
||
"time"
|
||
|
||
"bj_power_wms/ent/inboundorder"
|
||
"bj_power_wms/ent/inventory"
|
||
"bj_power_wms/ent/ordermaterialledger"
|
||
"bj_power_wms/ent/outboundorder"
|
||
"bj_power_wms/internal/svc"
|
||
)
|
||
|
||
// ledgerSyncRequest MES 下发工单物料清单后同步台账
|
||
type ledgerSyncRequest struct {
|
||
OrderNo string `json:"orderNo"`
|
||
ProductCode string `json:"productCode"`
|
||
Operator string `json:"operator"`
|
||
Items []struct {
|
||
MaterialCode string `json:"materialCode"`
|
||
MaterialName string `json:"materialName"`
|
||
TotalQty int `json:"totalQty"`
|
||
} `json:"items"`
|
||
}
|
||
|
||
// ledgerSyncHandler 同步/更新工单物料台账(幂等:按 orderNo+materialCode upsert)
|
||
func ledgerSyncHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req ledgerSyncRequest
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
|
||
return
|
||
}
|
||
if req.OrderNo == "" || len(req.Items) == 0 {
|
||
fail(w, http.StatusBadRequest, "orderNo 和 items 必填")
|
||
return
|
||
}
|
||
saved := 0
|
||
for _, it := range req.Items {
|
||
existing, err := ctx.EntClient.OrderMaterialLedger.Query().
|
||
Where(
|
||
ordermaterialledger.OrderNoEQ(req.OrderNo),
|
||
ordermaterialledger.MaterialCodeEQ(it.MaterialCode),
|
||
).Only(ctx0())
|
||
if err == nil {
|
||
// 只更新需求量;状态按净额派生(不能无条件置「进行中」,
|
||
// 否则已领料完结的工单被重新同步会误标为进行中)。
|
||
st := "进行中"
|
||
if existing.OutQty-existing.ReturnedQty >= it.TotalQty && it.TotalQty > 0 {
|
||
st = "领料完结"
|
||
}
|
||
ctx.EntClient.OrderMaterialLedger.UpdateOneID(existing.ID).
|
||
SetTotalQty(it.TotalQty).
|
||
SetStatus(st).
|
||
SetUpdatedAt(time.Now().Unix()).
|
||
ExecX(ctx0())
|
||
} else {
|
||
ctx.EntClient.OrderMaterialLedger.Create().
|
||
SetOrderNo(req.OrderNo).
|
||
SetMaterialCode(it.MaterialCode).
|
||
SetNillableMaterialName(strPtr(it.MaterialName)).
|
||
SetTotalQty(it.TotalQty).
|
||
SetOutQty(0).
|
||
SetStatus("进行中").
|
||
SaveX(ctx0())
|
||
}
|
||
saved++
|
||
}
|
||
ok(w, map[string]any{"orderNo": req.OrderNo, "synced": saved})
|
||
}
|
||
}
|
||
|
||
// internalDisplayHandler 库存总览(55寸大屏免登录用)
|
||
func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
// 批次库存(序列号=否)总量(按质量状态)
|
||
batches, _ := ctx.EntClient.Inventory.Query().Where(inventory.SnModeEQ(snModeBatch)).All(ctx0())
|
||
totalQty := 0
|
||
lockedQty := 0
|
||
type zoneRow struct {
|
||
Zone, Quality string
|
||
Qty int
|
||
}
|
||
zones := map[string]int{}
|
||
batchCount := len(batches)
|
||
for _, b := range batches {
|
||
totalQty += b.Quantity
|
||
lockedQty += b.LockedQty
|
||
zc := b.ZoneCode
|
||
if zc == "" {
|
||
zc = "未分区"
|
||
}
|
||
zones[zc+"/"+b.QualityStatus] += b.Quantity
|
||
}
|
||
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
|
||
finishedInStock, _ := ctx.EntClient.Inventory.Query().Where(inventory.CategoryEQ(invCatFinished), inventory.StatusIn("在库", "锁定")).Count(ctx0())
|
||
pkgCount, _ := ctx.EntClient.OutboundOrder.Query().Where(outboundorder.BoxNoNEQ("")).Count(ctx0())
|
||
|
||
dayStart := time.Now().Truncate(24 * time.Hour).Unix()
|
||
inToday, _ := ctx.EntClient.InboundOrder.Query().
|
||
Where(inboundorder.CreatedAtGTE(dayStart)).Count(ctx0())
|
||
outToday, _ := ctx.EntClient.OutboundOrder.Query().
|
||
Where(outboundorder.CreatedAtGTE(dayStart)).Count(ctx0())
|
||
|
||
ok(w, map[string]any{
|
||
"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"),
|
||
})
|
||
}
|
||
}
|
||
|
||
// finishedInboundRequest 成品入库请求(MES 完工回流内部接口 与 WMS 手工成品入库页 共用契约)
|
||
// 定稿(2026-09-07):成品 SN 由 MES 系统生成(系统必发号,实物可不贴码,允许手填覆盖),
|
||
// SN 与实物码解耦;完工品落 WMS 统一库存主表(sn_mode=1 序列号=是SN单件, category=3 成品)。
|
||
// 方案A(2026-10-04):完工检合格才入成品库,入库解耦为双通道——
|
||
// ① MES 完工检合格调 /api/internal/finished/inbound 自动回流;② 库房在「成品入库」页手工录入(/api/finished/inbound)。
|
||
// 归属三字段与产品状态/相关标准/试验记录单号/记录员/记录日期均可空,落库写法照 semiInboundHandler
|
||
// (归属类型经 ownershipTypeOrNone 归一化,其余 Nillable 空=不落)。
|
||
type finishedInboundRequest struct {
|
||
ProductCode string `json:"productCode"` // 产品编码(成品物料编码)
|
||
ProductName string `json:"productName"` // 产品名称(档案缺失时兜底展示)
|
||
Sn string `json:"sn"` // 成品 SN(系统生成或手填,全局唯一)
|
||
OrderNo string `json:"orderNo"` // 关联工单号
|
||
ZoneCode string `json:"zoneCode"` // 入库区域(可空=未分区)
|
||
QualityStatus string `json:"qualityStatus"` // 质量状态(默认 合格;MES 完工检按产品状态传入:已通过→合格/部分通过→合格/返修→不合格,后端尊重传入值不重复映射)
|
||
SnSource string `json:"snSource"` // AUTO=系统生成 / MANUAL=手填,仅记录
|
||
Operator string `json:"operator"`
|
||
// 归属三字段(照 semiInboundHandler 口径)
|
||
OwnershipType string `json:"ownershipType"` // workorder=合同号 / project=科技项目号 / other=其他
|
||
OwnershipNo string `json:"ownershipNo"` // 归属编号
|
||
ProductWorkNo string `json:"productWorkNo"` // 产品工号
|
||
// 成品质量档案(客户问题记录 L218 九字段)
|
||
ProductStatus string `json:"productStatus"` // 已通过/部分通过/返修
|
||
RelatedStandard string `json:"relatedStandard"` // 相关标准(试验方案号)
|
||
TestRecordNo string `json:"testRecordNo"` // 试验记录单号
|
||
RecordedBy string `json:"recordedBy"` // 记录员(手工入库必填;MES 回流可空)
|
||
RecordDate string `json:"recordDate"` // 记录日期 YYYY-MM-DD(可空;手工入库默认今天)
|
||
Remark string `json:"remark"` // 备注(手工入库用;MES 回流留空走默认文案)
|
||
}
|
||
|
||
// finishedInboundHandler 成品完工回流入库(MES 完工检合格后调用,X-API-TOKEN 内部接口)
|
||
// 创建逻辑抽至 createFinishedInventory(finished_inbound.go),与手工成品入库共享。
|
||
// 物料档案缺失时不阻塞回流(库存行 material_code 仍落产品编码,名称用请求传入兜底),
|
||
// 记 eventlog 提示补建档——编码主数据仍以 WMS 为单一来源,产线不被档案缺失卡死。
|
||
func finishedInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req finishedInboundRequest
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
|
||
return
|
||
}
|
||
rec, code, err := createFinishedInventory(ctx, &req, sourceMES)
|
||
if err != nil {
|
||
fail(w, code, err.Error())
|
||
return
|
||
}
|
||
ok(w, rec)
|
||
}
|
||
}
|
||
|
||
func snSourceLabel(s string) string {
|
||
if s == "MANUAL" {
|
||
return "手填"
|
||
}
|
||
return "系统生成"
|
||
}
|