- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集) - 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList - 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损) - 新增 AGV 车辆状态表 agv_vehicle_state 及查询 - 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
499 lines
32 KiB
Go
499 lines
32 KiB
Go
package db
|
||
|
||
import (
|
||
"context"
|
||
"database/sql"
|
||
"fmt"
|
||
"time"
|
||
|
||
"bj_power_mes/ent"
|
||
|
||
"entgo.io/ent/dialect"
|
||
entsql "entgo.io/ent/dialect/sql"
|
||
_ "github.com/jackc/pgx/v5/stdlib"
|
||
)
|
||
|
||
// DatabaseConf 数据库配置,DSN 由调用方从 yaml 读取
|
||
type DatabaseConf struct {
|
||
Host string `json:",default=127.0.0.1"`
|
||
Port int `json:",default=5432"`
|
||
User string `json:",default=postgres"`
|
||
Password string `json:",default=postgres"`
|
||
Dbname string `json:",default=bj_power_mes"`
|
||
MaxIdle int `json:",default=10"`
|
||
MaxOpen int `json:",default=20"`
|
||
}
|
||
|
||
// DSN 从配置拼装连接串(不在代码中硬编码口令)
|
||
func (c DatabaseConf) DSN() string {
|
||
return fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable",
|
||
c.Host, c.Port, c.User, c.Password, c.Dbname)
|
||
}
|
||
|
||
// MustNewDB 打开 PostgreSQL 连接并包装为 ent.Client
|
||
func MustNewDB(c DatabaseConf) (*ent.Client, *sql.DB) {
|
||
sqlDB, err := sql.Open("pgx", c.DSN())
|
||
if err != nil {
|
||
panic(fmt.Sprintf("open db failed: %v", err))
|
||
}
|
||
sqlDB.SetMaxIdleConns(c.MaxIdle)
|
||
sqlDB.SetMaxOpenConns(c.MaxOpen)
|
||
sqlDB.SetConnMaxLifetime(time.Hour)
|
||
|
||
drv := entsql.OpenDB(dialect.Postgres, sqlDB)
|
||
client := ent.NewClient(ent.Driver(drv))
|
||
return client, sqlDB
|
||
}
|
||
|
||
// NewDB 打开连接,失败返回 error(用于 migrate 等工具)
|
||
func NewDB(c DatabaseConf) (*sql.DB, error) {
|
||
sqlDB, err := sql.Open("pgx", c.DSN())
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if err := sqlDB.Ping(); err != nil {
|
||
return nil, err
|
||
}
|
||
return sqlDB, nil
|
||
}
|
||
|
||
// EnsureDB 若目标数据库不存在则自动创建。
|
||
// 先连接 PostgreSQL 内置维护库 maintenance db(默认 postgres),检查目标库,
|
||
// 不存在则执行 CREATE DATABASE,便于重置/建表命令在空环境一键运行。
|
||
func EnsureDB(c DatabaseConf) error {
|
||
maintenanceDSN := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=postgres sslmode=disable",
|
||
c.Host, c.Port, c.User, c.Password)
|
||
sqlDB, err := sql.Open("pgx", maintenanceDSN)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
defer sqlDB.Close()
|
||
|
||
var exists bool
|
||
if err := sqlDB.QueryRow(
|
||
`SELECT EXISTS(SELECT 1 FROM pg_database WHERE datname = $1)`, c.Dbname,
|
||
).Scan(&exists); err != nil {
|
||
return err
|
||
}
|
||
|
||
if exists {
|
||
return nil
|
||
}
|
||
|
||
// 库名需要用双引号包裹以支持大写/特殊字符
|
||
if _, err := sqlDB.Exec(`CREATE DATABASE "` + c.Dbname + `"`); err != nil {
|
||
return err
|
||
}
|
||
return nil
|
||
}
|
||
|
||
// schemaPatchSQL 幂等列补丁:ent Schema.Create 只建缺失的新表,绝不会给既有表加列;
|
||
// 因此对"已有表新增列"的场景必须走显式 ALTER。这里统一维护补丁清单,migrate/seed/reset-all 三入口共用。
|
||
var schemaPatchSQL = []string{
|
||
// 第三批:工程编号三级归属(合同号 → 工程编号 → 产品序号)
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS contract_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS project_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS product_serial varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// P0-4:过程巡检按步骤提交(步骤维度字段)
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS process_code integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS step_id integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS step_name varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS measured_value varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// 上生产线前剩余项(H 质量检验 / I 产品物料清单 / J 步骤附件 / M 工单字段·绩效)
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS report_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS material_code varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS material_name varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS manufacturer varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS inspection_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS attachment_ids varchar(512) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS disposal_type varchar(20) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS disposal_remark varchar(500) NOT NULL DEFAULT ''`,
|
||
// 批次号/SN:质量检验判不合格联动 WMS 在库处置时定位库存行(电气件=SN、结构件=批次)
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS batch_sn varchar(128) NOT NULL DEFAULT ''`,
|
||
// 完工检扩展:相关标准(试验方案号)/试验记录单号,产成品入库随回流 WMS(选填)
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS related_standard varchar(255) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE inspection_record ADD COLUMN IF NOT EXISTS test_record_no varchar(128) NOT NULL DEFAULT ''`,
|
||
// work_order_bom 表名注解为 work_order_bom(表已于 2026-09-23 退役删除,此补丁仅对历史库存留档库有意义)
|
||
`ALTER TABLE IF EXISTS work_order_bom ADD COLUMN IF NOT EXISTS related_standard varchar(255) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE process_step ADD COLUMN IF NOT EXISTS attachment jsonb NOT NULL DEFAULT '[]'::jsonb`,
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS created_by varchar(64) NOT NULL DEFAULT ''`,
|
||
// 2026-11-02 移除冗余字段「要求完成日期」(due_date):统一使用 plan_start/plan_end。
|
||
// ent 不再生成该列;存量库在此显式 DROP(幂等),避免脏列残留。
|
||
`ALTER TABLE work_order DROP COLUMN IF EXISTS due_date`,
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS actual_start timestamp`,
|
||
`ALTER TABLE workpiece_process ADD COLUMN IF NOT EXISTS duration_sec integer NOT NULL DEFAULT 0`,
|
||
|
||
// 客户第12条「记录查看加一项看工单号查询」:预警表补工单号,供预警中心按工单号检索
|
||
`ALTER TABLE alert ADD COLUMN IF NOT EXISTS order_no varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 遗留5 告警框架(第一阶段):alerts/alert_rules 幂等建表 + 既有表补列 ----
|
||
// 表名/列名与 ent 生成约定一致(snake_case;int 用 integer/bigint,created_at 为 timestamp)。
|
||
// 新装库由 ent Schema.Create 直接建出,此处 IF NOT EXISTS 幂等兜底;既有库只补缺失列。
|
||
`CREATE TABLE IF NOT EXISTS alert (
|
||
id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||
rule_id bigint NOT NULL DEFAULT 0,
|
||
type varchar(40) NOT NULL,
|
||
level varchar(20) NOT NULL DEFAULT '',
|
||
target varchar(128) NOT NULL DEFAULT '',
|
||
title varchar(255) NOT NULL,
|
||
content varchar(500) NOT NULL DEFAULT '',
|
||
ref_type varchar(40) NOT NULL DEFAULT '',
|
||
ref_id varchar(64) NOT NULL DEFAULT '',
|
||
order_no varchar(64) NOT NULL DEFAULT '',
|
||
status varchar(10) NOT NULL DEFAULT 'UNREAD',
|
||
receiver varchar(255) NOT NULL DEFAULT '',
|
||
resolved_at timestamp,
|
||
resolved_by varchar(64) NOT NULL DEFAULT '',
|
||
created_at timestamp NOT NULL DEFAULT now()
|
||
)`,
|
||
`CREATE INDEX IF NOT EXISTS alert_status ON alert (status)`,
|
||
`CREATE INDEX IF NOT EXISTS alert_type ON alert (type)`,
|
||
`CREATE INDEX IF NOT EXISTS alert_created_at ON alert (created_at)`,
|
||
`CREATE TABLE IF NOT EXISTS alert_rule (
|
||
id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||
name varchar(80) NOT NULL,
|
||
type varchar(40) NOT NULL,
|
||
threshold double precision NOT NULL DEFAULT 0,
|
||
enabled boolean NOT NULL DEFAULT true,
|
||
notify_channels varchar(255) NOT NULL DEFAULT '',
|
||
created_by varchar(64) NOT NULL DEFAULT '',
|
||
created_at timestamp NOT NULL DEFAULT now()
|
||
)`,
|
||
`CREATE INDEX IF NOT EXISTS alert_rule_type ON alert_rule (type)`,
|
||
`CREATE INDEX IF NOT EXISTS alert_rule_enabled ON alert_rule (enabled)`,
|
||
// 既有 alert 表补列(级别/目标/处置闭环)
|
||
`ALTER TABLE alert ADD COLUMN IF NOT EXISTS level varchar(20) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE alert ADD COLUMN IF NOT EXISTS target varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE alert ADD COLUMN IF NOT EXISTS resolved_at timestamp`,
|
||
`ALTER TABLE alert ADD COLUMN IF NOT EXISTS resolved_by varchar(64) NOT NULL DEFAULT ''`,
|
||
// alert.title 120→255(2026-10-13):T6/T7 对账预警以 Detail 作 title,超 120 字节恒失败;
|
||
// 新库由 ent 直接建 255,既有库幂等 ALTER(已是 255 时无变化)。
|
||
`ALTER TABLE alert ALTER COLUMN title TYPE varchar(255)`,
|
||
// 既有 alert_rule 表补列(通知渠道占位)
|
||
`ALTER TABLE alert_rule ADD COLUMN IF NOT EXISTS notify_channels varchar(255) NOT NULL DEFAULT ''`,
|
||
// 清理冗余 receiver 字段(统一使用 notify_channels 承载通知方式占位,不留兼容字段)
|
||
`ALTER TABLE alert_rule DROP COLUMN IF EXISTS receiver`,
|
||
|
||
// 出库与配送闭环改造(2026-09-19):拆开被污染的账本字段 + 数量不符处理侧 + 补料来源
|
||
// material_request:received_* 拆出「已接料量」(sent_qty 锁定为已发出量=幂等基准,唯一写者=自动出库)
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS received_qty double precision NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS received_at bigint NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS receive_by varchar(64) NOT NULL DEFAULT ''`,
|
||
// 来源标记:PLAN=按日排产备料 / REFILL=工位叫料·数量不符补发(补料优先出库)
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS source varchar(16) NOT NULL DEFAULT 'PLAN'`,
|
||
// 超 物料清单需求放行留痕:超量与原因(损耗/报废/返修/其他),自动出库不填=不超领
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS over_qty double precision NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS over_reason varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS ref_report_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS need_agv boolean NOT NULL DEFAULT false`,
|
||
// AGV 任务号(派车成功后回写,叫料单↔AGV 任务关联;2026-10-14 AGV 收口)
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS agv_task_no varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 2026-11-02 AGV 点位表 agv_point(硬件级真源)----
|
||
// 说明:ent Schema.Create 本应建此表,但若"改 schema 后只重启 serve(不跑 migrate)"就会漏建,报 SQLSTATE 42P01。
|
||
// 此处显式 CREATE TABLE IF NOT EXISTS 作幂等兜底,保证任意一次 migrate/seed 都能补齐,且不影响既有库(已存在则跳过)。
|
||
`CREATE TABLE IF NOT EXISTS agv_point (
|
||
id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||
position_code varchar(255) NOT NULL,
|
||
name varchar(255) NOT NULL DEFAULT '',
|
||
is_dock boolean NOT NULL DEFAULT false,
|
||
dock_id bigint,
|
||
enabled boolean NOT NULL DEFAULT true,
|
||
created_at timestamp NOT NULL DEFAULT now(),
|
||
CONSTRAINT ux_agv_point_position UNIQUE (position_code)
|
||
)`,
|
||
// agv_point 与 dock 的强绑定(接驳台点位)由 seed/LineManagement 维护;索引补充(按 position_code 查询频繁)
|
||
`CREATE INDEX IF NOT EXISTS agv_point_position_code ON agv_point (position_code)`,
|
||
`CREATE INDEX IF NOT EXISTS agv_point_dock_id ON agv_point (dock_id)`,
|
||
// material_qty_report:处理侧字段(补发=生成 REFILL 备料单;退库=WMS 退库单;调整=仅关闭)
|
||
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handle_type varchar(16) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handle_doc_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handle_note varchar(255) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handled_by varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_qty_report ADD COLUMN IF NOT EXISTS handled_at bigint NOT NULL DEFAULT 0`,
|
||
|
||
// 工位内置标识(实体位置由内置数据给定,页面不可手改)
|
||
`ALTER TABLE station ADD COLUMN IF NOT EXISTS is_builtin boolean NOT NULL DEFAULT false`,
|
||
// 存量数据回填:种子初始化的工位号(0/1..13)一律为内置工位;页面新增的工位号从 14 起,不受回填影响。
|
||
`UPDATE station SET is_builtin = true WHERE station_no BETWEEN 0 AND 13`,
|
||
|
||
// ---- 历史重构:删除工位组合冗余字段(接驳台关系改由 dock 表 station_no 承载)----
|
||
`ALTER TABLE work_order DROP COLUMN IF EXISTS process_seq`,
|
||
`ALTER TABLE workpiece DROP COLUMN IF EXISTS process_seq`,
|
||
`ALTER TABLE daily_plan DROP COLUMN IF EXISTS dock_codes`,
|
||
// station 上早期「1:1 接驳台绑定」字段(dock_code/has_dock)已从 ent schema 移除(2026-10-13):
|
||
// 工位↔接驳台为 M:N,由 dock 表 station_no 承载(工位1~10 各左L/右R 两个),此处清存量库残留列与唯一索引。
|
||
`DROP INDEX IF EXISTS ux_station_dock_code`,
|
||
`ALTER TABLE station DROP COLUMN IF EXISTS dock_code`,
|
||
`ALTER TABLE station DROP COLUMN IF EXISTS has_dock`,
|
||
// 备料单工位级 + 分批出库
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS station_no integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS sent_qty double precision NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS batch_no varchar(64) NOT NULL DEFAULT ''`,
|
||
// 2026-11-03 转产按工单精确退料:退库单(material_request 处于 RETURNING)记录工单归属,底层叫料池「工位×物料」聚合不变。
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS work_order_no varchar(64) NOT NULL DEFAULT ''`,
|
||
// 2026-11-03 拍板(AGV 三层安全机制 + 退料接驳台 + 损耗台账):
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS kind varchar(20) NOT NULL DEFAULT 'TRANSPORT'`,
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS biz_type varchar(20) NOT NULL DEFAULT 'CALL'`,
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS biz_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS chain_no varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS auto_end boolean NOT NULL DEFAULT false`,
|
||
`ALTER TABLE agv_tasks ADD COLUMN IF NOT EXISTS agv_code varchar(32) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS return_dock varchar(20) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS theory_qty double precision`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS loss_qty double precision`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS loss_reason varchar(200) NOT NULL DEFAULT ''`,
|
||
// 接驳台左右标识(左右互换拍板):工位 2/4/6/8/10(下排)左右名称互换——
|
||
// 偶数工位:奇数台(地图左)=right、偶数台(地图右)=left;奇数工位:奇数台(地图左)=left。存量库按此幂等刷数。
|
||
`ALTER TABLE dock ADD COLUMN IF NOT EXISTS side varchar(8) NOT NULL DEFAULT 'left'`,
|
||
`UPDATE dock SET side = CASE WHEN (CAST(SUBSTRING(dock_code, 5) AS INTEGER) % 2) = 0 THEN 'left' ELSE 'right' END WHERE dock_type = 'line' AND (station_no % 2) = 0 AND dock_code LIKE 'DOCK%' AND CAST(SUBSTRING(dock_code, 5) AS INTEGER) BETWEEN 1 AND 20`,
|
||
`UPDATE dock SET side = CASE WHEN (CAST(SUBSTRING(dock_code, 5) AS INTEGER) % 2) = 1 THEN 'left' ELSE 'right' END WHERE dock_type = 'line' AND (station_no % 2) = 1 AND dock_code LIKE 'DOCK%' AND CAST(SUBSTRING(dock_code, 5) AS INTEGER) BETWEEN 1 AND 20`,
|
||
`UPDATE dock SET side = 'left' WHERE dock_code = 'JBT21'`,
|
||
// T7(2026-11-03 拍板):库房接驳台代号统一 JBT21——存量库把 DOCK21 改名(幂等);
|
||
// AGV 点位表 position_code=dockCode 一并改名,保持 dock↔agv_point 绑定不断。
|
||
`UPDATE dock SET dock_code = 'JBT21' WHERE dock_code = 'DOCK21'`,
|
||
`UPDATE agv_point SET position_code = 'JBT21' WHERE position_code = 'DOCK21'`,
|
||
// 日排产各工位产量分配
|
||
`ALTER TABLE daily_plan ADD COLUMN IF NOT EXISTS station_plan_qty jsonb NOT NULL DEFAULT '{}'::jsonb`,
|
||
|
||
// ---- 物料档案 product_type 本地表清理(2026-09-21 方案 A:纯 WMS 代理,删除本地双写/缓存表)----
|
||
// ent 已移除 product_type 实体,Schema.Create 不再建此表;此处清理存量库遗留表。
|
||
`DROP TABLE IF EXISTS product_type`,
|
||
|
||
// ---- 附件统一存储方案(2026-09-19):年/月/日/文件类型/uuid.ext ----
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS file_type varchar(32) NOT NULL DEFAULT 'OTHER'`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS file_ext varchar(16) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS file_md5 varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS mime_type varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS deleted boolean NOT NULL DEFAULT false`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS deleted_at bigint NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS deleted_by varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS deleted_reason varchar(255) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS purged_at bigint NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE attachment ADD COLUMN IF NOT EXISTS purged_by varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 接驳台主数据迁入 MES(2026-09-21,真源自 WMS 移入)----
|
||
// 一个工位可绑多个接驳台(工位1~10 各左L/右R 两个,命名与 AGV 编号无关);库房接驳台 DOCK21 station_no=0 不参与工位映射。
|
||
// 撤销早期 1:1 唯一索引,允许 station_no 重复(索引若已存在则删除,幂等)。
|
||
`DROP INDEX IF EXISTS ux_dock_station_no`,
|
||
|
||
// ---- 生产模型重构(2026-09-22 定稿):删除「工序编号/工位派工」旧模型遗留 ----
|
||
// 路线唯一源头 = 工单工艺组合 flow_combination([{flowId,stationNo}],工位号即顺序号);
|
||
// 装配绑定/备料/齐套全部改走工艺物料清单 flow_material,bom_item/material_request/process_code 退役。
|
||
`DROP TABLE IF EXISTS station_process`,
|
||
// ---- 产品物料清单删除(2026-09-23 定稿):用料唯一来源=工单工艺组合×工艺物料清单,产品物料清单表退役 ----
|
||
`DROP TABLE IF EXISTS bom_item`,
|
||
`DROP TABLE IF EXISTS work_order_bom`,
|
||
`ALTER TABLE workpiece_process DROP COLUMN IF EXISTS process_code`,
|
||
`ALTER TABLE workpiece_bind DROP COLUMN IF EXISTS process_code`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS process_code`,
|
||
`ALTER TABLE workpiece DROP COLUMN IF EXISTS current_process`,
|
||
// 既有库补列(新装库由 ent AutoMigrate 直接建出,此处幂等兜底)
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS flow_combination jsonb`,
|
||
`ALTER TABLE workpiece ADD COLUMN IF NOT EXISTS current_station_no integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE workpiece_process ADD COLUMN IF NOT EXISTS flow_id integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE workpiece_bind ADD COLUMN IF NOT EXISTS flow_id integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS flow_id integer NOT NULL DEFAULT 0`,
|
||
// ---- 步骤签字记录(需求B,2026-10-04):既有库补签字备注列 ----
|
||
`ALTER TABLE step_sign_record ADD COLUMN IF NOT EXISTS remark varchar(256) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 半成品流转新模型(2026-09-22 定稿):进度唯一权威源=workpiece.currentStationNo ----
|
||
// semi_flow 补进度快照列 completed_text("已完成至工位N");旧 done_process_codes 保留历史数据、不再写入
|
||
`ALTER TABLE semi_flow ADD COLUMN IF NOT EXISTS completed_text varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 工位终端可见页签配置(2026-09-23):按工位勾选终端显示哪些页签(jsonb 数组),空=全部显示 ----
|
||
`ALTER TABLE station ADD COLUMN IF NOT EXISTS visible_tabs jsonb`,
|
||
|
||
// ---- 「类型」与「是否逐件SN管理」解耦(2026-09-30):新增 sn_mode,行为唯一依据 ----
|
||
// materials 存量回填:旧 manage_mode(1批次/2序列号)→ sn_mode(2序列号→1序列号=是,其余→2序列号=否),禁止留 0
|
||
`ALTER TABLE materials ADD COLUMN IF NOT EXISTS sn_mode integer NOT NULL DEFAULT 0`,
|
||
`UPDATE materials SET sn_mode = 1 WHERE manage_mode = 2 AND sn_mode = 0`,
|
||
`UPDATE materials SET sn_mode = 2 WHERE manage_mode <> 2 AND sn_mode = 0`,
|
||
// 快照表(flow_material/material_request/workpiece_bind)旧 manage_mode(批次/序列号口径) 改名 sn_mode:
|
||
// 先补列 → 按旧值回填('2'=旧序列号→1序列号=是,否则→2序列号=否)→ 删除旧列(新库由 ent 直接建 sn_mode,无旧列)
|
||
`ALTER TABLE flow_material ADD COLUMN IF NOT EXISTS sn_mode integer NOT NULL DEFAULT 2`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS sn_mode integer NOT NULL DEFAULT 2`,
|
||
`ALTER TABLE workpiece_bind ADD COLUMN IF NOT EXISTS sn_mode integer NOT NULL DEFAULT 2`,
|
||
`DO $$ BEGIN IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'flow_material' AND column_name = 'manage_mode') THEN UPDATE flow_material SET sn_mode = CASE WHEN manage_mode = '2' THEN 1 ELSE 2 END; END IF; END $$;`,
|
||
`DO $$ BEGIN IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'material_request' AND column_name = 'manage_mode') THEN UPDATE material_request SET sn_mode = CASE WHEN manage_mode = '2' THEN 1 ELSE 2 END; END IF; END $$;`,
|
||
`DO $$ BEGIN IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'workpiece_bind' AND column_name = 'manage_mode') THEN UPDATE workpiece_bind SET sn_mode = CASE WHEN manage_mode = '2' THEN 1 ELSE 2 END; END IF; END $$;`,
|
||
`ALTER TABLE flow_material DROP COLUMN IF EXISTS manage_mode`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS manage_mode`,
|
||
`ALTER TABLE workpiece_bind DROP COLUMN IF EXISTS manage_mode`,
|
||
|
||
// ---- 客户编号体系改造(2026-09-30):一级归属=合同号/科技项目号 二选一 → 产品工号 → 产品序号 ----
|
||
// work_order 新增 ownership_type 标记归属类型(与 WMS inventories.ownership_type 同值域:
|
||
// workorder=合同号 / project=科技项目号 / other=其他);contract_no 复用为「归属编号」。
|
||
// 工程编号 project_no 被合同号顶替,字段保留仅防历史数据迁移(UI 不再展示/录入/查询)。
|
||
// 存量回填:contract_no 非空 → 归属类型=合同号(仅补空值,幂等不覆盖人工修改)。
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS ownership_type varchar(20) NOT NULL DEFAULT ''`,
|
||
`UPDATE work_order SET ownership_type = 'workorder' WHERE contract_no <> '' AND ownership_type = ''`,
|
||
|
||
// ---- 签字机制(2026-10-04):工艺步骤配置操作工/检验员签字 + 步骤签字记录表 ----
|
||
`ALTER TABLE process_step ADD COLUMN IF NOT EXISTS need_operator_sign boolean NOT NULL DEFAULT false`,
|
||
`ALTER TABLE process_step ADD COLUMN IF NOT EXISTS need_inspector_sign boolean NOT NULL DEFAULT false`,
|
||
// ---- 拧紧查询下线(2026-10-04):删除审核留痕表与拧紧记录审核列(数据本体与 /torque/report 保留)----
|
||
`DROP TABLE IF EXISTS torque_audit_log`,
|
||
`ALTER TABLE torque_record DROP COLUMN IF EXISTS audit_by`,
|
||
`ALTER TABLE torque_record DROP COLUMN IF EXISTS audit_at`,
|
||
|
||
// ---- 方案 B 补1(2026-10-06):报工/拧紧落库操作人用户ID ----
|
||
// 配合隐患1「离线数据身份快照」:报工实绩/拧紧记录同时携带 姓名+用户ID,杜绝重名追溯歧义。
|
||
// operator_id=0 语义(核实4 文档化):=未采集,来源①PLC/设备直连、MES 前端虚拟工位等无工位
|
||
// 登录态路径;来源②快照机制上线前的历史存量(当时未采集,无法回填)。两类以 created_at 与
|
||
// 调用路径特征区分;operator_id>0 一律为工位登录态可信用户ID(含离线重传按录入人落库)。
|
||
`ALTER TABLE workpiece_process ADD COLUMN IF NOT EXISTS operator_id integer NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE torque_record ADD COLUMN IF NOT EXISTS operator_id integer NOT NULL DEFAULT 0`,
|
||
|
||
// ---- 回滚「自动代传」设计(2026-10-06):删除 delegate_id 列 ----
|
||
// 代传/快照/过期窗口等概念已移除,落库操作人统一为「当前登录态 JWT 解析出的用户ID」(operator_id);
|
||
// 历史库若已存在 delegate_id 列则删除,保持无遗留字段。
|
||
`ALTER TABLE workpiece_process DROP COLUMN IF EXISTS delegate_id`,
|
||
`ALTER TABLE torque_record DROP COLUMN IF EXISTS delegate_id`,
|
||
|
||
// ---- 工艺步骤审核(2026-10-08 定稿):need_audit 开关 + audit_role 审核角色(既有库补列,
|
||
// 上轮经 migrateonce 落库但漏挂本补丁清单,此处补齐防新装库遗漏)----
|
||
`ALTER TABLE process_step ADD COLUMN IF NOT EXISTS need_audit boolean NOT NULL DEFAULT false`,
|
||
`ALTER TABLE process_step ADD COLUMN IF NOT EXISTS audit_role varchar(64) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 产品工艺(2026-10-09 定稿):产品级工艺定义(有序工艺集合,不绑工位)----
|
||
// 两张新表由 ent Schema.Create 建出;此处只补既有表 work_order 的来源列。
|
||
`ALTER TABLE work_order ADD COLUMN IF NOT EXISTS product_process_id integer NOT NULL DEFAULT 0`,
|
||
|
||
// ---- 清理产品工艺遗留列(2026-10-09):is_default 已从 ent schema 移除,删除存量库残留列,不留兼容字段 ----
|
||
`ALTER TABLE product_process DROP COLUMN IF EXISTS is_default`,
|
||
|
||
// ---- B5 叫料池 + 叫料单七态(2026-10-13 定稿):旧「自动算料+自动出库+绑工单」模型退役 ----
|
||
// call_pool 新表(含唯一索引 station_no+material_code 与 station_no 索引)由 ent Schema.Create 直接建出。
|
||
`CREATE TABLE IF NOT EXISTS call_pool (
|
||
id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||
station_no integer NOT NULL,
|
||
material_code varchar(64) NOT NULL,
|
||
material_name varchar(128) NOT NULL DEFAULT '',
|
||
unit varchar(16) NOT NULL DEFAULT '',
|
||
sn_mode integer NOT NULL DEFAULT 2,
|
||
req_qty integer NOT NULL DEFAULT 0,
|
||
adj_qty integer NOT NULL DEFAULT 0,
|
||
sent_qty integer NOT NULL DEFAULT 0,
|
||
reserved_qty integer NOT NULL DEFAULT 0,
|
||
cross_day boolean NOT NULL DEFAULT false,
|
||
plan_dates varchar(255) NOT NULL DEFAULT '',
|
||
created_at timestamp NOT NULL DEFAULT now(),
|
||
updated_at timestamp NOT NULL DEFAULT now()
|
||
)`,
|
||
// 叫料单七态新增列:退库量 / 驳回理由 / 跨日标记 / WMS 出库单号
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS returned_qty double precision NOT NULL DEFAULT 0`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS reject_reason varchar(128) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS cross_day boolean NOT NULL DEFAULT false`,
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS outbound_no varchar(255) NOT NULL DEFAULT ''`,
|
||
// 跨工位借料来源(2026-11-02):记录叫料单实际消耗了哪些工位的叫料池额度(同工序候选工位间借用)
|
||
`ALTER TABLE material_request ADD COLUMN IF NOT EXISTS borrow_from jsonb NOT NULL DEFAULT '{}'::jsonb`,
|
||
`CREATE INDEX IF NOT EXISTS materialrequest_station_no ON material_request (station_no)`,
|
||
// 叫料单不绑工单/不绑排产(B5 定稿):删列及其索引;补发来源由 ref_report_no 承载
|
||
`DROP INDEX IF EXISTS materialrequest_order_no`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS order_no`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS plan_date`,
|
||
// 签收简化为整单确认(B5:系统不再对差异):删部分接料记账列
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS received_qty`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS received_at`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS receive_by`,
|
||
// 禁单内分批(B5 明确不做):删发料批次列
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS batch_no`,
|
||
// 叫料单按 (工位,物料) 池子行发起:删工艺归属列;硬性≤可用上限(无超领):删超领两列
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS flow_id`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS over_qty`,
|
||
`ALTER TABLE material_request DROP COLUMN IF EXISTS over_reason`,
|
||
// 存量状态映射(一次性,幂等):旧四态 → 新七态
|
||
// PENDING 待备料 → PENDING;LOCKED 已备料已出库 / DELIVERING 配送中 → SHIPPED 已发货;DONE 已接料完结 → DONE 已完成
|
||
`UPDATE material_request SET status = 'SHIPPED' WHERE status IN ('LOCKED', 'DELIVERING')`,
|
||
// 存量来源映射:PLAN(自动排产备料)→ CALL;REFILL(数量不符补发)保持不变
|
||
`UPDATE material_request SET source = 'CALL' WHERE source = 'PLAN'`,
|
||
|
||
// ---- 删除「是否拧紧」is_torque(2026-10-19 用户拍板):与 collectType=AUTO 语义完全重复 ----
|
||
// 扭矩判定统一改按 collect_type='AUTO'(logic/torque.go:torqueRangeCriteria);ent schema 已移除该字段,
|
||
// 新库不再建列,此处清理存量库残留列,不留兼容字段。
|
||
`ALTER TABLE process_step DROP COLUMN IF EXISTS is_torque`,
|
||
// ---- 注释同步(2026-10-19):ent schema 文案变更落到存量库列注释(Atlas diff 不改注释,须显式 COMMENT ON)----
|
||
`COMMENT ON COLUMN process_step.collect_type IS '采集方式 AUTO(拧紧枪自动)/MANUAL(手填)/SCAN(扫码,与手填等价采一串字符串)/NONE(仅记录)'`,
|
||
`COMMENT ON COLUMN materials.item_type IS '物料类别 1原材料/3成品(半成品不是物料类别,「其他」已移除)'`,
|
||
`COMMENT ON COLUMN materials.sn_mode IS '是否逐件SN管理 0未选择(必填)/1序列号=是(录SN)/2序列号=否(不录SN)'`,
|
||
// 备份记录:强制清理留痕(姓名/手机号),带默认值;存量表补全
|
||
`ALTER TABLE backup_record ADD COLUMN IF NOT EXISTS ack_name varchar(64) NOT NULL DEFAULT ''`,
|
||
`ALTER TABLE backup_record ADD COLUMN IF NOT EXISTS ack_phone varchar(32) NOT NULL DEFAULT ''`,
|
||
|
||
// ---- 角色表新增更新时间(2026-10-30 执行包 Rule 7):既有库补列,新库由 ent 直接建 ----
|
||
`ALTER TABLE role ADD COLUMN IF NOT EXISTS updated_at timestamp NOT NULL DEFAULT now()`,
|
||
// 存量回填:该列可能在更早的迁移中以「可空、无默认值」形式已存在(ADD COLUMN IF NOT EXISTS 因而跳过),
|
||
// 种子角色(SUPER_ADMIN/OPERATOR/INSPECTOR)创建早于该列,updated_at 为 NULL;
|
||
// 对在老旧环境下仍为空的数据回填为其 created_at,保证「更新时间」列对存量角色也非空(幂等,不覆盖已填值)。
|
||
`UPDATE "role" SET updated_at = created_at WHERE updated_at IS NULL`,
|
||
|
||
// ---- 2026-11-04 AGV 载货状态台账 agv_vehicle_state(防撞校验补做)----
|
||
// 说明:新表本应由 ent Schema.Create 建出;与 agv_point 同因——若「改 schema 后只重启 serve(不跑 migrate)」
|
||
// 就会漏建,报 SQLSTATE 42P01。此处显式 CREATE TABLE IF NOT EXISTS 幂等兜底(已存在则跳过)。
|
||
`CREATE TABLE IF NOT EXISTS agv_vehicle_state (
|
||
id bigint GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,
|
||
agv_code varchar(32) NOT NULL,
|
||
has_pallet boolean NOT NULL DEFAULT false,
|
||
source varchar(20) NOT NULL DEFAULT 'MANUAL',
|
||
updated_by varchar(64) NOT NULL DEFAULT '',
|
||
updated_at bigint NOT NULL DEFAULT 0,
|
||
remark varchar(200) NOT NULL DEFAULT ''
|
||
)`,
|
||
`CREATE UNIQUE INDEX IF NOT EXISTS agvvehiclestate_agv_code_key ON agv_vehicle_state (agv_code)`,
|
||
}
|
||
|
||
// EnsureSchema ent 建表 + 幂等列补丁(只增,不删数据)
|
||
func EnsureSchema(client *ent.Client, sqlDB *sql.DB) error {
|
||
if err := client.Schema.Create(context.Background()); err != nil {
|
||
return err
|
||
}
|
||
for _, q := range schemaPatchSQL {
|
||
if _, err := sqlDB.Exec(q); err != nil {
|
||
return fmt.Errorf("schema patch failed: %v", err)
|
||
}
|
||
}
|
||
return nil
|
||
}
|
||
|
||
// AutoMigrate 执行 ent 自动建表/补齐(只增,不删数据)。供命令行 migrate 使用。
|
||
|
||
func AutoMigrate(c DatabaseConf) error {
|
||
client, sqlDB := MustNewDB(c)
|
||
defer sqlDB.Close()
|
||
return EnsureSchema(client, sqlDB)
|
||
}
|
||
|
||
// DropAllTables 清空 public schema 下所有业务表(破坏性,仅供命令行 reset-all 使用)。
|
||
func DropAllTables(c DatabaseConf) error {
|
||
sqlDB, err := NewDB(c)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
defer sqlDB.Close()
|
||
|
||
rows, err := sqlDB.Query(`SELECT tablename FROM pg_tables WHERE schemaname='public'`)
|
||
if err != nil {
|
||
return err
|
||
}
|
||
var names []string
|
||
for rows.Next() {
|
||
var t string
|
||
if err := rows.Scan(&t); err != nil {
|
||
rows.Close()
|
||
return err
|
||
}
|
||
names = append(names, t)
|
||
}
|
||
rows.Close()
|
||
|
||
for _, t := range names {
|
||
if _, err := sqlDB.Exec(`DROP TABLE IF EXISTS "` + t + `" CASCADE`); err != nil {
|
||
return err
|
||
}
|
||
}
|
||
return nil
|
||
}
|