2026-08-28 15:06:01 +08:00
|
|
|
|
package handler
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
|
"net/http"
|
2026-09-01 14:30:26 +08:00
|
|
|
|
"strconv"
|
|
|
|
|
|
"strings"
|
2026-09-08 11:44:04 +08:00
|
|
|
|
"time"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
"bj_power_wms/ent"
|
2026-09-08 11:44:04 +08:00
|
|
|
|
"bj_power_wms/ent/inventory"
|
|
|
|
|
|
"bj_power_wms/ent/material"
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"bj_power_wms/ent/ordermaterialledger"
|
|
|
|
|
|
"bj_power_wms/internal/svc"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 库存品类(与 schema/inventory.go 保持一致):1=原材料 2=半成品 3=成品
|
|
|
|
|
|
const (
|
|
|
|
|
|
invCatRaw = 1
|
|
|
|
|
|
invCatSemi = 2
|
|
|
|
|
|
invCatFinished = 3
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2026-09-03 14:20:37 +08:00
|
|
|
|
// 半成品 / 台账 相关(盘点见 stocktake.go)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
//
|
|
|
|
|
|
// 【统一库存主表收编 2026-09-07】半成品不再写独立 semi_finisheds 表,
|
|
|
|
|
|
// 全部落 inventories(manage_mode=2 SN单件, category=2 半成品)。
|
|
|
|
|
|
// 三个 semi 接口签名与响应结构保持不变,MES / 前端零改造平滑切换。
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// semiInboundHandler 半成品/成品入库(携带已完成工序)
|
|
|
|
|
|
// 与 MES 闭环:MES 工位报工暂存退库 / 完工回流时调用本接口,把 SN 入 WMS 库
|
|
|
|
|
|
// (inventories,category=2 半成品 / 3 成品,客户诉求 问题记录 L222 半成品与成品要区分)。
|
|
|
|
|
|
// 成品入库 9 字段(L218):SN/图号/归属/产品状态/相关标准/试验记录单号/记录员/记录日期/工单号。
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 为保持两系统解耦,materialCode 不强制要求——优先用请求传入,都没有则留空(SN 本身即追溯锚点)。
|
2026-08-28 15:06:01 +08:00
|
|
|
|
func semiInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
var req struct {
|
|
|
|
|
|
Sn string `json:"sn"`
|
|
|
|
|
|
MaterialCode string `json:"materialCode"`
|
2026-09-01 14:30:26 +08:00
|
|
|
|
DoneProcessCodes []int `json:"doneProcessCodes"`
|
2026-08-28 15:06:01 +08:00
|
|
|
|
CompletedProcess string `json:"completedProcess"`
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"`
|
|
|
|
|
|
OrderNo string `json:"orderNo"`
|
|
|
|
|
|
Operator string `json:"operator"`
|
2026-09-17 12:49:07 +08:00
|
|
|
|
Category int `json:"category"` // 2=半成品 3=成品(默认 2)
|
|
|
|
|
|
OwnershipType string `json:"ownershipType"`
|
|
|
|
|
|
OwnershipNo string `json:"ownershipNo"`
|
2026-09-20 14:53:14 +08:00
|
|
|
|
ProductStatus string `json:"productStatus"` // 已通过/部分通过/返修(成品用)
|
|
|
|
|
|
RelatedStandard string `json:"relatedStandard"` // 相关标准(试验方案号)
|
|
|
|
|
|
TestRecordNo string `json:"testRecordNo"` // 试验记录单号
|
|
|
|
|
|
RecordedBy string `json:"recordedBy"` // 记录员
|
|
|
|
|
|
RecordedAt int64 `json:"recordedAt"` // 记录日期(unix 秒)
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
if err := parseJSON(r, &req); err != nil {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "参数错误")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-01 14:30:26 +08:00
|
|
|
|
if req.Sn == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "sn 必填")
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
category := req.Category
|
|
|
|
|
|
if category != invCatFinished {
|
|
|
|
|
|
category = invCatSemi
|
|
|
|
|
|
}
|
|
|
|
|
|
catLabel := "半成品"
|
|
|
|
|
|
if category == invCatFinished {
|
|
|
|
|
|
catLabel = "成品"
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// SN 防重:同一品类下同一 SN 只允许一条库存行(含已出库历史,避免重复回流)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
exists, err := ctx.EntClient.Inventory.Query().
|
2026-09-17 12:49:07 +08:00
|
|
|
|
Where(inventory.CategoryEQ(category), inventory.SnCodeEQ(req.Sn)).
|
2026-08-28 15:06:01 +08:00
|
|
|
|
Exist(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if exists {
|
2026-09-17 12:49:07 +08:00
|
|
|
|
fail(w, http.StatusConflict, catLabel+"已存在: "+req.Sn)
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-01 14:30:26 +08:00
|
|
|
|
// 已完成工序:MES 传 doneProcessCodes([]int) 优先,否则用 completedProcess 字符串
|
|
|
|
|
|
completed := req.CompletedProcess
|
|
|
|
|
|
if len(req.DoneProcessCodes) > 0 {
|
|
|
|
|
|
parts := make([]string, 0, len(req.DoneProcessCodes))
|
|
|
|
|
|
for _, c := range req.DoneProcessCodes {
|
|
|
|
|
|
parts = append(parts, strconv.Itoa(c))
|
|
|
|
|
|
}
|
|
|
|
|
|
completed = strings.Join(parts, ",")
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-08 11:44:04 +08:00
|
|
|
|
// 物料编码:以请求传入为准;名称从物料档案补齐(档案缺失则用编码兜底)
|
2026-09-01 14:30:26 +08:00
|
|
|
|
materialCode := req.MaterialCode
|
2026-09-08 11:44:04 +08:00
|
|
|
|
materialName := materialCode
|
|
|
|
|
|
if materialCode != "" {
|
|
|
|
|
|
if m, err := ctx.EntClient.Material.Query().Where(material.CodeEQ(materialCode)).First(ctx0()); err == nil && m != nil {
|
|
|
|
|
|
materialName = m.Name
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-01 14:30:26 +08:00
|
|
|
|
|
2026-09-08 11:44:04 +08:00
|
|
|
|
rec, err := ctx.EntClient.Inventory.Create().
|
|
|
|
|
|
SetManageMode(2).
|
2026-09-17 12:49:07 +08:00
|
|
|
|
SetCategory(category).
|
2026-09-08 11:44:04 +08:00
|
|
|
|
SetSnCode(req.Sn).
|
|
|
|
|
|
SetMaterialCode(materialCode).
|
|
|
|
|
|
SetMaterialName(materialName).
|
|
|
|
|
|
SetQuantity(1).
|
|
|
|
|
|
SetQualityStatus("未检").
|
2026-08-28 15:06:01 +08:00
|
|
|
|
SetNillableZoneCode(strPtr(req.ZoneCode)).
|
|
|
|
|
|
SetStatus("在库").
|
2026-09-08 11:44:04 +08:00
|
|
|
|
SetNillableInboundNo(strPtr(req.OrderNo)).
|
|
|
|
|
|
SetOrderNo(req.OrderNo).
|
|
|
|
|
|
SetCompletedProcess(completed).
|
2026-09-17 12:49:07 +08:00
|
|
|
|
SetNillableOwnershipType(strPtr(ownershipTypeOrNone(req.OwnershipType))).
|
|
|
|
|
|
SetNillableOwnershipNo(strPtr(req.OwnershipNo)).
|
|
|
|
|
|
SetNillableProductStatus(strPtr(req.ProductStatus)).
|
|
|
|
|
|
SetNillableRelatedStandard(strPtr(req.RelatedStandard)).
|
|
|
|
|
|
SetNillableTestRecordNo(strPtr(req.TestRecordNo)).
|
|
|
|
|
|
SetNillableRecordedBy(strPtr(req.RecordedBy)).
|
|
|
|
|
|
SetNillableRecordedAt(int64Ptr(req.RecordedAt)).
|
2026-09-20 14:53:14 +08:00
|
|
|
|
SetRemark(catLabel + "完工暂存回流").
|
2026-08-28 15:06:01 +08:00
|
|
|
|
Save(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-04 14:18:53 +08:00
|
|
|
|
ctx.EventLog.Write(ctx0(), "semi.inbound", r.Header.Get("X-Username"), "semi", req.Sn,
|
2026-09-17 12:49:07 +08:00
|
|
|
|
catLabel+"入库 "+req.Sn, map[string]any{"materialCode": materialCode, "category": category})
|
2026-09-08 11:44:04 +08:00
|
|
|
|
ok(w, semiView(rec))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// semiOutboundHandler 半成品/成品出库(重上线/发货等):更新 inventories 状态
|
|
|
|
|
|
// 客户诉求 L224:出库原因必选(包装/继续生产/检验试验/其他),写入 outbound_reason 留痕。
|
2026-08-28 15:06:01 +08:00
|
|
|
|
func semiOutboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
var req struct {
|
|
|
|
|
|
Sn string `json:"sn"`
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"`
|
|
|
|
|
|
Operator string `json:"operator"`
|
2026-09-17 12:49:07 +08:00
|
|
|
|
Reason string `json:"reason"` // 出库原因:包装/继续生产/检验试验/其他
|
|
|
|
|
|
Category int `json:"category"` // 2=半成品 3=成品(默认 2)
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
if err := parseJSON(r, &req); err != nil {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "参数错误")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if req.Sn == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "sn 必填")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
if strings.TrimSpace(req.Reason) == "" {
|
|
|
|
|
|
fail(w, http.StatusBadRequest, "出库原因必选(包装/继续生产/检验试验/其他)")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
category := req.Category
|
|
|
|
|
|
if category != invCatFinished {
|
|
|
|
|
|
category = invCatSemi
|
|
|
|
|
|
}
|
|
|
|
|
|
catLabel := "半成品"
|
|
|
|
|
|
if category == invCatFinished {
|
|
|
|
|
|
catLabel = "成品"
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-08 11:44:04 +08:00
|
|
|
|
rec, err := ctx.EntClient.Inventory.Query().
|
2026-09-17 12:49:07 +08:00
|
|
|
|
Where(inventory.CategoryEQ(category), inventory.SnCodeEQ(req.Sn)).
|
2026-08-28 15:06:01 +08:00
|
|
|
|
Only(ctx0())
|
|
|
|
|
|
if err != nil {
|
2026-09-17 12:49:07 +08:00
|
|
|
|
fail(w, http.StatusNotFound, catLabel+"不存在: "+req.Sn)
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if rec.Status != "在库" {
|
2026-09-17 12:49:07 +08:00
|
|
|
|
fail(w, http.StatusConflict, catLabel+"不在库: "+rec.Status)
|
2026-08-28 15:06:01 +08:00
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-20 14:52:36 +08:00
|
|
|
|
// 盘点冻结守卫(问题2):盘点期间库存量冻结,禁止半成品/成品出库。
|
|
|
|
|
|
if rec.StocktakeNo != "" {
|
|
|
|
|
|
fail(w, http.StatusConflict, catLabel+" "+req.Sn+" 正在盘点单 "+rec.StocktakeNo+" 锁定中,盘点期间禁止出库")
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-08 11:44:04 +08:00
|
|
|
|
ctx.EntClient.Inventory.UpdateOneID(rec.ID).
|
2026-08-28 15:06:01 +08:00
|
|
|
|
SetStatus("出库").
|
2026-09-17 12:49:07 +08:00
|
|
|
|
SetNillableOutboundReason(strPtr(req.Reason)).
|
2026-09-08 11:44:04 +08:00
|
|
|
|
SetUpdatedAt(time.Now().Unix()).
|
2026-08-28 15:06:01 +08:00
|
|
|
|
ExecX(ctx0())
|
|
|
|
|
|
|
2026-09-04 14:18:53 +08:00
|
|
|
|
ctx.EventLog.Write(ctx0(), "semi.outbound", r.Header.Get("X-Username"), "semi", req.Sn,
|
2026-09-17 12:49:07 +08:00
|
|
|
|
catLabel+"出库 "+req.Sn, map[string]any{"reason": req.Reason})
|
2026-08-28 15:06:01 +08:00
|
|
|
|
ok(w, map[string]any{"sn": req.Sn, "status": "出库"})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// semiView 把统一库存行映射为半成品/成品视图(保持原 /api/semi/query 响应结构,前端零改造)
|
2026-09-08 11:44:04 +08:00
|
|
|
|
type semiViewRow struct {
|
|
|
|
|
|
ID int `json:"id"`
|
|
|
|
|
|
Sn string `json:"sn"`
|
|
|
|
|
|
MaterialCode string `json:"materialCode"`
|
2026-09-17 12:49:07 +08:00
|
|
|
|
MaterialName string `json:"materialName"`
|
|
|
|
|
|
Category int `json:"category"` // 2=半成品 3=成品
|
2026-09-08 11:44:04 +08:00
|
|
|
|
CompletedProcess string `json:"completedProcess"`
|
|
|
|
|
|
Quantity int `json:"quantity"`
|
|
|
|
|
|
ZoneCode string `json:"zoneCode"`
|
|
|
|
|
|
Status string `json:"status"`
|
|
|
|
|
|
OrderNo string `json:"orderNo"`
|
2026-09-17 12:49:07 +08:00
|
|
|
|
OwnershipNo string `json:"ownershipNo"`
|
|
|
|
|
|
ProductStatus string `json:"productStatus"`
|
|
|
|
|
|
RelatedStandard string `json:"relatedStandard"`
|
|
|
|
|
|
TestRecordNo string `json:"testRecordNo"`
|
|
|
|
|
|
RecordedBy string `json:"recordedBy"`
|
|
|
|
|
|
RecordedAt int64 `json:"recordedAt"`
|
|
|
|
|
|
OutboundReason string `json:"outboundReason"`
|
2026-09-08 11:44:04 +08:00
|
|
|
|
CreatedAt int64 `json:"createdAt"`
|
|
|
|
|
|
UpdatedAt int64 `json:"updatedAt"`
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func semiView(inv *ent.Inventory) *semiViewRow {
|
|
|
|
|
|
return &semiViewRow{
|
|
|
|
|
|
ID: inv.ID,
|
|
|
|
|
|
Sn: inv.SnCode,
|
|
|
|
|
|
MaterialCode: inv.MaterialCode,
|
2026-09-17 12:49:07 +08:00
|
|
|
|
MaterialName: inv.MaterialName,
|
|
|
|
|
|
Category: inv.Category,
|
2026-09-08 11:44:04 +08:00
|
|
|
|
CompletedProcess: inv.CompletedProcess,
|
|
|
|
|
|
Quantity: inv.Quantity,
|
|
|
|
|
|
ZoneCode: inv.ZoneCode,
|
|
|
|
|
|
Status: inv.Status,
|
|
|
|
|
|
OrderNo: inv.OrderNo,
|
2026-09-17 12:49:07 +08:00
|
|
|
|
OwnershipNo: inv.OwnershipNo,
|
|
|
|
|
|
ProductStatus: inv.ProductStatus,
|
|
|
|
|
|
RelatedStandard: inv.RelatedStandard,
|
|
|
|
|
|
TestRecordNo: inv.TestRecordNo,
|
|
|
|
|
|
RecordedBy: inv.RecordedBy,
|
|
|
|
|
|
RecordedAt: inv.RecordedAt,
|
|
|
|
|
|
OutboundReason: inv.OutboundReason,
|
2026-09-08 11:44:04 +08:00
|
|
|
|
CreatedAt: inv.CreatedAt,
|
|
|
|
|
|
UpdatedAt: inv.UpdatedAt,
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-20 18:25:44 +08:00
|
|
|
|
// querySemiHandler 半成品查询(读统一库存主表 category=2 半成品)。
|
|
|
|
|
|
// 半成品管理页只处理半成品;成品由 MES 完工回流入库、经 WMS 完工检验,在「库存查询」页按品类查看,不在本页手工出入库。
|
2026-08-28 15:06:01 +08:00
|
|
|
|
func querySemiHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
page := atoi(r.URL.Query().Get("page"), 1)
|
|
|
|
|
|
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
|
|
|
|
|
|
materialCode := r.URL.Query().Get("materialCode")
|
|
|
|
|
|
status := r.URL.Query().Get("status")
|
2026-09-17 12:49:07 +08:00
|
|
|
|
sn := r.URL.Query().Get("sn")
|
|
|
|
|
|
ownershipNo := r.URL.Query().Get("ownershipNo")
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
2026-09-20 18:25:44 +08:00
|
|
|
|
q := ctx.EntClient.Inventory.Query().Where(inventory.CategoryEQ(invCatSemi))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
if materialCode != "" {
|
2026-09-08 11:44:04 +08:00
|
|
|
|
q = q.Where(inventory.MaterialCodeEqualFold(materialCode))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
|
|
|
|
|
if status != "" {
|
2026-09-08 11:44:04 +08:00
|
|
|
|
q = q.Where(inventory.StatusEQ(status))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
if sn != "" {
|
|
|
|
|
|
q = q.Where(inventory.SnCodeContainsFold(sn))
|
|
|
|
|
|
}
|
|
|
|
|
|
if ownershipNo != "" {
|
|
|
|
|
|
q = q.Where(inventory.OwnershipNoContainsFold(ownershipNo))
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
total, err := q.Count(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-03 18:13:59 +08:00
|
|
|
|
list, err := q.Order(ent.Desc("created_at"), ent.Desc("id")).
|
2026-08-28 15:06:01 +08:00
|
|
|
|
Offset((page - 1) * pageSize).Limit(pageSize).All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-08 11:44:04 +08:00
|
|
|
|
rows := make([]*semiViewRow, 0, len(list))
|
|
|
|
|
|
for _, inv := range list {
|
|
|
|
|
|
rows = append(rows, semiView(inv))
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
ok(w, map[string]any{
|
|
|
|
|
|
"total": total,
|
2026-09-08 11:44:04 +08:00
|
|
|
|
"list": rows,
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"page": page,
|
|
|
|
|
|
"pageSize": pageSize,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-15 16:37:39 +08:00
|
|
|
|
// ledgerRow 台账行(服务端派生 可用库存 / 缺口 / 四态)
|
|
|
|
|
|
type ledgerRow struct {
|
|
|
|
|
|
*ent.OrderMaterialLedger
|
|
|
|
|
|
AvailableQty int `json:"availableQty"` // 实时可用库存
|
|
|
|
|
|
ShortQty int `json:"shortQty"` // 缺口 = 需求 - 可用(下限 0)
|
|
|
|
|
|
State string `json:"state"` // 备料四态:齐套/未齐套/预警/未到货
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// ledgerState 备料四态判定(客户诉求 问题记录 L242-258 孙彦飞口径),优先级:未到货 > 预警 > 未齐套 > 齐套。
|
2026-09-15 16:37:39 +08:00
|
|
|
|
//
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// 状态定义(L253-256):
|
2026-09-20 14:53:14 +08:00
|
|
|
|
//
|
|
|
|
|
|
// 齐套 :可用库存 ≥ 需求总量
|
|
|
|
|
|
// 未齐套:0 < 可用库存 < 需求总量
|
|
|
|
|
|
// 未到货:可用库存 = 0 且 已出库 = 0
|
|
|
|
|
|
// 预警 :可用库存 < 未来5天需求量(future5Qty 由 MES 按近5天日排产×单台用量推送到 material_demands;
|
|
|
|
|
|
// 无推送记录时 future5Qty=0,该档不生效,退化为三态判定)
|
2026-09-17 12:49:07 +08:00
|
|
|
|
func ledgerState(avail, need, out, future5Qty int) string {
|
2026-09-15 16:37:39 +08:00
|
|
|
|
if avail <= 0 && out <= 0 {
|
|
|
|
|
|
return "未到货"
|
|
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
if future5Qty > 0 && avail < future5Qty {
|
2026-09-15 16:37:39 +08:00
|
|
|
|
return "预警"
|
|
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
if avail >= need {
|
|
|
|
|
|
return "齐套"
|
|
|
|
|
|
}
|
2026-09-15 16:37:39 +08:00
|
|
|
|
return "未齐套"
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// materialFuture5QtyMap 读取 MES 推送的未来5天需求量(material_demands),返回 material_code → qty
|
|
|
|
|
|
func materialFuture5QtyMap(ctx *svc.ServiceContext) map[string]int {
|
|
|
|
|
|
list, err := ctx.EntClient.MaterialDemand.Query().All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
return map[string]int{}
|
|
|
|
|
|
}
|
|
|
|
|
|
m := make(map[string]int, len(list))
|
|
|
|
|
|
for _, d := range list {
|
|
|
|
|
|
m[d.MaterialCode] = d.Future5Qty
|
|
|
|
|
|
}
|
|
|
|
|
|
return m
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2026-09-19 10:54:15 +08:00
|
|
|
|
// materialAvailableQty 物料可用库存汇总(在库/锁定 且 质量状态=合格)。
|
|
|
|
|
|
// 客户口径(问题记录 L135):「仅合格品计入库存数量」——未检(待检)/不合格/待退 不计可用。
|
2026-09-15 16:37:39 +08:00
|
|
|
|
func materialAvailableQty(ctx *svc.ServiceContext, code string) int {
|
|
|
|
|
|
rows, err := ctx.EntClient.Inventory.Query().
|
|
|
|
|
|
Where(
|
|
|
|
|
|
inventory.MaterialCodeEQ(code),
|
|
|
|
|
|
inventory.StatusIn("在库", "锁定"),
|
2026-09-19 10:54:15 +08:00
|
|
|
|
inventory.QualityStatusEQ(QStatusPass),
|
2026-09-15 16:37:39 +08:00
|
|
|
|
).All(ctx0())
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
return 0
|
|
|
|
|
|
}
|
|
|
|
|
|
avail := 0
|
|
|
|
|
|
for _, inv := range rows {
|
|
|
|
|
|
if inv.ManageMode == 1 {
|
|
|
|
|
|
avail += inv.Quantity - inv.LockedQty
|
|
|
|
|
|
} else if inv.Status == "在库" {
|
|
|
|
|
|
avail++
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
return avail
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func max0(n int) int {
|
|
|
|
|
|
if n < 0 {
|
|
|
|
|
|
return 0
|
|
|
|
|
|
}
|
|
|
|
|
|
return n
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// queryLedgerHandler 工单物料台账查询(含备料四态)
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// 完成时间筛选(客户诉求 问题记录 L238-240):completeStart/completeEnd 按台账 completed_at
|
|
|
|
|
|
// (最后一笔领料完结出库时间)过滤,仅匹配已完结的台账行。
|
2026-08-28 15:06:01 +08:00
|
|
|
|
func queryLedgerHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
|
|
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
|
|
orderNo := r.URL.Query().Get("orderNo")
|
|
|
|
|
|
materialCode := r.URL.Query().Get("materialCode")
|
2026-09-03 18:13:59 +08:00
|
|
|
|
materialName := r.URL.Query().Get("materialName")
|
|
|
|
|
|
status := r.URL.Query().Get("status")
|
2026-09-20 14:53:14 +08:00
|
|
|
|
state := r.URL.Query().Get("state") // 四态筛选:齐套/未齐套/预警/未到货
|
2026-09-17 12:49:07 +08:00
|
|
|
|
completeStart := r.URL.Query().Get("completeStart") // 完成时间起(YYYY-MM-DD)
|
|
|
|
|
|
completeEnd := r.URL.Query().Get("completeEnd") // 完成时间止
|
2026-08-28 15:06:01 +08:00
|
|
|
|
page := atoi(r.URL.Query().Get("page"), 1)
|
|
|
|
|
|
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
|
2026-09-15 16:37:39 +08:00
|
|
|
|
if page < 1 {
|
|
|
|
|
|
page = 1
|
|
|
|
|
|
}
|
|
|
|
|
|
if pageSize < 1 {
|
|
|
|
|
|
pageSize = 20
|
|
|
|
|
|
}
|
2026-08-28 15:06:01 +08:00
|
|
|
|
|
|
|
|
|
|
q := ctx.EntClient.OrderMaterialLedger.Query()
|
|
|
|
|
|
if orderNo != "" {
|
|
|
|
|
|
q = q.Where(ordermaterialledger.OrderNoEQ(orderNo))
|
|
|
|
|
|
}
|
|
|
|
|
|
if materialCode != "" {
|
2026-09-08 11:44:04 +08:00
|
|
|
|
q = q.Where(ordermaterialledger.MaterialCodeEqualFold(materialCode))
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-03 18:13:59 +08:00
|
|
|
|
if materialName != "" {
|
|
|
|
|
|
q = q.Where(ordermaterialledger.MaterialNameContains(materialName))
|
|
|
|
|
|
}
|
|
|
|
|
|
if status != "" {
|
2026-09-15 16:37:39 +08:00
|
|
|
|
// 兼容旧口径(进行中/领料完结)
|
2026-09-04 14:18:53 +08:00
|
|
|
|
switch status {
|
2026-09-15 16:37:39 +08:00
|
|
|
|
case "进行中":
|
|
|
|
|
|
q = q.Where(ordermaterialledger.StatusEQ("进行中"))
|
2026-09-04 14:18:53 +08:00
|
|
|
|
case "领料完结":
|
|
|
|
|
|
q = q.Where(ordermaterialledger.StatusEQ("领料完结"))
|
|
|
|
|
|
}
|
2026-09-03 18:13:59 +08:00
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
if completeStart != "" {
|
|
|
|
|
|
if t, err := time.ParseInLocation("2006-01-02", completeStart, time.Local); err == nil {
|
|
|
|
|
|
q = q.Where(ordermaterialledger.CompletedAtGTE(t.Unix()))
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
if completeEnd != "" {
|
|
|
|
|
|
if t, err := time.ParseInLocation("2006-01-02", completeEnd, time.Local); err == nil {
|
|
|
|
|
|
q = q.Where(ordermaterialledger.CompletedAtLTE(t.Add(24 * time.Hour).Unix()))
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2026-09-15 16:37:39 +08:00
|
|
|
|
|
|
|
|
|
|
all, err := q.Order(ent.Desc("created_at"), ent.Desc("id")).All(ctx0())
|
2026-08-28 15:06:01 +08:00
|
|
|
|
if err != nil {
|
|
|
|
|
|
fail(w, http.StatusInternalServerError, err.Error())
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2026-09-15 16:37:39 +08:00
|
|
|
|
|
2026-09-17 12:49:07 +08:00
|
|
|
|
// 计算可用库存 + 四态(四态需实时库存 + MES 推送的未来5天需求量,故在 Go 侧派生)
|
2026-09-15 16:37:39 +08:00
|
|
|
|
availCache := map[string]int{}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
demandMap := materialFuture5QtyMap(ctx)
|
2026-09-15 16:37:39 +08:00
|
|
|
|
rows := make([]*ledgerRow, 0, len(all))
|
|
|
|
|
|
for _, lg := range all {
|
2026-09-17 12:49:07 +08:00
|
|
|
|
avail, ok2 := availCache[lg.MaterialCode]
|
|
|
|
|
|
if !ok2 {
|
2026-09-15 16:37:39 +08:00
|
|
|
|
avail = materialAvailableQty(ctx, lg.MaterialCode)
|
|
|
|
|
|
availCache[lg.MaterialCode] = avail
|
|
|
|
|
|
}
|
2026-09-17 12:49:07 +08:00
|
|
|
|
st := ledgerState(avail, lg.TotalQty, lg.OutQty, demandMap[lg.MaterialCode])
|
2026-09-15 16:37:39 +08:00
|
|
|
|
if state != "" && st != state {
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
rows = append(rows, &ledgerRow{
|
|
|
|
|
|
OrderMaterialLedger: lg,
|
|
|
|
|
|
AvailableQty: avail,
|
|
|
|
|
|
ShortQty: max0(lg.TotalQty - avail),
|
|
|
|
|
|
State: st,
|
|
|
|
|
|
})
|
2026-08-28 15:06:01 +08:00
|
|
|
|
}
|
2026-09-15 16:37:39 +08:00
|
|
|
|
|
|
|
|
|
|
total := len(rows)
|
|
|
|
|
|
start := (page - 1) * pageSize
|
|
|
|
|
|
if start > total {
|
|
|
|
|
|
start = total
|
|
|
|
|
|
}
|
|
|
|
|
|
end := start + pageSize
|
|
|
|
|
|
if end > total {
|
|
|
|
|
|
end = total
|
|
|
|
|
|
}
|
|
|
|
|
|
pageRows := rows[start:end]
|
|
|
|
|
|
|
2026-08-28 15:06:01 +08:00
|
|
|
|
ok(w, map[string]any{
|
|
|
|
|
|
"total": total,
|
2026-09-15 16:37:39 +08:00
|
|
|
|
"list": pageRows,
|
2026-08-28 15:06:01 +08:00
|
|
|
|
"page": page,
|
|
|
|
|
|
"pageSize": pageSize,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|