|
@@ -69,6 +69,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
"""
|
|
"""
|
|
|
CREATE TABLE IF NOT EXISTS qms_gcjyd (
|
|
CREATE TABLE IF NOT EXISTS qms_gcjyd (
|
|
|
id BIGINT NOT NULL PRIMARY KEY COMMENT '主表id',
|
|
id BIGINT NOT NULL PRIMARY KEY COMMENT '主表id',
|
|
|
|
|
+ tenant_id BIGINT NULL COMMENT '租户id(DOP 多租户隔离列,上游抽数携带;为空回退0)',
|
|
|
djbh VARCHAR(255) NULL COMMENT '单据编号',
|
|
djbh VARCHAR(255) NULL COMMENT '单据编号',
|
|
|
cplx VARCHAR(255) NULL COMMENT '产品型号',
|
|
cplx VARCHAR(255) NULL COMMENT '产品型号',
|
|
|
scph VARCHAR(255) NULL COMMENT '生产批号',
|
|
scph VARCHAR(255) NULL COMMENT '生产批号',
|
|
@@ -162,6 +163,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
"""
|
|
"""
|
|
|
CREATE TABLE IF NOT EXISTS qms_gcjydzb (
|
|
CREATE TABLE IF NOT EXISTS qms_gcjydzb (
|
|
|
id BIGINT NOT NULL PRIMARY KEY COMMENT '子表id',
|
|
id BIGINT NOT NULL PRIMARY KEY COMMENT '子表id',
|
|
|
|
|
+ tenant_id BIGINT NULL COMMENT '租户id(DOP 多租户隔离列,上游抽数携带;为空回退0)',
|
|
|
glid BIGINT NULL COMMENT '关联id',
|
|
glid BIGINT NULL COMMENT '关联id',
|
|
|
dwsj TEXT NULL, jyxm TEXT NULL, jybz TEXT NULL, jyyj TEXT NULL,
|
|
dwsj TEXT NULL, jyxm TEXT NULL, jybz TEXT NULL, jyyj TEXT NULL,
|
|
|
j1 TEXT NULL, j2 TEXT NULL, j3 TEXT NULL, j4 TEXT NULL, j5 TEXT NULL,
|
|
j1 TEXT NULL, j2 TEXT NULL, j3 TEXT NULL, j4 TEXT NULL, j5 TEXT NULL,
|
|
@@ -258,7 +260,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
INSERT INTO mdp_stg_ipqc_inspection
|
|
INSERT INTO mdp_stg_ipqc_inspection
|
|
|
(tenant_id, factory_id, source_system, source_table, source_row_id, source_biz_key, sync_batch_id, sync_time, process_status, raw_data)
|
|
(tenant_id, factory_id, source_system, source_table, source_row_id, source_biz_key, sync_batch_id, sync_time, process_status, raw_data)
|
|
|
SELECT
|
|
SELECT
|
|
|
- 0, 1, 'AIDOP', 'qms_gcjyd',
|
|
|
|
|
|
|
+ IFNULL(m.tenant_id, 0), 1, 'AIDOP', 'qms_gcjyd',
|
|
|
CAST(m.id AS CHAR), CAST(m.djbh AS CHAR), @BatchId, @Now, 'PENDING',
|
|
CAST(m.id AS CHAR), CAST(m.djbh AS CHAR), @BatchId, @Now, 'PENDING',
|
|
|
JSON_OBJECT(
|
|
JSON_OBJECT(
|
|
|
'id', m.id, 'djbh', m.djbh, 'cplx', m.cplx, 'scph', m.scph, 'lydjbh', m.lydjbh,
|
|
'id', m.id, 'djbh', m.djbh, 'cplx', m.cplx, 'scph', m.scph, 'lydjbh', m.lydjbh,
|
|
@@ -290,7 +292,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
inspec_standard_version, inspec_standard_code, inspection_status,
|
|
inspec_standard_version, inspec_standard_code, inspection_status,
|
|
|
source_row_id, source_biz_key, sync_batch_id, sync_time)
|
|
source_row_id, source_biz_key, sync_batch_id, sync_time)
|
|
|
SELECT
|
|
SELECT
|
|
|
- 0, 1, 'AIDOP', IFNULL(m.djbh, CAST(m.id AS CHAR)), m.cplx, m.scph, m.lydjbh,
|
|
|
|
|
|
|
+ IFNULL(m.tenant_id, 0), 1, 'AIDOP', IFNULL(m.djbh, CAST(m.id AS CHAR)), m.cplx, m.scph, m.lydjbh,
|
|
|
CAST(m.jgpd AS CHAR), CAST(m.fj AS CHAR), CAST(m.bz AS CHAR), m.jyr, m.gxbm, m.gxmc, m.sczyry,
|
|
CAST(m.jgpd AS CHAR), CAST(m.fj AS CHAR), CAST(m.bz AS CHAR), m.jyr, m.gxbm, m.gxmc, m.sczyry,
|
|
|
m.ybl, m.bdbh, m.bbh, m.sxrq, m.wlbm, m.wlmc,
|
|
m.ybl, m.bdbh, m.bbh, m.sxrq, m.wlbm, m.wlmc,
|
|
|
m.jgbb, m.jgbh, m.status,
|
|
m.jgbb, m.jgbh, m.status,
|
|
@@ -321,7 +323,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
INSERT INTO mdp_stg_ipqc_inspection_detail
|
|
INSERT INTO mdp_stg_ipqc_inspection_detail
|
|
|
(tenant_id, factory_id, source_system, source_table, source_row_id, source_biz_key, sync_batch_id, sync_time, process_status, raw_data)
|
|
(tenant_id, factory_id, source_system, source_table, source_row_id, source_biz_key, sync_batch_id, sync_time, process_status, raw_data)
|
|
|
SELECT
|
|
SELECT
|
|
|
- 0, 1, 'AIDOP', 'qms_gcjydzb',
|
|
|
|
|
|
|
+ IFNULL(d.tenant_id, 0), 1, 'AIDOP', 'qms_gcjydzb',
|
|
|
CAST(d.id AS CHAR), CAST(d.glid AS CHAR), @BatchId, @Now, 'PENDING',
|
|
CAST(d.id AS CHAR), CAST(d.glid AS CHAR), @BatchId, @Now, 'PENDING',
|
|
|
JSON_OBJECT(
|
|
JSON_OBJECT(
|
|
|
'id', d.id, 'glid', d.glid, 'jyxm', CAST(d.jyxm AS CHAR), 'jyyj', CAST(d.jyyj AS CHAR),
|
|
'id', d.id, 'glid', d.glid, 'jyxm', CAST(d.jyxm AS CHAR), 'jyyj', CAST(d.jyyj AS CHAR),
|
|
@@ -354,14 +356,14 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
sample_qty, inspection_qty, unqualified_qty, result_judgement, non_numeric_ok, non_numeric_ng, remark, attachment,
|
|
sample_qty, inspection_qty, unqualified_qty, result_judgement, non_numeric_ok, non_numeric_ng, remark, attachment,
|
|
|
source_row_id, source_biz_key, sync_batch_id, sync_time)
|
|
source_row_id, source_biz_key, sync_batch_id, sync_time)
|
|
|
SELECT
|
|
SELECT
|
|
|
- 0, h.id, CAST(d.glid AS CHAR), CAST(d.jyxm AS CHAR), CAST(d.jyyj AS CHAR), CAST(d.jsbz AS CHAR), CAST(d.jyff AS CHAR),
|
|
|
|
|
|
|
+ IFNULL(h.tenant_id, IFNULL(d.tenant_id, 0)), h.id, CAST(d.glid AS CHAR), CAST(d.jyxm AS CHAR), CAST(d.jyyj AS CHAR), CAST(d.jsbz AS CHAR), CAST(d.jyff AS CHAR),
|
|
|
CAST(d.sx AS CHAR), CAST(d.xx AS CHAR), CAST(d.ProcessCode AS CHAR), CAST(d.ProcessName AS CHAR),
|
|
CAST(d.sx AS CHAR), CAST(d.xx AS CHAR), CAST(d.ProcessCode AS CHAR), CAST(d.ProcessName AS CHAR),
|
|
|
CAST(d.MeasurementInstrument AS CHAR), CAST(d.Inspector AS CHAR), d.InspectionTime,
|
|
CAST(d.MeasurementInstrument AS CHAR), CAST(d.Inspector AS CHAR), d.InspectionTime,
|
|
|
d.ybl, d.jysl, d.bhgsl, CAST(d.pd AS CHAR), d.NonNumericalTypeOK, d.NonNumericalTypeNG,
|
|
d.ybl, d.jysl, d.bhgsl, CAST(d.pd AS CHAR), d.NonNumericalTypeOK, d.NonNumericalTypeNG,
|
|
|
CAST(d.bz AS CHAR), CAST(d.fj AS CHAR),
|
|
CAST(d.bz AS CHAR), CAST(d.fj AS CHAR),
|
|
|
CAST(d.id AS CHAR), CAST(d.glid AS CHAR), @BatchId, @Now
|
|
CAST(d.id AS CHAR), CAST(d.glid AS CHAR), @BatchId, @Now
|
|
|
FROM qms_gcjydzb d
|
|
FROM qms_gcjydzb d
|
|
|
- LEFT JOIN mdp_std_ipqc_inspection h ON h.tenant_id = 0 AND h.source_row_id = CAST(d.glid AS CHAR)
|
|
|
|
|
|
|
+ LEFT JOIN mdp_std_ipqc_inspection h ON h.source_row_id = CAST(d.glid AS CHAR)
|
|
|
ON DUPLICATE KEY UPDATE
|
|
ON DUPLICATE KEY UPDATE
|
|
|
std_head_id=VALUES(std_head_id), source_head_id=VALUES(source_head_id), inspection_item=VALUES(inspection_item),
|
|
std_head_id=VALUES(std_head_id), source_head_id=VALUES(source_head_id), inspection_item=VALUES(inspection_item),
|
|
|
inspection_basis=VALUES(inspection_basis), technical_standard=VALUES(technical_standard), inspection_method=VALUES(inspection_method),
|
|
inspection_basis=VALUES(inspection_basis), technical_standard=VALUES(technical_standard), inspection_method=VALUES(inspection_method),
|
|
@@ -383,6 +385,7 @@ public class IpqcInspectionMdpSyncService : ITransient
|
|
|
"""
|
|
"""
|
|
|
INSERT INTO mdp_transform_run_log
|
|
INSERT INTO mdp_transform_run_log
|
|
|
(tenant_id, job_code, job_name, trigger_type, batch_id, status, start_time)
|
|
(tenant_id, job_code, job_name, trigger_type, batch_id, status, start_time)
|
|
|
|
|
+ -- tenant_id 固定 0:run_log 为跨租户运维元数据(一次全量刷新覆盖所有租户),非业务数据、不参与业务层租户过滤。
|
|
|
VALUES (0, @JobCode, 'S6过程检验单MDP同步与标准化转换', @TriggerType, @BatchId, 'RUNNING', @StartTime)
|
|
VALUES (0, @JobCode, 'S6过程检验单MDP同步与标准化转换', @TriggerType, @BatchId, 'RUNNING', @StartTime)
|
|
|
""",
|
|
""",
|
|
|
new SugarParameter("@JobCode", JobCode),
|
|
new SugarParameter("@JobCode", JobCode),
|