FqcInspBillFlowService.cs 19 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395
  1. using Admin.NET.Plugin.AiDOP.Entity;
  2. using Admin.NET.Plugin.AiDOP.FinishedWarehouse.Dto;
  3. using Admin.NET.Plugin.ApprovalFlow;
  4. using Admin.NET.Plugin.ApprovalFlow.Service;
  5. using Yitter.IdGenerator;
  6. namespace Admin.NET.Plugin.AiDOP.FinishedWarehouse;
  7. /// <summary>
  8. /// S7 FQC 成品检验单 检验员+主管最小审批流服务(S7-FQC-INSPBILL-INSPECTOR-SUPERVISOR-FLOW-1)。
  9. ///
  10. /// N1_INSPECT 检验员录入 pd/hgsl/bhgsl/clfs → 提交 → N2_SUP_REVIEW 检验主管审核(通过=Approved / 退回=回 N1)。
  11. /// 复用 ApprovalFlow 引擎扩展点(StartFlow/Approve/ReturnToPrev + IFlowBizHandler),不改 ApprovalFlow 核心。
  12. /// BizType=S7_FQC_INSPBILL,BizId=qms_qcpp_inspbill.id,BizCode=FBILLNO。反查用 ApprovalFlowInstance(BizType,BizId),inspbill 不加列。
  13. ///
  14. /// 状态归属(严格分离):
  15. /// - 检验业务结果 → qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs(仅 submit-result 写)
  16. /// - 检验任务执行进度 → qms_fqcbj.jyfzr/jykssj/jywcsj/FINSPECTSTATUS(经 lydjbh=FBILLNO 关联;仅执行状态未检验/检验中/检验完成)
  17. /// - 审批节点/待办/审核状态 → ApprovalFlowInstance(绝不写入 FINSPECTSTATUS)
  18. /// 不写 FBILLSTATUS/库存/仓储/生产状态;clfs 仅保存不触发任何后续动作。正常鉴权(非匿名)。
  19. /// </summary>
  20. [ApiDescriptionSettings(Order = 331, Description = "FQC检验单流程")]
  21. [Route("api/S7FqcInspBillFlow")]
  22. [NonUnify]
  23. public class FqcInspBillFlowService : IDynamicApiController, ITransient
  24. {
  25. private readonly ISqlSugarClient _db;
  26. private readonly FlowEngineService _flowEngine;
  27. private readonly UserManager _userManager;
  28. public FqcInspBillFlowService(ISqlSugarClient db, FlowEngineService flowEngine, UserManager userManager)
  29. {
  30. _db = db;
  31. _flowEngine = flowEngine;
  32. _userManager = userManager;
  33. }
  34. /// <summary>检验单流程状态(只读,供前端按钮控制)。</summary>
  35. [DisplayName("FQC检验单流程状态")]
  36. [HttpGet("state")]
  37. public async Task<FqcFlowStateOutput> GetState([FromQuery] long id)
  38. {
  39. await EnsureBillExistsAsync(id);
  40. return await BuildStateAsync(id);
  41. }
  42. /// <summary>
  43. /// 检验员提交检验结果(写 qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs + qms_fqcbj 任务进度 + 推进 N1→N2)。
  44. /// </summary>
  45. [DisplayName("检验员提交检验结果")]
  46. [HttpPost("submit-result")]
  47. public async Task<FqcFlowStateOutput> SubmitResult([FromBody] FqcSubmitResultInput input)
  48. {
  49. var (billNo, sourceBillNo) = await EnsureBillAsync(input.Id);
  50. // 参数校验
  51. if (input.Pd != 0 && input.Pd != 1) throw Oops.Oh("判定 pd 只能为 0(合格) 或 1(不合格)");
  52. if (input.Hgsl < 0) throw Oops.Oh("合格数量不能为负");
  53. if (input.Bhgsl < 0) throw Oops.Oh("不合格数量不能为负");
  54. if (input.Pd == 0)
  55. {
  56. if (input.Bhgsl != 0) throw Oops.Oh("判定合格时不合格数量必须为 0");
  57. }
  58. else // pd == 1
  59. {
  60. if (input.Bhgsl <= 0) throw Oops.Oh("判定不合格时不合格数量必须大于 0");
  61. if (input.Clfs is not (0 or 1 or 2)) throw Oops.Oh("判定不合格时处理方式 clfs 必填且只能为 0(让步接收)/1(挑选)/2(报废)");
  62. }
  63. var inst = await GetLatestInstanceAsync(input.Id);
  64. if (inst != null && inst.Status != FlowInstanceStatusEnum.Running)
  65. throw Oops.Oh("该检验单流程已结束,无法再提交检验结果");
  66. var inspectorName = _userManager.RealName ?? _userManager.Account;
  67. var now = DateTime.Now;
  68. var tran = await _db.AsTenant().UseTranAsync(async () =>
  69. {
  70. // 无运行中实例 → 起流程(自动生成 N1 任务给检验员角色成员)
  71. long instanceId = inst?.Id ?? await _flowEngine.StartFlow(new StartFlowInput
  72. {
  73. BizType = FqcInspBillFlowConst.BizType,
  74. BizId = input.Id,
  75. BizNo = billNo,
  76. Title = $"FQC检验单 {billNo}",
  77. Comment = input.Comment,
  78. });
  79. var myTask = await GetMyPendingTaskAsync(instanceId);
  80. if (myTask == null)
  81. throw Oops.Oh("当前用户没有待处理的检验任务(需检验员角色成员)");
  82. if (myTask.NodeId != FqcInspBillFlowConst.NodeInspect)
  83. throw Oops.Oh("当前不在检验录入节点,无法提交检验结果");
  84. // ① 检验业务结果 → qms_qcpp_inspbill(仅 pd/hgsl/bhgsl/clfs,不覆盖继承字段)
  85. await _db.Ado.ExecuteCommandAsync(
  86. "UPDATE qms_qcpp_inspbill SET pd=@pd, hgsl=@hgsl, bhgsl=@bhgsl, clfs=@clfs WHERE id=@id",
  87. new List<SugarParameter>
  88. {
  89. new("@pd", input.Pd),
  90. new("@hgsl", input.Hgsl),
  91. new("@bhgsl", input.Bhgsl),
  92. new("@clfs", input.Pd == 1 ? input.Clfs : null),
  93. new("@id", input.Id),
  94. });
  95. // ② 检验任务执行进度 → qms_fqcbj(经 lydjbh=FBILLNO 关联;lydjbh 为空则跳过,防误伤)
  96. // 安全约束(§二):先查关联数量 —— 0 条跳过、1 条更新、>1 条视为数据异常抛错整体回滚,
  97. // 杜绝无保护批量 UPDATE 一次误更新多条任务(即使未来真实数据出现重复 FBILLNO 也安全)。
  98. // jykssj 若为空则补首次开始时间(IFNULL 保留既有);jywcsj=本次提交时间;FINSPECTSTATUS=检验完成
  99. if (!string.IsNullOrWhiteSpace(sourceBillNo))
  100. {
  101. var taskCount = await _db.Ado.GetIntAsync(
  102. "SELECT COUNT(1) FROM qms_fqcbj WHERE FBILLNO=@bjbh",
  103. new List<SugarParameter> { new("@bjbh", sourceBillNo) });
  104. if (taskCount > 1)
  105. throw Oops.Oh($"检验任务数据异常:来源单号 {sourceBillNo} 匹配到 {taskCount} 条报检任务(qms_fqcbj),无法安全更新,已整体回滚");
  106. if (taskCount == 1)
  107. {
  108. await _db.Ado.ExecuteCommandAsync(
  109. "UPDATE qms_fqcbj SET jyfzr=@jyfzr, jykssj=IFNULL(jykssj,@now), jywcsj=@now, FINSPECTSTATUS=@status WHERE FBILLNO=@bjbh",
  110. new List<SugarParameter>
  111. {
  112. new("@jyfzr", inspectorName),
  113. new("@now", now),
  114. new("@status", FqcInspBillFlowConst.InspectStatusDone),
  115. new("@bjbh", sourceBillNo),
  116. });
  117. }
  118. }
  119. // ③ 推进 N1 → N2
  120. await _flowEngine.Approve(myTask.Id, input.Comment);
  121. });
  122. if (!tran.IsSuccess) throw tran.ErrorException;
  123. return await BuildStateAsync(input.Id);
  124. }
  125. /// <summary>检验主管通过(N2 → 完成,不覆盖检验员业务结果)。</summary>
  126. [DisplayName("检验主管通过")]
  127. [HttpPost("supervisor-approve")]
  128. public async Task<FqcFlowStateOutput> SupervisorApprove([FromBody] FqcSupervisorApproveInput input)
  129. {
  130. await EnsureBillAsync(input.Id);
  131. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  132. var tran = await _db.AsTenant().UseTranAsync(async () =>
  133. {
  134. await _flowEngine.Approve(myTask.Id, input.Comment);
  135. });
  136. if (!tran.IsSuccess) throw tran.ErrorException;
  137. return await BuildStateAsync(input.Id);
  138. }
  139. /// <summary>检验主管退回(N2 → 回 N1,意见必填;保留检验员业务结果与任务进度)。</summary>
  140. [DisplayName("检验主管退回")]
  141. [HttpPost("supervisor-reject")]
  142. public async Task<FqcFlowStateOutput> SupervisorReject([FromBody] FqcSupervisorRejectInput input)
  143. {
  144. if (string.IsNullOrWhiteSpace(input.Comment))
  145. throw Oops.Oh("退回必须填写意见");
  146. await EnsureBillAsync(input.Id);
  147. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  148. var tran = await _db.AsTenant().UseTranAsync(async () =>
  149. {
  150. // ReturnToPrev 回 N1;不清 pd/hgsl/bhgsl/clfs、不清 FINSPECTSTATUS/jywcsj,检验员改后重提
  151. await _flowEngine.ReturnToPrev(myTask.Id, input.Comment);
  152. });
  153. if (!tran.IsSuccess) throw tran.ErrorException;
  154. return await BuildStateAsync(input.Id);
  155. }
  156. /// <summary>
  157. /// QE 提交处置方案(N3_QE_DISPOSITION → end)。写 ado_s7_fqc_qe_disposition + 推进 N3→end,同事务。
  158. /// 仅记录处置结论;不覆盖 qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs、不写 qms_fqcbj/库存/仓储/生产。一单一有效处置。
  159. /// </summary>
  160. [DisplayName("QE提交处置方案")]
  161. [HttpPost("qe-submit-disposition")]
  162. public async Task<FqcFlowStateOutput> QeSubmitDisposition([FromBody] FqcQeSubmitDispositionInput input)
  163. {
  164. var (billNo, sourceBillNo) = await EnsureBillAsync(input.Id);
  165. // 参数校验
  166. var dt = input.DispositionType?.Trim().ToUpperInvariant();
  167. if (dt is not (FqcInspBillFlowConst.DispTypeRework or FqcInspBillFlowConst.DispTypeConcession
  168. or FqcInspBillFlowConst.DispTypeScrap or FqcInspBillFlowConst.DispTypeOther))
  169. throw Oops.Oh("处置类型只能为 REWORK(返工)/CONCESSION(让步放行)/SCRAP(报废)/OTHER(其它)");
  170. if (string.IsNullOrWhiteSpace(input.DispositionOpinion)) throw Oops.Oh("处置意见必填");
  171. foreach (var q in new[] { input.DispositionQty, input.ReworkQty, input.ConcessionQty, input.ScrapQty })
  172. if (q is < 0) throw Oops.Oh("处置数量不能为负");
  173. var inst = await GetLatestInstanceAsync(input.Id);
  174. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  175. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  176. var myTask = await GetMyPendingTaskAsync(inst.Id);
  177. if (myTask == null) throw Oops.Oh("当前用户没有待处理的 QE 处置任务(需质量工程师角色成员)");
  178. if (myTask.NodeId != FqcInspBillFlowConst.NodeDisposition) throw Oops.Oh("当前不在 QE 处置节点");
  179. // 一单一有效处置(唯一索引 inspbill_id + status==1 双保险)
  180. var hasEffective = await _db.Queryable<AdoS7FqcQeDisposition>()
  181. .Where(x => x.InspbillId == input.Id && x.Status == 1)
  182. .AnyAsync();
  183. if (hasEffective) throw Oops.Oh("该检验单已有有效 QE 处置,不可重复提交");
  184. var now = DateTime.Now;
  185. var disposition = new AdoS7FqcQeDisposition
  186. {
  187. Id = YitIdHelper.NextId(),
  188. TenantId = _userManager.TenantId,
  189. OrgId = inst.OrgId,
  190. InspbillId = input.Id,
  191. InspbillNo = billNo,
  192. SourceBillNo = sourceBillNo,
  193. BizType = FqcInspBillFlowConst.BizType,
  194. FlowInstanceId = inst.Id,
  195. DispositionNo = $"FQCQE-{billNo}-{now:yyyyMMddHHmmss}",
  196. DispositionType = dt!,
  197. DispositionQty = input.DispositionQty,
  198. ReworkQty = input.ReworkQty,
  199. ConcessionQty = input.ConcessionQty,
  200. ScrapQty = input.ScrapQty,
  201. DispositionOpinion = input.DispositionOpinion!.Trim(),
  202. ResponsibilityDept = input.ResponsibilityDept,
  203. ResponsibleUser = input.ResponsibleUser,
  204. AttachmentJson = input.AttachmentJson,
  205. SubmittedBy = _userManager.UserId,
  206. SubmittedByName = _userManager.RealName ?? _userManager.Account,
  207. Status = 1,
  208. SubmittedAt = now,
  209. };
  210. var tran = await _db.AsTenant().UseTranAsync(async () =>
  211. {
  212. await _db.Insertable(disposition).ExecuteCommandAsync();
  213. // 推进 N3 → end
  214. await _flowEngine.Approve(myTask.Id, input.Comment);
  215. });
  216. if (!tran.IsSuccess) throw tran.ErrorException;
  217. return await BuildStateAsync(input.Id);
  218. }
  219. // ───────────────────────── helpers ─────────────────────────
  220. /// <summary>校验检验单存在并返回 FBILLNO。</summary>
  221. private async Task<string> EnsureBillExistsAsync(long id)
  222. {
  223. var (billNo, _) = await EnsureBillAsync(id);
  224. return billNo;
  225. }
  226. /// <summary>校验检验单存在并返回 (FBILLNO, lydjbh来源单号)。</summary>
  227. private async Task<(string billNo, string? sourceBillNo)> EnsureBillAsync(long id)
  228. {
  229. if (id <= 0) throw Oops.Oh("检验单 id 非法");
  230. var rows = await _db.Ado.SqlQueryAsync<FqcBillKey>(
  231. "SELECT FBILLNO AS BillNo, lydjbh AS SourceBillNo FROM qms_qcpp_inspbill WHERE id=@id LIMIT 1",
  232. new List<SugarParameter> { new("@id", id) });
  233. var r = rows.FirstOrDefault();
  234. if (r == null) throw Oops.Oh("检验单不存在");
  235. return (r.BillNo ?? id.ToString(), r.SourceBillNo);
  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 == FqcInspBillFlowConst.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 != FqcInspBillFlowConst.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>组装流程状态输出。</summary>
  275. private async Task<FqcFlowStateOutput> BuildStateAsync(long bizId)
  276. {
  277. var output = new FqcFlowStateOutput { BizId = bizId };
  278. var inst = await GetLatestInstanceAsync(bizId);
  279. if (inst == null)
  280. {
  281. output.FlowStatus = "NotStarted";
  282. output.CanSubmitResult = await HasRoleAsync(FqcInspBillFlowConst.RoleInspectorId);
  283. output.Message = output.CanSubmitResult ? "待检验员录入结果" : "尚未发起流程";
  284. return output;
  285. }
  286. output.InstanceId = inst.Id;
  287. output.FlowStatus = inst.Status.ToString();
  288. output.UpdatedAt = inst.EndTime ?? inst.StartTime;
  289. // QE 处置摘要(任何状态都展示已提交处置)+ 网关判据 disposition_required(由 pd 计算,供展示/调试)
  290. var disp = await _db.Queryable<AdoS7FqcQeDisposition>()
  291. .Where(x => x.InspbillId == bizId && x.Status == 1)
  292. .OrderByDescending(x => x.Id)
  293. .FirstAsync();
  294. if (disp != null)
  295. {
  296. output.HasDisposition = true;
  297. output.DispositionType = disp.DispositionType;
  298. output.DispositionOpinion = disp.DispositionOpinion;
  299. }
  300. var pdRows = await _db.Ado.SqlQueryAsync<string>(
  301. "SELECT pd FROM qms_qcpp_inspbill WHERE id=@id LIMIT 1",
  302. new List<SugarParameter> { new("@id", bizId) });
  303. output.DispositionRequired = (pdRows.FirstOrDefault()?.Trim() == "1") ? 1 : 0;
  304. if (inst.Status != FlowInstanceStatusEnum.Running)
  305. {
  306. output.IsCompleted = true;
  307. output.Message = inst.Status == FlowInstanceStatusEnum.Approved ? "流程已完成(审批通过)" : $"流程已结束({inst.Status})";
  308. return output;
  309. }
  310. output.CurrentNodeCode = inst.CurrentNodeId;
  311. output.IsWaitingDisposition = inst.CurrentNodeId == FqcInspBillFlowConst.NodeDisposition;
  312. var myTask = await GetMyPendingTaskAsync(inst.Id);
  313. if (myTask != null)
  314. {
  315. output.CurrentNodeName = myTask.NodeName;
  316. if (myTask.NodeId == FqcInspBillFlowConst.NodeInspect)
  317. {
  318. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleInspectorCode;
  319. output.CanSubmitResult = true;
  320. output.Message = "待当前用户录入检验结果";
  321. }
  322. else if (myTask.NodeId == FqcInspBillFlowConst.NodeSupervisor)
  323. {
  324. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleSupervisorCode;
  325. output.CanSupervisorApprove = true;
  326. output.CanSupervisorReject = true;
  327. output.Message = "待当前用户主管审核";
  328. }
  329. else if (myTask.NodeId == FqcInspBillFlowConst.NodeDisposition)
  330. {
  331. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleQeCode;
  332. output.CanSubmitDisposition = true;
  333. output.Message = "待当前用户提交 QE 处置";
  334. }
  335. }
  336. else
  337. {
  338. output.CurrentAssigneeRole = inst.CurrentNodeId switch
  339. {
  340. FqcInspBillFlowConst.NodeInspect => FqcInspBillFlowConst.RoleInspectorCode,
  341. FqcInspBillFlowConst.NodeDisposition => FqcInspBillFlowConst.RoleQeCode,
  342. _ => FqcInspBillFlowConst.RoleSupervisorCode,
  343. };
  344. output.Message = "流程进行中(当前用户无待办)";
  345. }
  346. return output;
  347. }
  348. private class FqcBillKey
  349. {
  350. public string? BillNo { get; set; }
  351. public string? SourceBillNo { get; set; }
  352. }
  353. }