feat: 核心业务实体扩充(混产模板/产品BOM/试制记录)、WMS 库存检验增强与前端通用能力

- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页)
- WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报
- AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典
- 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列
- 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等)
- 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
This commit is contained in:
SunYF
2026-11-15 12:17:39 +08:00
parent 7e8066ab66
commit 1e92b2a596
221 changed files with 26421 additions and 2230 deletions
@@ -119,7 +119,7 @@ func attachmentRefs(svcCtx *svc.ServiceContext, bizType, bizId string) (int, []s
return refResult(err, n, fmt.Sprintf("检验记录 #%s", bizId))
case "semi":
n, err := c.SemiFlow.Query().Where(semiflow.SnEQ(bizId)).Count(ctx)
return refResult(err, n, fmt.Sprintf("半成品 %s", bizId))
return refResult(err, n, fmt.Sprintf("在制品 %s", bizId))
case "attachment":
// 系统级附件(说明书等):无业务单据,视为无引用,由管理员在孤儿扫描中自行判断清理
return 0, nil
@@ -14,7 +14,8 @@ import (
// 业务接口(/api/v1) 供 MES 前端;内部接口(/api/internal) 供 WMS 代理转发;
// SPI 回调(/api/spi) 供海康 RCS 主动回调(需在 RCS 后台配置上层回调地址,生产环境以防火墙/IP 白名单隔离)。
// SubmitAgvHandler 手动下发 AGV(WMS「下发AGV」页 / MES 前端):按 target_dock 聚合派车。
// SubmitAgvHandler 业务配送单下发 AGV(内部专用 /api/internal/agv/submit,2026-11-13 拍板):
// 仅由 WMS 备料完成/业务配送链路触发,前端不再有可直调的手动派车入口。
func SubmitAgvHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req logic.AgvSubmitRequest
@@ -262,6 +263,11 @@ func AgvChainNextHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
httpx.BadRequest(w, "缺少任务链号(chainNo)")
return
}
// 2026-11-13 拍板:人工链每一步都禁止派到工位接驳台(前端大图标已过滤,后端兜底)
if verr := validateManualDispatchTarget(svcCtx, r.Context(), req.Target); verr != nil {
httpx.Fail(w, 3313, verr.Error())
return
}
operator := r.Header.Get("X-Username")
if operator == "" {
operator = "dispatcher"
@@ -1,14 +1,39 @@
package production
import (
"context"
"encoding/json"
"fmt"
"net/http"
"bj_power_mes/common/httpx"
"bj_power_mes/ent/agvpoint"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// validateManualDispatchTarget 人工派车目标点硬校验(2026-11-14 用户终版)。
// 白名单硬拦截:只允许库房接驳台 JBT21 与 7 个虚拟点位(A1-A4 / XW / XT / KF1)。
// 所有 GW* 工位接驳台、DOCK* 历史业务点位、AGV-WAIT*/AGV-CHARGE* 待命充电位一律禁止。
// 规则真源在 logic.AgvManualAllowed,与前端 utils/agvPoints.js 同口径;
// 前端大图标按钮已过滤,这里做后端兜底,防止直接调接口绕过。
func validateManualDispatchTarget(svcCtx *svc.ServiceContext, ctx context.Context, target string) error {
if target == "" {
return fmt.Errorf("请先选择目标点位")
}
pt, err := svcCtx.EntClient.AgvPoint.Query().Where(agvpoint.PositionCode(target)).Only(ctx)
if err != nil || pt == nil {
return fmt.Errorf("AGV 点位不存在:%s", target)
}
if !pt.Enabled {
return fmt.Errorf("点位已停用:%s", target)
}
if !logic.AgvManualAllowed(target) {
return fmt.Errorf("人工派车不能派到 %s;只能选择库房接驳台 JBT21 或虚拟点位 A1-A4 / XW / XT / KF1", target)
}
return nil
}
// ============ AGV 三段链确认与自由调度(2026-11-03 三层安全机制) ============
// 第一层 业务自动触发(免弹窗):空车去程/回充由系统自动下发(CompleteCall/卸货放行内触发);
// 第二层 装卸强制确认(到位待令):本文件 confirm 端点——「确认装车并送货/卸货完成并放行/结束回充」;
@@ -76,6 +101,11 @@ func FreeDispatchHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
httpx.Fail(w, 400, "参数错误: "+err.Error())
return
}
// 2026-11-13 拍板:人工派车白名单(禁止工位接驳台;JBT21 例外)
if verr := validateManualDispatchTarget(svcCtx, r.Context(), req.Target); verr != nil {
httpx.Fail(w, 400, verr.Error())
return
}
op := r.Header.Get("X-Username")
if op == "" {
op = "system"
@@ -0,0 +1,89 @@
package production
import (
"encoding/json"
"net/http"
"strings"
"bj_power_mes/common/httpx"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// ListMixTemplatesHandler GET /mix-templates 混产模板列表(圈定哪几个成品可混线生产,带 isActive)。
func ListMixTemplatesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
rows, err := logic.New(svcCtx).ListMixTemplates(r.Context())
if err != nil {
httpx.Fail(w, 500, err.Error())
return
}
httpx.Ok(w, map[string]any{"list": rows})
}
}
// SaveMixTemplateHandler POST /mix-templates/save 新增/编辑混产模板(即「保存当前绑定为模板」)。
func SaveMixTemplateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Id int `json:"id"`
Name string `json:"name"`
ProductCodes string `json:"productCodes"`
Remark string `json:"remark"`
Status string `json:"status"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
httpx.BadRequest(w, "参数错误: "+err.Error())
return
}
op := r.Header.Get("X-Username")
if err := logic.New(svcCtx).SaveMixTemplate(r.Context(), req.Id, req.Name, req.ProductCodes, req.Remark, req.Status, op); err != nil {
httpx.Fail(w, 400, err.Error())
return
}
httpx.Ok(w, map[string]any{"ok": true})
}
}
// SetActiveMixTemplateHandler POST /mix-templates/active 切换「当前产线在用的混产模板」。
// 排产/建工单按当前模板校验产品范围,同模板内混产切换才免清线。
func SetActiveMixTemplateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Name string `json:"name"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
httpx.BadRequest(w, "参数错误: "+err.Error())
return
}
if err := logic.New(svcCtx).SetActiveMixTemplate(r.Context(), req.Name, r.Header.Get("X-Username")); err != nil {
httpx.Fail(w, 400, err.Error())
return
}
httpx.Ok(w, map[string]any{"ok": true})
}
}
// CheckLineClearanceHandler POST /mix-templates/clearance-check
// 返回结构化「清线确认单」:needClearance=false 表示同模板混产免清线;
// 否则给出五项(在制品/余料/托盘/PLC 未完成任务/AGV 在途)实测数量与 passed 结论。
// confirmed 为人工逐项确认放行的 key;确认结果在 logic 层写 event_log 留痕。
func CheckLineClearanceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ProductCode string `json:"productCode"`
Confirmed []string `json:"confirmed"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
httpx.BadRequest(w, "参数错误: "+err.Error())
return
}
res, err := logic.New(svcCtx).CheckLineClearance(r.Context(),
strings.TrimSpace(req.ProductCode), req.Confirmed, r.Header.Get("X-Username"))
if err != nil {
httpx.Fail(w, 500, err.Error())
return
}
httpx.Ok(w, res)
}
}
@@ -0,0 +1,101 @@
package production
import (
"encoding/json"
"net/http"
"strconv"
"strings"
"bj_power_mes/common/httpx"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// ============ 成品 BOM 总账 / 分账(2026-11-13 拍板「总分制」) ============
// 总账挂在成品下、分账挂在产品工艺下;P10:物料清单与工艺配置分离、各自独立保存。
// 硬校验:Σ分账 = 总账、分账物料是总账子集、分账工序在工艺路线内;改总账会回校已有分账。
// ListProductBOMHandler GET /product-boms?productCode= 读取某成品的总账。
func ListProductBOMHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
code := strings.TrimSpace(r.URL.Query().Get("productCode"))
if code == "" {
httpx.BadRequest(w, "productCode 必填")
return
}
rows, err := logic.New(svcCtx).ListProductBOM(r.Context(), code)
if err != nil {
httpx.Fail(w, 500, err.Error())
return
}
httpx.Ok(w, map[string]any{"list": rows})
}
}
// SaveProductBOMHandler POST /product-boms/save 维护总账(整表覆盖)。
func SaveProductBOMHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ProductCode string `json:"productCode"`
Rows []logic.BOMRow `json:"rows"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
httpx.BadRequest(w, "参数错误: "+err.Error())
return
}
op := r.Header.Get("X-Username")
if op == "" {
op = "system"
}
if err := logic.New(svcCtx).SaveProductBOM(r.Context(), req.ProductCode, req.Rows, op); err != nil {
httpx.Fail(w, 400, err.Error())
return
}
httpx.Ok(w, map[string]any{"ok": true, "rows": len(req.Rows)})
}
}
// ListProcessAllocationsHandler GET /product-process-materials?productProcessId= 物料清单回显分账。
func ListProcessAllocationsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
id, _ := strconv.Atoi(r.URL.Query().Get("productProcessId"))
if id <= 0 {
httpx.Ok(w, map[string]any{"list": []any{}})
return
}
rows, err := logic.New(svcCtx).ListProcessAllocations(r.Context(), id)
if err != nil {
httpx.Fail(w, 500, err.Error())
return
}
httpx.Ok(w, map[string]any{"list": rows})
}
}
// SaveProcessAllocationsHandler POST /product-process-materials/save
// P10:物料清单(分账)独立保存,不再随「保存产品工艺」一起提交;Σ分账=总账硬校验在 logic 层。
func SaveProcessAllocationsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ProductProcessId int `json:"productProcessId"`
Rows []logic.BOMAllocation `json:"rows"`
}
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
httpx.BadRequest(w, "参数错误: "+err.Error())
return
}
if req.ProductProcessId <= 0 {
httpx.BadRequest(w, "请先保存产品工艺,再维护物料清单")
return
}
op := r.Header.Get("X-Username")
if op == "" {
op = "system"
}
if err := logic.New(svcCtx).SaveProcessAllocations(r.Context(), req.ProductProcessId, req.Rows, op); err != nil {
httpx.Fail(w, 400, err.Error())
return
}
httpx.Ok(w, map[string]any{"ok": true, "rows": len(req.Rows)})
}
}
@@ -10,7 +10,10 @@ import (
token "bj_power_mes/common/token"
"bj_power_mes/common/httpx"
"bj_power_mes/ent"
"bj_power_mes/ent/inspectionrecord"
"bj_power_mes/ent/material"
"bj_power_mes/ent/workorder"
"bj_power_mes/ent/workpiece"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
@@ -227,7 +230,7 @@ func OrderQueryInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
if n, e := strconv.Atoi(r.URL.Query().Get("limit")); e == nil && n > 0 {
limit = n
}
list, err := logic.New(svcCtx).ListWorkOrders(r.Context(), orderNo, status, "", "", "", "", keyword, limit)
list, err := logic.New(svcCtx).ListWorkOrders(r.Context(), orderNo, status, "", "", "", "", keyword, limit, 0)
if err != nil {
httpx.Fail(w, 2004, err.Error())
return
@@ -312,6 +315,50 @@ func DoneWorkpieceInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
// FinishedLookupInternalHandler GET /api/internal/finished/lookup?sn=
// 2026-11-13 拍板:WMS「成品入库」扫 SN 自动带出工单;图号/产品名称/产品状态/归属全部由 MES 透传,
// WMS 只读展示、禁止库管手选。MES 侧没有「产品型号/SN 档案字段」这类臆造概念——SN 属于工件(workpiece.sn),
// 成品档案只存名称与系统生成的唯一码(图号),本接口把两者关联起来。
// 仅 WMS 手工成品入库调用;物料入库(/api/inbound/*)不依赖 MES,故 MES 宕机不影响物料入库。
func FinishedLookupInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
sn := strings.TrimSpace(r.URL.Query().Get("sn"))
if sn == "" {
httpx.Fail(w, 2003, "SN 必填")
return
}
ctx := r.Context()
wp, err := svcCtx.EntClient.Workpiece.Query().Where(workpiece.SnEQ(sn)).Only(ctx)
if err != nil {
httpx.Fail(w, 2003, "该 SN 无追溯数据,禁止成品入库")
return
}
if wp.Status != "DONE" {
httpx.Fail(w, 2003, "该 SN 尚未完工("+wp.Status+"),禁止成品入库")
return
}
wo, err := svcCtx.EntClient.WorkOrder.Query().Where(workorder.WorkOrderNoEQ(wp.OrderNo)).Only(ctx)
if err != nil {
httpx.Fail(w, 2003, "未找到该 SN 对应工单,禁止成品入库")
return
}
// 产品状态 = MES 完工检结论透传(NG/报废不产生入库凭证,WMS 侧不存在「返修」可选项)。
productStatus := "已通过"
irs, _ := svcCtx.EntClient.InspectionRecord.Query().
Where(inspectionrecord.SnEQ(sn), inspectionrecord.CategoryEQ("FINAL")).
Order(ent.Desc("id")).Limit(1).All(ctx)
if len(irs) > 0 && irs[0].Result == "PARTIAL" {
productStatus = "部分通过"
}
httpx.Ok(w, map[string]any{
"sn": sn, "orderNo": wp.OrderNo,
"productCode": wo.ProductCode, "productName": wo.ProductName,
"productStatus": productStatus,
"ownershipType": wo.OwnershipType, "ownershipNo": wo.ContractNo,
})
}
}
// OrderUsageInternalHandler 工单单台用料(工位终端上线面板「领料确认」按工单工艺组合的物料清单展示应领料)。
// GET ?orderNo=,返回 []logic.UsageRow。物料清单已删除:用料唯一来源 = 工单工艺组合×工艺物料清单。
func OrderUsageInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
@@ -0,0 +1,43 @@
package production
import (
"net/http"
"bj_power_mes/common/httpx"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// ShortageOnBehalfInternalHandler POST /api/internal/shortage/on-behalf
// WMS 库管代工位提交补料申请:复用现有补料申请 logic.CreateShortage,只生成 PENDING 待审批单,
// 不审批、不调增叫料池额度——审批仍由主管在 MES「补料审批」完成,WMS 不绕过审批。
// 请求结构与 /api/v1/shortages 同款;shortage_requests 无「产品工号」列,产品工号由 WMS 附在补料原因里带过来。
func ShortageOnBehalfInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
StationNo int `json:"stationNo"`
MaterialCode string `json:"materialCode"`
Qty int `json:"qty"`
Reason string `json:"reason"`
Operator string `json:"operator"`
}
if err := httpx.ParseJSON(r, &req); err != nil {
httpx.BadRequest(w, "请求体解析失败")
return
}
op := req.Operator
if op == "" {
op = r.Header.Get("X-Username")
}
if op == "" {
op = "system"
}
row, err := logic.New(svcCtx).CreateShortage(r.Context(), req.StationNo,
req.MaterialCode, "", "", req.Qty, req.Reason, op)
if err != nil {
httpx.Fail(w, 500, err.Error())
return
}
httpx.Ok(w, row)
}
}
@@ -78,14 +78,16 @@ func PrecheckStationTemplateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
func ApplyStationTemplateHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Name string `json:"name"`
TargetProductCode string `json:"targetProductCode"`
Name string `json:"name"`
TargetProductCode string `json:"targetProductCode"`
Confirmed []string `json:"confirmed"` // 清线确认单逐项打勾/人工放行
}
if err := httpx.ParseJSON(r, &req); err != nil {
httpx.BadRequest(w, "请求体解析失败")
return
}
res, err := logic.New(svcCtx).ApplyStationTemplate(r.Context(), req.Name, req.TargetProductCode, operator(r, ""))
res, err := logic.New(svcCtx).ApplyStationTemplateWithConfirm(r.Context(),
req.Name, req.TargetProductCode, operator(r, ""), req.Confirmed)
if err != nil {
httpx.Fail(w, 3504, err.Error())
return
@@ -0,0 +1,56 @@
package production
import (
"net/http"
"strconv"
"strings"
"bj_power_mes/common/httpx"
"bj_power_mes/internal/logic"
"bj_power_mes/internal/svc"
)
// RegisterTrialHandler POST /trial/register 成品试验登记(2026-11-14 用户拍板:生产后试验区)
func RegisterTrialHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Sn string `json:"sn"`
Result string `json:"result"`
Reason string `json:"reason"`
}
if err := httpx.ParseJSON(r, &req); err != nil {
httpx.BadRequest(w, "请求体解析失败")
return
}
out, err := logic.New(svcCtx).RegisterTrial(r.Context(), req.Sn, req.Result, req.Reason, operator(r, ""))
if err != nil {
httpx.Fail(w, 3501, err.Error())
return
}
httpx.OkMessage(w, "登记成功", out)
}
}
// ListTrialsHandler GET /trials?result=&page=&size= 试验登记列表(分页 50/页,登记时间倒序)
func ListTrialsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
page, _ := strconv.Atoi(q.Get("page"))
size, _ := strconv.Atoi(q.Get("size"))
out, err := logic.New(svcCtx).ListTrials(r.Context(), strings.TrimSpace(q.Get("result")), page, size)
if err != nil {
httpx.Fail(w, 3502, err.Error())
return
}
httpx.Ok(w, out)
}
}
// ReasonDictHandler GET /dict/reasons?kind=stop|defect|loss 原因基础字典
//(2026-11-14 用户拍板:工位终端停机/不良原因由自由文本改下拉,MES 为唯一真源,终端经内部代理拉取)
func ReasonDictHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
kind := strings.TrimSpace(r.URL.Query().Get("kind"))
httpx.Ok(w, map[string]any{"kind": kind, "items": logic.ReasonDictItems(kind)})
}
}
@@ -228,17 +228,23 @@ func ExportProductTypesHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
func ListWorkOrdersHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
// keyword+limit:下拉远程搜索(limit>0 才截断,封顶 200);列表页不传=全量,行为不变
// keyword+limit+offset:下拉远程搜索(limit>0 才截断,封顶 200;offset>0 跳过前 N 条供滚动分页);列表页不传=全量,行为不变
limit := 0
if v := q.Get("limit"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
limit = n
}
}
offset := 0
if v := q.Get("offset"); v != "" {
if n, err := strconv.Atoi(v); err == nil && n > 0 {
offset = n
}
}
data, err := logic.New(svcCtx).ListWorkOrders(r.Context(),
q.Get("orderNo"), q.Get("status"), q.Get("productCode"), q.Get("productName"),
q.Get("contractNo"), q.Get("ownershipType"),
q.Get("keyword"), limit)
q.Get("keyword"), limit, offset)
if err != nil {
httpx.Fail(w, 3004, err.Error())
return
@@ -338,7 +344,7 @@ func SnPrefixHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
// WorkOrderInternalHandler GET /api/internal/work-orders/:no
// 供 WMS 解析工单归属(A2 半成品入库归属继承产线工单):返回工单号、归属编号(contractNo)、
// 供 WMS 解析工单归属(A2 在制品入库归属继承产线工单):返回工单号、归属编号(contractNo)、
// 归属类型(ownershipType: workorder=合同号/project=科技项目号/other=其他)。
// 工程编号 projectNo 已废弃(被合同号顶替),字段保留防历史迁移,不再对外提供。
// X-API-TOKEN 保护;工单不存在返回 code!=0(调用方按"找不到"静默处理,不阻断入库)。
@@ -140,7 +140,7 @@ func TraceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
// ---------- 半成品流转 ----------
// ---------- 在制品流转 ----------
func SemiFlowHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
@@ -50,12 +50,13 @@ func SaveProductProcessHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
httpx.BadRequest(w, "请求体解析失败")
return
}
if err := logic.New(svcCtx).SaveProductProcess(r.Context(), req, operator(r, "")); err != nil {
ppID, err := logic.New(svcCtx).SaveProductProcess(r.Context(), req, operator(r, ""))
if err != nil {
// 收集式校验(code=3015)经 FailErr 结构化输出,前端弹 ErrorListDialog 一次列全
httpx.FailErr(w, err)
return
}
httpx.OkMessage(w, "产品工艺已保存", nil)
httpx.OkMessage(w, "产品工艺已保存", map[string]any{"id": ppID})
}
}
@@ -31,10 +31,14 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/workpiece/trace", Handler: internal(production.WorkpieceTraceInternalHandler(serverCtx)),
})
// 2026-11-13 拍板:WMS 成品入库扫 SN → MES 透传工单/图号/名称/产品状态(只读);WMS 只在此链路调用,物料入库不依赖 MES。
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/finished/lookup", Handler: internal(production.FinishedLookupInternalHandler(serverCtx)),
})
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/order/query", Handler: internal(production.OrderQueryInternalHandler(serverCtx)),
})
// 工单归属解析(A2 半成品入库继承产线工单):凭工单号取合同号/工程编号
// 工单归属解析(A2 在制品入库继承产线工单):凭工单号取合同号/工程编号
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/work-orders/:no", Handler: internal(production.WorkOrderInternalHandler(serverCtx)),
})
@@ -312,6 +316,19 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
Method: http.MethodGet, Path: "/api/internal/agv/mode", Handler: internal(production.AgvModeHandler(serverCtx)),
})
// ---------- 原因基础字典(2026-11-14 补注册):工位终端经内部通道代理拉取 ----------
// JWT 组已有 /api/v1/dict/reasons(routes_production.go:497);终端 line.go 代理走
// X-API-TOKEN 内部通道,此前漏注册 internal 路由导致终端拉字典 404。
server.AddRoute(rest.Route{
Method: http.MethodGet, Path: "/api/internal/dict/reasons", Handler: internal(production.ReasonDictHandler(serverCtx)),
})
// 库管代工位补料申请(2026-11-14 用户第16条):WMS 经内部通道转发,复用补料申请 logic 只生成待审批单,
// 审批仍在 MES「补料审批」。内部通道必须全路径直写 AddRoute,不能进 JWT 组(否则工位终端/看板侧 404)。
server.AddRoute(rest.Route{
Method: http.MethodPost, Path: "/api/internal/shortage/on-behalf", Handler: internal(production.ShortageOnBehalfInternalHandler(serverCtx)),
})
// ---------- JWT 业务 API ----------
jwtRoutes := []rest.Route{
{Method: http.MethodGet, Path: "/product-types", Handler: production.ListProductTypesHandler(serverCtx)},
@@ -419,8 +436,8 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodPost, Path: "/plc/mismatch/override", Handler: PlcMismatchOverrideHandler(serverCtx)},
// ---------- AGV 调度(MES 前端,2026-10-14 迁 MES 为唯一真源) ----------
// 与 WMS 代理端点同源:WMS 仓管「AGV配送」页经 /api/internal/agv/* 转发;MES 前端直接走本组。
{Method: http.MethodPost, Path: "/agv/submit", Handler: production.SubmitAgvHandler(serverCtx)},
// 2026-11-13 拍板:独立「手动派车/叫料派车」入口下线——前端可直调的 /agv/submit 已删除。
// 派车只由业务配送单触发:WMS 备料完成 → /api/internal/agv/submit(内部专用,X-API-TOKEN 保护)。
{Method: http.MethodGet, Path: "/agv/tasks", Handler: production.ListAgvTasksHandler(serverCtx)},
{Method: http.MethodPost, Path: "/agv/refresh", Handler: production.RefreshAgvTasksHandler(serverCtx)},
{Method: http.MethodPost, Path: "/agv/cancel", Handler: production.CancelAgvTaskHandler(serverCtx)},
@@ -460,7 +477,7 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodPost, Path: "/workpiece/online", Handler: production.OnlineWorkpieceHandler(serverCtx)},
{Method: http.MethodPost, Path: "/workpiece/done", Handler: production.DoneWorkpieceHandler(serverCtx)},
// 工件报废/人工取走(2026-11-03 断头路补全):SCRAPPED 唯一写入者,原因必填、留痕;
// 与「暂存退库(半成品回库)」语义互斥——报废=永久退出,退库=合法暂停可重上线。
// 与「暂存退库(在制品回库)」语义互斥——报废=永久退出,退库=合法暂停可重上线。
{Method: http.MethodPost, Path: "/workpiece/scrap", Handler: production.ScrapWorkpieceHandler(serverCtx)},
{Method: http.MethodGet, Path: "/workpieces", Handler: production.ListWorkpiecesHandler(serverCtx)},
{Method: http.MethodGet, Path: "/workpieces/in-process", Handler: production.InProcessHandler(serverCtx)},
@@ -484,6 +501,14 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodPost, Path: "/alerts/:id/resolve", Handler: production.ResolveAlertHandler(serverCtx)},
{Method: http.MethodPost, Path: "/alert/read", Handler: production.MarkAlertReadHandler(serverCtx)},
// ---------- 生产后试验区(2026-11-14 用户拍板新增) ----------
// 成品试验登记:默认合格;报废/返修必填原因≤500字;报废联动 WMS 库存核销。
// 菜单入口由权限码 produce.trial 控制(seed 已登记),接口为登录可用(与预警读端点同口径)。
{Method: http.MethodPost, Path: "/trial/register", Handler: production.RegisterTrialHandler(serverCtx)},
{Method: http.MethodGet, Path: "/trials", Handler: production.ListTrialsHandler(serverCtx)},
// 原因基础字典(工位终端经内部代理拉取,停机/不良/损耗原因唯一真源)
{Method: http.MethodGet, Path: "/dict/reasons", Handler: production.ReasonDictHandler(serverCtx)},
// ---------- 附件中心(统一存储方案 2026-09-19) ----------
// 2026-10-28 生命周期重构:附件中心转纯查阅;删除/恢复/彻底清除唯一入口=数据归档页(sys.attachment:manage);
// 业务面板仅保留上传人本人「移除」误传附件(/remove,handler 内校验本人)。
@@ -525,6 +550,16 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
{Method: http.MethodPost, Path: "/product-processes/status", Handler: SetProductProcessStatusHandler(serverCtx)},
{Method: http.MethodDelete, Path: "/product-processes/:id", Handler: DeleteProductProcessHandler(serverCtx)},
{Method: http.MethodPost, Path: "/product-processes/copy", Handler: CopyProductProcessHandler(serverCtx)},
// 2026-11-13 拍板「总分制」:成品BOM总账 + 产品工艺把总账物料分配到各工序(分账)
{Method: http.MethodGet, Path: "/product-boms", Handler: production.ListProductBOMHandler(serverCtx)},
{Method: http.MethodPost, Path: "/product-boms/save", Handler: production.SaveProductBOMHandler(serverCtx)},
{Method: http.MethodGet, Path: "/product-process-materials", Handler: production.ListProcessAllocationsHandler(serverCtx)},
{Method: http.MethodPost, Path: "/product-process-materials/save", Handler: production.SaveProcessAllocationsHandler(serverCtx)},
// 2026-11-13 拍板:混产模板(多工单多成品混线)+ 模板外新产品的清线门禁
{Method: http.MethodGet, Path: "/mix-templates", Handler: production.ListMixTemplatesHandler(serverCtx)},
{Method: http.MethodPost, Path: "/mix-templates/save", Handler: production.SaveMixTemplateHandler(serverCtx)},
{Method: http.MethodPost, Path: "/mix-templates/active", Handler: production.SetActiveMixTemplateHandler(serverCtx)},
{Method: http.MethodPost, Path: "/mix-templates/clearance-check", Handler: production.CheckLineClearanceHandler(serverCtx)},
{Method: http.MethodGet, Path: "/line/points", Handler: ListPointsHandler(serverCtx)},
// ---------- PAD 巡检终端(块8) ----------
+3 -3
View File
@@ -145,7 +145,7 @@ func StationTaskInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
stationNo := atoiDefault(r.URL.Query().Get("stationNo"), 0)
// 工位号须为正整数(原 0/13 虚拟位已废弃,业务定稿·一.10)
if stationNo <= 0 {
httpx.BadRequest(w, "缺少有效的 stationNo 参数")
httpx.BadRequest(w, "当前终端未确定工位,请重新登录并选择工位")
return
}
data, err := logic.New(svcCtx).StationTask(r.Context(), stationNo)
@@ -219,8 +219,8 @@ func FileDownloadInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
}
}
// StationCheckinInternalHandler 工位终端暂存退库(半成品入库,块4/5)
// 进度由 MES 服务端自取(workpiece.currentStationNo),按半成品 INBOUND 流转并通知 WMS 入库。
// StationCheckinInternalHandler 工位终端暂存退库(在制品入库,块4/5)
// 进度由 MES 服务端自取(workpiece.currentStationNo),按在制品 INBOUND 流转并通知 WMS 入库。
func StationCheckinInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {