2026-08-28 15:06:01 +08:00
|
|
|
|
package handler
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
|
"net/http"
|
2026-10-20 16:36:26 +08:00
|
|
|
|
"sort"
|
|
|
|
|
|
"strings"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"time"
|
|
|
|
|
|
|
2026-10-20 16:36:26 +08:00
|
|
|
|
"bj_power_wms/ent"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"bj_power_wms/ent/inboundorder"
|
2026-09-02 08:21:11 +08:00
|
|
|
|
"bj_power_wms/ent/inventory"
|
2026-10-20 16:36:26 +08:00
|
|
|
|
"bj_power_wms/ent/material"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"bj_power_wms/ent/outboundorder"
|
2026-10-20 16:36:26 +08:00
|
|
|
|
"bj_power_wms/ent/zone"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"bj_power_wms/internal/svc"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
// internalDisplayHandler 库存总览(55寸大屏免登录用)
|
|
|
|
|
|
func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// 批次库存(序列号=否)总量(按质量状态)
|
2026-09-30 17:33:11 +08:00
|
|
|
|
batches, _ := ctx.EntClient.Inventory.Query().Where(inventory.SnModeEQ(snModeBatch)).All(ctx0())
|
2026-08-28 15:06:01 +08:00
|
|
|
|
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
|
2026-09-02 08:21:11 +08:00
|
|
|
|
zc := b.ZoneCode
|
|
|
|
|
|
if zc == "" {
|
|
|
|
|
|
zc = "未分区"
|
|
|
|
|
|
}
|
|
|
|
|
|
zones[zc+"/"+b.QualityStatus] += b.Quantity
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-30 17:33:11 +08:00
|
|
|
|
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())
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 半成品统计:统一库存主表 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())
|
2026-09-03 14:20:37 +08:00
|
|
|
|
pkgCount, _ := ctx.EntClient.OutboundOrder.Query().Where(outboundorder.BoxNoNEQ("")).Count(ctx0())
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
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())
|
|
|
|
|
|
|
2026-10-20 16:36:26 +08:00
|
|
|
|
// ---- 库位利用率:库位 = 货架(区域→货架→层→位置 中的「货架」物理存储单元)----
|
|
|
|
|
|
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)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-08-28 15:06:01 +08:00
|
|
|
|
ok(w, map[string]any{
|
2026-09-30 17:33:11 +08:00
|
|
|
|
"batchCount": batchCount,
|
|
|
|
|
|
"totalQty": totalQty,
|
|
|
|
|
|
"lockedQty": lockedQty,
|
|
|
|
|
|
"snInStock": snInStock,
|
|
|
|
|
|
"snOut": snOut,
|
|
|
|
|
|
"semiInStock": semiInStock,
|
2026-09-08 11:44:04 +08:00
|
|
|
|
"finishedInStock": finishedInStock,
|
2026-09-30 17:33:11 +08:00
|
|
|
|
"packageCount": pkgCount,
|
|
|
|
|
|
"inToday": inToday,
|
|
|
|
|
|
"outToday": outToday,
|
|
|
|
|
|
"zoneDetail": zones,
|
2026-10-20 16:36:26 +08:00
|
|
|
|
"locationUsed": locUsed,
|
|
|
|
|
|
"locationTotal": locTotal,
|
|
|
|
|
|
"pendingInbound": pendingInbound,
|
|
|
|
|
|
"pendingOutbound": pendingOutbound,
|
|
|
|
|
|
"movements": movements,
|
2026-09-30 17:33:11 +08:00
|
|
|
|
"time": time.Now().Format("2006-01-02 15:04:05"),
|
2026-08-28 15:06:01 +08:00
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-08 11:44:04 +08:00
|
|
|
|
|
2026-10-20 16:36:26 +08:00
|
|
|
|
// 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)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-10-05 20:15:38 +08:00
|
|
|
|
// finishedInboundRequest 成品入库请求(MES 完工回流内部接口 与 WMS 手工成品入库页 共用契约)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 定稿(2026-09-07):成品 SN 由 MES 系统生成(系统必发号,实物可不贴码,允许手填覆盖),
|
2026-10-10 15:58:59 +08:00
|
|
|
|
// SN 与实物码解耦;完工品落 WMS 统一库存主表(sn_mode=1 序列号=是SN单件, category=3 成品)。
|
2026-10-05 20:15:38 +08:00
|
|
|
|
// 方案A(2026-10-04):完工检合格才入成品库,入库解耦为双通道——
|
|
|
|
|
|
// ① MES 完工检合格调 /api/internal/finished/inbound 自动回流;② 库房在「成品入库」页手工录入(/api/finished/inbound)。
|
|
|
|
|
|
// 归属三字段与产品状态/相关标准/试验记录单号/记录员/记录日期均可空,落库写法照 semiInboundHandler
|
|
|
|
|
|
// (归属类型经 ownershipTypeOrNone 归一化,其余 Nillable 空=不落)。
|
2026-09-08 11:44:04 +08:00
|
|
|
|
type finishedInboundRequest struct {
|
|
|
|
|
|
ProductCode string `json:"productCode"` // 产品编码(成品物料编码)
|
|
|
|
|
|
ProductName string `json:"productName"` // 产品名称(档案缺失时兜底展示)
|
|
|
|
|
|
Sn string `json:"sn"` // 成品 SN(系统生成或手填,全局唯一)
|
|
|
|
|
|
OrderNo string `json:"orderNo"` // 关联工单号
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"` // 入库区域(可空=未分区)
|
2026-10-05 20:15:38 +08:00
|
|
|
|
QualityStatus string `json:"qualityStatus"` // 质量状态(默认 合格;MES 完工检按产品状态传入:已通过→合格/部分通过→合格/返修→不合格,后端尊重传入值不重复映射)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
SnSource string `json:"snSource"` // AUTO=系统生成 / MANUAL=手填,仅记录
|
|
|
|
|
|
Operator string `json:"operator"`
|
2026-10-05 20:15:38 +08:00
|
|
|
|
// 归属三字段(照 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 回流留空走默认文案)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2026-10-05 20:15:38 +08:00
|
|
|
|
// finishedInboundHandler 成品完工回流入库(MES 完工检合格后调用,X-API-TOKEN 内部接口)
|
|
|
|
|
|
// 创建逻辑抽至 createFinishedInventory(finished_inbound.go),与手工成品入库共享。
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 物料档案缺失时不阻塞回流(库存行 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
|
|
|
|
|
|
}
|
2026-10-05 20:15:38 +08:00
|
|
|
|
rec, code, err := createFinishedInventory(ctx, &req, sourceMES)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
if err != nil {
|
2026-10-05 20:15:38 +08:00
|
|
|
|
fail(w, code, err.Error())
|
2026-09-08 11:44:04 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
ok(w, rec)
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func snSourceLabel(s string) string {
|
|
|
|
|
|
if s == "MANUAL" {
|
|
|
|
|
|
return "手填"
|
|
|
|
|
|
}
|
|
|
|
|
|
return "系统生成"
|
|
|
|
|
|
}
|