FqcInspBillFlowService.cs 27 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553
  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.FinishedWarehouse.Dto;
  5. using Admin.NET.Plugin.AiDOP.Infrastructure;
  6. using Admin.NET.Plugin.ApprovalFlow;
  7. using Admin.NET.Plugin.ApprovalFlow.Service;
  8. using Microsoft.Extensions.Logging;
  9. using Yitter.IdGenerator;
  10. namespace Admin.NET.Plugin.AiDOP.FinishedWarehouse;
  11. /// <summary>
  12. /// S7 FQC 成品检验单 检验员+主管最小审批流服务(S7-FQC-INSPBILL-INSPECTOR-SUPERVISOR-FLOW-1)。
  13. ///
  14. /// N1_INSPECT 检验员录入 pd/hgsl/bhgsl/clfs → 提交 → N2_SUP_REVIEW 检验主管审核(通过=Approved / 退回=回 N1)。
  15. /// 复用 ApprovalFlow 引擎扩展点(StartFlow/Approve/ReturnToPrev + IFlowBizHandler),不改 ApprovalFlow 核心。
  16. /// BizType=S7_FQC_INSPBILL,BizId=qms_qcpp_inspbill.id,BizCode=FBILLNO。反查用 ApprovalFlowInstance(BizType,BizId),inspbill 不加列。
  17. ///
  18. /// 状态归属(严格分离):
  19. /// - 检验业务结果 → qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs(仅 submit-result 写)
  20. /// - 检验任务执行进度 → qms_fqcbj.jyfzr/jykssj/jywcsj/FINSPECTSTATUS(经 lydjbh=FBILLNO 关联;仅执行状态未检验/检验中/检验完成)
  21. /// - 审批节点/待办/审核状态 → ApprovalFlowInstance(绝不写入 FINSPECTSTATUS)
  22. /// 不写 FBILLSTATUS/库存/仓储/生产状态;clfs 仅保存不触发任何后续动作。正常鉴权(非匿名)。
  23. /// </summary>
  24. [ApiDescriptionSettings(Order = 331, Description = "FQC检验单流程")]
  25. [Route("api/S7FqcInspBillFlow")]
  26. [NonUnify]
  27. public class FqcInspBillFlowService : IDynamicApiController, ITransient
  28. {
  29. private readonly ISqlSugarClient _db;
  30. private readonly FlowEngineService _flowEngine;
  31. private readonly UserManager _userManager;
  32. private readonly FqcMdpSyncService _fqcMdpSyncService;
  33. private readonly ILogger<FqcInspBillFlowService> _logger;
  34. public FqcInspBillFlowService(
  35. ISqlSugarClient db,
  36. FlowEngineService flowEngine,
  37. UserManager userManager,
  38. FqcMdpSyncService fqcMdpSyncService,
  39. ILoggerFactory loggerFactory)
  40. {
  41. _db = db;
  42. _flowEngine = flowEngine;
  43. _userManager = userManager;
  44. _fqcMdpSyncService = fqcMdpSyncService;
  45. _logger = loggerFactory.CreateLogger<FqcInspBillFlowService>();
  46. }
  47. /// <summary>
  48. /// 业务写入落库后,把本单据同步到数据中台标准层(result-list / detail / task-list 均读 std)。
  49. ///
  50. /// 必须放在业务事务<b>之外</b>(事务内跑同步会把 std 写入绑进业务事务,放大锁范围);
  51. /// 走单据级 <see cref="FqcMdpSyncService.SyncBillAsync"/> 而非 12s 的全量 RunFullAsync。
  52. /// 同步失败只告警不抛:此刻业务事务已提交且流程已推进,让 API 失败会诱导用户重试,
  53. /// 而重试必然报"当前不在检验录入节点"——反而更难排查。std 可由下一次 targeted/全量刷新自愈。
  54. /// </summary>
  55. private async Task SyncBillToStdSafeAsync(long billId, string triggerType)
  56. {
  57. try
  58. {
  59. var tid = ResolveTenantOrThrow();
  60. await _fqcMdpSyncService.SyncBillAsync(billId, tid, triggerType);
  61. }
  62. catch (Exception ex)
  63. {
  64. _logger.LogWarning(ex, "[FqcFlow] 单据 {BillId} 业务写入已成功,但标准层 targeted 同步失败({Trigger}),列表可能仍显示旧值", billId, triggerType);
  65. }
  66. }
  67. /// <summary>严格可信租户解析,见 <see cref="Infrastructure.AidopTenantScope.ResolveOrThrow"/>。</summary>
  68. private long ResolveTenantOrThrow() => Infrastructure.AidopTenantScope.ResolveOrThrow(_userManager);
  69. /// <summary>检验单流程状态(只读,供前端按钮控制)。</summary>
  70. [DisplayName("FQC检验单流程状态")]
  71. [HttpGet("state")]
  72. public async Task<FqcFlowStateOutput> GetState([FromQuery] long id)
  73. {
  74. await EnsureBillExistsAsync(id);
  75. return await BuildStateAsync(id);
  76. }
  77. /// <summary>
  78. /// 检验员提交检验结果(写 qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs + qms_fqcbj 任务进度 + 推进 N1→N2)。
  79. /// </summary>
  80. [DisplayName("检验员提交检验结果")]
  81. [HttpPost("submit-result")]
  82. public async Task<FqcFlowStateOutput> SubmitResult([FromBody] FqcSubmitResultInput input)
  83. {
  84. var (billNo, sourceBillNo) = await EnsureBillAsync(input.Id);
  85. // 参数校验
  86. if (input.Pd != 0 && input.Pd != 1) throw Oops.Oh("判定 pd 只能为 0(合格) 或 1(不合格)");
  87. if (input.Hgsl < 0) throw Oops.Oh("合格数量不能为负");
  88. if (input.Bhgsl < 0) throw Oops.Oh("不合格数量不能为负");
  89. if (input.Pd == 0)
  90. {
  91. if (input.Bhgsl != 0) throw Oops.Oh("判定合格时不合格数量必须为 0");
  92. }
  93. else // pd == 1
  94. {
  95. if (input.Bhgsl <= 0) throw Oops.Oh("判定不合格时不合格数量必须大于 0");
  96. if (input.Clfs is not (0 or 1 or 2)) throw Oops.Oh("判定不合格时处理方式 clfs 必填且只能为 0(让步接收)/1(挑选)/2(报废)");
  97. }
  98. var inst = await GetLatestInstanceAsync(input.Id);
  99. if (inst != null && inst.Status != FlowInstanceStatusEnum.Running)
  100. throw Oops.Oh("该检验单流程已结束,无法再提交检验结果");
  101. // 负责人业务门:当前用户必须是该检验单负责人(qms_fqcbj.jyfzr==UserId)。
  102. // Flow 引擎只校 N1 Assignee,业务层再校 jyfzr → 双重保证 jyfzr==当前用户==N1 Assignee 三者一致。
  103. var gateTenantId = ResolveTenantOrThrow();
  104. if (!string.IsNullOrWhiteSpace(sourceBillNo))
  105. {
  106. var jyfzrOwner = await _db.Ado.SqlQuerySingleAsync<string>(
  107. "SELECT jyfzr FROM qms_fqcbj WHERE FBILLNO=@bjbh AND tenant_id=@t LIMIT 1",
  108. new SugarParameter("@bjbh", sourceBillNo), new SugarParameter("@t", gateTenantId));
  109. if (!string.Equals((jyfzrOwner ?? "").Trim(), _userManager.UserId.ToString(), StringComparison.Ordinal))
  110. throw Oops.Oh("当前用户不是该检验单负责人,无权提交检验结果");
  111. // S7-FQC-INITIATOR-TENANT-GUARD-1:起流边界。本方法在下面的事务里可能 StartFlow,
  112. // 而 StartFlow 会把当前用户照实记成 Initiator;Initiator 的**读取**侧(ReturnToPrev→N1)
  113. // 按环境租户过滤用户,因此一个不属于本租户的负责人会造出「退回 N1 时无人可解析」的实例。
  114. // 上面的负责人门只保证 jyfzr == 当前用户,不保证这个人属于本租户 —— 这里补上。
  115. await S7FqcInitiatorTenantGuard.EnsureBillOwnerTenantSafeAsync(_db, jyfzrOwner, gateTenantId);
  116. }
  117. var now = DateTime.Now;
  118. // 检验人=本次实际提交检验结果的操作者姓名(RealName 空回退 Account);语义区别于负责人 jyfzr(=SysUser.Id),二者不混用
  119. var inspectorName = _userManager.RealName ?? _userManager.Account;
  120. var tran = await _db.AsTenant().UseTranAsync(async () =>
  121. {
  122. // 无运行中实例 → 起流程(自动生成 N1 任务给检验员角色成员)
  123. long instanceId = inst?.Id ?? await _flowEngine.StartFlow(new StartFlowInput
  124. {
  125. BizType = FqcInspBillFlowConst.BizType,
  126. BizId = input.Id,
  127. BizNo = billNo,
  128. Title = $"FQC检验单 {billNo}",
  129. Comment = input.Comment,
  130. });
  131. var myTask = await GetMyPendingTaskAsync(instanceId);
  132. if (myTask == null)
  133. throw Oops.Oh("当前用户没有待处理的检验任务(需检验员角色成员)");
  134. if (myTask.NodeId != FqcInspBillFlowConst.NodeInspect)
  135. throw Oops.Oh("当前不在检验录入节点,无法提交检验结果");
  136. var tid = ResolveTenantOrThrow();
  137. // ① 检验业务结果 → qms_qcpp_inspbill(pd/hgsl/bhgsl/clfs 结果;jyr=录入者、FINSPEENDDATE=检验完成时刻)
  138. // FINSPEENDDATE 复用同一 now,与本事务内 qms_fqcbj.jywcsj 保持同一"检验完成"时刻;退回重提允许覆盖为最后一次有效提交
  139. await _db.Ado.ExecuteCommandAsync(
  140. "UPDATE qms_qcpp_inspbill SET pd=@pd, hgsl=@hgsl, bhgsl=@bhgsl, clfs=@clfs, jyr=@jyr, FINSPEENDDATE=@finsp WHERE id=@id AND tenant_id=@TenantFilter",
  141. new List<SugarParameter>
  142. {
  143. new("@pd", input.Pd),
  144. new("@hgsl", input.Hgsl),
  145. new("@bhgsl", input.Bhgsl),
  146. new("@clfs", input.Pd == 1 ? input.Clfs : null),
  147. new("@jyr", inspectorName),
  148. new("@finsp", now),
  149. new("@id", input.Id),
  150. new("@TenantFilter", tid),
  151. });
  152. // ② 检验任务执行进度 → qms_fqcbj(经 lydjbh=FBILLNO 关联;lydjbh 为空则跳过,防误伤)
  153. // 安全约束(§二):先查关联数量 —— 0 条跳过、1 条更新、>1 条视为数据异常抛错整体回滚,
  154. // 杜绝无保护批量 UPDATE 一次误更新多条任务(即使未来真实数据出现重复 FBILLNO 也安全)。
  155. // jykssj 若为空则补首次开始时间(IFNULL 保留既有);jywcsj=本次提交时间;FINSPECTSTATUS=检验完成
  156. if (!string.IsNullOrWhiteSpace(sourceBillNo))
  157. {
  158. var taskCount = await _db.Ado.GetIntAsync(
  159. "SELECT COUNT(1) FROM qms_fqcbj WHERE FBILLNO=@bjbh AND tenant_id=@TenantFilter",
  160. new List<SugarParameter> { new("@bjbh", sourceBillNo), new("@TenantFilter", tid) });
  161. if (taskCount > 1)
  162. throw Oops.Oh($"检验任务数据异常:来源单号 {sourceBillNo} 匹配到 {taskCount} 条报检任务(qms_fqcbj),无法安全更新,已整体回滚");
  163. if (taskCount == 1)
  164. {
  165. // 不覆写 jyfzr:保持 Claim/Assign 设定的 SysUser.Id 语义,禁止被姓名污染(负责人门/待办均按 id 比对)。
  166. // 仅更新任务进度(开始/完成时间、检验完成状态);如需展示姓名由 SysUser join 解析。
  167. await _db.Ado.ExecuteCommandAsync(
  168. "UPDATE qms_fqcbj SET jykssj=IFNULL(jykssj,@now), jywcsj=@now, FINSPECTSTATUS=@status WHERE FBILLNO=@bjbh AND tenant_id=@TenantFilter",
  169. new List<SugarParameter>
  170. {
  171. new("@now", now),
  172. new("@status", FqcInspBillFlowConst.InspectStatusDone),
  173. new("@bjbh", sourceBillNo),
  174. new("@TenantFilter", tid),
  175. });
  176. }
  177. }
  178. // ③ 推进 N1 → N2
  179. await _flowEngine.Approve(myTask.Id, input.Comment);
  180. });
  181. if (!tran.IsSuccess) throw tran.ErrorException;
  182. // ④ 标准层同步(事务外):①写的 pd/hgsl/bhgsl/jyr/FINSPEENDDATE → mdp_std_fqc_result,
  183. // save-detail 已写的 qms_qcpp_inspbillst 明细 → mdp_std_fqc_result_detail(本单一次性全量收口,
  184. // 故 save-detail 逐项保存时不必同步),②写的 qms_fqcbj 进度 → mdp_std_fqc_task。
  185. await SyncBillToStdSafeAsync(input.Id, "SUBMIT_RESULT");
  186. return await BuildStateAsync(input.Id);
  187. }
  188. /// <summary>检验主管通过(N2 → 完成,不覆盖检验员业务结果)。</summary>
  189. [DisplayName("检验主管通过")]
  190. [HttpPost("supervisor-approve")]
  191. public async Task<FqcFlowStateOutput> SupervisorApprove([FromBody] FqcSupervisorApproveInput input)
  192. {
  193. await EnsureBillAsync(input.Id);
  194. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  195. var tran = await _db.AsTenant().UseTranAsync(async () =>
  196. {
  197. await _flowEngine.Approve(myTask.Id, input.Comment);
  198. });
  199. if (!tran.IsSuccess) throw tran.ErrorException;
  200. // 双模式出站:主管通过且判定合格时写入 Outbox(QMS_API 占位源,真实地址配置后由 Job 推送)
  201. await TryEnqueueFqcPassOutboxAsync(input.Id);
  202. return await BuildStateAsync(input.Id);
  203. }
  204. /// <summary>检验主管退回(N2 → 回 N1,意见必填;保留检验员业务结果与任务进度)。</summary>
  205. [DisplayName("检验主管退回")]
  206. [HttpPost("supervisor-reject")]
  207. public async Task<FqcFlowStateOutput> SupervisorReject([FromBody] FqcSupervisorRejectInput input)
  208. {
  209. if (string.IsNullOrWhiteSpace(input.Comment))
  210. throw Oops.Oh("退回必须填写意见");
  211. var (_, sourceBillNo) = await EnsureBillAsync(input.Id);
  212. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  213. var tid = ResolveTenantOrThrow();
  214. var tran = await _db.AsTenant().UseTranAsync(async () =>
  215. {
  216. // ReturnToPrev 回 N1(原流程回退,不重新起流/不改 Initiator/N1 Assignee/jyfzr);
  217. // 保留已录检验明细与 pd/hgsl/bhgsl/clfs(不清结果),检验员在原数据上修改后重提。
  218. await _flowEngine.ReturnToPrev(myTask.Id, input.Comment);
  219. // 业务状态同步:退回后 Flow 回 N1 ⇔ FINSPECTSTATUS 恢复"检验中"(与生成时口径一致),
  220. // 与 ReturnToPrev 同一事务,杜绝"Flow回N1但状态仍检验完成"或"状态改了但Reject失败仍N2"的分叉。
  221. if (!string.IsNullOrWhiteSpace(sourceBillNo))
  222. {
  223. await _db.Ado.ExecuteCommandAsync(
  224. "UPDATE qms_fqcbj SET FINSPECTSTATUS='检验中' WHERE FBILLNO=@bjbh AND tenant_id=@t",
  225. new SugarParameter("@bjbh", sourceBillNo), new SugarParameter("@t", tid));
  226. }
  227. });
  228. if (!tran.IsSuccess) throw tran.ErrorException;
  229. // 退回改写了 qms_fqcbj.FINSPECTSTATUS,该列即检验任务列表的「检验进度」(mdp_std_fqc_task.inspect_progress),
  230. // 不同步则任务列表停留在"检验完成"。检验结果 pd/hgsl/bhgsl 本动作不改,同步对其为幂等重写。
  231. await SyncBillToStdSafeAsync(input.Id, "SUP_REJECT");
  232. return await BuildStateAsync(input.Id);
  233. }
  234. /// <summary>
  235. /// QE 提交处置方案(N3_QE_DISPOSITION → end)。写 ado_s7_fqc_qe_disposition + 推进 N3→end,同事务。
  236. /// 仅记录处置结论;不覆盖 qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs、不写 qms_fqcbj/库存/仓储/生产。一单一有效处置。
  237. /// </summary>
  238. [DisplayName("QE提交处置方案")]
  239. [HttpPost("qe-submit-disposition")]
  240. public async Task<FqcFlowStateOutput> QeSubmitDisposition([FromBody] FqcQeSubmitDispositionInput input)
  241. {
  242. var (billNo, sourceBillNo) = await EnsureBillAsync(input.Id);
  243. // 参数校验
  244. var dt = input.DispositionType?.Trim().ToUpperInvariant();
  245. if (dt is not (FqcInspBillFlowConst.DispTypeRework or FqcInspBillFlowConst.DispTypeConcession
  246. or FqcInspBillFlowConst.DispTypeScrap or FqcInspBillFlowConst.DispTypeOther))
  247. throw Oops.Oh("处置类型只能为 REWORK(返工)/CONCESSION(让步放行)/SCRAP(报废)/OTHER(其它)");
  248. if (string.IsNullOrWhiteSpace(input.DispositionOpinion)) throw Oops.Oh("处置意见必填");
  249. foreach (var q in new[] { input.DispositionQty, input.ReworkQty, input.ConcessionQty, input.ScrapQty })
  250. if (q is < 0) throw Oops.Oh("处置数量不能为负");
  251. var inst = await GetLatestInstanceAsync(input.Id);
  252. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  253. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  254. var myTask = await GetMyPendingTaskAsync(inst.Id);
  255. if (myTask == null) throw Oops.Oh("当前用户没有待处理的 QE 处置任务(需质量工程师角色成员)");
  256. if (myTask.NodeId != FqcInspBillFlowConst.NodeDisposition) throw Oops.Oh("当前不在 QE 处置节点");
  257. // 一单一有效处置(唯一索引 inspbill_id + status==1 双保险)
  258. var hasEffective = await _db.Queryable<AdoS7FqcQeDisposition>()
  259. .Where(x => x.InspbillId == input.Id && x.Status == 1)
  260. .AnyAsync();
  261. if (hasEffective) throw Oops.Oh("该检验单已有有效 QE 处置,不可重复提交");
  262. // 写库前严格解析可信租户(无 Token / 超管未选主租户 → 抛错,不落库)
  263. var tid = ResolveTenantOrThrow();
  264. var now = DateTime.Now;
  265. var disposition = new AdoS7FqcQeDisposition
  266. {
  267. Id = YitIdHelper.NextId(),
  268. TenantId = tid,
  269. OrgId = inst.OrgId,
  270. InspbillId = input.Id,
  271. InspbillNo = billNo,
  272. SourceBillNo = sourceBillNo,
  273. BizType = FqcInspBillFlowConst.BizType,
  274. FlowInstanceId = inst.Id,
  275. DispositionNo = $"FQCQE-{billNo}-{now:yyyyMMddHHmmss}",
  276. DispositionType = dt!,
  277. DispositionQty = input.DispositionQty,
  278. ReworkQty = input.ReworkQty,
  279. ConcessionQty = input.ConcessionQty,
  280. ScrapQty = input.ScrapQty,
  281. DispositionOpinion = input.DispositionOpinion!.Trim(),
  282. ResponsibilityDept = input.ResponsibilityDept,
  283. ResponsibleUser = input.ResponsibleUser,
  284. AttachmentJson = input.AttachmentJson,
  285. SubmittedBy = _userManager.UserId,
  286. SubmittedByName = _userManager.RealName ?? _userManager.Account,
  287. Status = 1,
  288. SubmittedAt = now,
  289. };
  290. var tran = await _db.AsTenant().UseTranAsync(async () =>
  291. {
  292. await _db.Insertable(disposition).ExecuteCommandAsync();
  293. // 推进 N3 → end
  294. await _flowEngine.Approve(myTask.Id, input.Comment);
  295. });
  296. if (!tran.IsSuccess) throw tran.ErrorException;
  297. return await BuildStateAsync(input.Id);
  298. }
  299. // ───────────────────────── helpers ─────────────────────────
  300. /// <summary>校验检验单存在并返回 FBILLNO。</summary>
  301. private async Task<string> EnsureBillExistsAsync(long id)
  302. {
  303. var (billNo, _) = await EnsureBillAsync(id);
  304. return billNo;
  305. }
  306. /// <summary>校验检验单存在并返回 (FBILLNO, lydjbh来源单号)。</summary>
  307. private async Task<(string billNo, string? sourceBillNo)> EnsureBillAsync(long id)
  308. {
  309. if (id <= 0) throw Oops.Oh("检验单 id 非法");
  310. var tid = ResolveTenantOrThrow();
  311. var rows = await _db.Ado.SqlQueryAsync<FqcBillKey>(
  312. "SELECT FBILLNO AS BillNo, lydjbh AS SourceBillNo FROM qms_qcpp_inspbill WHERE id=@id AND tenant_id=@TenantFilter LIMIT 1",
  313. new List<SugarParameter> { new("@id", id), new("@TenantFilter", tid) });
  314. var r = rows.FirstOrDefault();
  315. if (r == null) throw Oops.Oh("检验单不存在");
  316. return (r.BillNo ?? id.ToString(), r.SourceBillNo);
  317. }
  318. /// <summary>取该检验单最新流程实例(BizType+BizId,跨数据范围)。</summary>
  319. private async Task<ApprovalFlowInstance?> GetLatestInstanceAsync(long bizId)
  320. {
  321. return await _db.Queryable<ApprovalFlowInstance>()
  322. .ClearFilter()
  323. .Where(x => x.BizType == FqcInspBillFlowConst.BizType && x.BizId == bizId)
  324. .OrderByDescending(x => x.Id)
  325. .FirstAsync();
  326. }
  327. /// <summary>取当前用户在指定实例下的待办任务。</summary>
  328. private async Task<ApprovalFlowTask?> GetMyPendingTaskAsync(long instanceId)
  329. {
  330. var userId = _userManager.UserId;
  331. return await _db.Queryable<ApprovalFlowTask>()
  332. .ClearFilter()
  333. .Where(x => x.InstanceId == instanceId && x.AssigneeId == userId && x.Status == FlowTaskStatusEnum.Pending)
  334. .FirstAsync();
  335. }
  336. /// <summary>校验并返回主管 N2 待办任务。</summary>
  337. private async Task<(ApprovalFlowInstance inst, ApprovalFlowTask task)> RequireSupervisorTaskAsync(long bizId)
  338. {
  339. var inst = await GetLatestInstanceAsync(bizId);
  340. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  341. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  342. var myTask = await GetMyPendingTaskAsync(inst.Id);
  343. if (myTask == null) throw Oops.Oh("当前用户没有待处理的审核任务(需检验主管角色成员)");
  344. if (myTask.NodeId != FqcInspBillFlowConst.NodeSupervisor) throw Oops.Oh("当前不在主管审核节点");
  345. return (inst, myTask);
  346. }
  347. /// <summary>当前用户是否具备指定角色(跨数据范围)。</summary>
  348. private async Task<bool> HasRoleAsync(long roleId)
  349. {
  350. var userId = _userManager.UserId;
  351. return await _db.Queryable<SysUserRole>()
  352. .ClearFilter()
  353. .AnyAsync(x => x.UserId == userId && x.RoleId == roleId);
  354. }
  355. /// <summary>组装流程状态输出。</summary>
  356. private async Task<FqcFlowStateOutput> BuildStateAsync(long bizId)
  357. {
  358. var output = new FqcFlowStateOutput { BizId = bizId };
  359. var inst = await GetLatestInstanceAsync(bizId);
  360. if (inst == null)
  361. {
  362. output.FlowStatus = "NotStarted";
  363. output.CanSubmitResult = await HasRoleAsync(FqcInspBillFlowConst.RoleInspectorId);
  364. output.Message = output.CanSubmitResult ? "待检验员录入结果" : "尚未发起流程";
  365. return output;
  366. }
  367. output.InstanceId = inst.Id;
  368. output.FlowStatus = inst.Status.ToString();
  369. output.UpdatedAt = inst.EndTime ?? inst.StartTime;
  370. // QE 处置摘要(任何状态都展示已提交处置)+ 网关判据 disposition_required(由 pd 计算,供展示/调试)
  371. var disp = await _db.Queryable<AdoS7FqcQeDisposition>()
  372. .Where(x => x.InspbillId == bizId && x.Status == 1)
  373. .OrderByDescending(x => x.Id)
  374. .FirstAsync();
  375. if (disp != null)
  376. {
  377. output.HasDisposition = true;
  378. output.DispositionType = disp.DispositionType;
  379. output.DispositionOpinion = disp.DispositionOpinion;
  380. }
  381. var tid = ResolveTenantOrThrow();
  382. var pdRows = await _db.Ado.SqlQueryAsync<string>(
  383. "SELECT pd FROM qms_qcpp_inspbill WHERE id=@id AND tenant_id=@TenantFilter LIMIT 1",
  384. new List<SugarParameter> { new("@id", bizId), new("@TenantFilter", tid) });
  385. output.DispositionRequired = (pdRows.FirstOrDefault()?.Trim() == "1") ? 1 : 0;
  386. if (inst.Status != FlowInstanceStatusEnum.Running)
  387. {
  388. output.IsCompleted = true;
  389. output.Message = inst.Status == FlowInstanceStatusEnum.Approved ? "流程已完成(审批通过)" : $"流程已结束({inst.Status})";
  390. return output;
  391. }
  392. output.CurrentNodeCode = inst.CurrentNodeId;
  393. output.IsWaitingDisposition = inst.CurrentNodeId == FqcInspBillFlowConst.NodeDisposition;
  394. var myTask = await GetMyPendingTaskAsync(inst.Id);
  395. if (myTask != null)
  396. {
  397. output.CurrentNodeName = myTask.NodeName;
  398. if (myTask.NodeId == FqcInspBillFlowConst.NodeInspect)
  399. {
  400. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleInspectorCode;
  401. output.CanSubmitResult = true;
  402. output.Message = "待当前用户录入检验结果";
  403. }
  404. else if (myTask.NodeId == FqcInspBillFlowConst.NodeSupervisor)
  405. {
  406. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleSupervisorCode;
  407. output.CanSupervisorApprove = true;
  408. output.CanSupervisorReject = true;
  409. output.Message = "待当前用户主管审核";
  410. }
  411. else if (myTask.NodeId == FqcInspBillFlowConst.NodeDisposition)
  412. {
  413. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleQeCode;
  414. output.CanSubmitDisposition = true;
  415. output.Message = "待当前用户提交 QE 处置";
  416. }
  417. }
  418. else
  419. {
  420. output.CurrentAssigneeRole = inst.CurrentNodeId switch
  421. {
  422. FqcInspBillFlowConst.NodeInspect => FqcInspBillFlowConst.RoleInspectorCode,
  423. FqcInspBillFlowConst.NodeDisposition => FqcInspBillFlowConst.RoleQeCode,
  424. _ => FqcInspBillFlowConst.RoleSupervisorCode,
  425. };
  426. output.Message = "流程进行中(当前用户无待办)";
  427. }
  428. return output;
  429. }
  430. /// <summary>
  431. /// 合格闭环时写 mdp_outbox(幂等);失败不阻断主流程。
  432. /// </summary>
  433. private async Task TryEnqueueFqcPassOutboxAsync(long billId)
  434. {
  435. try
  436. {
  437. long tenantId = ResolveTenantOrThrow();
  438. var row = await _db.Ado.SqlQuerySingleAsync<FqcOutboxBillRow>(
  439. "SELECT id AS Id, FBILLNO AS BillNo, pd AS Pd, hgsl AS Hgsl, bhgsl AS Bhgsl FROM qms_qcpp_inspbill WHERE id=@id AND tenant_id=@tid LIMIT 1",
  440. new List<SugarParameter> { new("@id", billId), new("@tid", tenantId) });
  441. if (row == null || row.Pd != 0) return; // 仅合格回写
  442. string billNo = string.IsNullOrWhiteSpace(row.BillNo) ? billId.ToString() : row.BillNo!;
  443. var payload = JsonSerializer.Serialize(new
  444. {
  445. path = "/fqc/result",
  446. method = "POST",
  447. body = new
  448. {
  449. billId,
  450. billNo,
  451. pd = row.Pd,
  452. hgsl = row.Hgsl,
  453. bhgsl = row.Bhgsl,
  454. action = "S7_FQC_RESULT_PUSH"
  455. }
  456. });
  457. var exists = await _db.Ado.GetIntAsync(
  458. "SELECT COUNT(1) FROM mdp_outbox WHERE tenant_id=@tid AND target_source_code='QMS_API' AND action_code='S7_FQC_RESULT_PUSH' AND idem_key=@idem",
  459. new List<SugarParameter>
  460. {
  461. new("@tid", tenantId),
  462. new("@idem", billNo)
  463. }) > 0;
  464. if (exists) return;
  465. await _db.Insertable(new MdpOutbox
  466. {
  467. TenantId = tenantId,
  468. TargetSourceCode = "QMS_API",
  469. ActionCode = "S7_FQC_RESULT_PUSH",
  470. IdemKey = billNo,
  471. PayloadJson = payload,
  472. Status = 0,
  473. RetryCount = 0,
  474. CreateTime = DateTime.Now,
  475. UpdateTime = DateTime.Now
  476. }).ExecuteCommandAsync();
  477. }
  478. catch
  479. {
  480. // Outbox 写入失败不影响检验闭环
  481. }
  482. }
  483. private sealed class FqcOutboxBillRow
  484. {
  485. public long Id { get; set; }
  486. public string? BillNo { get; set; }
  487. public int? Pd { get; set; }
  488. public decimal? Hgsl { get; set; }
  489. public decimal? Bhgsl { get; set; }
  490. }
  491. private class FqcBillKey
  492. {
  493. public string? BillNo { get; set; }
  494. public string? SourceBillNo { get; set; }
  495. }
  496. }