IpqcInspectionFlowService.cs 15 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354
  1. using Admin.NET.Plugin.AiDOP.Entity;
  2. using Admin.NET.Plugin.AiDOP.Manufacturing.Dto;
  3. using Admin.NET.Plugin.ApprovalFlow;
  4. using Admin.NET.Plugin.ApprovalFlow.Service;
  5. using Yitter.IdGenerator;
  6. namespace Admin.NET.Plugin.AiDOP.Manufacturing;
  7. /// <summary>
  8. /// S6 过程检验单(IPQC)检验员+主管最小审批流服务(IPQC-INSPECTOR-SUPERVISOR-FLOW-1)。
  9. ///
  10. /// N1_INSPECT 检验员录入 jgpd/jyhgsl/jybhgsl/ybl/jyr/bz → 提交 → N2_SUP_REVIEW 检验主管审核(通过=完成 / 退回=回 N1)。
  11. /// 复用 ApprovalFlow 引擎扩展点(StartFlow/Approve/ReturnToPrev + IFlowBizHandler),不改 ApprovalFlow 核心。
  12. /// BizType=IPQC_INSPECTION,BizId=qms_gcjyd.id,BizCode=djbh。反查用 ApprovalFlowInstance(BizType,BizId),qms_gcjyd 不加列。
  13. /// submit-inspection 仅写 qms_gcjyd 白名单列;审核信息落轻量扩展表 ado_s6_ipqc_inspection_flow_state;
  14. /// 不回写 qms_gcjyd.status;不写库存/生产/仓储;不做不合格处置/SQE/通知。
  15. /// 正常鉴权(非 AllowAnonymous);权限以当前用户 pending task 归属为准。
  16. /// </summary>
  17. [ApiDescriptionSettings(Order = 312, Description = "过程检验单流程")]
  18. [Route("api/IpqcInspectionFlow")]
  19. [NonUnify]
  20. public class IpqcInspectionFlowService : IDynamicApiController, ITransient
  21. {
  22. private readonly ISqlSugarClient _db;
  23. private readonly FlowEngineService _flowEngine;
  24. private readonly UserManager _userManager;
  25. public IpqcInspectionFlowService(ISqlSugarClient db, FlowEngineService flowEngine, UserManager userManager)
  26. {
  27. _db = db;
  28. _flowEngine = flowEngine;
  29. _userManager = userManager;
  30. }
  31. /// <summary>
  32. /// 检验单流程状态(只读,供前端按钮控制)。
  33. /// </summary>
  34. [DisplayName("过程检验单流程状态")]
  35. [HttpGet("state")]
  36. public async Task<IpqcFlowStateOutput> GetState([FromQuery] long id)
  37. {
  38. await EnsureBillExistsAsync(id);
  39. return await BuildStateAsync(id);
  40. }
  41. /// <summary>
  42. /// 检验员提交检验结果(写 qms_gcjyd 白名单列 + 推进 N1→N2)。
  43. /// </summary>
  44. [DisplayName("检验员提交检验结果")]
  45. [HttpPost("submit-inspection")]
  46. public async Task<IpqcFlowStateOutput> SubmitInspection([FromBody] IpqcSubmitInspectionInput input)
  47. {
  48. var billNo = await EnsureBillExistsAsync(input.Id);
  49. // 参数校验(不合格数不得为负、不得大于样本量;合格数不得为负)
  50. if (input.Jyhgsl < 0) throw Oops.Oh("检验合格数量不能为负");
  51. if (input.Jybhgsl < 0) throw Oops.Oh("检验不合格数量不能为负");
  52. if (input.Ybl is < 0) throw Oops.Oh("样本量不能为负");
  53. if (input.Ybl is > 0 && input.Jybhgsl > input.Ybl.Value)
  54. throw Oops.Oh("不合格数量不能大于样本量(检验数)");
  55. var inst = await GetLatestInstanceAsync(input.Id);
  56. if (inst != null && inst.Status != FlowInstanceStatusEnum.Running)
  57. throw Oops.Oh("该检验单流程已结束,无法再提交检验结果");
  58. var now = DateTime.Now;
  59. var inspectorName = _userManager.RealName ?? _userManager.Account;
  60. var tran = await _db.AsTenant().UseTranAsync(async () =>
  61. {
  62. // 无运行中实例 → 起流程(自动生成 N1 任务给检验员角色成员)
  63. long instanceId;
  64. if (inst == null)
  65. {
  66. instanceId = await _flowEngine.StartFlow(new StartFlowInput
  67. {
  68. BizType = IpqcInspectionFlowConst.BizType,
  69. BizId = input.Id,
  70. BizNo = billNo,
  71. Title = $"过程检验单 {billNo}",
  72. Comment = input.Comment,
  73. });
  74. }
  75. else
  76. {
  77. instanceId = inst.Id;
  78. }
  79. var myTask = await GetMyPendingTaskAsync(instanceId);
  80. if (myTask == null)
  81. throw Oops.Oh("当前用户没有待处理的检验任务(需检验员角色成员)");
  82. if (myTask.NodeId != IpqcInspectionFlowConst.NodeInspect)
  83. throw Oops.Oh("当前不在检验录入节点,无法提交检验结果");
  84. // 写检验结果(仅 qms_gcjyd 白名单列 jgpd/jyhgsl/jybhgsl/ybl/jyr/bz;jgpd 可空不强写)
  85. await _db.Ado.ExecuteCommandAsync(
  86. "UPDATE qms_gcjyd SET jgpd=@jgpd, jyhgsl=@jyhgsl, jybhgsl=@jybhgsl, ybl=@ybl, jyr=@jyr, bz=@bz WHERE id=@id",
  87. new List<SugarParameter>
  88. {
  89. new("@jgpd", input.Jgpd.HasValue ? input.Jgpd.Value : (object?)null),
  90. new("@jyhgsl", input.Jyhgsl),
  91. new("@jybhgsl", input.Jybhgsl),
  92. new("@ybl", input.Ybl.HasValue ? input.Ybl.Value : (object?)null),
  93. new("@jyr", inspectorName),
  94. new("@bz", input.Bz),
  95. new("@id", input.Id),
  96. });
  97. // 落轻量扩展表(提交人/提交时间/业务状态,不回写 qms_gcjyd.status)
  98. await UpsertFlowStateAsync(input.Id, billNo, instanceId, IpqcInspectionFlowConst.StatusPendingReview,
  99. IpqcInspectionFlowConst.NodeSupervisor, now, isSubmit: true, inspectorName: inspectorName);
  100. // 推进 N1 → N2
  101. await _flowEngine.Approve(myTask.Id, input.Comment);
  102. });
  103. if (!tran.IsSuccess) throw tran.ErrorException;
  104. return await BuildStateAsync(input.Id);
  105. }
  106. /// <summary>
  107. /// 检验主管通过(N2 → 完成)。
  108. /// </summary>
  109. [DisplayName("检验主管通过")]
  110. [HttpPost("supervisor-approve")]
  111. public async Task<IpqcFlowStateOutput> SupervisorApprove([FromBody] IpqcSupervisorApproveInput input)
  112. {
  113. var billNo = await EnsureBillExistsAsync(input.Id);
  114. var (inst, myTask) = await RequireSupervisorTaskAsync(input.Id);
  115. var now = DateTime.Now;
  116. var supervisorName = _userManager.RealName ?? _userManager.Account;
  117. var tran = await _db.AsTenant().UseTranAsync(async () =>
  118. {
  119. await UpsertFlowStateAsync(input.Id, billNo, inst.Id, IpqcInspectionFlowConst.StatusApproved,
  120. null, now, isSubmit: false, reviewResult: "APPROVED", supervisorName: supervisorName);
  121. await _flowEngine.Approve(myTask.Id, input.Comment);
  122. });
  123. if (!tran.IsSuccess) throw tran.ErrorException;
  124. return await BuildStateAsync(input.Id);
  125. }
  126. /// <summary>
  127. /// 检验主管退回(N2 → 回 N1,意见必填)。
  128. /// </summary>
  129. [DisplayName("检验主管退回")]
  130. [HttpPost("supervisor-return")]
  131. public async Task<IpqcFlowStateOutput> SupervisorReturn([FromBody] IpqcSupervisorReturnInput input)
  132. {
  133. if (string.IsNullOrWhiteSpace(input.Comment))
  134. throw Oops.Oh("退回必须填写意见");
  135. var billNo = await EnsureBillExistsAsync(input.Id);
  136. var (inst, myTask) = await RequireSupervisorTaskAsync(input.Id);
  137. var now = DateTime.Now;
  138. var supervisorName = _userManager.RealName ?? _userManager.Account;
  139. var tran = await _db.AsTenant().UseTranAsync(async () =>
  140. {
  141. await UpsertFlowStateAsync(input.Id, billNo, inst.Id, IpqcInspectionFlowConst.StatusReturned,
  142. IpqcInspectionFlowConst.NodeInspect, now, isSubmit: false, reviewResult: "RETURNED",
  143. supervisorName: supervisorName, returnReason: input.Comment);
  144. await _flowEngine.ReturnToPrev(myTask.Id, input.Comment);
  145. });
  146. if (!tran.IsSuccess) throw tran.ErrorException;
  147. return await BuildStateAsync(input.Id);
  148. }
  149. // ───────────────────────── helpers ─────────────────────────
  150. /// <summary>校验检验单存在并返回 djbh(无 djbh 用 id 兜底)。</summary>
  151. private async Task<string> EnsureBillExistsAsync(long id)
  152. {
  153. if (id <= 0) throw Oops.Oh("检验单 id 非法");
  154. var rows = await _db.Ado.SqlQueryAsync<string>(
  155. "SELECT djbh FROM qms_gcjyd WHERE id=@id LIMIT 1",
  156. new List<SugarParameter> { new("@id", id) });
  157. if (rows.Count == 0) throw Oops.Oh("检验单不存在");
  158. return rows[0] ?? id.ToString();
  159. }
  160. /// <summary>取该检验单最新流程实例(BizType+BizId,跨数据范围)。</summary>
  161. private async Task<ApprovalFlowInstance?> GetLatestInstanceAsync(long bizId)
  162. {
  163. return await _db.Queryable<ApprovalFlowInstance>()
  164. .ClearFilter()
  165. .Where(x => x.BizType == IpqcInspectionFlowConst.BizType && x.BizId == bizId)
  166. .OrderByDescending(x => x.Id)
  167. .FirstAsync();
  168. }
  169. /// <summary>取当前用户在指定实例下的待办任务。</summary>
  170. private async Task<ApprovalFlowTask?> GetMyPendingTaskAsync(long instanceId)
  171. {
  172. var userId = _userManager.UserId;
  173. return await _db.Queryable<ApprovalFlowTask>()
  174. .ClearFilter()
  175. .Where(x => x.InstanceId == instanceId && x.AssigneeId == userId && x.Status == FlowTaskStatusEnum.Pending)
  176. .FirstAsync();
  177. }
  178. /// <summary>校验并返回主管 N2 待办任务。</summary>
  179. private async Task<(ApprovalFlowInstance inst, ApprovalFlowTask task)> RequireSupervisorTaskAsync(long bizId)
  180. {
  181. var inst = await GetLatestInstanceAsync(bizId);
  182. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  183. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  184. var myTask = await GetMyPendingTaskAsync(inst.Id);
  185. if (myTask == null) throw Oops.Oh("当前用户没有待处理的审核任务(需检验主管角色成员)");
  186. if (myTask.NodeId != IpqcInspectionFlowConst.NodeSupervisor) throw Oops.Oh("当前不在主管审核节点");
  187. return (inst, myTask);
  188. }
  189. /// <summary>当前用户是否具备指定角色(跨数据范围)。</summary>
  190. private async Task<bool> HasRoleAsync(long roleId)
  191. {
  192. var userId = _userManager.UserId;
  193. return await _db.Queryable<SysUserRole>()
  194. .ClearFilter()
  195. .AnyAsync(x => x.UserId == userId && x.RoleId == roleId);
  196. }
  197. /// <summary>Upsert 流程状态扩展表(不回写 qms_gcjyd.status)。</summary>
  198. private async Task UpsertFlowStateAsync(long inspectionId, string billNo, long instanceId, string businessStatus,
  199. string? currentNode, DateTime now, bool isSubmit, string? inspectorName = null, string? supervisorName = null,
  200. string? reviewResult = null, string? returnReason = null)
  201. {
  202. var existing = await _db.Queryable<AdoS6IpqcInspectionFlowState>()
  203. .ClearFilter()
  204. .Where(x => x.InspectionId == inspectionId)
  205. .FirstAsync();
  206. if (existing == null)
  207. {
  208. var row = new AdoS6IpqcInspectionFlowState
  209. {
  210. Id = YitIdHelper.NextId(),
  211. TenantId = _userManager.TenantId,
  212. InspectionId = inspectionId,
  213. InspectionNo = billNo,
  214. BizType = IpqcInspectionFlowConst.BizType,
  215. FlowInstanceId = instanceId,
  216. BusinessStatus = businessStatus,
  217. CurrentNode = currentNode,
  218. RowVersion = 1,
  219. CreateTime = now,
  220. };
  221. if (isSubmit)
  222. {
  223. row.InspectorUserId = _userManager.UserId;
  224. row.InspectorName = inspectorName;
  225. row.SubmittedAt = now;
  226. }
  227. else
  228. {
  229. row.SupervisorUserId = _userManager.UserId;
  230. row.SupervisorName = supervisorName;
  231. row.ReviewedAt = now;
  232. row.ReviewResult = reviewResult;
  233. row.ReturnReason = returnReason;
  234. }
  235. await _db.Insertable(row).ExecuteCommandAsync();
  236. return;
  237. }
  238. existing.FlowInstanceId = instanceId;
  239. existing.BusinessStatus = businessStatus;
  240. existing.CurrentNode = currentNode;
  241. existing.RowVersion = (existing.RowVersion ?? 0) + 1;
  242. existing.UpdateTime = now;
  243. if (isSubmit)
  244. {
  245. existing.InspectorUserId = _userManager.UserId;
  246. existing.InspectorName = inspectorName;
  247. existing.SubmittedAt = now;
  248. }
  249. else
  250. {
  251. existing.SupervisorUserId = _userManager.UserId;
  252. existing.SupervisorName = supervisorName;
  253. existing.ReviewedAt = now;
  254. existing.ReviewResult = reviewResult;
  255. existing.ReturnReason = returnReason;
  256. }
  257. await _db.Updateable(existing).ExecuteCommandAsync();
  258. }
  259. /// <summary>组装流程状态输出。</summary>
  260. private async Task<IpqcFlowStateOutput> BuildStateAsync(long bizId)
  261. {
  262. var output = new IpqcFlowStateOutput { BizId = bizId };
  263. var inst = await GetLatestInstanceAsync(bizId);
  264. var state = await _db.Queryable<AdoS6IpqcInspectionFlowState>()
  265. .ClearFilter()
  266. .Where(x => x.InspectionId == bizId)
  267. .FirstAsync();
  268. if (state != null)
  269. {
  270. output.BusinessStatus = state.BusinessStatus;
  271. output.InspectorName = state.InspectorName;
  272. output.SupervisorName = state.SupervisorName;
  273. }
  274. if (inst == null)
  275. {
  276. output.FlowStatus = "NotStarted";
  277. output.CanSubmitResult = await HasRoleAsync(IpqcInspectionFlowConst.RoleInspectorId);
  278. output.Message = output.CanSubmitResult ? "待检验员录入结果" : "尚未发起流程";
  279. return output;
  280. }
  281. output.InstanceId = inst.Id;
  282. output.FlowStatus = inst.Status.ToString();
  283. output.UpdatedAt = inst.EndTime ?? inst.StartTime;
  284. if (inst.Status != FlowInstanceStatusEnum.Running)
  285. {
  286. output.IsCompleted = true;
  287. output.Message = inst.Status == FlowInstanceStatusEnum.Approved ? "流程已完成(主管审核通过)" : $"流程已结束({inst.Status})";
  288. return output;
  289. }
  290. output.CurrentNodeCode = inst.CurrentNodeId;
  291. var myTask = await GetMyPendingTaskAsync(inst.Id);
  292. if (myTask != null)
  293. {
  294. output.CurrentNodeName = myTask.NodeName;
  295. if (myTask.NodeId == IpqcInspectionFlowConst.NodeInspect)
  296. {
  297. output.CurrentAssigneeRole = IpqcInspectionFlowConst.RoleInspectorCode;
  298. output.CanSubmitResult = true;
  299. output.Message = "待当前用户录入检验结果";
  300. }
  301. else if (myTask.NodeId == IpqcInspectionFlowConst.NodeSupervisor)
  302. {
  303. output.CurrentAssigneeRole = IpqcInspectionFlowConst.RoleSupervisorCode;
  304. output.CanSupervisorApprove = true;
  305. output.CanSupervisorReturn = true;
  306. output.Message = "待当前用户主管审核";
  307. }
  308. }
  309. else
  310. {
  311. output.CurrentAssigneeRole = inst.CurrentNodeId == IpqcInspectionFlowConst.NodeInspect
  312. ? IpqcInspectionFlowConst.RoleInspectorCode
  313. : IpqcInspectionFlowConst.RoleSupervisorCode;
  314. output.Message = "流程进行中(当前用户无待办)";
  315. }
  316. return output;
  317. }
  318. }