feat: 同步失败台账双向可重试 + 拧紧枪按工位配置 + 虚拟工位体系 + 去Redis与文档口径对齐
- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。 - 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。 - 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。 - AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。 - 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。 - 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。 - 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
This commit is contained in:
@@ -0,0 +1,138 @@
|
||||
// Command run 自动化流水测试全量入口。
|
||||
// 用法:GOWORK=off go run ./cmd/run -scenario 1 -seq 1
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"bj_power_test/cases/common"
|
||||
"bj_power_test/cases/scenario1"
|
||||
"bj_power_test/cases/scenario2"
|
||||
"bj_power_test/cases/scenario3"
|
||||
"bj_power_test/internal/assert"
|
||||
"bj_power_test/internal/client"
|
||||
"bj_power_test/internal/db"
|
||||
"bj_power_test/internal/env"
|
||||
"bj_power_test/internal/fixture"
|
||||
"bj_power_test/internal/report"
|
||||
)
|
||||
|
||||
func main() {
|
||||
scenario := flag.String("scenario", "1", "场景:1 | 2 | 3 | all")
|
||||
seq := flag.Int("seq", 1, "当日运行序号,用于批次前缀 RUNYYYYMMDD-NN")
|
||||
reportDir := flag.String("report-dir", "", "报告输出目录,默认 test/reports")
|
||||
probeOnly := flag.Bool("probe-only", false, "只做探活/建连/登录,不跑业务流水")
|
||||
flag.Parse()
|
||||
|
||||
cfg := env.Load()
|
||||
if *reportDir != "" {
|
||||
cfg.ReportDir = *reportDir
|
||||
}
|
||||
run := fixture.New(*seq)
|
||||
ctx := context.Background()
|
||||
rep := report.New(run.Batch, "场景"+*scenario)
|
||||
|
||||
fmt.Println("==========================================================")
|
||||
fmt.Printf("自动化流水测试 批次=%s 场景=%s T=%s / T+1=%s / T+2=%s\n",
|
||||
run.Batch, *scenario, run.Date(0), run.Date(1), run.Date(2))
|
||||
fmt.Println("测试数据全部保留在库里,不删除;唯一键用批次前缀隔离。")
|
||||
fmt.Println("==========================================================")
|
||||
|
||||
// 1) 四服务探活
|
||||
rep.Probes = cfg.Probe(ctx)
|
||||
for _, p := range rep.Probes {
|
||||
state := "不可达"
|
||||
if p.OK {
|
||||
state = "在监听"
|
||||
}
|
||||
fmt.Printf("[探活] %-8s %-24s %s %s\n", p.Name, p.URL, state, p.Detail)
|
||||
}
|
||||
|
||||
// 2) 三库直连
|
||||
database, dbErrs := db.Open(ctx, cfg.MESDSN, cfg.WMSDSN, cfg.SQLitePath)
|
||||
defer database.Close()
|
||||
for _, e := range dbErrs {
|
||||
rep.DBErrors = append(rep.DBErrors, e.Error())
|
||||
fmt.Println("[建连] " + e.Error())
|
||||
}
|
||||
fmt.Printf("[建连] MES库=%v WMS库=%v 工位终端SQLite=%v\n",
|
||||
database.Ready(db.MES), database.Ready(db.WMS), database.Ready(db.WS))
|
||||
|
||||
// 3) 三端登录(看板免登录)
|
||||
tk, loginErrs := cfg.Login(ctx)
|
||||
for _, e := range loginErrs {
|
||||
rep.LoginErrors = append(rep.LoginErrors, e.Error())
|
||||
fmt.Println("[登录] " + e.Error())
|
||||
}
|
||||
fmt.Printf("[登录] MES=%v WMS=%v 工位终端=%v\n", tk.MES != "", tk.WMS != "", tk.WS != "")
|
||||
|
||||
cl := client.New(cfg, tk)
|
||||
ac := assert.NewCtx(ctx, run, cl, database)
|
||||
|
||||
// 业务流水前置:MES/WMS/工位终端三服务在监听 + 两库可用 + 后台 token 到位。
|
||||
required := map[string]bool{string(env.MES): false, string(env.WMS): false, string(env.WS): false}
|
||||
for _, p := range rep.Probes {
|
||||
if _, ok := required[p.Name]; ok {
|
||||
required[p.Name] = p.OK
|
||||
}
|
||||
}
|
||||
servicesReady := required[string(env.MES)] && required[string(env.WMS)] && required[string(env.WS)]
|
||||
ready := servicesReady && database.Ready(db.MES) && database.Ready(db.WMS) && tk.MES != "" && tk.WMS != ""
|
||||
|
||||
if !ready {
|
||||
fmt.Println("----------------------------------------------------------")
|
||||
fmt.Println("真实流水被阻断:四服务未全部启动(或库/登录未就绪)。")
|
||||
fmt.Println("本轮不编造任何测试数据,不向运行库写入业务单据;报告逐条标注「阻断」。")
|
||||
fmt.Println("前置:启动 MES(8888) / WMS(8890) / 工位终端(8892) / 看板(5173),PostgreSQL(5432) 已在监听。")
|
||||
fmt.Println("----------------------------------------------------------")
|
||||
}
|
||||
|
||||
if !*probeOnly {
|
||||
switch strings.ToLower(*scenario) {
|
||||
case "1":
|
||||
scenario1.Run(ac, ready)
|
||||
case "2":
|
||||
scenario2.Run(ac)
|
||||
case "3":
|
||||
scenario3.Run(ac)
|
||||
case "all":
|
||||
scenario1.Run(ac, ready)
|
||||
scenario2.Run(ac)
|
||||
scenario3.Run(ac)
|
||||
default:
|
||||
fmt.Println("未知场景:" + *scenario)
|
||||
os.Exit(2)
|
||||
}
|
||||
// 跨场景口径只读核查:即使服务未起也能查库,给出真实分布。
|
||||
common.Run(ac)
|
||||
}
|
||||
|
||||
rep.Results = ac.Results
|
||||
rep.Finish()
|
||||
mdPath, jsonPath, err := rep.Write(cfg.ReportDir)
|
||||
if err != nil {
|
||||
fmt.Println("报告写入失败:" + err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
fmt.Println("----------------------------------------------------------")
|
||||
fmt.Printf("汇总:共 %d 项,通过 %d / 失败 %d / 阻断 %d,通过率 %s\n",
|
||||
rep.Summary.Total, rep.Summary.Pass, rep.Summary.Fail, rep.Summary.Block, rep.Summary.PassRate)
|
||||
fmt.Println("报告(Markdown):" + mdPath)
|
||||
fmt.Println("报告(JSON) :" + jsonPath)
|
||||
if rep.Summary.Fail > 0 {
|
||||
fmt.Println("失败项:")
|
||||
for _, r := range rep.Results {
|
||||
if r.Status == "失败" {
|
||||
fmt.Printf(" - %s [%s] %s\n", r.StepID, r.CaseLine, r.FailReason)
|
||||
}
|
||||
}
|
||||
}
|
||||
// 有失败或阻断时返回非 0,便于 CI 判定;纯探活模式不判失败。
|
||||
if !*probeOnly && (rep.Summary.Fail > 0 || rep.Summary.Block > 0) {
|
||||
os.Exit(1)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user