IpqcInspectionFlowService.cs 17 KB

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