Files
bj_power/bj_power_wms/internal/handler/call.go
T
SunYF 1d1dc1bdd8 按模块说明
一、MES — 叫料单扩展(schema + 逻辑)​

material_request 新增字段:packageNo(叫料包号,一次提交=一包)、callDate(叫料日,默认当天)、planBreakdown(jsonb,工单×排产日明细 []CallPlanBreakdown);targetDock 语义降级为"期望接驳台(可空,配送时 WMS 确定实际台)"。
新增 internal/logic/call_plan.go:实时计算「叫料需求明细(工单×排产日×物料)」,派生两类提示(当日剩余未叫 / 跨日量明细),不落库、不拦提交;接驳台空台校验 EnsureStationDocksEmpty、托盘回库 DispatchPalletReturnManual、人工清台 ClearDockLedger、配送单派车 DispatchDeliveryAgv、工位物料明细 StationMaterialDetail。
新增 internal/handler/production/call_pkg.go:8 个 MES 内部端点(X-API-TOKEN 网关),供 WMS 调用——叫料需求明细、按包查单、接驳台状态、托盘回库、人工清台、配送单派车、叫料池原始行、工位物料明细、WMS 代叫料。
internal/handler/production/call.go、internal/logic/call.go、agv.go、qty_report.go、routes_production.go、wmsclient/client.go、db.go 同步接入上述逻辑。
二、WMS — 配送单(新功能,叫料与送料彻底拆开)​

新增 schema/delivery_order.go + delivery_order_item.go 及 ent 生成代码:delivery_order(PENDING→DISPATCHED→DONE / CANCELLED,一单=一次托盘配送)、delivery_order_item(配送物料明细快照:工单/工艺/排产日)。
新增 internal/handler/delivery.go + 路由 + DeliveryOrders.vue 页面(仓储作业 → 配送单)。
mesclient/client.go 扩展:MES 叫料单结构补 packageNo/callDate/workOrderNo/planBreakdown,新增 PoolRow/DockPalletState/DeliveryAgvItem/getJSON 等。
CallQueue.vue:按叫料包展示,新增「代叫料」「建配送单」按钮与对话框;出库单回写所属配送单号(outbound_order 加字段);AGV 派送改由配送单驱动。
三、工位终端 — 叫料体验升级

MaterialPanel.vue:新增「本工位物料明细」卡(工艺物料全集×工位账四数,量为 0 也显示);叫料改为「叫料包」模式(默认当天、可勾选分批、可选其他排产日、期望接驳台可空),新增叫料日选择器、两条提示横幅(当日剩余未叫 / 跨日量明细)、托盘回库按钮。
InspectPanel.vue/Main.vue/OnlinePanel.vue/OfflinePanel.vue/WorkPanel.vue/SyncQueueDialog.vue/api/index.js/internal/handler/line.go/routes.go 同步接入接驳台状态、托盘回库、下班双台空台校验等。
web/static/index.html 构建刷新。
四、文档

案例.md:重写第 5/6/8/9 节与新「配送单」流程,补「模拟模式跳过接驳台校验」说明,库管员菜单加「配送单」;并修正"本单箱体"等措辞歧义。
客户问题.md:同步本轮拍板口径。
五、构建产物 / 同步

多个 MES 前端页面(.vue)随本次改动统一重新构建刷新;ent 生成代码(MES material_request、WMS delivery_order/outbound_order 相关)随 schema 更新重新生成。
2026-11-05 19:18:18 +08:00

282 lines
9.5 KiB
Go
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
package handler
import (
"bytes"
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
"strconv"
"strings"
"bj_power_wms/ent"
"bj_power_wms/ent/inventory"
"bj_power_wms/internal/mesclient"
"bj_power_wms/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
)
// ============ B5 叫料队列(仓库端,2026-10-13 定稿) ============
// 入口:WMS「叫料队列」页(JWT + call:view/call:manage)。
// 完成备料 = WMS 本地 FIFO 选库存 → 通用出库(类别「叫料配送」)→ 通知 MES /call/complete;
// MES 不反向调 WMS 出库(主控裁定:库存动作归 WMS,减少环、降低失败面)。
// callPendingHandler GET /api/call/pending 叫料队列:待备料叫料单(代理 MES 内部列表)。
// 支持 stationNo / materialCode / requestNo 过滤(不区分大小写由 MES 侧处理)。
func callPendingHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if ctx.Mes == nil {
fail(w, http.StatusInternalServerError, "MES 未配置,无法拉取叫料队列")
return
}
list, err := ctx.Mes.ListMaterialRequests(r.Context(), "PENDING")
if err != nil {
fail(w, http.StatusBadGateway, "拉取 MES 叫料队列失败: "+err.Error())
return
}
stationNo := strings.TrimSpace(r.URL.Query().Get("stationNo"))
materialCode := strings.TrimSpace(r.URL.Query().Get("materialCode"))
requestNo := strings.TrimSpace(r.URL.Query().Get("requestNo"))
out := make([]mesclient.MaterialRequest, 0, len(list))
for _, m := range list {
if stationNo != "" && strconv.Itoa(m.StationNo) != stationNo {
continue
}
if materialCode != "" && !strings.Contains(strings.ToLower(m.MaterialCode), strings.ToLower(materialCode)) {
continue
}
if requestNo != "" && !strings.Contains(strings.ToLower(m.RequestNo), strings.ToLower(requestNo)) {
continue
}
out = append(out, m)
}
ok(w, map[string]any{"total": len(out), "list": out})
}
}
// callCompleteHandler POST /api/call/complete 仓库完成备料(点「完成」一键:选库存→出库→通知 MES→派车)。
// body: {requestNo}。实发量由 WMS 库存实况确定(缺多少发多少,差额 MES 自动释放)。
func callCompleteHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if ctx.Mes == nil {
fail(w, http.StatusInternalServerError, "MES 未配置,无法完成备料")
return
}
var req struct {
RequestNo string `json:"requestNo"`
}
if err := parseJSON(r, &req); err != nil || strings.TrimSpace(req.RequestNo) == "" {
fail(w, http.StatusBadRequest, "缺少叫料单号")
return
}
operator := r.Header.Get("X-Username")
if operator == "" {
operator = "warehouse"
}
// 1. 取 MES 叫料单并校验状态
list, err := ctx.Mes.ListMaterialRequests(r.Context(), "PENDING")
if err != nil {
fail(w, http.StatusBadGateway, "拉取 MES 叫料单失败: "+err.Error())
return
}
var call *mesclient.MaterialRequest
for i := range list {
if list[i].RequestNo == req.RequestNo {
call = &list[i]
break
}
}
if call == nil {
fail(w, http.StatusNotFound, "叫料单不存在或已不是待备料状态(可能已被其他仓库处理)")
return
}
if call.TargetDock == "" {
fail(w, http.StatusBadRequest, "该叫料单未指定目标接驳台,不能配送")
return
}
need := int(call.ReqQty + 0.5)
if need <= 0 {
fail(w, http.StatusBadRequest, "叫料单请求量异常")
return
}
// 借料来源透传(库房知情权):排除本工位自取项,仅保留真正借出的兄弟工位
borrowForWMS := map[string]int{}
for k, v := range call.BorrowFrom {
if k == strconv.Itoa(call.StationNo) {
continue
}
if v > 0 {
borrowForWMS[k] = v
}
}
// 2. FIFO 选库存(口径同 /api/internal/stock/batches:在库 + 合格 + 未锁定部分)
rows, err := ctx.EntClient.Inventory.Query().
Where(
inventory.MaterialCodeEQ(call.MaterialCode),
inventory.QuantityGT(0),
inventory.QualityStatusIn(QStatusPass),
inventory.StatusEQ("在库"),
).
Order(ent.Asc("batch_no"), ent.Asc("created_at")).
All(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, "查询库存失败: "+err.Error())
return
}
type pick struct {
batchNo string
sn string
take int
}
picks := make([]pick, 0, 4)
remain := need
totalAvail := 0
for _, inv := range rows {
if remain <= 0 {
break
}
avail := inv.Quantity - inv.LockedQty
if avail <= 0 {
continue
}
take := avail
if take > remain {
take = remain
}
if call.SnMode == 1 {
// 序列号=是:逐件(每行 quantity=1)
if inv.SnCode == "" {
continue
}
picks = append(picks, pick{sn: inv.SnCode, take: 1})
totalAvail++
remain--
continue
}
if inv.SnMode == snModeBatch {
picks = append(picks, pick{batchNo: inv.BatchNo, take: take})
totalAvail += avail
remain -= take
}
}
if len(picks) == 0 {
fail(w, http.StatusConflict, "缺料无法完成备料:物料「"+call.MaterialName+"("+call.MaterialCode+")」工位 "+strconv.Itoa(call.StationNo)+" 请求量 "+itoa(need)+",合格可用量 "+itoa(totalAvail)+",请先补入库或走补料审批")
return
}
// 3. 逐批通用出库(类别=叫料配送;目标接驳台=叫料单目标;进程内复用通用出库全链路)
outboundNos := make([]string, 0, len(picks))
sentTotal := 0
for _, p := range picks {
payload := generalOutboundRequest{
MaterialCode: call.MaterialCode,
Qty: p.take,
Operator: operator,
OutboundCategory: "call",
Remark: "叫料单 " + call.RequestNo,
TargetDock: call.TargetDock,
TargetStation: strconv.Itoa(call.StationNo),
NeedAgv: call.NeedAgv,
BorrowFrom: borrowForWMS,
}
if p.sn != "" {
payload.SnList = []string{p.sn}
} else {
payload.BatchNo = p.batchNo
}
obNo, obQty, gerr := doGeneralOutbound(ctx, payload)
if gerr != nil {
fail(w, http.StatusInternalServerError, "出库失败(物料 "+call.MaterialCode+"):"+gerr.Error())
return
}
outboundNos = append(outboundNos, obNo)
sentTotal += obQty
}
if sentTotal <= 0 {
fail(w, http.StatusInternalServerError, "出库结果异常:实发量为 0")
return
}
// 4. 通知 MES 完成备料(状态迁移 + 四数账;失败不阻断出库事实,返回出库单号供重试)
joined := strings.Join(outboundNos, ",")
if cerr := ctx.Mes.CallComplete(r.Context(), call.RequestNo, float64(sentTotal), joined, operator); cerr != nil {
logx.Errorf("call complete notify MES failed: requestNo=%s err=%v", call.RequestNo, cerr)
fail(w, http.StatusBadGateway, "已出库(单号 "+joined+"),但通知 MES 失败,请重试「完成备料」: "+cerr.Error())
return
}
// 5. AGV 自动派车已交由 MES 在「完成备料」内统一触发(best-effort),WMS 不再本地下发海康 RCS
agvNote := "(AGV 由 MES 自动派车)"
ok(w, map[string]any{
"requestNo": call.RequestNo, "sentQty": sentTotal, "reqQty": need,
"outboundNos": joined, "short": need - sentTotal, "agvNote": agvNote,
})
}
}
// callRejectHandler POST /api/call/reject 仓库驳回叫料单(仅待备料;理由必填,异常标记:非当日等)。
func callRejectHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if ctx.Mes == nil {
fail(w, http.StatusInternalServerError, "MES 未配置")
return
}
var req struct {
RequestNo string `json:"requestNo"`
Reason string `json:"reason"`
}
if err := parseJSON(r, &req); err != nil || strings.TrimSpace(req.RequestNo) == "" {
fail(w, http.StatusBadRequest, "缺少叫料单号")
return
}
if strings.TrimSpace(req.Reason) == "" {
fail(w, http.StatusBadRequest, "驳回必须填写理由")
return
}
operator := r.Header.Get("X-Username")
if operator == "" {
operator = "warehouse"
}
if err := ctx.Mes.CallReject(r.Context(), req.RequestNo, strings.TrimSpace(req.Reason), operator); err != nil {
fail(w, http.StatusBadGateway, "驳回失败: "+err.Error())
return
}
ok(w, map[string]any{"requestNo": req.RequestNo})
}
}
// doGeneralOutbound 进程内复用通用出库全链路(事务/扣减/单号/冻结守卫零重复实现)。
// 返回出库单号与实发量;HTTP 层错误以 error 返回(message 透出)。
func doGeneralOutbound(ctx *svc.ServiceContext, req generalOutboundRequest) (string, int, error) {
body, merr := json.Marshal(req)
if merr != nil {
return "", 0, merr
}
rec := httptest.NewRecorder()
httpReq := httptest.NewRequest(http.MethodPost, "/api/outbound/general", bytes.NewReader(body))
httpReq.Header.Set("Content-Type", "application/json")
makeOutboundHandler(ctx, "general")(rec, httpReq)
var env struct {
Code int `json:"code"`
Message string `json:"message"`
Data struct {
OutboundNo string `json:"outboundNo"`
Qty int `json:"qty"`
} `json:"data"`
}
if derr := json.Unmarshal(rec.Body.Bytes(), &env); derr != nil {
return "", 0, derr
}
if env.Code != 0 {
return "", 0, errors.New(env.Message)
}
return env.Data.OutboundNo, env.Data.Qty, nil
}
// dispatchAgv 已移除(2026-10-14 AGV 唯一真源迁 MES):WMS 完成备料后由 MES 在 /api/internal/call/complete
// 内部统一触发海康 RCS 派车,WMS 不再本地持有 RCS 客户端,避免双真源/双派车。