FqcInspBillFlowService.cs 14 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298
  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. namespace Admin.NET.Plugin.AiDOP.FinishedWarehouse;
  6. /// <summary>
  7. /// S7 FQC 成品检验单 检验员+主管最小审批流服务(S7-FQC-INSPBILL-INSPECTOR-SUPERVISOR-FLOW-1)。
  8. ///
  9. /// N1_INSPECT 检验员录入 pd/hgsl/bhgsl/clfs → 提交 → N2_SUP_REVIEW 检验主管审核(通过=Approved / 退回=回 N1)。
  10. /// 复用 ApprovalFlow 引擎扩展点(StartFlow/Approve/ReturnToPrev + IFlowBizHandler),不改 ApprovalFlow 核心。
  11. /// BizType=S7_FQC_INSPBILL,BizId=qms_qcpp_inspbill.id,BizCode=FBILLNO。反查用 ApprovalFlowInstance(BizType,BizId),inspbill 不加列。
  12. ///
  13. /// 状态归属(严格分离):
  14. /// - 检验业务结果 → qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs(仅 submit-result 写)
  15. /// - 检验任务执行进度 → qms_fqcbj.jyfzr/jykssj/jywcsj/FINSPECTSTATUS(经 lydjbh=FBILLNO 关联;仅执行状态未检验/检验中/检验完成)
  16. /// - 审批节点/待办/审核状态 → ApprovalFlowInstance(绝不写入 FINSPECTSTATUS)
  17. /// 不写 FBILLSTATUS/库存/仓储/生产状态;clfs 仅保存不触发任何后续动作。正常鉴权(非匿名)。
  18. /// </summary>
  19. [ApiDescriptionSettings(Order = 331, Description = "FQC检验单流程")]
  20. [Route("api/S7FqcInspBillFlow")]
  21. [NonUnify]
  22. public class FqcInspBillFlowService : IDynamicApiController, ITransient
  23. {
  24. private readonly ISqlSugarClient _db;
  25. private readonly FlowEngineService _flowEngine;
  26. private readonly UserManager _userManager;
  27. public FqcInspBillFlowService(ISqlSugarClient db, FlowEngineService flowEngine, UserManager userManager)
  28. {
  29. _db = db;
  30. _flowEngine = flowEngine;
  31. _userManager = userManager;
  32. }
  33. /// <summary>检验单流程状态(只读,供前端按钮控制)。</summary>
  34. [DisplayName("FQC检验单流程状态")]
  35. [HttpGet("state")]
  36. public async Task<FqcFlowStateOutput> GetState([FromQuery] long id)
  37. {
  38. await EnsureBillExistsAsync(id);
  39. return await BuildStateAsync(id);
  40. }
  41. /// <summary>
  42. /// 检验员提交检验结果(写 qms_qcpp_inspbill.pd/hgsl/bhgsl/clfs + qms_fqcbj 任务进度 + 推进 N1→N2)。
  43. /// </summary>
  44. [DisplayName("检验员提交检验结果")]
  45. [HttpPost("submit-result")]
  46. public async Task<FqcFlowStateOutput> SubmitResult([FromBody] FqcSubmitResultInput input)
  47. {
  48. var (billNo, sourceBillNo) = await EnsureBillAsync(input.Id);
  49. // 参数校验
  50. if (input.Pd != 0 && input.Pd != 1) throw Oops.Oh("判定 pd 只能为 0(合格) 或 1(不合格)");
  51. if (input.Hgsl < 0) throw Oops.Oh("合格数量不能为负");
  52. if (input.Bhgsl < 0) throw Oops.Oh("不合格数量不能为负");
  53. if (input.Pd == 0)
  54. {
  55. if (input.Bhgsl != 0) throw Oops.Oh("判定合格时不合格数量必须为 0");
  56. }
  57. else // pd == 1
  58. {
  59. if (input.Bhgsl <= 0) throw Oops.Oh("判定不合格时不合格数量必须大于 0");
  60. if (input.Clfs is not (0 or 1 or 2)) throw Oops.Oh("判定不合格时处理方式 clfs 必填且只能为 0(让步接收)/1(挑选)/2(报废)");
  61. }
  62. var inst = await GetLatestInstanceAsync(input.Id);
  63. if (inst != null && inst.Status != FlowInstanceStatusEnum.Running)
  64. throw Oops.Oh("该检验单流程已结束,无法再提交检验结果");
  65. var inspectorName = _userManager.RealName ?? _userManager.Account;
  66. var now = DateTime.Now;
  67. var tran = await _db.AsTenant().UseTranAsync(async () =>
  68. {
  69. // 无运行中实例 → 起流程(自动生成 N1 任务给检验员角色成员)
  70. long instanceId = inst?.Id ?? await _flowEngine.StartFlow(new StartFlowInput
  71. {
  72. BizType = FqcInspBillFlowConst.BizType,
  73. BizId = input.Id,
  74. BizNo = billNo,
  75. Title = $"FQC检验单 {billNo}",
  76. Comment = input.Comment,
  77. });
  78. var myTask = await GetMyPendingTaskAsync(instanceId);
  79. if (myTask == null)
  80. throw Oops.Oh("当前用户没有待处理的检验任务(需检验员角色成员)");
  81. if (myTask.NodeId != FqcInspBillFlowConst.NodeInspect)
  82. throw Oops.Oh("当前不在检验录入节点,无法提交检验结果");
  83. // ① 检验业务结果 → qms_qcpp_inspbill(仅 pd/hgsl/bhgsl/clfs,不覆盖继承字段)
  84. await _db.Ado.ExecuteCommandAsync(
  85. "UPDATE qms_qcpp_inspbill SET pd=@pd, hgsl=@hgsl, bhgsl=@bhgsl, clfs=@clfs WHERE id=@id",
  86. new List<SugarParameter>
  87. {
  88. new("@pd", input.Pd),
  89. new("@hgsl", input.Hgsl),
  90. new("@bhgsl", input.Bhgsl),
  91. new("@clfs", input.Pd == 1 ? input.Clfs : null),
  92. new("@id", input.Id),
  93. });
  94. // ② 检验任务执行进度 → qms_fqcbj(经 lydjbh=FBILLNO 关联;lydjbh 为空则跳过,防误伤)
  95. // 安全约束(§二):先查关联数量 —— 0 条跳过、1 条更新、>1 条视为数据异常抛错整体回滚,
  96. // 杜绝无保护批量 UPDATE 一次误更新多条任务(即使未来真实数据出现重复 FBILLNO 也安全)。
  97. // jykssj 若为空则补首次开始时间(IFNULL 保留既有);jywcsj=本次提交时间;FINSPECTSTATUS=检验完成
  98. if (!string.IsNullOrWhiteSpace(sourceBillNo))
  99. {
  100. var taskCount = await _db.Ado.GetIntAsync(
  101. "SELECT COUNT(1) FROM qms_fqcbj WHERE FBILLNO=@bjbh",
  102. new List<SugarParameter> { new("@bjbh", sourceBillNo) });
  103. if (taskCount > 1)
  104. throw Oops.Oh($"检验任务数据异常:来源单号 {sourceBillNo} 匹配到 {taskCount} 条报检任务(qms_fqcbj),无法安全更新,已整体回滚");
  105. if (taskCount == 1)
  106. {
  107. await _db.Ado.ExecuteCommandAsync(
  108. "UPDATE qms_fqcbj SET jyfzr=@jyfzr, jykssj=IFNULL(jykssj,@now), jywcsj=@now, FINSPECTSTATUS=@status WHERE FBILLNO=@bjbh",
  109. new List<SugarParameter>
  110. {
  111. new("@jyfzr", inspectorName),
  112. new("@now", now),
  113. new("@status", FqcInspBillFlowConst.InspectStatusDone),
  114. new("@bjbh", sourceBillNo),
  115. });
  116. }
  117. }
  118. // ③ 推进 N1 → N2
  119. await _flowEngine.Approve(myTask.Id, input.Comment);
  120. });
  121. if (!tran.IsSuccess) throw tran.ErrorException;
  122. return await BuildStateAsync(input.Id);
  123. }
  124. /// <summary>检验主管通过(N2 → 完成,不覆盖检验员业务结果)。</summary>
  125. [DisplayName("检验主管通过")]
  126. [HttpPost("supervisor-approve")]
  127. public async Task<FqcFlowStateOutput> SupervisorApprove([FromBody] FqcSupervisorApproveInput input)
  128. {
  129. await EnsureBillAsync(input.Id);
  130. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  131. var tran = await _db.AsTenant().UseTranAsync(async () =>
  132. {
  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>检验主管退回(N2 → 回 N1,意见必填;保留检验员业务结果与任务进度)。</summary>
  139. [DisplayName("检验主管退回")]
  140. [HttpPost("supervisor-reject")]
  141. public async Task<FqcFlowStateOutput> SupervisorReject([FromBody] FqcSupervisorRejectInput input)
  142. {
  143. if (string.IsNullOrWhiteSpace(input.Comment))
  144. throw Oops.Oh("退回必须填写意见");
  145. await EnsureBillAsync(input.Id);
  146. var (_, myTask) = await RequireSupervisorTaskAsync(input.Id);
  147. var tran = await _db.AsTenant().UseTranAsync(async () =>
  148. {
  149. // ReturnToPrev 回 N1;不清 pd/hgsl/bhgsl/clfs、不清 FINSPECTSTATUS/jywcsj,检验员改后重提
  150. await _flowEngine.ReturnToPrev(myTask.Id, input.Comment);
  151. });
  152. if (!tran.IsSuccess) throw tran.ErrorException;
  153. return await BuildStateAsync(input.Id);
  154. }
  155. // ───────────────────────── helpers ─────────────────────────
  156. /// <summary>校验检验单存在并返回 FBILLNO。</summary>
  157. private async Task<string> EnsureBillExistsAsync(long id)
  158. {
  159. var (billNo, _) = await EnsureBillAsync(id);
  160. return billNo;
  161. }
  162. /// <summary>校验检验单存在并返回 (FBILLNO, lydjbh来源单号)。</summary>
  163. private async Task<(string billNo, string? sourceBillNo)> EnsureBillAsync(long id)
  164. {
  165. if (id <= 0) throw Oops.Oh("检验单 id 非法");
  166. var rows = await _db.Ado.SqlQueryAsync<FqcBillKey>(
  167. "SELECT FBILLNO AS BillNo, lydjbh AS SourceBillNo FROM qms_qcpp_inspbill WHERE id=@id LIMIT 1",
  168. new List<SugarParameter> { new("@id", id) });
  169. var r = rows.FirstOrDefault();
  170. if (r == null) throw Oops.Oh("检验单不存在");
  171. return (r.BillNo ?? id.ToString(), r.SourceBillNo);
  172. }
  173. /// <summary>取该检验单最新流程实例(BizType+BizId,跨数据范围)。</summary>
  174. private async Task<ApprovalFlowInstance?> GetLatestInstanceAsync(long bizId)
  175. {
  176. return await _db.Queryable<ApprovalFlowInstance>()
  177. .ClearFilter()
  178. .Where(x => x.BizType == FqcInspBillFlowConst.BizType && x.BizId == bizId)
  179. .OrderByDescending(x => x.Id)
  180. .FirstAsync();
  181. }
  182. /// <summary>取当前用户在指定实例下的待办任务。</summary>
  183. private async Task<ApprovalFlowTask?> GetMyPendingTaskAsync(long instanceId)
  184. {
  185. var userId = _userManager.UserId;
  186. return await _db.Queryable<ApprovalFlowTask>()
  187. .ClearFilter()
  188. .Where(x => x.InstanceId == instanceId && x.AssigneeId == userId && x.Status == FlowTaskStatusEnum.Pending)
  189. .FirstAsync();
  190. }
  191. /// <summary>校验并返回主管 N2 待办任务。</summary>
  192. private async Task<(ApprovalFlowInstance inst, ApprovalFlowTask task)> RequireSupervisorTaskAsync(long bizId)
  193. {
  194. var inst = await GetLatestInstanceAsync(bizId);
  195. if (inst == null) throw Oops.Oh("该检验单尚未发起流程");
  196. if (inst.Status != FlowInstanceStatusEnum.Running) throw Oops.Oh("该检验单流程已结束");
  197. var myTask = await GetMyPendingTaskAsync(inst.Id);
  198. if (myTask == null) throw Oops.Oh("当前用户没有待处理的审核任务(需检验主管角色成员)");
  199. if (myTask.NodeId != FqcInspBillFlowConst.NodeSupervisor) throw Oops.Oh("当前不在主管审核节点");
  200. return (inst, myTask);
  201. }
  202. /// <summary>当前用户是否具备指定角色(跨数据范围)。</summary>
  203. private async Task<bool> HasRoleAsync(long roleId)
  204. {
  205. var userId = _userManager.UserId;
  206. return await _db.Queryable<SysUserRole>()
  207. .ClearFilter()
  208. .AnyAsync(x => x.UserId == userId && x.RoleId == roleId);
  209. }
  210. /// <summary>组装流程状态输出。</summary>
  211. private async Task<FqcFlowStateOutput> BuildStateAsync(long bizId)
  212. {
  213. var output = new FqcFlowStateOutput { BizId = bizId };
  214. var inst = await GetLatestInstanceAsync(bizId);
  215. if (inst == null)
  216. {
  217. output.FlowStatus = "NotStarted";
  218. output.CanSubmitResult = await HasRoleAsync(FqcInspBillFlowConst.RoleInspectorId);
  219. output.Message = output.CanSubmitResult ? "待检验员录入结果" : "尚未发起流程";
  220. return output;
  221. }
  222. output.InstanceId = inst.Id;
  223. output.FlowStatus = inst.Status.ToString();
  224. output.UpdatedAt = inst.EndTime ?? inst.StartTime;
  225. if (inst.Status != FlowInstanceStatusEnum.Running)
  226. {
  227. output.IsCompleted = true;
  228. output.Message = inst.Status == FlowInstanceStatusEnum.Approved ? "流程已完成(主管审核通过)" : $"流程已结束({inst.Status})";
  229. return output;
  230. }
  231. output.CurrentNodeCode = inst.CurrentNodeId;
  232. var myTask = await GetMyPendingTaskAsync(inst.Id);
  233. if (myTask != null)
  234. {
  235. output.CurrentNodeName = myTask.NodeName;
  236. if (myTask.NodeId == FqcInspBillFlowConst.NodeInspect)
  237. {
  238. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleInspectorCode;
  239. output.CanSubmitResult = true;
  240. output.Message = "待当前用户录入检验结果";
  241. }
  242. else if (myTask.NodeId == FqcInspBillFlowConst.NodeSupervisor)
  243. {
  244. output.CurrentAssigneeRole = FqcInspBillFlowConst.RoleSupervisorCode;
  245. output.CanSupervisorApprove = true;
  246. output.CanSupervisorReject = true;
  247. output.Message = "待当前用户主管审核";
  248. }
  249. }
  250. else
  251. {
  252. output.CurrentAssigneeRole = inst.CurrentNodeId == FqcInspBillFlowConst.NodeInspect
  253. ? FqcInspBillFlowConst.RoleInspectorCode
  254. : FqcInspBillFlowConst.RoleSupervisorCode;
  255. output.Message = "流程进行中(当前用户无待办)";
  256. }
  257. return output;
  258. }
  259. private class FqcBillKey
  260. {
  261. public string? BillNo { get; set; }
  262. public string? SourceBillNo { get; set; }
  263. }
  264. }