|
|
@@ -0,0 +1,290 @@
|
|
|
+namespace Admin.NET.Plugin.AiDOP.MaterialWarehouse;
|
|
|
+
|
|
|
+/// <summary>
|
|
|
+/// S5 生产退料单 数据中台只读同步转换服务（DOP 内部，head-detail 双表，独立于 S5MdpSyncTransformService 的 KPI 管线）。
|
|
|
+///
|
|
|
+/// 源：aidopdev NbrMaster(m) + NbrDetail(dt)，业务类型 Type='WOD'；头明细关联 dt.NbrRecID -> m.RecID。
|
|
|
+/// 维表 DepartmentMaster(d) / ItemMaster(i) / LocationMaster(lf,lt) 全 LEFT JOIN（LocationMaster 列名小写 location/descr）。
|
|
|
+/// 链路：NbrMaster/NbrDetail(WOD) 只读 → mdp_std_production_return(_detail)(typed)。
|
|
|
+/// 不经 stg、不建 dwd（只读列表/详情）；WOD=退料单业务类型有 S2 WorkOrderSchedulingService 代码实证。
|
|
|
+///
|
|
|
+/// 约束：
|
|
|
+/// - 只读源表，仅写 mdp_std_production_return(_detail)；绝不 INSERT/UPDATE/DELETE NbrMaster/NbrDetail；不碰 S2 写路径。
|
|
|
+/// - 头过滤 m.Type='WOD' AND m.IsActive=1 AND m.IsReturn=0；明细 dt.Type='WOD' 且经 NbrRecID join WOD 头。
|
|
|
+/// - status_desc 规则本批仅：Status='C' -> '关闭'，其他 -> 原值（UPPER）。
|
|
|
+/// - 退料人 return_user 本批取 m.User1（列表 SQL 口径）；user1/user2 原样落库，页面策略后置微调。
|
|
|
+/// - trans_type_text 恒空（旧系统口径）；不做 danjia/jiage/库存事务/状态流转。
|
|
|
+/// - WOD 为 0 行时转换成功完成、处理数为 0，不报错。
|
|
|
+/// </summary>
|
|
|
+public class ProductionReturnMdpSyncService : ITransient
|
|
|
+{
|
|
|
+ private const string JobCode = "S5_PRODUCTION_RETURN_MDP_SYNC";
|
|
|
+
|
|
|
+ private readonly ISqlSugarClient _db;
|
|
|
+
|
|
|
+ public ProductionReturnMdpSyncService(ISqlSugarClient db)
|
|
|
+ {
|
|
|
+ _db = db;
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>全量同步转换：源(WOD 头/明细) → 标准层(头/明细)。</summary>
|
|
|
+ public async Task<ProductionReturnMdpSyncResult> RunFullAsync(CancellationToken cancellationToken = default, string triggerType = "AUTO")
|
|
|
+ {
|
|
|
+ cancellationToken.ThrowIfCancellationRequested();
|
|
|
+ await EnsureTablesAsync();
|
|
|
+
|
|
|
+ var now = DateTime.Now;
|
|
|
+ var batchId = $"S5_PROD_RTN_FULL_{now:yyyyMMddHHmmss}";
|
|
|
+ var runLogId = await InsertRunLogAsync(batchId, now, triggerType);
|
|
|
+ var result = new ProductionReturnMdpSyncResult { BatchId = batchId, RunLogId = runLogId };
|
|
|
+
|
|
|
+ try
|
|
|
+ {
|
|
|
+ result.HeadRows = await TransformHeadStandardAsync(batchId, now);
|
|
|
+ result.DetailRows = await TransformDetailStandardAsync(batchId, now);
|
|
|
+ await MarkRunSuccessAsync(runLogId, now, result);
|
|
|
+ return result;
|
|
|
+ }
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ await MarkRunFailedAsync(runLogId, now, ex.Message);
|
|
|
+ throw;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>防御式建表（与 UpdateScripts/1.0.213.sql 同构，幂等）。</summary>
|
|
|
+ private async Task EnsureTablesAsync()
|
|
|
+ {
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ CREATE TABLE IF NOT EXISTS mdp_std_production_return (
|
|
|
+ id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
|
|
+ tenant_id BIGINT NOT NULL DEFAULT 0,
|
|
|
+ factory_id BIGINT NULL DEFAULT 1,
|
|
|
+ source_system VARCHAR(50) NOT NULL DEFAULT 'AIDOP',
|
|
|
+ domain VARCHAR(80) NOT NULL,
|
|
|
+ rec_id INT NOT NULL,
|
|
|
+ nbr VARCHAR(24) NULL,
|
|
|
+ return_date DATETIME NULL,
|
|
|
+ status VARCHAR(8) NULL,
|
|
|
+ status_desc VARCHAR(20) NULL,
|
|
|
+ work_ord VARCHAR(64) NULL,
|
|
|
+ department VARCHAR(8) NULL,
|
|
|
+ department_desc VARCHAR(255) NULL,
|
|
|
+ qty_ord DECIMAL(18,5) NULL DEFAULT 0,
|
|
|
+ prod_line VARCHAR(8) NULL,
|
|
|
+ applicant_name VARCHAR(12) NULL,
|
|
|
+ return_user VARCHAR(255) NULL,
|
|
|
+ user1 TEXT NULL,
|
|
|
+ user2 TEXT NULL,
|
|
|
+ remark VARCHAR(200) NULL,
|
|
|
+ create_user VARCHAR(24) NULL,
|
|
|
+ source_create_time DATETIME NULL,
|
|
|
+ trans_type VARCHAR(24) NULL,
|
|
|
+ trans_type_text VARCHAR(50) NULL,
|
|
|
+ eff_date DATETIME NULL,
|
|
|
+ ufld1 VARCHAR(50) NULL,
|
|
|
+ source_biz_key VARCHAR(200) NULL,
|
|
|
+ sync_batch_id VARCHAR(100) NOT NULL,
|
|
|
+ sync_time DATETIME NOT NULL,
|
|
|
+ create_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
|
+ update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
|
+ UNIQUE KEY uk_mdp_std_prod_rtn (tenant_id, domain, rec_id),
|
|
|
+ KEY idx_mdp_std_prod_rtn_nbr (tenant_id, nbr),
|
|
|
+ KEY idx_mdp_std_prod_rtn_date (tenant_id, return_date),
|
|
|
+ KEY idx_mdp_std_prod_rtn_status (tenant_id, status),
|
|
|
+ KEY idx_mdp_std_prod_rtn_workord (tenant_id, work_ord),
|
|
|
+ KEY idx_mdp_std_prod_rtn_prodline (tenant_id, prod_line),
|
|
|
+ KEY idx_mdp_std_prod_rtn_dept (tenant_id, department)
|
|
|
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='S5生产退料单头标准层'
|
|
|
+ """);
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ CREATE TABLE IF NOT EXISTS mdp_std_production_return_detail (
|
|
|
+ id BIGINT AUTO_INCREMENT PRIMARY KEY,
|
|
|
+ tenant_id BIGINT NOT NULL DEFAULT 0,
|
|
|
+ std_head_id BIGINT NULL,
|
|
|
+ domain VARCHAR(80) NOT NULL,
|
|
|
+ nbr_rec_id INT NOT NULL,
|
|
|
+ rec_id INT NULL,
|
|
|
+ line SMALLINT NOT NULL DEFAULT 0,
|
|
|
+ item_num VARCHAR(24) NULL,
|
|
|
+ item_name VARCHAR(200) NULL,
|
|
|
+ item_spec VARCHAR(200) NULL,
|
|
|
+ um VARCHAR(8) NULL,
|
|
|
+ qty_to DECIMAL(18,5) NULL DEFAULT 0,
|
|
|
+ qty_rec DECIMAL(18,5) NULL DEFAULT 0,
|
|
|
+ location_from VARCHAR(8) NULL,
|
|
|
+ location_from_desc VARCHAR(255) NULL,
|
|
|
+ location_to VARCHAR(8) NULL,
|
|
|
+ location_to_desc VARCHAR(255) NULL,
|
|
|
+ lot_serial VARCHAR(120) NULL,
|
|
|
+ status VARCHAR(8) NULL,
|
|
|
+ status_desc VARCHAR(20) NULL,
|
|
|
+ remark VARCHAR(500) NULL,
|
|
|
+ work_ord VARCHAR(64) NULL,
|
|
|
+ source_biz_key VARCHAR(200) NULL,
|
|
|
+ sync_batch_id VARCHAR(100) NOT NULL,
|
|
|
+ sync_time DATETIME NOT NULL,
|
|
|
+ create_time DATETIME DEFAULT CURRENT_TIMESTAMP,
|
|
|
+ update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
|
|
|
+ UNIQUE KEY uk_mdp_std_prod_rtn_dtl (tenant_id, domain, nbr_rec_id, line),
|
|
|
+ KEY idx_mdp_std_prod_rtn_dtl_head (tenant_id, std_head_id),
|
|
|
+ KEY idx_mdp_std_prod_rtn_dtl_item (tenant_id, item_num),
|
|
|
+ KEY idx_mdp_std_prod_rtn_dtl_locto (tenant_id, location_to),
|
|
|
+ KEY idx_mdp_std_prod_rtn_dtl_lot (tenant_id, lot_serial)
|
|
|
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='S5生产退料单明细标准层'
|
|
|
+ """);
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 标准化头：NbrMaster(WOD) + DepartmentMaster -> mdp_std_production_return。返回处理头行数。
|
|
|
+ /// SQL 由旧系统头 SQL 翻译（SQL Server -> MySQL）：IsNull->IFNULL、upper() 保留、
|
|
|
+ /// rtrim(a+' '+b)->TRIM(CONCAT(...))、with(nolock) 去除。
|
|
|
+ /// </summary>
|
|
|
+ private async Task<int> TransformHeadStandardAsync(string batchId, DateTime now)
|
|
|
+ {
|
|
|
+ var rows = await _db.Ado.GetIntAsync(
|
|
|
+ "SELECT COUNT(1) FROM NbrMaster m WHERE m.Type='WOD' AND m.IsActive=1 AND m.IsReturn=0");
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ INSERT INTO mdp_std_production_return
|
|
|
+ (tenant_id, factory_id, source_system, domain, rec_id, nbr, return_date, status, status_desc,
|
|
|
+ work_ord, department, department_desc, qty_ord, prod_line, applicant_name, return_user,
|
|
|
+ user1, user2, remark, create_user, source_create_time, trans_type, trans_type_text,
|
|
|
+ eff_date, ufld1, source_biz_key, sync_batch_id, sync_time)
|
|
|
+ SELECT
|
|
|
+ IFNULL(m.tenant_id, 0), 1, 'AIDOP', m.Domain, m.RecID, m.Nbr, m.Date,
|
|
|
+ UPPER(IFNULL(m.Status, '')),
|
|
|
+ CASE WHEN UPPER(IFNULL(m.Status,''))='C' THEN '关闭' ELSE UPPER(IFNULL(m.Status,'')) END,
|
|
|
+ m.WorkOrd, m.Department, TRIM(CONCAT(m.Department, ' ', IFNULL(d.Descr, ''))),
|
|
|
+ m.QtyOrd, m.ProdLine, m.Name, CAST(m.User1 AS CHAR),
|
|
|
+ CAST(m.User1 AS CHAR), CAST(m.User2 AS CHAR), m.Remark, m.CreateUser, m.CreateTime,
|
|
|
+ m.TransType, '', m.EffDate, m.Ufld1,
|
|
|
+ CONCAT(m.Domain, ':', m.RecID), @BatchId, @Now
|
|
|
+ FROM NbrMaster m
|
|
|
+ LEFT JOIN DepartmentMaster d ON d.Domain = m.Domain AND d.Department = m.Department
|
|
|
+ WHERE m.Type='WOD' AND m.IsActive=1 AND m.IsReturn=0
|
|
|
+ ON DUPLICATE KEY UPDATE
|
|
|
+ factory_id=VALUES(factory_id), nbr=VALUES(nbr), return_date=VALUES(return_date),
|
|
|
+ status=VALUES(status), status_desc=VALUES(status_desc), work_ord=VALUES(work_ord),
|
|
|
+ department=VALUES(department), department_desc=VALUES(department_desc), qty_ord=VALUES(qty_ord),
|
|
|
+ prod_line=VALUES(prod_line), applicant_name=VALUES(applicant_name), return_user=VALUES(return_user),
|
|
|
+ user1=VALUES(user1), user2=VALUES(user2), remark=VALUES(remark), create_user=VALUES(create_user),
|
|
|
+ source_create_time=VALUES(source_create_time), trans_type=VALUES(trans_type),
|
|
|
+ trans_type_text=VALUES(trans_type_text), eff_date=VALUES(eff_date), ufld1=VALUES(ufld1),
|
|
|
+ sync_batch_id=VALUES(sync_batch_id), sync_time=VALUES(sync_time), update_time=CURRENT_TIMESTAMP
|
|
|
+ """,
|
|
|
+ new SugarParameter("@BatchId", batchId),
|
|
|
+ new SugarParameter("@Now", now));
|
|
|
+ return rows;
|
|
|
+ }
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 标准化明细：NbrDetail(WOD) + ItemMaster + LocationMaster -> mdp_std_production_return_detail（回填 std_head_id）。
|
|
|
+ /// 返回处理明细行数。LocationMaster 列名小写 location/descr，分别 join LocationFrom/LocationTo。
|
|
|
+ /// </summary>
|
|
|
+ private async Task<int> TransformDetailStandardAsync(string batchId, DateTime now)
|
|
|
+ {
|
|
|
+ var rows = await _db.Ado.GetIntAsync(
|
|
|
+ """
|
|
|
+ SELECT COUNT(1) FROM NbrDetail dt
|
|
|
+ JOIN NbrMaster m ON m.RecID = dt.NbrRecID AND m.Type='WOD' AND m.IsActive=1 AND m.IsReturn=0
|
|
|
+ WHERE dt.Type='WOD'
|
|
|
+ """);
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ INSERT INTO mdp_std_production_return_detail
|
|
|
+ (tenant_id, std_head_id, domain, nbr_rec_id, rec_id, line, item_num, item_name, item_spec, um,
|
|
|
+ qty_to, qty_rec, location_from, location_from_desc, location_to, location_to_desc,
|
|
|
+ lot_serial, status, status_desc, remark, work_ord, source_biz_key, sync_batch_id, sync_time)
|
|
|
+ SELECT
|
|
|
+ IFNULL(dt.tenant_id, 0), h.id, m.Domain, dt.NbrRecID, dt.RecID, dt.Line,
|
|
|
+ dt.ItemNum, i.Descr, i.Descr1, dt.UM,
|
|
|
+ dt.QtyTo, dt.QtyRec, dt.LocationFrom, lf.descr, dt.LocationTo, lt.descr,
|
|
|
+ CAST(dt.LotSerial AS CHAR), UPPER(IFNULL(dt.Status, '')),
|
|
|
+ CASE WHEN UPPER(IFNULL(dt.Status,''))='C' THEN '关闭' ELSE UPPER(IFNULL(dt.Status,'')) END,
|
|
|
+ CAST(dt.Remark AS CHAR), dt.WorkOrd,
|
|
|
+ CONCAT(m.Domain, ':', dt.NbrRecID, ':', dt.Line), @BatchId, @Now
|
|
|
+ FROM NbrDetail dt
|
|
|
+ JOIN NbrMaster m ON m.RecID = dt.NbrRecID AND m.Type='WOD' AND m.IsActive=1 AND m.IsReturn=0
|
|
|
+ LEFT JOIN ItemMaster i ON i.Domain = dt.Domain AND i.ItemNum = dt.ItemNum
|
|
|
+ LEFT JOIN LocationMaster lf ON lf.tenant_id = IFNULL(dt.tenant_id, 0) AND lf.location = dt.LocationFrom
|
|
|
+ LEFT JOIN LocationMaster lt ON lt.tenant_id = IFNULL(dt.tenant_id, 0) AND lt.location = dt.LocationTo
|
|
|
+ LEFT JOIN mdp_std_production_return h ON h.tenant_id = IFNULL(dt.tenant_id, 0) AND h.domain = m.Domain AND h.rec_id = dt.NbrRecID
|
|
|
+ WHERE dt.Type='WOD'
|
|
|
+ ON DUPLICATE KEY UPDATE
|
|
|
+ std_head_id=VALUES(std_head_id), rec_id=VALUES(rec_id), item_num=VALUES(item_num),
|
|
|
+ item_name=VALUES(item_name), item_spec=VALUES(item_spec), um=VALUES(um),
|
|
|
+ qty_to=VALUES(qty_to), qty_rec=VALUES(qty_rec), location_from=VALUES(location_from),
|
|
|
+ location_from_desc=VALUES(location_from_desc), location_to=VALUES(location_to),
|
|
|
+ location_to_desc=VALUES(location_to_desc), lot_serial=VALUES(lot_serial),
|
|
|
+ status=VALUES(status), status_desc=VALUES(status_desc), remark=VALUES(remark), work_ord=VALUES(work_ord),
|
|
|
+ sync_batch_id=VALUES(sync_batch_id), sync_time=VALUES(sync_time), update_time=CURRENT_TIMESTAMP
|
|
|
+ """,
|
|
|
+ new SugarParameter("@BatchId", batchId),
|
|
|
+ new SugarParameter("@Now", now));
|
|
|
+ return rows;
|
|
|
+ }
|
|
|
+
|
|
|
+ private async Task<long> InsertRunLogAsync(string batchId, DateTime startedAt, string triggerType)
|
|
|
+ {
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ INSERT INTO mdp_transform_run_log
|
|
|
+ (tenant_id, job_code, job_name, trigger_type, batch_id, status, start_time)
|
|
|
+ VALUES (0, @JobCode, 'S5生产退料单MDP同步与标准化转换', @TriggerType, @BatchId, 'RUNNING', @StartTime)
|
|
|
+ """,
|
|
|
+ new SugarParameter("@JobCode", JobCode),
|
|
|
+ new SugarParameter("@TriggerType", NormalizeTriggerType(triggerType)),
|
|
|
+ new SugarParameter("@BatchId", batchId),
|
|
|
+ new SugarParameter("@StartTime", startedAt));
|
|
|
+ return await _db.Ado.GetLongAsync(
|
|
|
+ "SELECT id FROM mdp_transform_run_log WHERE batch_id=@BatchId ORDER BY id DESC LIMIT 1",
|
|
|
+ new List<SugarParameter> { new("@BatchId", batchId) });
|
|
|
+ }
|
|
|
+
|
|
|
+ private async Task MarkRunSuccessAsync(long runLogId, DateTime startedAt, ProductionReturnMdpSyncResult result)
|
|
|
+ {
|
|
|
+ var finishedAt = DateTime.Now;
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ UPDATE mdp_transform_run_log
|
|
|
+ SET status='SUCCESS', end_time=@EndTime, duration_ms=@DurationMs,
|
|
|
+ stage_rows=0, standard_rows=@StandardRows, dwd_rows=0, update_time=CURRENT_TIMESTAMP
|
|
|
+ WHERE id=@Id
|
|
|
+ """,
|
|
|
+ new SugarParameter("@EndTime", finishedAt),
|
|
|
+ new SugarParameter("@DurationMs", (int)(finishedAt - startedAt).TotalMilliseconds),
|
|
|
+ new SugarParameter("@StandardRows", result.HeadRows + result.DetailRows),
|
|
|
+ new SugarParameter("@Id", runLogId));
|
|
|
+ }
|
|
|
+
|
|
|
+ private async Task MarkRunFailedAsync(long runLogId, DateTime startedAt, string message)
|
|
|
+ {
|
|
|
+ var finishedAt = DateTime.Now;
|
|
|
+ await _db.Ado.ExecuteCommandAsync(
|
|
|
+ """
|
|
|
+ UPDATE mdp_transform_run_log
|
|
|
+ SET status='FAILED', end_time=@EndTime, duration_ms=@DurationMs,
|
|
|
+ error_message=@ErrorMessage, update_time=CURRENT_TIMESTAMP
|
|
|
+ WHERE id=@Id
|
|
|
+ """,
|
|
|
+ new SugarParameter("@EndTime", finishedAt),
|
|
|
+ new SugarParameter("@DurationMs", (int)(finishedAt - startedAt).TotalMilliseconds),
|
|
|
+ new SugarParameter("@ErrorMessage", message.Length > 2000 ? message[..2000] : message),
|
|
|
+ new SugarParameter("@Id", runLogId));
|
|
|
+ }
|
|
|
+
|
|
|
+ private static string NormalizeTriggerType(string? triggerType)
|
|
|
+ => string.IsNullOrWhiteSpace(triggerType) ? "AUTO" : triggerType.Trim().ToUpperInvariant();
|
|
|
+}
|
|
|
+
|
|
|
+/// <summary>生产退料单 MDP 同步转换结果。</summary>
|
|
|
+public sealed class ProductionReturnMdpSyncResult
|
|
|
+{
|
|
|
+ public long RunLogId { get; set; }
|
|
|
+ public string BatchId { get; set; } = string.Empty;
|
|
|
+ public int HeadRows { get; set; }
|
|
|
+ public int DetailRows { get; set; }
|
|
|
+}
|
YY968XX