feat: AGV点位锁与缓存迁移 + 工位终端去离线队列 + WMS出入库增强
【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新
This commit is contained in:
@@ -860,116 +860,8 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
type planRow struct {
|
||||
row int
|
||||
code string
|
||||
name string
|
||||
spec string
|
||||
unit string
|
||||
manageMode int
|
||||
snMode int // 序列号=是/否:按类型默认联动派生(电气件→1,其余→2)
|
||||
itemType int
|
||||
description string
|
||||
}
|
||||
plans := make([]planRow, 0, len(rows)-1)
|
||||
errs := make([]importErr, 0)
|
||||
|
||||
// 表头→列下标映射:容忍列顺序变化与多余列(如「物料类别」/旧「品类」插在单位与类型之间)。
|
||||
// 先按"去括号后的表头名"精确匹配,再按关键字包含兜底(顺序稳定),都找不到回退模板固定下标。
|
||||
normHeader := func(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
for _, op := range []string{"(", "("} {
|
||||
if i := strings.Index(s, op); i >= 0 {
|
||||
s = s[:i]
|
||||
}
|
||||
}
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
headerNorm := make([]string, len(rows[0]))
|
||||
for j, h := range rows[0] {
|
||||
headerNorm[j] = normHeader(h)
|
||||
}
|
||||
colOf := func(names []string, fallback int) int {
|
||||
for _, n := range names {
|
||||
for j, hn := range headerNorm {
|
||||
if hn == n {
|
||||
return j
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, n := range names {
|
||||
for j, hn := range headerNorm {
|
||||
if hn != "" && strings.Contains(hn, n) {
|
||||
return j
|
||||
}
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
codeCol := colOf([]string{"图号", "物料编码", "编码"}, 0)
|
||||
nameCol := colOf([]string{"名称", "物料名称"}, 1)
|
||||
specCol := colOf([]string{"规格", "规格型号"}, 2)
|
||||
unitCol := colOf([]string{"单位"}, 3)
|
||||
typeCol := colOf([]string{"类型", "管理类型", "管理粒度"}, 4)
|
||||
catCol := colOf([]string{"物料类别", "品类", "类别"}, -1)
|
||||
descCol := colOf([]string{"说明", "备注", "描述"}, 5)
|
||||
|
||||
// 阶段1:解析 + 校验(不落库)
|
||||
for i, row := range rows {
|
||||
if i == 0 {
|
||||
continue // 表头
|
||||
}
|
||||
cell := func(idx int) string {
|
||||
if idx < 0 || idx >= len(row) {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(row[idx])
|
||||
}
|
||||
pr := planRow{row: i + 1}
|
||||
pr.code = cell(codeCol)
|
||||
pr.name = cell(nameCol)
|
||||
pr.spec = cell(specCol)
|
||||
pr.unit = cell(unitCol)
|
||||
pr.manageMode = parseManageMode(cell(typeCol))
|
||||
pr.itemType = parseItemType(cell(catCol))
|
||||
pr.snMode = snModeByType(pr.manageMode)
|
||||
if pr.itemType == invCatFinished {
|
||||
pr.snMode = snModeSN // 成品强制「序列号=是」(与编辑/同步同口径,2026-10-19 拍板)
|
||||
}
|
||||
pr.description = cell(descCol)
|
||||
|
||||
if pr.code == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "图号为空"})
|
||||
continue
|
||||
}
|
||||
if pr.name == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "名称为空"})
|
||||
continue
|
||||
}
|
||||
if pr.spec == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "规格型号为空"})
|
||||
continue
|
||||
}
|
||||
if pr.unit == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "单位为空"})
|
||||
continue
|
||||
}
|
||||
if pr.manageMode == 0 {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "类型无法识别,请填写「结构件/电气件/其他」(兼容 1/2/3)"})
|
||||
continue
|
||||
}
|
||||
if catCol >= 0 && cell(catCol) != "" && pr.itemType == 0 {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品」(兼容 1/3;半成品不是物料类别,「其他」已取消)"})
|
||||
continue
|
||||
}
|
||||
exists, _ := ctx.EntClient.Material.Query().
|
||||
Where(material.CodeEQ(pr.code)).Exist(ctx0())
|
||||
if exists {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "图号已存在: " + pr.code})
|
||||
continue
|
||||
}
|
||||
plans = append(plans, pr)
|
||||
}
|
||||
// 阶段1:解析 + 逐行校验(不落库)——与预检端点 excelMaterialImportPreviewHandler 共用同一函数,规则同源
|
||||
plans, errs := parseMaterialImportPlan(ctx, rows)
|
||||
|
||||
// 阶段2:有错则整体拒绝,一行都不写
|
||||
if len(errs) > 0 {
|
||||
@@ -1026,3 +918,160 @@ func excelMaterialImportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ok(w, map[string]any{"success": len(plans), "failed": 0, "errors": []importErr{}})
|
||||
}
|
||||
}
|
||||
|
||||
// materialImportPlan 物料档案导入单行写入计划(预检与写入共用同一解析/校验,规则同源不漂移)。
|
||||
type materialImportPlan struct {
|
||||
row int
|
||||
code string
|
||||
name string
|
||||
spec string
|
||||
unit string
|
||||
manageMode int
|
||||
snMode int // 序列号=是/否:按类型默认联动派生(电气件→1,其余→2)
|
||||
itemType int
|
||||
description string
|
||||
}
|
||||
|
||||
// parseMaterialImportPlan 阶段1:解析 + 逐行校验(只读不落库):图号必填且库内唯一 /
|
||||
// 名称、规格、单位必填 / 类型、物料类别合法。返回通过校验的行计划与逐行错误。
|
||||
func parseMaterialImportPlan(ctx *svc.ServiceContext, rows [][]string) ([]materialImportPlan, []importErr) {
|
||||
plans := make([]materialImportPlan, 0, len(rows)-1)
|
||||
errs := make([]importErr, 0)
|
||||
|
||||
// 表头→列下标映射:容忍列顺序变化与多余列(如「物料类别」/旧「品类」插在单位与类型之间)。
|
||||
// 先按"去括号后的表头名"精确匹配,再按关键字包含兜底(顺序稳定),都找不到回退模板固定下标。
|
||||
normHeader := func(s string) string {
|
||||
s = strings.TrimSpace(s)
|
||||
for _, op := range []string{"(", "("} {
|
||||
if i := strings.Index(s, op); i >= 0 {
|
||||
s = s[:i]
|
||||
}
|
||||
}
|
||||
return strings.TrimSpace(s)
|
||||
}
|
||||
headerNorm := make([]string, len(rows[0]))
|
||||
for j, h := range rows[0] {
|
||||
headerNorm[j] = normHeader(h)
|
||||
}
|
||||
colOf := func(names []string, fallback int) int {
|
||||
for _, n := range names {
|
||||
for j, hn := range headerNorm {
|
||||
if hn == n {
|
||||
return j
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, n := range names {
|
||||
for j, hn := range headerNorm {
|
||||
if hn != "" && strings.Contains(hn, n) {
|
||||
return j
|
||||
}
|
||||
}
|
||||
}
|
||||
return fallback
|
||||
}
|
||||
codeCol := colOf([]string{"图号", "物料编码", "编码"}, 0)
|
||||
nameCol := colOf([]string{"名称", "物料名称"}, 1)
|
||||
specCol := colOf([]string{"规格", "规格型号"}, 2)
|
||||
unitCol := colOf([]string{"单位"}, 3)
|
||||
typeCol := colOf([]string{"类型", "管理类型", "管理粒度"}, 4)
|
||||
catCol := colOf([]string{"物料类别", "品类", "类别"}, -1)
|
||||
descCol := colOf([]string{"说明", "备注", "描述"}, 5)
|
||||
|
||||
for i, row := range rows {
|
||||
if i == 0 {
|
||||
continue // 表头
|
||||
}
|
||||
cell := func(idx int) string {
|
||||
if idx < 0 || idx >= len(row) {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(row[idx])
|
||||
}
|
||||
pr := materialImportPlan{row: i + 1}
|
||||
pr.code = cell(codeCol)
|
||||
pr.name = cell(nameCol)
|
||||
pr.spec = cell(specCol)
|
||||
pr.unit = cell(unitCol)
|
||||
pr.manageMode = parseManageMode(cell(typeCol))
|
||||
pr.itemType = parseItemType(cell(catCol))
|
||||
pr.snMode = snModeByType(pr.manageMode)
|
||||
if pr.itemType == invCatFinished {
|
||||
pr.snMode = snModeSN // 成品强制「序列号=是」(与编辑/同步同口径,2026-10-19 拍板)
|
||||
}
|
||||
pr.description = cell(descCol)
|
||||
|
||||
if pr.code == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "图号为空"})
|
||||
continue
|
||||
}
|
||||
if pr.name == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "名称为空"})
|
||||
continue
|
||||
}
|
||||
if pr.spec == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "规格型号为空"})
|
||||
continue
|
||||
}
|
||||
if pr.unit == "" {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "单位为空"})
|
||||
continue
|
||||
}
|
||||
if pr.manageMode == 0 {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "类型无法识别,请填写「结构件/电气件/其他」(兼容 1/2/3)"})
|
||||
continue
|
||||
}
|
||||
if catCol >= 0 && cell(catCol) != "" && pr.itemType == 0 {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "物料类别无法识别,请填写「原材料/成品」(兼容 1/3;半成品不是物料类别,「其他」已取消)"})
|
||||
continue
|
||||
}
|
||||
exists, _ := ctx.EntClient.Material.Query().
|
||||
Where(material.CodeEQ(pr.code)).Exist(ctx0())
|
||||
if exists {
|
||||
errs = append(errs, importErr{pr.row, pr.code, "图号已存在: " + pr.code})
|
||||
continue
|
||||
}
|
||||
plans = append(plans, pr)
|
||||
}
|
||||
return plans, errs
|
||||
}
|
||||
|
||||
// excelMaterialImportPreviewHandler POST /api/material/import/preview 物料档案导入预检(只读):
|
||||
// 复用写入端点的阶段1校验(parseMaterialImportPlan,同一函数保证规则同源),不写任何数据。
|
||||
// 返回 {total 总行数, success 将成功行数, failed 失败行数, errors 逐行失败原因(行号+图号+原因)}。
|
||||
func excelMaterialImportPreviewHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if err := r.ParseMultipartForm(20 << 20); err != nil {
|
||||
fail(w, http.StatusBadRequest, "文件上传失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
f, _, err := r.FormFile("file")
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadRequest, "缺少 file 字段")
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
xl, err := excelize.OpenReader(f)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadRequest, "无法解析 Excel: "+err.Error())
|
||||
return
|
||||
}
|
||||
defer xl.Close()
|
||||
sheet := xl.GetSheetList()[0]
|
||||
rows, err := xl.GetRows(sheet)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadRequest, "读取工作表失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
if len(rows) <= 1 {
|
||||
fail(w, http.StatusBadRequest, "文件无数据行(首行为表头,需至少一行数据)")
|
||||
return
|
||||
}
|
||||
plans, errs := parseMaterialImportPlan(ctx, rows)
|
||||
if errs == nil {
|
||||
errs = []importErr{}
|
||||
}
|
||||
ok(w, map[string]any{"total": len(rows) - 1, "success": len(plans), "failed": len(errs), "errors": errs})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user