FqcInspBillFlowService.cs 24 KB

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