IpqcInspectionFlowService.cs 25 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541
  1. using System.Text.Json;
  2. using Admin.NET.Plugin.AiDOP.Entity;
  3. using Admin.NET.Plugin.AiDOP.Entity.DataPlatform;
  4. using Admin.NET.Plugin.AiDOP.Manufacturing.Dto;
  5. using Admin.NET.Plugin.ApprovalFlow;
  6. using Admin.NET.Plugin.ApprovalFlow.Service;
  7. using Microsoft.Extensions.Logging;
  8. using Yitter.IdGenerator;
  9. namespace Admin.NET.Plugin.AiDOP.Manufacturing;
  10. /// <summary>
  11. /// S6 过程检验单(IPQC)检验员+主管流程服务(v2:含整批判定驱动的质量处置分流)。
  12. ///
  13. /// N1_INSPECT 检验员录入 → 提交 → N2_SUP_REVIEW 主管整批审核:
  14. /// 整批合格(Qualified=true) → GW_RESULT(disposition_required=0) → end;
  15. /// 整批不合格(Qualified=false) → GW_RESULT(disposition_required=1) → N3_QUALITY_DISPOSITION(见 IpqcInspectionDispositionService)。
  16. /// 退回:N2→N1。复用 ApprovalFlow 引擎(StartFlow/Approve/ReturnToPrev + IFlowBizHandler),不改核心。
  17. /// 整批判定 jgpd 写 qms_gcjyd 白名单列(可空、不硬编码枚举);disposition_required 落扩展表作网关判据(与 jgpd 整批判定一致)。
  18. /// 项目级 pd(qms_gcjydzb)仅明细展示辅助,不驱动整批流程。不回写 qms_gcjyd.status;不写库存/生产/仓储。
  19. /// 正常鉴权(非 AllowAnonymous);权限以当前用户 pending task 归属为准。
  20. /// </summary>
  21. [ApiDescriptionSettings(Order = 312, Description = "过程检验单流程")]
  22. [Route("api/IpqcInspectionFlow")]
  23. [NonUnify]
  24. public class IpqcInspectionFlowService : IDynamicApiController, ITransient
  25. {
  26. /// <summary>主/系统租户哨兵:超管未选择目标租户时其 JWT TenantId 即此值,拒绝作为业务租户。</summary>
  27. private const long MainTenantId = 1300000000001L;
  28. private readonly ISqlSugarClient _db;
  29. private readonly FlowEngineService _flowEngine;
  30. private readonly UserManager _userManager;
  31. private readonly IpqcInspectionMdpSyncService _mdpSyncService;
  32. private readonly ILogger<IpqcInspectionFlowService> _logger;
  33. public IpqcInspectionFlowService(
  34. ISqlSugarClient db,
  35. FlowEngineService flowEngine,
  36. UserManager userManager,
  37. IpqcInspectionMdpSyncService mdpSyncService,
  38. ILoggerFactory loggerFactory)
  39. {
  40. _db = db;
  41. _flowEngine = flowEngine;
  42. _userManager = userManager;
  43. _mdpSyncService = mdpSyncService;
  44. _logger = loggerFactory.CreateLogger<IpqcInspectionFlowService>();
  45. }
  46. /// <summary>
  47. /// 源表 qms_gcjyd 写入落库后,把本单据同步到标准层(list/detail 只读 mdp_std_ipqc_inspection,无 live 回退)。
  48. ///
  49. /// 必须放在业务事务<b>之外</b>:源表是权威数据,同步只是派生物,不能让派生失败回滚已成立的检验结果。
  50. /// 走单据级 <see cref="IpqcInspectionMdpSyncService.SyncInspectionAsync"/>,不调 RunFullAsync/RunInboundAsync
  51. /// (二者为全表扫描,且 RunFullAsync 的租户写死为 pbxfxp 账套映射,对其他租户捞不到行)。
  52. /// 失败只记 Error 日志不抛:此刻业务事务已提交且流程已推进,让 API 失败会诱导用户重试,
  53. /// 而重试必然报"当前不在检验录入节点"。标准层可由下一次 targeted / 手动 inbound 自愈。
  54. /// </summary>
  55. private async Task SyncInspectionToStdSafeAsync(long inspectionId, long tenantId, string triggerType)
  56. {
  57. try
  58. {
  59. await _mdpSyncService.SyncInspectionAsync(inspectionId, tenantId, triggerType);
  60. }
  61. catch (Exception ex)
  62. {
  63. _logger.LogError(ex,
  64. "[IpqcFlow] 检验单 {InspectionId}(租户 {TenantId}) 业务写入已提交,但标准层 targeted 同步失败({Trigger}),列表/详情可能仍显示旧值",
  65. inspectionId, tenantId, triggerType);
  66. }
  67. }
  68. /// <summary>严格可信租户解析:只来自认证后 JWT;无 Token(&lt;=0) 或超管未选主租户 → 拒绝;不读前端 tenantId、无默认回退。</summary>
  69. private long ResolveTenantOrThrow()
  70. {
  71. var tid = _userManager.TenantId;
  72. if (tid <= 0)
  73. throw Oops.Oh("无法确定当前租户,请重新登录或选择目标租户");
  74. if (_userManager.SuperAdmin && tid == MainTenantId)
  75. throw Oops.Oh("超级管理员操作前必须选择目标租户");
  76. return tid;
  77. }
  78. /// <summary>
  79. /// 检验单流程状态(只读,供前端按钮控制)。
  80. /// </summary>
  81. [DisplayName("过程检验单流程状态")]
  82. [HttpGet("state")]
  83. public async Task<IpqcFlowStateOutput> GetState([FromQuery] long id)
  84. {
  85. await EnsureBillExistsAsync(id);
  86. return await BuildStateAsync(id);
  87. }
  88. /// <summary>
  89. /// 检验员提交检验结果(写 qms_gcjyd 白名单列 + 推进 N1→N2)。
  90. /// </summary>
  91. [DisplayName("检验员提交检验结果")]
  92. [HttpPost("submit-inspection")]
  93. public async Task<IpqcFlowStateOutput> SubmitInspection([FromBody] IpqcSubmitInspectionInput input)
  94. {
  95. var billNo = await EnsureBillExistsAsync(input.Id);
  96. // 参数校验(不合格数不得为负、不得大于样本量;合格数不得为负)
  97. if (input.Jyhgsl < 0) throw Oops.Oh("检验合格数量不能为负");
  98. if (input.Jybhgsl < 0) throw Oops.Oh("检验不合格数量不能为负");
  99. if (input.Ybl is < 0) throw Oops.Oh("样本量不能为负");
  100. if (input.Ybl is > 0 && input.Jybhgsl > input.Ybl.Value)
  101. throw Oops.Oh("不合格数量不能大于样本量(检验数)");
  102. var inst = await GetLatestInstanceAsync(input.Id);
  103. if (inst != null && inst.Status != FlowInstanceStatusEnum.Running)
  104. throw Oops.Oh("该检验单流程已结束,无法再提交检验结果");
  105. var now = DateTime.Now;
  106. var inspectorName = _userManager.RealName ?? _userManager.Account;
  107. var tran = await _db.AsTenant().UseTranAsync(async () =>
  108. {
  109. // 无运行中实例 → 起流程(自动生成 N1 任务给检验员角色成员)
  110. long instanceId;
  111. if (inst == null)
  112. {
  113. instanceId = await _flowEngine.StartFlow(new StartFlowInput
  114. {
  115. BizType = IpqcInspectionFlowConst.BizType,
  116. BizId = input.Id,
  117. BizNo = billNo,
  118. Title = $"过程检验单 {billNo}",
  119. Comment = input.Comment,
  120. });
  121. }
  122. else
  123. {
  124. instanceId = inst.Id;
  125. }
  126. var myTask = await GetMyPendingTaskAsync(instanceId);
  127. if (myTask == null)
  128. throw Oops.Oh("当前用户没有待处理的检验任务(需检验员角色成员)");
  129. if (myTask.NodeId != IpqcInspectionFlowConst.NodeInspect)
  130. throw Oops.Oh("当前不在检验录入节点,无法提交检验结果");
  131. // 写检验结果(仅 qms_gcjyd 白名单列 jgpd/jyhgsl/jybhgsl/ybl/jyr/bz;jgpd 可空不强写)
  132. var tid = ResolveTenantOrThrow();
  133. await _db.Ado.ExecuteCommandAsync(
  134. "UPDATE qms_gcjyd SET jgpd=@jgpd, jyhgsl=@jyhgsl, jybhgsl=@jybhgsl, ybl=@ybl, jyr=@jyr, bz=@bz WHERE id=@id AND tenant_id=@tid",
  135. new List<SugarParameter>
  136. {
  137. new("@jgpd", input.Jgpd.HasValue ? input.Jgpd.Value : (object?)null),
  138. new("@jyhgsl", input.Jyhgsl),
  139. new("@jybhgsl", input.Jybhgsl),
  140. new("@ybl", input.Ybl.HasValue ? input.Ybl.Value : (object?)null),
  141. new("@jyr", inspectorName),
  142. new("@bz", input.Bz),
  143. new("@id", input.Id),
  144. new("@tid", tid),
  145. });
  146. // 落轻量扩展表(提交人/提交时间/业务状态,不回写 qms_gcjyd.status)
  147. await UpsertFlowStateAsync(input.Id, billNo, instanceId, IpqcInspectionFlowConst.StatusPendingReview,
  148. IpqcInspectionFlowConst.NodeSupervisor, now, isSubmit: true, inspectorName: inspectorName);
  149. // 推进 N1 → N2
  150. await _flowEngine.Approve(myTask.Id, input.Comment);
  151. });
  152. if (!tran.IsSuccess) throw tran.ErrorException;
  153. // 事务外 targeted 同步:本动作写了 qms_gcjyd 的 jgpd/jyhgsl/jybhgsl/ybl/jyr/bz,
  154. // 其中 jgpd/jyr/ybl/bz 由 list/detail 投影渲染,不同步则页面停留在上一次快照。
  155. await SyncInspectionToStdSafeAsync(input.Id, ResolveTenantOrThrow(), "SUBMIT_INSPECTION");
  156. return await BuildStateAsync(input.Id);
  157. }
  158. /// <summary>
  159. /// 检验主管通过(整批判定):Qualified=true 整批合格→end;Qualified=false 整批不合格→N3 质量处置。
  160. /// 写整批 jgpd(可空、不硬编码枚举)+ disposition_required(网关判据),再 Approve→GW_RESULT 分流。
  161. /// </summary>
  162. [DisplayName("检验主管通过")]
  163. [HttpPost("supervisor-approve")]
  164. public async Task<IpqcFlowStateOutput> SupervisorApprove([FromBody] IpqcSupervisorApproveInput input)
  165. {
  166. var billNo = await EnsureBillExistsAsync(input.Id);
  167. var (inst, myTask) = await RequireSupervisorTaskAsync(input.Id);
  168. var now = DateTime.Now;
  169. var supervisorName = _userManager.RealName ?? _userManager.Account;
  170. var dispositionRequired = input.Qualified ? 0 : 1;
  171. var businessStatus = input.Qualified ? IpqcInspectionFlowConst.StatusApproved : IpqcInspectionFlowConst.StatusPendingDisposition;
  172. var nextNode = input.Qualified ? null : IpqcInspectionFlowConst.NodeDisposition;
  173. var tran = await _db.AsTenant().UseTranAsync(async () =>
  174. {
  175. // 整批判定 jgpd 写 qms_gcjyd 白名单列(可空,不硬编码枚举;由前端传测试/已确认合法值)
  176. if (input.Jgpd.HasValue)
  177. {
  178. var tid = ResolveTenantOrThrow();
  179. await _db.Ado.ExecuteCommandAsync(
  180. "UPDATE qms_gcjyd SET jgpd=@jgpd WHERE id=@id AND tenant_id=@tid",
  181. new List<SugarParameter> { new("@jgpd", input.Jgpd.Value), new("@id", input.Id), new("@tid", tid) });
  182. }
  183. // 先写 disposition_required(GW_RESULT 网关判据,Approve 时 GetBizData 读取)再推进
  184. await UpsertFlowStateAsync(input.Id, billNo, inst.Id, businessStatus, nextNode, now,
  185. isSubmit: false, reviewResult: input.Qualified ? "APPROVED" : "TO_DISPOSITION",
  186. supervisorName: supervisorName, dispositionRequired: dispositionRequired);
  187. await _flowEngine.Approve(myTask.Id, input.Comment);
  188. });
  189. if (!tran.IsSuccess) throw tran.ErrorException;
  190. // 事务外 targeted 同步:**仅当本次确实改写了源表 jgpd 时**才同步。
  191. // 主管未传 jgpd 时本动作只动 flow_state(流程状态由 live 的 /state 接口读),标准层内容不变,
  192. // 无条件同步等于每次审批都做一次无意义写入。
  193. if (input.Jgpd.HasValue)
  194. await SyncInspectionToStdSafeAsync(input.Id, ResolveTenantOrThrow(), "SUPERVISOR_APPROVE");
  195. // 双模式出站:整批合格结束时写 Outbox(QMS_API 占位;任务书 action=S6_REPORT_PUSH)
  196. if (input.Qualified)
  197. await TryEnqueueIpqcPassOutboxAsync(input.Id, billNo);
  198. return await BuildStateAsync(input.Id);
  199. }
  200. /// <summary>
  201. /// 检验主管退回(N2 → 回 N1,意见必填)。
  202. /// </summary>
  203. [DisplayName("检验主管退回")]
  204. [HttpPost("supervisor-return")]
  205. public async Task<IpqcFlowStateOutput> SupervisorReturn([FromBody] IpqcSupervisorReturnInput input)
  206. {
  207. if (string.IsNullOrWhiteSpace(input.Comment))
  208. throw Oops.Oh("退回必须填写意见");
  209. var billNo = await EnsureBillExistsAsync(input.Id);
  210. var (inst, myTask) = await RequireSupervisorTaskAsync(input.Id);
  211. var now = DateTime.Now;
  212. var supervisorName = _userManager.RealName ?? _userManager.Account;
  213. var tran = await _db.AsTenant().UseTranAsync(async () =>
  214. {
  215. await UpsertFlowStateAsync(input.Id, billNo, inst.Id, IpqcInspectionFlowConst.StatusReturned,
  216. IpqcInspectionFlowConst.NodeInspect, now, isSubmit: false, reviewResult: "RETURNED",
  217. supervisorName: supervisorName, returnReason: input.Comment);
  218. await _flowEngine.ReturnToPrev(myTask.Id, input.Comment);
  219. });
  220. if (!tran.IsSuccess) throw tran.ErrorException;
  221. return await BuildStateAsync(input.Id);
  222. }
  223. // ───────────────────────── helpers ─────────────────────────
  224. /// <summary>校验检验单存在并返回 djbh(无 djbh 用 id 兜底)。</summary>
  225. private async Task<string> EnsureBillExistsAsync(long id)
  226. {
  227. if (id <= 0) throw Oops.Oh("检验单 id 非法");
  228. // 强制租户隔离:qms_gcjyd 全库共享无框架租户过滤器,裸 SQL 必须显式按当前用户租户校验,
  229. // 防止跨租户读到/操作他租户检验单。严格解析租户(无 Token / 超管未选主租户 → 拒绝,不回退默认)。
  230. var tid = ResolveTenantOrThrow();
  231. var rows = await _db.Ado.SqlQueryAsync<string>(
  232. "SELECT djbh FROM qms_gcjyd WHERE id=@id AND tenant_id=@tid LIMIT 1",
  233. new List<SugarParameter> { new("@id", id), new("@tid", tid) });
  234. if (rows.Count == 0) throw Oops.Oh("检验单不存在");
  235. return rows[0] ?? id.ToString();
  236. }
  237. /// <summary>取该检验单最新流程实例(BizType+BizId,跨数据范围)。</summary>
  238. private async Task<ApprovalFlowInstance?> GetLatestInstanceAsync(long bizId)
  239. {
  240. return await _db.Queryable<ApprovalFlowInstance>()
  241. .ClearFilter()
  242. .Where(x => x.BizType == IpqcInspectionFlowConst.BizType && x.BizId == bizId)
  243. .OrderByDescending(x => x.Id)
  244. .FirstAsync();
  245. }
  246. /// <summary>取当前用户在指定实例下的待办任务。</summary>
  247. private async Task<ApprovalFlowTask?> GetMyPendingTaskAsync(long instanceId)
  248. {
  249. var userId = _userManager.UserId;
  250. return await _db.Queryable<ApprovalFlowTask>()
  251. .ClearFilter()
  252. .Where(x => x.InstanceId == instanceId && x.AssigneeId == userId && x.Status == FlowTaskStatusEnum.Pending)
  253. .FirstAsync();
  254. }
  255. /// <summary>校验并返回主管 N2 待办任务。</summary>
  256. private async Task<(ApprovalFlowInstance inst, ApprovalFlowTask task)> RequireSupervisorTaskAsync(long bizId)
  257. {
  258. var inst = await GetLatestInstanceAsync(bizId);
  259. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  260. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  261. var myTask = await GetMyPendingTaskAsync(inst.Id);
  262. if (myTask == null) throw Oops.Oh("当前用户没有待处理的审核任务(需检验主管角色成员)");
  263. if (myTask.NodeId != IpqcInspectionFlowConst.NodeSupervisor) throw Oops.Oh("当前不在主管审核节点");
  264. return (inst, myTask);
  265. }
  266. /// <summary>当前用户是否具备指定角色(跨数据范围)。</summary>
  267. private async Task<bool> HasRoleAsync(long roleId)
  268. {
  269. var userId = _userManager.UserId;
  270. return await _db.Queryable<SysUserRole>()
  271. .ClearFilter()
  272. .AnyAsync(x => x.UserId == userId && x.RoleId == roleId);
  273. }
  274. /// <summary>Upsert 流程状态扩展表(不回写 qms_gcjyd.status)。dispositionRequired 非空时更新网关判据。</summary>
  275. private async Task UpsertFlowStateAsync(long inspectionId, string billNo, long instanceId, string businessStatus,
  276. string? currentNode, DateTime now, bool isSubmit, string? inspectorName = null, string? supervisorName = null,
  277. string? reviewResult = null, string? returnReason = null, int? dispositionRequired = null)
  278. {
  279. // 显式租户隔离:ClearFilter 移除框架租户过滤器后,必须补 TenantId 谓词,防止跨租户命中他租户流程状态行。
  280. var tid = ResolveTenantOrThrow();
  281. var existing = await _db.Queryable<AdoS6IpqcInspectionFlowState>()
  282. .ClearFilter()
  283. .Where(x => x.InspectionId == inspectionId && x.TenantId == tid)
  284. .FirstAsync();
  285. if (existing == null)
  286. {
  287. var row = new AdoS6IpqcInspectionFlowState
  288. {
  289. Id = YitIdHelper.NextId(),
  290. TenantId = tid,
  291. InspectionId = inspectionId,
  292. InspectionNo = billNo,
  293. BizType = IpqcInspectionFlowConst.BizType,
  294. FlowInstanceId = instanceId,
  295. BusinessStatus = businessStatus,
  296. CurrentNode = currentNode,
  297. DispositionRequired = dispositionRequired,
  298. RowVersion = 1,
  299. CreateTime = now,
  300. };
  301. if (isSubmit)
  302. {
  303. row.InspectorUserId = _userManager.UserId;
  304. row.InspectorName = inspectorName;
  305. row.SubmittedAt = now;
  306. }
  307. else
  308. {
  309. row.SupervisorUserId = _userManager.UserId;
  310. row.SupervisorName = supervisorName;
  311. row.ReviewedAt = now;
  312. row.ReviewResult = reviewResult;
  313. row.ReturnReason = returnReason;
  314. }
  315. await _db.Insertable(row).ExecuteCommandAsync();
  316. return;
  317. }
  318. existing.FlowInstanceId = instanceId;
  319. existing.BusinessStatus = businessStatus;
  320. existing.CurrentNode = currentNode;
  321. if (dispositionRequired.HasValue) existing.DispositionRequired = dispositionRequired;
  322. existing.RowVersion = (existing.RowVersion ?? 0) + 1;
  323. existing.UpdateTime = now;
  324. if (isSubmit)
  325. {
  326. existing.InspectorUserId = _userManager.UserId;
  327. existing.InspectorName = inspectorName;
  328. existing.SubmittedAt = now;
  329. }
  330. else
  331. {
  332. existing.SupervisorUserId = _userManager.UserId;
  333. existing.SupervisorName = supervisorName;
  334. existing.ReviewedAt = now;
  335. existing.ReviewResult = reviewResult;
  336. existing.ReturnReason = returnReason;
  337. }
  338. await _db.Updateable(existing).ExecuteCommandAsync();
  339. }
  340. /// <summary>
  341. /// 完成态解释文案。IPQC 有两个合法完成终态,业务语义不同,不能都说"主管审核通过":
  342. /// <list type="bullet">
  343. /// <item>APPROVED = 整批合格、主管审核通过后直接结束;</item>
  344. /// <item>DISPOSED = 整批不合格,经 N3 质量处置完成后结束(ApprovalFlow 实例同样是 Approved)。</item>
  345. /// </list>
  346. /// 仅生成给 UI 的解释性文字,<b>不参与任何状态判定、不影响状态机</b>。
  347. /// 业务状态缺失时返回中性文案,不臆断"审核通过"。
  348. /// </summary>
  349. private static string BuildCompletedMessage(string? businessStatus) => businessStatus switch
  350. {
  351. IpqcInspectionFlowConst.StatusApproved => "流程已完成(整批合格·主管审核通过)",
  352. IpqcInspectionFlowConst.StatusDisposed => "流程已完成(整批不合格·已处置)",
  353. _ => "流程已完成",
  354. };
  355. /// <summary>组装流程状态输出。</summary>
  356. private async Task<IpqcFlowStateOutput> BuildStateAsync(long bizId)
  357. {
  358. var output = new IpqcFlowStateOutput { BizId = bizId };
  359. var inst = await GetLatestInstanceAsync(bizId);
  360. // 显式租户隔离:ClearFilter 移除框架租户过滤器后,必须补 TenantId 谓词,防止跨租户读到他租户流程状态/处置。
  361. var tid = ResolveTenantOrThrow();
  362. var state = await _db.Queryable<AdoS6IpqcInspectionFlowState>()
  363. .ClearFilter()
  364. .Where(x => x.InspectionId == bizId && x.TenantId == tid)
  365. .FirstAsync();
  366. if (state != null)
  367. {
  368. output.BusinessStatus = state.BusinessStatus;
  369. output.InspectorName = state.InspectorName;
  370. output.SupervisorName = state.SupervisorName;
  371. output.DispositionRequired = state.DispositionRequired;
  372. }
  373. output.HasDisposition = await _db.Queryable<AdoS6IpqcQualityDisposition>()
  374. .ClearFilter().AnyAsync(x => x.InspectionId == bizId && x.TenantId == tid && x.Status == 1);
  375. if (inst == null)
  376. {
  377. output.FlowStatus = "NotStarted";
  378. output.CanSubmitResult = await HasRoleAsync(IpqcInspectionFlowConst.RoleInspectorId);
  379. output.Message = output.CanSubmitResult ? "待检验员录入结果" : "尚未发起流程";
  380. return output;
  381. }
  382. output.InstanceId = inst.Id;
  383. output.FlowStatus = inst.Status.ToString();
  384. output.UpdatedAt = inst.EndTime ?? inst.StartTime;
  385. if (inst.Status != FlowInstanceStatusEnum.Running)
  386. {
  387. output.IsCompleted = true;
  388. output.Message = inst.Status == FlowInstanceStatusEnum.Approved
  389. ? BuildCompletedMessage(output.BusinessStatus)
  390. : $"流程已结束({inst.Status})";
  391. return output;
  392. }
  393. output.CurrentNodeCode = inst.CurrentNodeId;
  394. var myTask = await GetMyPendingTaskAsync(inst.Id);
  395. if (myTask != null)
  396. {
  397. output.CurrentNodeName = myTask.NodeName;
  398. if (myTask.NodeId == IpqcInspectionFlowConst.NodeInspect)
  399. {
  400. output.CurrentAssigneeRole = IpqcInspectionFlowConst.RoleInspectorCode;
  401. output.CanSubmitResult = true;
  402. output.Message = "待当前用户录入检验结果";
  403. }
  404. else if (myTask.NodeId == IpqcInspectionFlowConst.NodeSupervisor)
  405. {
  406. output.CurrentAssigneeRole = IpqcInspectionFlowConst.RoleSupervisorCode;
  407. output.CanSupervisorApprove = true;
  408. output.CanSupervisorReturn = true;
  409. output.Message = "待当前用户主管审核";
  410. }
  411. else if (myTask.NodeId == IpqcInspectionFlowConst.NodeDisposition)
  412. {
  413. output.CurrentAssigneeRole = IpqcInspectionFlowConst.RoleQualityEngineerCode;
  414. output.CanSubmitDisposition = true;
  415. output.Message = "待当前用户提交质量处置";
  416. }
  417. }
  418. else
  419. {
  420. output.CurrentAssigneeRole = inst.CurrentNodeId switch
  421. {
  422. IpqcInspectionFlowConst.NodeInspect => IpqcInspectionFlowConst.RoleInspectorCode,
  423. IpqcInspectionFlowConst.NodeDisposition => IpqcInspectionFlowConst.RoleQualityEngineerCode,
  424. _ => IpqcInspectionFlowConst.RoleSupervisorCode,
  425. };
  426. output.Message = "流程进行中(当前用户无待办)";
  427. }
  428. return output;
  429. }
  430. /// <summary>
  431. /// 整批合格闭环时写 mdp_outbox(幂等);失败不阻断主流程。
  432. /// </summary>
  433. private async Task TryEnqueueIpqcPassOutboxAsync(long billId, string billNo)
  434. {
  435. try
  436. {
  437. // 严格租户隔离:裸 SQL 读 qms_gcjyd 必须显式按当前用户租户校验,防止跨租户读他租户单据。
  438. long tenantId = ResolveTenantOrThrow();
  439. var row = await _db.Ado.SqlQuerySingleAsync<IpqcOutboxBillRow>(
  440. "SELECT id AS Id, djbh AS BillNo, jgpd AS Jgpd, jyhgsl AS Jyhgsl, jybhgsl AS Jybhgsl FROM qms_gcjyd WHERE id=@id AND tenant_id=@tid LIMIT 1",
  441. new List<SugarParameter> { new("@id", billId), new("@tid", tenantId) });
  442. if (row == null) return;
  443. string idem = string.IsNullOrWhiteSpace(billNo) ? billId.ToString() : billNo;
  444. var payload = JsonSerializer.Serialize(new
  445. {
  446. path = "/ipqc/result",
  447. method = "POST",
  448. body = new
  449. {
  450. billId,
  451. billNo = idem,
  452. jgpd = row.Jgpd,
  453. jyhgsl = row.Jyhgsl,
  454. jybhgsl = row.Jybhgsl,
  455. action = "S6_REPORT_PUSH"
  456. }
  457. });
  458. var exists = await _db.Ado.GetIntAsync(
  459. "SELECT COUNT(1) FROM mdp_outbox WHERE tenant_id=@tid AND target_source_code='QMS_API' AND action_code='S6_REPORT_PUSH' AND idem_key=@idem",
  460. new List<SugarParameter>
  461. {
  462. new("@tid", tenantId),
  463. new("@idem", idem)
  464. }) > 0;
  465. if (exists) return;
  466. await _db.Insertable(new MdpOutbox
  467. {
  468. TenantId = tenantId,
  469. TargetSourceCode = "QMS_API",
  470. ActionCode = "S6_REPORT_PUSH",
  471. IdemKey = idem,
  472. PayloadJson = payload,
  473. Status = 0,
  474. RetryCount = 0,
  475. CreateTime = DateTime.Now,
  476. UpdateTime = DateTime.Now
  477. }).ExecuteCommandAsync();
  478. }
  479. catch
  480. {
  481. // Outbox 写入失败不影响检验闭环
  482. }
  483. }
  484. private sealed class IpqcOutboxBillRow
  485. {
  486. public long Id { get; set; }
  487. public string? BillNo { get; set; }
  488. public int? Jgpd { get; set; }
  489. public decimal? Jyhgsl { get; set; }
  490. public decimal? Jybhgsl { get; set; }
  491. }
  492. }