feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程
新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
@@ -8,7 +8,6 @@ import (
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/ent/ordermaterialledger"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
|
||||
@@ -340,174 +339,3 @@ func querySemiHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// ledgerRow 台账行(服务端派生 可用库存 / 缺口 / 四态)
|
||||
type ledgerRow struct {
|
||||
*ent.OrderMaterialLedger
|
||||
AvailableQty int `json:"availableQty"` // 实时可用库存
|
||||
ShortQty int `json:"shortQty"` // 缺口 = 需求 - 可用(下限 0)
|
||||
State string `json:"state"` // 备料四态:齐套/未齐套/预警/未到货
|
||||
}
|
||||
|
||||
// ledgerState 备料四态判定(客户诉求 问题记录 L242-258 孙彦飞口径),优先级:未到货 > 预警 > 未齐套 > 齐套。
|
||||
//
|
||||
// 状态定义(L253-256):
|
||||
//
|
||||
// 齐套 :可用库存 ≥ 需求总量
|
||||
// 未齐套:0 < 可用库存 < 需求总量
|
||||
// 未到货:可用库存 = 0 且 已出库 = 0
|
||||
// 预警 :可用库存 < 未来5天需求量(future5Qty 由 MES 按近5天日排产×单台用量推送到 material_demands;
|
||||
// 无推送记录时 future5Qty=0,该档不生效,退化为三态判定)
|
||||
func ledgerState(avail, need, out, future5Qty int) string {
|
||||
if avail <= 0 && out <= 0 {
|
||||
return "未到货"
|
||||
}
|
||||
if future5Qty > 0 && avail < future5Qty {
|
||||
return "预警"
|
||||
}
|
||||
if avail >= need {
|
||||
return "齐套"
|
||||
}
|
||||
return "未齐套"
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
|
||||
// materialAvailableQty 物料可用库存汇总(在库/锁定 且 质量状态=合格)。
|
||||
// 客户口径(问题记录 L135):「仅合格品计入库存数量」——未检(待检)/不合格/待退 不计可用。
|
||||
func materialAvailableQty(ctx *svc.ServiceContext, code string) int {
|
||||
rows, err := ctx.EntClient.Inventory.Query().
|
||||
Where(
|
||||
inventory.MaterialCodeEQ(code),
|
||||
inventory.StatusIn("在库", "锁定"),
|
||||
inventory.QualityStatusIn(QStatusPass),
|
||||
).All(ctx0())
|
||||
if err != nil {
|
||||
return 0
|
||||
}
|
||||
avail := 0
|
||||
for _, inv := range rows {
|
||||
if inv.SnMode == snModeBatch {
|
||||
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 工单物料台账查询(含备料四态)
|
||||
// 完成时间筛选(客户诉求 问题记录 L238-240):completeStart/completeEnd 按台账 completed_at
|
||||
// (最后一笔领料完结出库时间)过滤,仅匹配已完结的台账行。
|
||||
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")
|
||||
materialName := r.URL.Query().Get("materialName")
|
||||
status := r.URL.Query().Get("status")
|
||||
state := r.URL.Query().Get("state") // 四态筛选:齐套/未齐套/预警/未到货
|
||||
completeStart := r.URL.Query().Get("completeStart") // 完成时间起(YYYY-MM-DD)
|
||||
completeEnd := r.URL.Query().Get("completeEnd") // 完成时间止
|
||||
page := atoi(r.URL.Query().Get("page"), 1)
|
||||
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
|
||||
if page < 1 {
|
||||
page = 1
|
||||
}
|
||||
if pageSize < 1 {
|
||||
pageSize = 20
|
||||
}
|
||||
|
||||
q := ctx.EntClient.OrderMaterialLedger.Query()
|
||||
if orderNo != "" {
|
||||
q = q.Where(ordermaterialledger.OrderNoEQ(orderNo))
|
||||
}
|
||||
if materialCode != "" {
|
||||
q = q.Where(ordermaterialledger.MaterialCodeEqualFold(materialCode))
|
||||
}
|
||||
if materialName != "" {
|
||||
q = q.Where(ordermaterialledger.MaterialNameContains(materialName))
|
||||
}
|
||||
if status != "" {
|
||||
// 兼容旧口径(进行中/领料完结)
|
||||
switch status {
|
||||
case "进行中":
|
||||
q = q.Where(ordermaterialledger.StatusEQ("进行中"))
|
||||
case "领料完结":
|
||||
q = q.Where(ordermaterialledger.StatusEQ("领料完结"))
|
||||
}
|
||||
}
|
||||
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()))
|
||||
}
|
||||
}
|
||||
|
||||
all, err := q.Order(ent.Desc("created_at"), ent.Desc("id")).All(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
// 计算可用库存 + 四态(四态需实时库存 + MES 推送的未来5天需求量,故在 Go 侧派生)
|
||||
availCache := map[string]int{}
|
||||
demandMap := materialFuture5QtyMap(ctx)
|
||||
rows := make([]*ledgerRow, 0, len(all))
|
||||
for _, lg := range all {
|
||||
avail, ok2 := availCache[lg.MaterialCode]
|
||||
if !ok2 {
|
||||
avail = materialAvailableQty(ctx, lg.MaterialCode)
|
||||
availCache[lg.MaterialCode] = avail
|
||||
}
|
||||
st := ledgerState(avail, lg.TotalQty, lg.OutQty, demandMap[lg.MaterialCode])
|
||||
if state != "" && st != state {
|
||||
continue
|
||||
}
|
||||
rows = append(rows, &ledgerRow{
|
||||
OrderMaterialLedger: lg,
|
||||
AvailableQty: avail,
|
||||
ShortQty: max0(lg.TotalQty - avail),
|
||||
State: st,
|
||||
})
|
||||
}
|
||||
|
||||
total := len(rows)
|
||||
start := (page - 1) * pageSize
|
||||
if start > total {
|
||||
start = total
|
||||
}
|
||||
end := start + pageSize
|
||||
if end > total {
|
||||
end = total
|
||||
}
|
||||
pageRows := rows[start:end]
|
||||
|
||||
ok(w, map[string]any{
|
||||
"total": total,
|
||||
"list": pageRows,
|
||||
"page": page,
|
||||
"pageSize": pageSize,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user