按模块说明

一、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 更新重新生成。
This commit is contained in:
SunYF
2026-11-05 19:18:18 +08:00
parent 46fcb59079
commit 1d1dc1bdd8
102 changed files with 12953 additions and 379 deletions
+5
View File
@@ -443,6 +443,11 @@ var schemaPatchSQL = []string{
remark varchar(200) NOT NULL DEFAULT ''
)`,
`CREATE UNIQUE INDEX IF NOT EXISTS agvvehiclestate_agv_code_key ON agv_vehicle_state (agv_code)`,
// ---- 2026-11-05 叫料包拍板:一次提交=一包 + 工单×排产日明细维度(池聚合层不动,两层并存)----
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS package_no varchar(64) NOT NULL DEFAULT ''`,
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS call_date varchar(10) NOT NULL DEFAULT ''`,
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS plan_breakdown jsonb`,
}
// EnsureSchema ent 建表 + 幂等列补丁(只增,不删数据)
@@ -33,14 +33,17 @@ func CallPoolInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
// CreateCallHandler POST /api/internal/call/create 发起叫料(按物料行拆 N 张单,占用池子可用量)。
// CreateCallHandler POST /api/internal/call/create 发起叫料(一次提交=一个叫料包,按物料行拆 N 张单,
// 占用池子可用量)。callDate=所选排产日(空=当天);force=true 为 PLC 离线降级强行提交。
func CreateCallHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
StationNo int `json:"stationNo"`
Source string `json:"source"` // CALL(默认)/REFILL
RefReportNo string `json:"refReportNo"`
Items []logic.CallItem `json:"items"`
StationNo int `json:"stationNo"`
Source string `json:"source"` // CALL(默认)/REFILL
RefReportNo string `json:"refReportNo"`
CallDate string `json:"callDate"`
Force bool `json:"force"`
Items []logic.CallItem `json:"items"`
}
if err := httpx.ParseJSON(r, &req); err != nil {
httpx.BadRequest(w, "请求体解析失败")
@@ -48,7 +51,7 @@ func CreateCallHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
stationNo := StationNo(r, req.StationNo)
n, err := logic.New(svcCtx).CreateCallOrders(r.Context(), stationNo, req.Items,
req.Source, req.RefReportNo, StationOp(r, ""))
req.Source, req.RefReportNo, StationOp(r, ""), req.CallDate, req.Force)
if err != nil {
httpx.Fail(w, 3202, err.Error())
return
@@ -0,0 +1,204 @@
package production
// 2026-11-05 叫料包+配送单拍板:MES 内部端点(X-API-TOKEN 网关)
// ① 叫料需求明细(工单×排产日,两类提示数据源)
// ② 按工位批量读左右接驳台实时传感器(空台校验/下班校验共用)
// ③ 按包查叫料单(WMS 建配送单数据源,含工单×排产明细)
// ④ 托盘回库(传感器为准、台账软校验)
// ⑤ 人工清台(JBT21 等台账卡死兜底)
// ⑥ 配送单派车(AGV 派车改配送单驱动)
// ⑦ 叫料池原始行(WMS 代叫料对话框数据源)
// ⑧ 工位物料明细(工艺物料全集 左连接 工位账,量为0也显示)
import (
"net/http"
"strconv"
"bj_power_mes/common/httpx"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// CallPlanDetailInternalHandler GET /api/internal/call/plan-detail?stationNo=
// 叫料需求明细 + 「当日剩余没叫/跨日量明细」两类提示(实时计算不落库不拦提交)。
func CallPlanDetailInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
n, _ := strconv.Atoi(r.URL.Query().Get("stationNo"))
if n <= 0 {
httpx.BadRequest(w, "缺少工位号")
return
}
detail, err := logic.New(svcCtx).CallPlanDetail(r.Context(), n)
if err != nil {
httpx.Fail(w, 3230, err.Error())
return
}
httpx.Ok(w, detail)
}
}
// CallPackageInternalHandler GET /api/internal/call/package?packageNo=
// 按包查叫料单(WMS 建配送单数据源;含工单×排产明细 planBreakdown、出库单号)。
func CallPackageInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
pkg := r.URL.Query().Get("packageNo")
if pkg == "" {
httpx.BadRequest(w, "缺少包号")
return
}
rows, err := logic.New(svcCtx).ListMaterialRequestsByPackage(r.Context(), pkg)
if err != nil {
httpx.Fail(w, 3231, err.Error())
return
}
httpx.Ok(w, rows)
}
}
// StationDockPalletsInternalHandler GET /api/internal/dock/station-pallets?stationNo=
// 按工位批量读左右接驳台实时传感器(叫料空台校验/下班校验共用;PLC 不可达回退台账并标 plcOk=false)。
func StationDockPalletsInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
n, _ := strconv.Atoi(r.URL.Query().Get("stationNo"))
if n <= 0 {
httpx.BadRequest(w, "缺少工位号")
return
}
rows, err := logic.New(svcCtx).StationDockPallets(r.Context(), n)
if err != nil {
httpx.Fail(w, 3232, err.Error())
return
}
httpx.Ok(w, rows)
}
}
// PalletReturnInternalHandler POST /api/internal/dock/pallet-return
// 托盘回库(工位终端触发):传感器为准、台账软校验,不一致由操作人确认(confirmHasPallet)留痕;
// 物理拉回仓库 JBT21,非退料——物料账/库存不变。
func PalletReturnInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
DockCode string `json:"dockCode"`
Operator string `json:"operator"`
ConfirmHasPallet bool `json:"confirmHasPallet"`
}
if err := httpx.ParseJSON(r, &req); err != nil || req.DockCode == "" {
httpx.BadRequest(w, "缺少接驳台编码")
return
}
if err := logic.New(svcCtx).DispatchPalletReturnManual(r.Context(), req.DockCode, req.Operator, req.ConfirmHasPallet); err != nil {
httpx.Fail(w, 3233, err.Error())
return
}
httpx.OkMessage(w, "托盘回库已派车(物理拉回仓库,非退料;物料账与库存不变)", nil)
}
}
// DockClearInternalHandler POST /api/internal/dock/clear
// 人工清台:托盘被人工卸走后台账卡死兜底;仅清台账,不碰任何库存/池账/工件账。
func DockClearInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
DockCode string `json:"dockCode"`
Operator string `json:"operator"`
Reason string `json:"reason"`
}
if err := httpx.ParseJSON(r, &req); err != nil || req.DockCode == "" {
httpx.BadRequest(w, "缺少接驳台编码")
return
}
if err := logic.New(svcCtx).ClearDockLedger(r.Context(), req.DockCode, req.Operator, req.Reason); err != nil {
httpx.Fail(w, 3234, err.Error())
return
}
httpx.OkMessage(w, "已清台(台账置无托盘)", nil)
}
}
// DispatchDeliveryInternalHandler POST /api/internal/delivery/dispatch
// 配送单派车(AGV 派车改配送单驱动):WMS 校验配送单后转发,生成空车段(GO_LOAD)前往装货点 JBT21。
func DispatchDeliveryInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
DeliveryNo string `json:"deliveryNo"`
TargetDock string `json:"targetDock"`
Operator string `json:"operator"`
Items []logic.DeliveryAgvItem `json:"items"`
}
if err := httpx.ParseJSON(r, &req); err != nil || req.DeliveryNo == "" {
httpx.BadRequest(w, "缺少配送单号")
return
}
if err := logic.New(svcCtx).DispatchDeliveryAgv(r.Context(), req.DeliveryNo, req.TargetDock, req.Items, req.Operator); err != nil {
httpx.Fail(w, 3235, err.Error())
return
}
httpx.OkMessage(w, "配送单已派车(空车前往装货点,到位待令后确认装车)", nil)
}
}
// CallPoolRawInternalHandler GET /api/internal/call/pool-raw?stationNo=
// 叫料池原始行(WMS 代叫料对话框数据源;与终端同源同口径)。
func CallPoolRawInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
n, _ := strconv.Atoi(r.URL.Query().Get("stationNo"))
if n <= 0 {
httpx.BadRequest(w, "缺少工位号")
return
}
rows, err := logic.New(svcCtx).StationPool(r.Context(), n)
if err != nil {
httpx.Fail(w, 3201, err.Error())
return
}
httpx.Ok(w, rows)
}
}
// CreateCallInternalHandler POST /api/internal/call/create-internal
// WMS 代叫料(2026-11-05 拍板:与工位终端同一套逻辑;操作人取请求体,plain internal)。
func CreateCallInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
StationNo int `json:"stationNo"`
Source string `json:"source"`
CallDate string `json:"callDate"`
Force bool `json:"force"`
Operator string `json:"operator"`
Items []logic.CallItem `json:"items"`
}
if err := httpx.ParseJSON(r, &req); err != nil {
httpx.BadRequest(w, "请求体解析失败")
return
}
if req.Source == "" {
req.Source = "CALL"
}
n, err := logic.New(svcCtx).CreateCallOrders(r.Context(), req.StationNo, req.Items,
req.Source, "", req.Operator, req.CallDate, req.Force)
if err != nil {
httpx.Fail(w, 3202, err.Error())
return
}
httpx.OkMessage(w, "代叫料已提交", map[string]any{"count": n})
}
}
// StationMaterialDetailInternalHandler GET /api/internal/call/material-detail?stationNo=
// 工位物料明细(工艺物料全集 左连接 工位账四数,量为0也显示、不分左右托盘)。
func StationMaterialDetailInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
n, _ := strconv.Atoi(r.URL.Query().Get("stationNo"))
if n <= 0 {
httpx.BadRequest(w, "缺少工位号")
return
}
rows, err := logic.New(svcCtx).StationMaterialDetail(r.Context(), n)
if err != nil {
httpx.Fail(w, 3236, err.Error())
return
}
httpx.Ok(w, rows)
}
}
@@ -230,6 +230,18 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/call/pool", Handler: internal(production.StationSessionAuth(serverCtx)(production.CallPoolInternalHandler(serverCtx))),
})
// 2026-11-05 叫料包/配送单拍板:需求明细(两类提示)、按包查单、工位物料明细
server.AddRoute(rest.Route{Method: http.MethodGet, Path: "/api/internal/call/plan-detail", Handler: internal(production.CallPlanDetailInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodGet, Path: "/api/internal/call/package", Handler: internal(production.CallPackageInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodGet, Path: "/api/internal/call/pool-raw", Handler: internal(production.CallPoolRawInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodGet, Path: "/api/internal/call/material-detail", Handler: internal(production.StationMaterialDetailInternalHandler(serverCtx))})
// 接驳台实时传感器批量读 / 托盘回库(工位终端)/ 人工清台 / 配送单派车
server.AddRoute(rest.Route{Method: http.MethodGet, Path: "/api/internal/dock/station-pallets", Handler: internal(production.StationDockPalletsInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodPost, Path: "/api/internal/dock/pallet-return", Handler: internal(production.PalletReturnInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodPost, Path: "/api/internal/dock/clear", Handler: internal(production.DockClearInternalHandler(serverCtx))})
server.AddRoute(rest.Route{Method: http.MethodPost, Path: "/api/internal/delivery/dispatch", Handler: internal(production.DispatchDeliveryInternalHandler(serverCtx))})
// WMS 代叫料(与工位终端同一套 CreateCallOrders;操作人取请求体)
server.AddRoute(rest.Route{Method: http.MethodPost, Path: "/api/internal/call/create-internal", Handler: internal(production.CreateCallInternalHandler(serverCtx))})
server.AddRoute(rest.Route{
Method: http.MethodPost, Path: "/api/internal/call/create", Handler: internal(production.StationSessionAuth(serverCtx)(production.CreateCallHandler(serverCtx))),
})
+15 -1
View File
@@ -219,7 +219,7 @@ func (s *Service) DispatchCallAgv(ctx context.Context, requestNo, operator strin
return errors.New("叫料单不存在")
}
if mr.Status != "SHIPPED" {
return errors.New("仅已发货(SHIPPED)的叫料单可派车(请先完成备料)")
return errors.New("仅已发货的叫料单可派车(请先完成备料)")
}
if !mr.NeedAgv || mr.TargetDock == "" {
return errors.New("该叫料单无需 AGV 配送")
@@ -690,6 +690,13 @@ func (s *Service) ConfirmLoadAndGo(ctx context.Context, taskNo, nextDock, operat
nextDock = mr.TargetDock
}
}
if nextDock == "" && t.BizType == "CALL" {
// 配送单驱动(2026-11-05 拍板):BizNo=配送单号,目标接驳台随物料行下发
//(WMS 创建配送单时确定,可改终端期望接驳台)
if rows := decodeSegMaterials(t.MaterialsJSON); len(rows) > 0 {
nextDock = rows[0].TargetDock
}
}
if nextDock == "" {
return errors.New("请选择送货目标接驳台/点位")
}
@@ -732,6 +739,13 @@ func (s *Service) ConfirmUnloadRelease(ctx context.Context, taskNo, operator str
// 出库单回写已送达(CALL 链)
if t.BizType == "CALL" {
s.notifyDeliveredOnArrival(ctx, t)
// 配送单送达回写(2026-11-05 拍板):BizNo=配送单号 → WMS 置「已送达」;
// 旧叫料单直派链路 BizNo=叫料单号,WMS 端查不到配送单时忽略。
if s.ctx.Wms != nil && t.RelatedRequestNo != "" {
if derr := s.ctx.Wms.DeliveryDelivered(ctx, t.BizNo); derr != nil {
fmt.Println("配送单送达回写失败(可人工改状态):", derr)
}
}
}
// 空车回充段:业务自动触发免确认,到位自动结束
if _, derr := s.dispatchAgvSegment(ctx, agvSegInput{
+37 -10
View File
@@ -440,9 +440,12 @@ func (s *Service) AdjustPoolQty(ctx context.Context, stationNo int, materialCode
return nil
}
// CreateCallOrders 发起叫料:按物料行拆 N 张单;事务内行锁占用池子可用量(耗尽即止)。
// source=CALL(工位终端叫料)/ REFILL(数量不符补发,refReportNo 必填);两入口消耗同一池子。
func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []CallItem, source, refReportNo, operator string) (int, error) {
// CreateCallOrders 发起叫料:按物料行拆 N 张单(2026-11-05 拍板:一次提交=一个叫料包,
// 同批所有单赋同一 package_no;callDate=所选排产日默认当天);事务内行锁占用池子可用量(耗尽即止)。
// source=CALL(工位终端叫料/WMS 代叫料)/ REFILL(数量不符补发,refReportNo 必填);两入口消耗同一池子。
// 接驳台降级为「期望接驳台」(可空,配送时 WMS 确定实际接驳台);提交时校验两接驳台都为空
// (force=true 为 PLC 离线降级强提,仅 CALL 口径生效)。
func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []CallItem, source, refReportNo, operator string, callDate string, force bool) (int, error) {
if stationNo <= 0 {
return 0, errors.New("工位号无效")
}
@@ -488,15 +491,19 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
}
}
}
// 2026-11-05 拍板:两个接驳台都为空才能叫料(提交时校验;PLC 离线降级=提示后可强行提交)
if source == "CALL" && !force {
if derr := s.EnsureStationDocksEmpty(ctx, stationNo); derr != nil {
return 0, derr
}
}
// 接驳台降级为期望接驳台(可空);填写时仍须属于本工位且启用
// 预校验(fail-fast,减少进事务后回滚)
for _, it := range items {
if it.MaterialCode == "" || it.Qty <= 0 {
return 0, errors.New("叫料明细的物料编码与数量必填")
}
if it.Dock == "" {
return 0, errors.New("请选择目标接驳台")
}
if !dockSet[it.Dock] {
if it.Dock != "" && !dockSet[it.Dock] {
return 0, fmt.Errorf("接驳台 %s 不属于本工位或已停用,请在「产线管理」确认后重选", it.Dock)
}
}
@@ -512,6 +519,11 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
}()
created := 0
ts := time.Now().UnixNano()
// 叫料包(2026-11-05 拍板):同批提交的所有单赋同一包号;存量单为空=单包
packageNo := fmt.Sprintf("PK%d-%d", stationNo, ts)
if callDate == "" {
callDate = time.Now().Format("2006-01-02")
}
borrowLogs := []borrowLogEntry{}
for _, it := range items {
ownRow, rerr := tx.CallPool.Query().
@@ -599,12 +611,15 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
return created, fmt.Errorf("%s 自身可用 %d 不足(请求 %d),请开启借料或从同工序工位借料", it.MaterialCode, ownAvail, it.Qty)
}
reqNo := fmt.Sprintf("MR%d", ts+int64(created))
// 工单×排产日明细拆分(2026-11-05 拍板:物料挂工单;池聚合层不动,明细层补留)
breakdown := s.splitPlanBreakdown(ctx, stationNo, it.MaterialCode, it.Qty, callDate)
if _, cerr := tx.MaterialRequest.Create().
SetRequestNo(reqNo).SetMaterialCode(it.MaterialCode).SetMaterialName(ownRow.MaterialName).
SetUnit(ownRow.Unit).SetSnMode(ownRow.SnMode).SetReqQty(float64(it.Qty)).
SetStatus("PENDING").SetStationNo(stationNo).SetTargetDock(it.Dock).
SetCrossDay(ownRow.CrossDay).SetSource(source).SetRefReportNo(refReportNo).
SetBorrowFrom(alloc).SetNeedAgv(true).SetOperator(operator).Save(ctx); cerr != nil {
SetBorrowFrom(alloc).SetNeedAgv(true).SetOperator(operator).
SetPackageNo(packageNo).SetCallDate(callDate).SetPlanBreakdown(breakdown).Save(ctx); cerr != nil {
return created, cerr
}
if d := borrowDetail(alloc, stationNo, it.MaterialCode); d != "" {
@@ -617,8 +632,9 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
}
committed = true
s.ctx.EventLog.Write(ctx, "call.create", "", operator, "material_request", "",
fmt.Sprintf("工位%d 发起叫料 %d 项", stationNo, created),
map[string]any{"stationNo": stationNo, "count": created, "source": source, "refReportNo": refReportNo})
fmt.Sprintf("工位%d 发起叫料 %d 项(包 %s,叫料日 %s)", stationNo, created, packageNo, callDate),
map[string]any{"stationNo": stationNo, "count": created, "source": source,
"refReportNo": refReportNo, "packageNo": packageNo, "callDate": callDate})
for _, bl := range borrowLogs {
s.ctx.EventLog.Write(ctx, "call.create", "", operator, "material_request", bl.reqNo,
"操作人["+operator+"] "+borrowDetail(bl.alloc, stationNo, bl.materialCode), nil)
@@ -627,6 +643,17 @@ func (s *Service) CreateCallOrders(ctx context.Context, stationNo int, items []C
return created, nil
}
// ListMaterialRequestsByPackage 按叫料包号查叫料单(WMS 建配送单数据源;
// 含工单×排产明细 planBreakdown 与出库单号;按创建时间升序)。
func (s *Service) ListMaterialRequestsByPackage(ctx context.Context, packageNo string) ([]*ent.MaterialRequest, error) {
if packageNo == "" {
return nil, errors.New("缺少包号")
}
return s.ctx.EntClient.MaterialRequest.Query().
Where(materialrequest.PackageNo(packageNo)).
Order(ent.Asc(materialrequest.FieldCreatedAt)).All(ctx)
}
// loadCallForUpdate 事务内锁叫料单并复核状态(返回锁后的行)
func loadCallForUpdate(ctx context.Context, tx *ent.Tx, requestNo string) (*ent.MaterialRequest, error) {
mr, err := tx.MaterialRequest.Query().
+486
View File
@@ -0,0 +1,486 @@
package logic
// 2026-11-05 叫料包拍板支持层(叫料与送料彻底拆开):
// ① CallPlanDetail 叫料需求明细(工单×排产日×物料,实时计算不落库)——池底层 工位×物料
// 聚合记账不动(两层并存),本明细层供「当日剩余没叫/跨日量」提示与 plan_breakdown 拆分。
// ② EnsureStationDocksEmpty / StationDockPallets 两接驳台都为空才能叫料(传感器为准)。
// ③ DispatchPalletReturnManual 托盘回库(传感器为准、台账软校验,不一致由操作人确认留痕)。
// ④ ClearDockLedger 人工清台(托盘被人工卸走后台账卡死兜底;仅清台账不碰账)。
// ⑤ DispatchDeliveryAgv 配送单派车(WMS 配送单驱动,BizNo=配送单号)。
// ⑥ StationMaterialDetail 工位物料明细(工艺物料全集 左连接 工位账四数,量为0也显示)。
import (
"context"
"errors"
"fmt"
"math"
"sort"
"strconv"
"time"
"bj_power_mes/ent"
"bj_power_mes/ent/callpool"
"bj_power_mes/ent/dailyplan"
"bj_power_mes/ent/dock"
"bj_power_mes/ent/flowmaterial"
"bj_power_mes/ent/materialrequest"
"bj_power_mes/ent/workorder"
"bj_power_mes/schema"
)
// ErrDockPLCOffline PLC 离线无法核实接驳台为空(前端提示后可强行提交——离线降级拍板口径)
var ErrDockPLCOffline = errors.New("PLC 离线,无法确认接驳台是否为空")
// CallPlanDetailRow 叫料需求明细行(工单×排产日×物料维度)
type CallPlanDetailRow struct {
PlanDate string `json:"planDate"`
OrderNo string `json:"orderNo"`
FlowID int `json:"flowId"`
FlowName string `json:"flowName"`
MaterialCode string `json:"materialCode"`
MaterialName string `json:"materialName"`
Unit string `json:"unit"`
NeedQty int `json:"needQty"`
CalledQty int `json:"calledQty"`
RemainQty int `json:"remainQty"`
}
// CallPlanDetail 明细全集 + 两类提示(当日剩余没叫 / 跨日量明细)——实时计算不落库不拦提交
type CallPlanDetail struct {
Today string `json:"today"`
Rows []CallPlanDetailRow `json:"rows"`
TodayRemain []CallPlanDetailRow `json:"todayRemain"`
CrossDayRemain []CallPlanDetailRow `json:"crossDayRemain"`
}
// CallPlanDetail 叫料需求明细:复刻 recomputePoolStations 的派生算法,按 工单×排产日×物料 展开;
// 已叫量从 material_request.plan_breakdown 汇总(存量单 breakdown 为空时按 call_date/工单号归并)。
func (s *Service) CallPlanDetail(ctx context.Context, stationNo int) (*CallPlanDetail, error) {
today := time.Now().Format("2006-01-02")
type key struct {
date string
order string
flow int
mat string
}
need := map[key]*CallPlanDetailRow{}
plans, err := s.ctx.EntClient.DailyPlan.Query().
Where(dailyplan.Status("CONFIRMED")).All(ctx)
if err != nil {
return nil, err
}
flowNameCache := map[int]string{}
for _, p := range plans {
wo, werr := s.ctx.EntClient.WorkOrder.Query().
Where(workorder.WorkOrderNo(p.OrderNo)).First(ctx)
if werr != nil || wo == nil {
continue
}
items, rerr := RouteStationsFromWO(ctx, s.ctx.EntClient, wo)
if rerr != nil || len(items) == 0 {
continue
}
fmByFlow := map[int][]*ent.FlowMaterial{}
for _, it := range items {
if _, done := fmByFlow[it.FlowId]; done {
continue
}
fms, ferr := s.ctx.EntClient.FlowMaterial.Query().
Where(flowmaterial.FlowId(it.FlowId)).All(ctx)
if ferr != nil {
continue
}
fmByFlow[it.FlowId] = fms
}
stationsByFlow := map[int][]int{}
for _, it := range items {
stationsByFlow[it.FlowId] = append(stationsByFlow[it.FlowId], it.StationNo)
}
stationQty := map[int]int{}
for k, v := range p.StationPlanQty {
if n, e := strconv.Atoi(k); e == nil {
stationQty[n] = v
}
}
for flowId, stations := range stationsByFlow {
fms := fmByFlow[flowId]
if len(fms) == 0 {
continue
}
qtys := splitQtyToStations(stations, p.PlanQty, stationQty)
for i, stNo := range stations {
if stNo != stationNo {
continue
}
q := qtys[i]
if q <= 0 {
continue
}
if _, ok := flowNameCache[flowId]; !ok {
flowNameCache[flowId] = s.flowNameById(ctx, flowId)
}
for _, fm := range fms {
if fm.MaterialCode == "" {
continue
}
needQty := int(math.Ceil(float64(q) * fm.UnitQty))
if needQty <= 0 {
continue
}
k := key{p.PlanDate, p.OrderNo, flowId, fm.MaterialCode}
r := need[k]
if r == nil {
r = &CallPlanDetailRow{PlanDate: p.PlanDate, OrderNo: p.OrderNo,
FlowID: flowId, FlowName: flowNameCache[flowId],
MaterialCode: fm.MaterialCode, MaterialName: fm.MaterialName, Unit: fm.Unit}
need[k] = r
}
r.NeedQty += needQty
}
}
}
}
// 已叫量:活跃叫料单(待备料/已发货/已完成——已取消/已驳回/退库不计)
called := map[key]int{}
mrs, _ := s.ctx.EntClient.MaterialRequest.Query().
Where(materialrequest.StationNo(stationNo),
materialrequest.StatusIn("PENDING", "SHIPPED", "DONE")).All(ctx)
for _, mr := range mrs {
if len(mr.PlanBreakdown) > 0 {
for _, b := range mr.PlanBreakdown {
called[key{b.PlanDate, b.OrderNo, b.FlowID, mr.MaterialCode}] += int(b.Qty)
}
} else {
// 存量单兼容:无明细按 叫料日×工单号 归并(空=未拆分)
called[key{mr.CallDate, mr.WorkOrderNo, 0, mr.MaterialCode}] += int(mr.ReqQty)
}
}
out := CallPlanDetail{Today: today, Rows: []CallPlanDetailRow{},
TodayRemain: []CallPlanDetailRow{}, CrossDayRemain: []CallPlanDetailRow{}}
for k, r := range need {
r.CalledQty = called[k]
if r.CalledQty > r.NeedQty {
r.CalledQty = r.NeedQty
}
r.RemainQty = r.NeedQty - r.CalledQty
out.Rows = append(out.Rows, *r)
if r.RemainQty > 0 {
if k.date == today {
out.TodayRemain = append(out.TodayRemain, *r)
} else {
out.CrossDayRemain = append(out.CrossDayRemain, *r)
}
}
}
sort.Slice(out.Rows, func(i, j int) bool {
a, b := out.Rows[i], out.Rows[j]
if a.PlanDate != b.PlanDate {
return a.PlanDate < b.PlanDate
}
if a.OrderNo != b.OrderNo {
return a.OrderNo < b.OrderNo
}
return a.MaterialCode < b.MaterialCode
})
sort.Slice(out.TodayRemain, func(i, j int) bool { return out.TodayRemain[i].MaterialCode < out.TodayRemain[j].MaterialCode })
sort.Slice(out.CrossDayRemain, func(i, j int) bool {
a, b := out.CrossDayRemain[i], out.CrossDayRemain[j]
if a.PlanDate != b.PlanDate {
return a.PlanDate < b.PlanDate
}
return a.MaterialCode < b.MaterialCode
})
return &out, nil
}
// splitPlanBreakdown 把本次叫料量按 工单×排产日 明细拆分(FIFO:最早排产日优先、同日按工单号序);
// 只分配「需求−已叫」的余量;无可分配明细时退化为单行(planDate=叫料日,存量兼容)。
func (s *Service) splitPlanBreakdown(ctx context.Context, stationNo int, materialCode string, qty int, callDate string) []schema.CallPlanBreakdown {
detail, err := s.CallPlanDetail(ctx, stationNo)
if err != nil || detail == nil {
return []schema.CallPlanBreakdown{{PlanDate: callDate, Qty: float64(qty)}}
}
out := []schema.CallPlanBreakdown{}
for _, r := range detail.Rows {
if qty <= 0 {
break
}
if r.MaterialCode != materialCode {
continue
}
room := r.NeedQty - r.CalledQty
if room <= 0 {
continue
}
take := room
if take > qty {
take = qty
}
out = append(out, schema.CallPlanBreakdown{OrderNo: r.OrderNo, PlanDate: r.PlanDate,
FlowID: r.FlowID, FlowName: r.FlowName, Qty: float64(take)})
qty -= take
}
if qty > 0 {
out = append(out, schema.CallPlanBreakdown{PlanDate: callDate, Qty: float64(qty)})
}
return out
}
// DockPalletState 接驳台托盘状态(实时传感器为准;PLC 不可达时回退台账并标注 plcOk=false)
type DockPalletState struct {
DockCode string `json:"dockCode"`
Name string `json:"name"`
Side string `json:"side"`
HasPallet bool `json:"hasPallet"`
LedgerPallet bool `json:"ledgerPallet"`
PlcOk bool `json:"plcOk"`
}
// StationDockPallets 按工位批量读左右接驳台实时传感器(叫料空台校验/下班校验共用)。
func (s *Service) StationDockPallets(ctx context.Context, stationNo int) ([]DockPalletState, error) {
dks, err := s.ctx.EntClient.Dock.Query().
Where(dock.StationNo(stationNo)).Order(ent.Asc(dock.FieldDockCode)).All(ctx)
if err != nil {
return nil, err
}
out := []DockPalletState{}
for _, d := range dks {
if d.Status == "DISABLED" {
continue
}
st := DockPalletState{DockCode: d.DockCode, Name: d.Name, Side: d.Side,
LedgerPallet: d.HasPallet, HasPallet: d.HasPallet}
if s.ctx.PLC != nil && !s.ctx.PLC.IsMock() {
if has, e := s.ctx.PLC.Get().QueryDockPallet(ctx, d.DockCode); e == nil {
st.PlcOk = true
st.HasPallet = has
}
}
out = append(out, st)
}
return out, nil
}
// EnsureStationDocksEmpty 两接驳台都为空才允许叫料(2026-11-05 拍板:提交时校验)。
// 传感器为准;PLC 离线返回 ErrDockPLCOffline(前端提示后可强行提交);台账仅软校验留痕。
func (s *Service) EnsureStationDocksEmpty(ctx context.Context, stationNo int) error {
if s.ctx.PLC == nil || s.ctx.PLC.IsMock() {
return nil // mock PLC 无真实传感器:跳过校验
}
dks, err := s.ctx.EntClient.Dock.Query().
Where(dock.StationNo(stationNo)).All(ctx)
if err != nil || len(dks) == 0 {
return nil // 无接驳台配置不拦
}
for _, d := range dks {
if d.Status == "DISABLED" {
continue
}
has, e := s.ctx.PLC.Get().QueryDockPallet(ctx, d.DockCode)
if e != nil {
return ErrDockPLCOffline
}
if has {
return fmt.Errorf("工位%d 接驳台 %s(%s)有托盘,请先退料或点「托盘回库」拉走后再叫料", stationNo, d.DockCode, d.Name)
}
if d.HasPallet {
// 台账与传感器不一致:以传感器(空)为准放行,留痕
s.ctx.EventLog.Write(ctx, "dock.pallet_mismatch", "", "", "dock", d.DockCode,
"叫料空台校验:台账有托盘但传感器为空,以传感器为准放行", nil)
}
}
return nil
}
// DispatchPalletReturnManual 工位终端「托盘回库」(2026-11-05 拍板):
// 物理拉回仓库 JBT21,不是退料——物料账仍挂工位、WMS 库存不变(PALLET 链不碰任何账),
// 系统内一律按空托盘理解(盘上有无料都不管)。判定以传感器为准、台账软校验;
// 不一致由操作人确认(confirmHasPallet=true)并留痕。
func (s *Service) DispatchPalletReturnManual(ctx context.Context, dockCode, operator string, confirmHasPallet bool) error {
d, err := s.ctx.EntClient.Dock.Query().Where(dock.DockCodeEQ(dockCode)).First(ctx)
if err != nil || d == nil {
return fmt.Errorf("接驳台 %s 不存在", dockCode)
}
if d.Status == "DISABLED" {
return fmt.Errorf("接驳台 %s 已停用", dockCode)
}
hasPallet := d.HasPallet
plcOk := false
if s.ctx.PLC != nil && !s.ctx.PLC.IsMock() {
if has, e := s.ctx.PLC.Get().QueryDockPallet(ctx, dockCode); e == nil {
plcOk = true
hasPallet = has
}
}
if plcOk && !hasPallet {
if d.HasPallet && !confirmHasPallet {
return errors.New("传感器显示该接驳台无托盘(台账有托盘)。如托盘确实已不在台上,请库管在 WMS 托盘工作台「人工清台」更正;如确认有托盘,请勾选「确认台上有托盘」后重试")
}
if !d.HasPallet {
return fmt.Errorf("接驳台 %s 无托盘,无需回库", dockCode)
}
// 操作人坚持有托盘:按台账派车并留痕
s.ctx.EventLog.Write(ctx, "dock.pallet_return_confirm", operator, "", "dock", dockCode,
"托盘回库:传感器为空但操作人确认台上有托盘,按台账派车", nil)
} else if !plcOk && !hasPallet {
return fmt.Errorf("接驳台 %s 台账无托盘(PLC 离线无法核实),无需回库", dockCode)
}
if free, reason := s.Jbt21Free(ctx); !free {
return fmt.Errorf("库房接驳台 %s 暂无空位:%s。请先卸走库房接驳台上的托盘后再派车", dockStoreCode, reason)
}
_, err = s.dispatchAgvSegment(ctx, agvSegInput{
Kind: "GO_LOAD", BizType: "PALLET", BizNo: dockCode,
Source: "", Target: dockCode, Operator: operator,
})
if err == nil {
s.ctx.EventLog.Write(ctx, "dock.pallet_return", operator, "", "dock", dockCode,
"托盘回库已派车(物理拉回仓库,非退料;物料账与库存不变)", nil)
}
return err
}
// ClearDockLedger 人工清台(2026-11-05 兜底):托盘被人工卸走(未走 AGV)后台账卡 hasPallet=true,
// 会卡住 Jbt21Free 空位判定与防撞校验——库管在 WMS 托盘工作台手动清台并留痕。
// 仅清台账,不碰任何库存/池账/工件账。
func (s *Service) ClearDockLedger(ctx context.Context, dockCode, operator, reason string) error {
d, err := s.ctx.EntClient.Dock.Query().Where(dock.DockCodeEQ(dockCode)).First(ctx)
if err != nil || d == nil {
return fmt.Errorf("接驳台 %s 不存在", dockCode)
}
if !d.HasPallet {
return errors.New("该接驳台账账本无托盘,无需清台")
}
if uerr := s.ctx.EntClient.Dock.UpdateOneID(d.ID).SetHasPallet(false).SetPalletRef("").Exec(ctx); uerr != nil {
return uerr
}
s.ctx.EventLog.Write(ctx, "dock.manual_clear", operator, "", "dock", dockCode,
"人工清台:台账置无托盘(托盘已被人工卸走;物料账/库存不变) 原因:"+reason, nil)
return nil
}
// DeliveryAgvItem 配送单物料行(WMS 派车时传入)
type DeliveryAgvItem struct {
RequestNo string `json:"requestNo"`
MaterialCode string `json:"materialCode"`
MaterialName string `json:"materialName"`
Unit string `json:"unit"`
Qty float64 `json:"qty"`
}
// DispatchDeliveryAgv 配送单派车(2026-11-05 拍板:AGV 派车改配送单驱动):
// WMS 校验配送单后转发(BizType=CALL、BizNo=配送单号、关联单号=配送单号)→
// 空车段(GO_LOAD)前往装货点 JBT21 → 到位待令 → 库管「确认装车并送货」
// (目标=配送单接驳台,随物料行下发)→ 卸货放行后经 /api/internal/delivery/delivered 回写已送达。
func (s *Service) DispatchDeliveryAgv(ctx context.Context, deliveryNo, targetDock string, items []DeliveryAgvItem, operator string) error {
if deliveryNo == "" || targetDock == "" {
return errors.New("配送单号与配送接驳台必填")
}
if len(items) == 0 {
return errors.New("配送单无明细,不能派车")
}
if d, derr := s.ctx.EntClient.Dock.Query().Where(dock.DockCodeEQ(dockStoreCode)).First(ctx); derr == nil && d != nil && d.Status == "DISABLED" {
return fmt.Errorf("库房接驳台 %s 已停用,拒绝派车(请恢复接驳台或人工配送)", dockStoreCode)
}
rows := make([]AgvSubmitRow, 0, len(items))
for _, it := range items {
rows = append(rows, AgvSubmitRow{RequestNo: deliveryNo, MaterialCode: it.MaterialCode,
MaterialName: it.MaterialName, Unit: it.Unit, Qty: it.Qty, TargetDock: targetDock})
}
s.checkSensorVsLedger(ctx, dockStoreCode, true, deliveryNo)
taskNo, err := s.dispatchAgvSegment(ctx, agvSegInput{
Kind: "GO_LOAD", BizType: "CALL", BizNo: deliveryNo,
Source: "", Target: dockStoreCode,
Materials: rows, Operator: operator,
})
if err != nil {
return err
}
s.ctx.EventLog.Write(ctx, "delivery.dispatch", "", operator, "delivery_order", deliveryNo,
fmt.Sprintf("配送单 %s 派车成功(AGV 任务 %s,目标 %s)", deliveryNo, taskNo, targetDock), nil)
return nil
}
// StationMaterialDetailRow 工位物料明细行(工艺物料全集 左连接 工位账四数)
type StationMaterialDetailRow struct {
MaterialCode string `json:"materialCode"`
MaterialName string `json:"materialName"`
Spec string `json:"spec"`
Unit string `json:"unit"`
SnMode int `json:"snMode"`
FlowName string `json:"flowName"`
ReqQty int `json:"reqQty"`
AdjQty int `json:"adjQty"`
SentQty int `json:"sentQty"`
AvailQty int `json:"availQty"`
}
// StationMaterialDetail 工位物料明细(2026-11-05 拍板:比叫料列表更突出,量为0也显示、
// 不分左右托盘):工艺全集 = 活跃工单(下发/进行/暂停)组合中绑定本工位的工艺;
// 池(工位×物料)为记账层,两层并存。
func (s *Service) StationMaterialDetail(ctx context.Context, stationNo int) ([]StationMaterialDetailRow, error) {
flowIds := map[int]bool{}
wos, _ := s.ctx.EntClient.WorkOrder.Query().
Where(workorder.StatusIn("RELEASED", "IN_PROGRESS", "PAUSED")).All(ctx)
for _, wo := range wos {
items, err := RouteStationsFromWO(ctx, s.ctx.EntClient, wo)
if err != nil {
continue
}
for _, it := range items {
if it.StationNo == stationNo {
flowIds[it.FlowId] = true
}
}
}
poolRows, _ := s.ctx.EntClient.CallPool.Query().Where(callpool.StationNo(stationNo)).All(ctx)
poolBy := map[string]*ent.CallPool{}
for _, r := range poolRows {
poolBy[r.MaterialCode] = r
}
out := []StationMaterialDetailRow{}
seen := map[string]bool{}
fidList := make([]int, 0, len(flowIds))
for fid := range flowIds {
fidList = append(fidList, fid)
}
sort.Ints(fidList)
for _, fid := range fidList {
fms, _ := s.ctx.EntClient.FlowMaterial.Query().Where(flowmaterial.FlowId(fid)).All(ctx)
for _, fm := range fms {
if fm.MaterialCode == "" || seen[fm.MaterialCode] {
continue
}
seen[fm.MaterialCode] = true
row := StationMaterialDetailRow{MaterialCode: fm.MaterialCode, MaterialName: fm.MaterialName,
Spec: fm.Spec, Unit: fm.Unit, SnMode: fm.SnMode, FlowName: s.flowNameById(ctx, fid)}
if r := poolBy[fm.MaterialCode]; r != nil {
row.ReqQty = r.ReqQty
row.AdjQty = r.AdjQty
row.SentQty = r.SentQty
row.AvailQty = poolAvail(r.ReqQty, r.AdjQty, r.SentQty, r.ReservedQty)
}
out = append(out, row)
}
}
// 有在途/占用但活跃工艺已不再覆盖的物料也补出(池有、工艺无:显示为「—」工艺)
keys := make([]string, 0, len(poolBy))
for k := range poolBy {
keys = append(keys, k)
}
sort.Strings(keys)
for _, mc := range keys {
if seen[mc] {
continue
}
seen[mc] = true
r := poolBy[mc]
row := StationMaterialDetailRow{MaterialCode: mc, MaterialName: r.MaterialName,
Unit: r.Unit, SnMode: r.SnMode, FlowName: "—"}
row.ReqQty = r.ReqQty
row.AdjQty = r.AdjQty
row.SentQty = r.SentQty
row.AvailQty = poolAvail(r.ReqQty, r.AdjQty, r.SentQty, r.ReservedQty)
out = append(out, row)
}
return out, nil
}
+1 -1
View File
@@ -183,7 +183,7 @@ func (s *Service) HandleQtyReport(ctx context.Context, id int, handleType, note,
// 生成 source=REFILL 的叫料单(PENDING,占用池子可用量),后续走仓库完成备料→签收链路。
n, e := s.CreateCallOrders(ctx, rep.StationNo,
[]CallItem{{MaterialCode: rep.MaterialCode, Qty: int(rep.DiffQty), Dock: dock}},
"REFILL", qtyReportNo(rep.ID), operator)
"REFILL", qtyReportNo(rep.ID), operator, "", false)
if e != nil {
return nil, fmt.Errorf("生成补发叫料单失败:%w", e)
}
@@ -734,6 +734,12 @@ func (c *Client) DeliveredOutbound(ctx context.Context, outboundNos []string) er
return c.post(ctx, "/api/internal/outbound/delivered", map[string]any{"outboundNos": outboundNos})
}
// DeliveryDelivered 调 WMS /api/internal/delivery/delivered:配送单驱动的 AGV 卸货放行后
// 把配送单置「已送达」(2026-11-05 拍板;WMS 端查不到配送单时忽略——兼容旧叫料单直派链路)。
func (c *Client) DeliveryDelivered(ctx context.Context, deliveryNo string) error {
return c.post(ctx, "/api/internal/delivery/delivered", map[string]any{"deliveryNo": deliveryNo})
}
func (e *RespError) Error() string {
if e.Message != "" {
return "wms call failed with status " + strconv.Itoa(e.Status) + ": " + e.Message