AdoS0QualityAggregateControllers.cs 38 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810811812813814815816817818819820821822823824825826827828829830831832833834835836837838839840841842843844845846847848849850851852853854855856857858859860861862863864865
  1. using Admin.NET.Plugin.AiDOP.Dto.S0.Quality;
  2. using Admin.NET.Plugin.AiDOP.Entity.S0.Quality;
  3. using Admin.NET.Plugin.AiDOP.Infrastructure;
  4. using static Admin.NET.Plugin.AiDOP.Controllers.S0.Quality.AdoS0QmsControllerHelpers;
  5. namespace Admin.NET.Plugin.AiDOP.Controllers.S0.Quality;
  6. [ApiController]
  7. [Route("api/s0/quality/inspection-bases")]
  8. [NonUnify]
  9. public class AdoS0QmsInspectionBasesController : ControllerBase
  10. {
  11. private readonly SqlSugarRepository<AdoS0QmsInspectionBasis> _rep;
  12. private readonly SqlSugarRepository<AdoS0QmsInspectionBasisEntry> _entryRep;
  13. public AdoS0QmsInspectionBasesController(
  14. SqlSugarRepository<AdoS0QmsInspectionBasis> rep,
  15. SqlSugarRepository<AdoS0QmsInspectionBasisEntry> entryRep)
  16. {
  17. _rep = rep;
  18. _entryRep = entryRep;
  19. }
  20. [HttpGet]
  21. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0QualityPagedQueryDto q)
  22. {
  23. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  24. (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
  25. var query = _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  26. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword), x =>
  27. (x.Number != null && x.Number.Contains(q.Keyword!)) ||
  28. (x.Name != null && x.Name.Contains(q.Keyword!)));
  29. var total = await query.CountAsync();
  30. var list = await query.OrderBy(x => x.Number).Skip((q.Page - 1) * q.PageSize).Take(q.PageSize).ToListAsync();
  31. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  32. }
  33. [HttpGet("{id:long}")]
  34. public async Task<IActionResult> GetDetailAsync(long id)
  35. {
  36. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  37. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  38. if (master == null) return NotFound();
  39. var items = await _entryRep.AsQueryable().Where(x => x.MasterId == id).OrderBy(x => x.Seq).OrderBy(x => x.Id).ToListAsync();
  40. return Ok(new { master, items });
  41. }
  42. [HttpGet("options")]
  43. public async Task<IActionResult> GetOptionsAsync()
  44. {
  45. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  46. return Ok(await _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  47. .OrderBy(x => x.Number)
  48. .Select(x => new AdoS0QualitySimpleOptionDto { Value = x.Id, Label = (x.Number ?? "") + " / " + (x.Name ?? "") })
  49. .ToListAsync());
  50. }
  51. [HttpPost]
  52. public async Task<IActionResult> CreateAsync([FromBody] AdoS0QmsInspectionBasisUpsertDto dto)
  53. {
  54. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  55. var db = _rep.Context;
  56. await db.Ado.BeginTranAsync();
  57. try
  58. {
  59. var master = new AdoS0QmsInspectionBasis();
  60. ApplyInspectionBasis(master, dto, true);
  61. master.TenantId = tenantId;
  62. await _rep.AsInsertable(master).ExecuteReturnEntityAsync();
  63. await SyncInspectionBasisEntriesAsync(master.Id, dto.Items, tenantId);
  64. await db.Ado.CommitTranAsync();
  65. return await GetDetailAsync(master.Id);
  66. }
  67. catch
  68. {
  69. await db.Ado.RollbackTranAsync();
  70. throw;
  71. }
  72. }
  73. [HttpPut("{id:long}")]
  74. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0QmsInspectionBasisUpsertDto dto)
  75. {
  76. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  77. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  78. if (master == null) return NotFound();
  79. var db = _rep.Context;
  80. await db.Ado.BeginTranAsync();
  81. try
  82. {
  83. ApplyInspectionBasis(master, dto, false);
  84. await _rep.AsUpdateable(master).ExecuteCommandAsync();
  85. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  86. await SyncInspectionBasisEntriesAsync(id, dto.Items, tenantId);
  87. await db.Ado.CommitTranAsync();
  88. return await GetDetailAsync(id);
  89. }
  90. catch
  91. {
  92. await db.Ado.RollbackTranAsync();
  93. throw;
  94. }
  95. }
  96. [HttpDelete("{id:long}")]
  97. public async Task<IActionResult> DeleteAsync(long id)
  98. {
  99. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  100. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  101. if (master == null) return NotFound();
  102. var db = _rep.Context;
  103. await db.Ado.BeginTranAsync();
  104. try
  105. {
  106. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  107. await _rep.DeleteAsync(master);
  108. await db.Ado.CommitTranAsync();
  109. return Ok(new { message = "删除成功" });
  110. }
  111. catch
  112. {
  113. await db.Ado.RollbackTranAsync();
  114. throw;
  115. }
  116. }
  117. private static void ApplyInspectionBasis(AdoS0QmsInspectionBasis entity, AdoS0QmsInspectionBasisUpsertDto dto, bool isCreate)
  118. {
  119. entity.Number = dto.Number.Trim();
  120. entity.Name = dto.Name.Trim();
  121. entity.ControlStrategy = NullIfWhiteSpace(dto.ControlStrategy);
  122. entity.CreateOrgId = dto.CreateOrgId;
  123. entity.UseOrgId = dto.UseOrgId;
  124. entity.Comment = NullIfWhiteSpace(dto.Comment);
  125. entity.Status = NullIfWhiteSpace(dto.Status);
  126. entity.EnableStatus = NullIfWhiteSpace(dto.EnableStatus);
  127. if (isCreate) entity.CreateTime = DateTime.Now;
  128. entity.ModifyTime = DateTime.Now;
  129. }
  130. private async Task SyncInspectionBasisEntriesAsync(long masterId, IEnumerable<AdoS0QmsInspectionBasisEntryDto> items, long tenantId)
  131. {
  132. var seq = 1L;
  133. foreach (var item in items)
  134. {
  135. var entity = new AdoS0QmsInspectionBasisEntry
  136. {
  137. TenantId = tenantId,
  138. MasterId = masterId,
  139. Seq = item.Seq ?? seq++,
  140. DocumentNumber = NullIfWhiteSpace(item.DocumentNumber),
  141. DocumentName = NullIfWhiteSpace(item.DocumentName),
  142. Attachment = NullIfWhiteSpace(item.Attachment)
  143. };
  144. await _entryRep.AsInsertable(entity).ExecuteCommandAsync();
  145. }
  146. }
  147. }
  148. [ApiController]
  149. [Route("api/s0/quality/inspection-standards")]
  150. [NonUnify]
  151. public class AdoS0QmsInspectionStandardsController : ControllerBase
  152. {
  153. private readonly SqlSugarRepository<AdoS0QmsInspectionStandard> _rep;
  154. private readonly SqlSugarRepository<AdoS0QmsInspectionStandardEntry> _entryRep;
  155. public AdoS0QmsInspectionStandardsController(
  156. SqlSugarRepository<AdoS0QmsInspectionStandard> rep,
  157. SqlSugarRepository<AdoS0QmsInspectionStandardEntry> entryRep)
  158. {
  159. _rep = rep;
  160. _entryRep = entryRep;
  161. }
  162. [HttpGet]
  163. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0QualityPagedQueryDto q)
  164. {
  165. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  166. (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
  167. var query = _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  168. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword), x =>
  169. (x.Number != null && x.Number.Contains(q.Keyword!)) ||
  170. (x.Name != null && x.Name.Contains(q.Keyword!)));
  171. var total = await query.CountAsync();
  172. var list = await query.OrderBy(x => x.Number).Skip((q.Page - 1) * q.PageSize).Take(q.PageSize).ToListAsync();
  173. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  174. }
  175. [HttpGet("{id:long}")]
  176. public async Task<IActionResult> GetDetailAsync(long id)
  177. {
  178. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  179. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  180. if (master == null) return NotFound();
  181. var items = await _entryRep.AsQueryable().Where(x => x.MasterId == id).OrderBy(x => x.Seq).OrderBy(x => x.Id).ToListAsync();
  182. return Ok(new { master, items });
  183. }
  184. [HttpGet("options")]
  185. public async Task<IActionResult> GetOptionsAsync()
  186. {
  187. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  188. return Ok(await _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  189. .OrderBy(x => x.Number)
  190. .Select(x => new AdoS0QualitySimpleOptionDto { Value = x.Id, Label = (x.Number ?? "") + " / " + (x.Name ?? "") })
  191. .ToListAsync());
  192. }
  193. [HttpPost]
  194. public async Task<IActionResult> CreateAsync([FromBody] AdoS0QmsInspectionStandardUpsertDto dto)
  195. {
  196. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  197. var db = _rep.Context;
  198. await db.Ado.BeginTranAsync();
  199. try
  200. {
  201. var master = new AdoS0QmsInspectionStandard();
  202. ApplyInspectionStandard(master, dto);
  203. master.TenantId = tenantId;
  204. await _rep.AsInsertable(master).ExecuteReturnEntityAsync();
  205. await SyncInspectionStandardEntriesAsync(master.Id, dto.Items, tenantId);
  206. await db.Ado.CommitTranAsync();
  207. return await GetDetailAsync(master.Id);
  208. }
  209. catch
  210. {
  211. await db.Ado.RollbackTranAsync();
  212. throw;
  213. }
  214. }
  215. [HttpPut("{id:long}")]
  216. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0QmsInspectionStandardUpsertDto dto)
  217. {
  218. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  219. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  220. if (master == null) return NotFound();
  221. var db = _rep.Context;
  222. await db.Ado.BeginTranAsync();
  223. try
  224. {
  225. ApplyInspectionStandard(master, dto);
  226. await _rep.AsUpdateable(master).ExecuteCommandAsync();
  227. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  228. await SyncInspectionStandardEntriesAsync(id, dto.Items, tenantId);
  229. await db.Ado.CommitTranAsync();
  230. return await GetDetailAsync(id);
  231. }
  232. catch
  233. {
  234. await db.Ado.RollbackTranAsync();
  235. throw;
  236. }
  237. }
  238. [HttpDelete("{id:long}")]
  239. public async Task<IActionResult> DeleteAsync(long id)
  240. {
  241. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  242. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  243. if (master == null) return NotFound();
  244. var db = _rep.Context;
  245. await db.Ado.BeginTranAsync();
  246. try
  247. {
  248. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  249. await _rep.DeleteAsync(master);
  250. await db.Ado.CommitTranAsync();
  251. return Ok(new { message = "删除成功" });
  252. }
  253. catch
  254. {
  255. await db.Ado.RollbackTranAsync();
  256. throw;
  257. }
  258. }
  259. private static void ApplyInspectionStandard(AdoS0QmsInspectionStandard entity, AdoS0QmsInspectionStandardUpsertDto dto)
  260. {
  261. entity.Number = dto.Number.Trim();
  262. entity.Name = dto.Name.Trim();
  263. entity.Comment = NullIfWhiteSpace(dto.Comment);
  264. entity.ControlStrategy = NullIfWhiteSpace(dto.ControlStrategy);
  265. entity.CreateOrgId = dto.CreateOrgId;
  266. entity.UseOrgId = dto.UseOrgId;
  267. entity.Status = NullIfWhiteSpace(dto.Status);
  268. entity.EnableStatus = NullIfWhiteSpace(dto.EnableStatus);
  269. }
  270. private async Task SyncInspectionStandardEntriesAsync(long masterId, IEnumerable<AdoS0QmsInspectionStandardEntryDto> items, long tenantId)
  271. {
  272. var seq = 1L;
  273. foreach (var item in items)
  274. {
  275. var entity = new AdoS0QmsInspectionStandardEntry
  276. {
  277. TenantId = tenantId,
  278. MasterId = masterId,
  279. Seq = item.Seq ?? seq++,
  280. CheckItems = NullIfWhiteSpace(item.CheckItems),
  281. CheckContent = NullIfWhiteSpace(item.CheckContent),
  282. NormType = NullIfWhiteSpace(item.NormType),
  283. SpecValue = NullIfWhiteSpace(item.SpecValue),
  284. TopValue = item.TopValue,
  285. DownValue = item.DownValue,
  286. CheckBasisId = item.CheckBasisId,
  287. CheckMethodId = item.CheckMethodId,
  288. CheckFrequencyId = item.CheckFrequencyId,
  289. CheckInstructId = item.CheckInstructId,
  290. Unit = NullIfWhiteSpace(item.Unit),
  291. KeyQuality = item.KeyQuality
  292. };
  293. await _entryRep.AsInsertable(entity).ExecuteCommandAsync();
  294. }
  295. }
  296. }
  297. [ApiController]
  298. [Route("api/s0/quality/inspection-plans")]
  299. [NonUnify]
  300. public class AdoS0QmsInspectionPlansController : ControllerBase
  301. {
  302. private readonly SqlSugarRepository<AdoS0QmsInspectionPlan> _rep;
  303. private readonly SqlSugarRepository<AdoS0QmsInspectionPlanEntry> _entryRep;
  304. public AdoS0QmsInspectionPlansController(
  305. SqlSugarRepository<AdoS0QmsInspectionPlan> rep,
  306. SqlSugarRepository<AdoS0QmsInspectionPlanEntry> entryRep)
  307. {
  308. _rep = rep;
  309. _entryRep = entryRep;
  310. }
  311. [HttpGet]
  312. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0QualityPagedQueryDto q)
  313. {
  314. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  315. (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
  316. var query = _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  317. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword), x =>
  318. (x.Number != null && x.Number.Contains(q.Keyword!)) ||
  319. (x.Name != null && x.Name.Contains(q.Keyword!)));
  320. var total = await query.CountAsync();
  321. var list = await query.OrderBy(x => x.Number).Skip((q.Page - 1) * q.PageSize).Take(q.PageSize).ToListAsync();
  322. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  323. }
  324. [HttpGet("{id:long}")]
  325. public async Task<IActionResult> GetDetailAsync(long id)
  326. {
  327. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  328. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  329. if (master == null) return NotFound();
  330. var items = await _entryRep.AsQueryable().Where(x => x.MasterId == id).OrderBy(x => x.Seq).OrderBy(x => x.Id).ToListAsync();
  331. return Ok(new { master, items });
  332. }
  333. [HttpPost]
  334. public async Task<IActionResult> CreateAsync([FromBody] AdoS0QmsInspectionPlanUpsertDto dto)
  335. {
  336. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  337. var db = _rep.Context;
  338. await db.Ado.BeginTranAsync();
  339. try
  340. {
  341. var master = new AdoS0QmsInspectionPlan();
  342. ApplyInspectionPlan(master, dto, true);
  343. master.TenantId = tenantId;
  344. await _rep.AsInsertable(master).ExecuteReturnEntityAsync();
  345. await SyncInspectionPlanEntriesAsync(master.Id, dto.Items, tenantId);
  346. await db.Ado.CommitTranAsync();
  347. return await GetDetailAsync(master.Id);
  348. }
  349. catch
  350. {
  351. await db.Ado.RollbackTranAsync();
  352. throw;
  353. }
  354. }
  355. [HttpPut("{id:long}")]
  356. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0QmsInspectionPlanUpsertDto dto)
  357. {
  358. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  359. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  360. if (master == null) return NotFound();
  361. var db = _rep.Context;
  362. await db.Ado.BeginTranAsync();
  363. try
  364. {
  365. ApplyInspectionPlan(master, dto, false);
  366. await _rep.AsUpdateable(master).ExecuteCommandAsync();
  367. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  368. await SyncInspectionPlanEntriesAsync(id, dto.Items, tenantId);
  369. await db.Ado.CommitTranAsync();
  370. return await GetDetailAsync(id);
  371. }
  372. catch
  373. {
  374. await db.Ado.RollbackTranAsync();
  375. throw;
  376. }
  377. }
  378. [HttpDelete("{id:long}")]
  379. public async Task<IActionResult> DeleteAsync(long id)
  380. {
  381. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  382. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  383. if (master == null) return NotFound();
  384. var db = _rep.Context;
  385. await db.Ado.BeginTranAsync();
  386. try
  387. {
  388. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  389. await _rep.DeleteAsync(master);
  390. await db.Ado.CommitTranAsync();
  391. return Ok(new { message = "删除成功" });
  392. }
  393. catch
  394. {
  395. await db.Ado.RollbackTranAsync();
  396. throw;
  397. }
  398. }
  399. private static void ApplyInspectionPlan(AdoS0QmsInspectionPlan entity, AdoS0QmsInspectionPlanUpsertDto dto, bool isCreate)
  400. {
  401. entity.Number = dto.Number.Trim();
  402. entity.Name = dto.Name.Trim();
  403. entity.BizTypeId = NullIfWhiteSpace(dto.BizTypeId);
  404. entity.Comment = NullIfWhiteSpace(dto.Comment);
  405. entity.ControlStrategy = NullIfWhiteSpace(dto.ControlStrategy);
  406. entity.CreateOrgId = dto.CreateOrgId;
  407. entity.UseOrgId = dto.UseOrgId;
  408. entity.Status = NullIfWhiteSpace(dto.Status);
  409. entity.EnableStatus = NullIfWhiteSpace(dto.EnableStatus);
  410. if (isCreate) entity.CreateTime = DateTime.Now;
  411. entity.ModifyTime = DateTime.Now;
  412. }
  413. private async Task SyncInspectionPlanEntriesAsync(long masterId, IEnumerable<AdoS0QmsInspectionPlanEntryDto> items, long tenantId)
  414. {
  415. var seq = 1;
  416. foreach (var item in items)
  417. {
  418. var entity = new AdoS0QmsInspectionPlanEntry
  419. {
  420. TenantId = tenantId,
  421. MasterId = masterId,
  422. Seq = item.Seq ?? seq++,
  423. SetupType = NullIfWhiteSpace(item.SetupType),
  424. MaterialCode = NullIfWhiteSpace(item.MaterialCode),
  425. MaterialName = NullIfWhiteSpace(item.MaterialName),
  426. MaterialTypeId = item.MaterialTypeId,
  427. SupplierId = NullIfWhiteSpace(item.SupplierId),
  428. SamplingSchemeId = item.SamplingSchemeId,
  429. InspectionStandardId = item.InspectionStandardId,
  430. InspectOrgId = item.InspectOrgId,
  431. InspectUserId = item.InspectUserId,
  432. QRouteId = item.QRouteId,
  433. OperationNo = NullIfWhiteSpace(item.OperationNo),
  434. OperationId = item.OperationId,
  435. InspectionFrequencyId = item.InspectionFrequencyId,
  436. ProcessSeq = NullIfWhiteSpace(item.ProcessSeq),
  437. InspectionType = item.InspectionType
  438. };
  439. await _entryRep.AsInsertable(entity).ExecuteCommandAsync();
  440. }
  441. }
  442. }
  443. [ApiController]
  444. [Route("api/s0/quality/raw-inspection-specs")]
  445. [NonUnify]
  446. public class AdoS0QmsRawInspectionSpecsController : ControllerBase
  447. {
  448. private readonly SqlSugarRepository<AdoS0QmsRawInspectionSpec> _rep;
  449. private readonly SqlSugarRepository<AdoS0QmsRawInspectionSpecEntry> _entryRep;
  450. /// <summary>
  451. /// S5 IQC 检规↔物料桥表同步(B-1)。原材料检规是 S5 IQC 的检规源,
  452. /// 主表 wlbm 变化后必须同步派生映射,否则 B-2 Resolver 会读到过期关系。
  453. /// 与 S7 在 AdoS0QualityFqcOqcControllers 中的 FqcSpecMaterialMapService 用法同构。
  454. /// </summary>
  455. private readonly MaterialWarehouse.S5IqcSpecMaterialMapService _iqcSpecMap;
  456. public AdoS0QmsRawInspectionSpecsController(
  457. SqlSugarRepository<AdoS0QmsRawInspectionSpec> rep,
  458. SqlSugarRepository<AdoS0QmsRawInspectionSpecEntry> entryRep,
  459. MaterialWarehouse.S5IqcSpecMaterialMapService iqcSpecMap)
  460. {
  461. _rep = rep;
  462. _entryRep = entryRep;
  463. _iqcSpecMap = iqcSpecMap;
  464. }
  465. [HttpGet]
  466. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0QualityPagedQueryDto q)
  467. {
  468. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  469. (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
  470. var query = _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  471. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword), x =>
  472. (x.FileNumber != null && x.FileNumber.Contains(q.Keyword!)) ||
  473. (x.RawMaterialName != null && x.RawMaterialName.Contains(q.Keyword!)) ||
  474. (x.MaterialCode != null && x.MaterialCode.Contains(q.Keyword!)));
  475. var total = await query.CountAsync();
  476. var list = await query.OrderByDescending(x => x.Id).Skip((q.Page - 1) * q.PageSize).Take(q.PageSize).ToListAsync();
  477. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  478. }
  479. [HttpGet("{id:long}")]
  480. public Task<IActionResult> GetDetailAsync(long id) => GetDetailAsync(id, null);
  481. /// <summary>
  482. /// 详情。<paramref name="specMapWarning"/> 仅在 Create/Update 后回传 S5 IQC 桥表同步告警,
  483. /// 正常读取恒为 null(响应形状对既有前端向后兼容,仅新增可选字段)。
  484. /// </summary>
  485. [NonAction]
  486. private async Task<IActionResult> GetDetailAsync(long id, string? specMapWarning)
  487. {
  488. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  489. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  490. if (master == null) return NotFound();
  491. var items = await _entryRep.AsQueryable().Where(x => x.MasterId == id).OrderBy(x => x.Seq).OrderBy(x => x.Id).ToListAsync();
  492. return Ok(new { master, items, specMapWarning });
  493. }
  494. /// <summary>
  495. /// 同步 S5 IQC 检规物料桥表;失败**不抛**(业务写已提交,桥表是派生数据),
  496. /// 以告警字符串回传调用方,并可通过 POST /api/S5IqcSpecMap/sync/{specId} 幂等重试。
  497. /// </summary>
  498. [NonAction]
  499. private async Task<string?> TrySyncIqcSpecMapAsync(long tenantId, long specId)
  500. {
  501. try
  502. {
  503. await _iqcSpecMap.SyncSpecAsync(tenantId, specId);
  504. return null;
  505. }
  506. catch (Exception ex)
  507. {
  508. return $"检规已保存,但 IQC 检规物料映射同步失败,请调用 POST /api/S5IqcSpecMap/sync/{specId} 重试:{ex.Message}";
  509. }
  510. }
  511. [HttpPost]
  512. public async Task<IActionResult> CreateAsync([FromBody] AdoS0QmsRawInspectionSpecUpsertDto dto)
  513. {
  514. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  515. var items = AdoS0QmsSpecAggregateGuard.Meaningful(dto.Items);
  516. var guardError = AdoS0QmsSpecAggregateGuard.ValidateCreate(RawRequiredFields(dto), items.Count);
  517. if (guardError != null) return AdoS0ApiErrors.InvalidRequest(guardError);
  518. var db = _rep.Context;
  519. await db.Ado.BeginTranAsync();
  520. try
  521. {
  522. var master = new AdoS0QmsRawInspectionSpec();
  523. ApplyRawInspectionSpec(master, dto);
  524. master.TenantId = tenantId;
  525. await _rep.AsInsertable(master).ExecuteReturnEntityAsync();
  526. await SyncRawInspectionSpecEntriesAsync(master.Id, items, tenantId);
  527. await db.Ado.CommitTranAsync();
  528. // 业务写已提交后再同步 S5 IQC 桥表(同构 S7 AdoS0QualityFqcOqcControllers)。
  529. // 桥表是派生数据,其失败不得回滚已成功的检规保存;失败以 specMapWarning 显式回传,可人工 resync。
  530. var mapWarn = await TrySyncIqcSpecMapAsync(tenantId, master.Id);
  531. return await GetDetailAsync(master.Id, mapWarn);
  532. }
  533. catch
  534. {
  535. await db.Ado.RollbackTranAsync();
  536. throw;
  537. }
  538. }
  539. [HttpPut("{id:long}")]
  540. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0QmsRawInspectionSpecUpsertDto dto)
  541. {
  542. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  543. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  544. if (master == null) return NotFound();
  545. // 写入集保留历史已持久化的明细行(含空行),只丢弃本次新补的空占位;
  546. // 「原有明细数」按 meaningful 计,避免全空明细的历史单被自己的空行锁死。
  547. var existingRows = await _entryRep.AsQueryable().Where(x => x.MasterId == id).ToListAsync();
  548. var items = AdoS0QmsSpecAggregateGuard.ForUpdateWrite(dto.Items);
  549. var guardError = AdoS0QmsSpecAggregateGuard.ValidateUpdate(
  550. [
  551. ("文件编号", master.FileNumber, dto.FileNumber),
  552. ("物料编码", master.MaterialCode, dto.MaterialCode),
  553. ("原材料名称", master.RawMaterialName, dto.RawMaterialName),
  554. ("版本", master.VersionNo, dto.VersionNo)
  555. ],
  556. AdoS0QmsSpecAggregateGuard.CountMeaningful(existingRows),
  557. AdoS0QmsSpecAggregateGuard.Meaningful(dto.Items).Count);
  558. if (guardError != null) return AdoS0ApiErrors.InvalidRequest(guardError);
  559. var db = _rep.Context;
  560. await db.Ado.BeginTranAsync();
  561. try
  562. {
  563. ApplyRawInspectionSpec(master, dto);
  564. await _rep.AsUpdateable(master).ExecuteCommandAsync();
  565. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  566. await SyncRawInspectionSpecEntriesAsync(id, items, tenantId);
  567. await db.Ado.CommitTranAsync();
  568. // wlbm/wjbh/bb 可能已变更 → 重建该检规的自动派生映射(人工绑定行不受影响)
  569. var mapWarn = await TrySyncIqcSpecMapAsync(tenantId, id);
  570. return await GetDetailAsync(id, mapWarn);
  571. }
  572. catch
  573. {
  574. await db.Ado.RollbackTranAsync();
  575. throw;
  576. }
  577. }
  578. [HttpDelete("{id:long}")]
  579. public async Task<IActionResult> DeleteAsync(long id)
  580. {
  581. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  582. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  583. if (master == null) return NotFound();
  584. var db = _rep.Context;
  585. await db.Ado.BeginTranAsync();
  586. try
  587. {
  588. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  589. await _rep.DeleteAsync(master);
  590. await db.Ado.CommitTranAsync();
  591. // 检规已删除 → 桥表整条清理(含人工绑定行:指向已删检规的人工绑定属悬挂引用)
  592. string? mapWarn = null;
  593. try { await _iqcSpecMap.PurgeSpecAsync(tenantId, id); }
  594. catch (Exception ex) { mapWarn = $"检规已删除,但 IQC 检规物料映射清理失败,请调用 POST /api/S5IqcSpecMap/sync/{id} 重试:{ex.Message}"; }
  595. return Ok(new { message = "删除成功", specMapWarning = mapWarn });
  596. }
  597. catch
  598. {
  599. await db.Ado.RollbackTranAsync();
  600. throw;
  601. }
  602. }
  603. /// <summary>原材料检规必填集(UAT-S0-10 拍板)。与 Excel 导入入口共用同一守卫,口径单一。</summary>
  604. private static IReadOnlyList<(string, string?)> RawRequiredFields(AdoS0QmsRawInspectionSpecUpsertDto dto) =>
  605. [
  606. ("文件编号", dto.FileNumber),
  607. ("物料编码", dto.MaterialCode),
  608. ("原材料名称", dto.RawMaterialName),
  609. ("版本", dto.VersionNo),
  610. ];
  611. private static void ApplyRawInspectionSpec(AdoS0QmsRawInspectionSpec entity, AdoS0QmsRawInspectionSpecUpsertDto dto)
  612. {
  613. entity.FileNumber = NullIfWhiteSpace(dto.FileNumber);
  614. entity.VersionNo = NullIfWhiteSpace(dto.VersionNo);
  615. entity.DrawingNo = NullIfWhiteSpace(dto.DrawingNo);
  616. entity.RawMaterialName = NullIfWhiteSpace(dto.RawMaterialName);
  617. entity.MaterialCode = NullIfWhiteSpace(dto.MaterialCode);
  618. entity.EffectiveDate = NullIfWhiteSpace(dto.EffectiveDate);
  619. entity.DrawingVersion = NullIfWhiteSpace(dto.DrawingVersion);
  620. entity.MaterialGrade = NullIfWhiteSpace(dto.MaterialGrade);
  621. entity.CavityOrMold = NullIfWhiteSpace(dto.CavityOrMold);
  622. entity.Attachment = NullIfWhiteSpace(dto.Attachment);
  623. entity.FileName = NullIfWhiteSpace(dto.FileName);
  624. entity.Title = NullIfWhiteSpace(dto.Title);
  625. }
  626. private async Task SyncRawInspectionSpecEntriesAsync(long masterId, IEnumerable<AdoS0QmsRawInspectionSpecEntryDto> items, long tenantId)
  627. {
  628. var seq = 1;
  629. foreach (var item in items)
  630. {
  631. var entity = new AdoS0QmsRawInspectionSpecEntry
  632. {
  633. TenantId = tenantId,
  634. MasterId = masterId,
  635. Seq = item.Seq ?? seq++,
  636. InspectionItem = NullIfWhiteSpace(item.InspectionItem),
  637. InspectionStandard = NullIfWhiteSpace(item.InspectionStandard),
  638. InspectionMethod = NullIfWhiteSpace(item.InspectionMethod),
  639. ImageCategory = NullIfWhiteSpace(item.ImageCategory),
  640. SamplingScheme = NullIfWhiteSpace(item.SamplingScheme),
  641. Remark = NullIfWhiteSpace(item.Remark),
  642. Attachment = NullIfWhiteSpace(item.Attachment),
  643. UpperLimit = NullIfWhiteSpace(item.UpperLimit),
  644. LowerLimit = NullIfWhiteSpace(item.LowerLimit)
  645. };
  646. await _entryRep.AsInsertable(entity).ExecuteCommandAsync();
  647. }
  648. }
  649. }
  650. [ApiController]
  651. [Route("api/s0/quality/process-inspection-specs")]
  652. [NonUnify]
  653. public class AdoS0QmsProcessInspectionSpecsController : ControllerBase
  654. {
  655. private readonly SqlSugarRepository<AdoS0QmsProcessInspectionSpec> _rep;
  656. private readonly SqlSugarRepository<AdoS0QmsProcessInspectionSpecEntry> _entryRep;
  657. public AdoS0QmsProcessInspectionSpecsController(
  658. SqlSugarRepository<AdoS0QmsProcessInspectionSpec> rep,
  659. SqlSugarRepository<AdoS0QmsProcessInspectionSpecEntry> entryRep)
  660. {
  661. _rep = rep;
  662. _entryRep = entryRep;
  663. }
  664. [HttpGet]
  665. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0QualityPagedQueryDto q)
  666. {
  667. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  668. (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
  669. var query = _rep.AsQueryable().Where(x => x.TenantId == tenantId)
  670. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword), x =>
  671. (x.FileNumber != null && x.FileNumber.Contains(q.Keyword!)) ||
  672. (x.ApplicableModel != null && x.ApplicableModel.Contains(q.Keyword!)) ||
  673. (x.MaterialCode != null && x.MaterialCode.Contains(q.Keyword!)));
  674. var total = await query.CountAsync();
  675. var list = await query.OrderByDescending(x => x.Id).Skip((q.Page - 1) * q.PageSize).Take(q.PageSize).ToListAsync();
  676. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  677. }
  678. [HttpGet("{id:long}")]
  679. public async Task<IActionResult> GetDetailAsync(long id)
  680. {
  681. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  682. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  683. if (master == null) return NotFound();
  684. var items = await _entryRep.AsQueryable().Where(x => x.MasterId == id).OrderBy(x => x.Id).ToListAsync();
  685. return Ok(new { master, items });
  686. }
  687. [HttpPost]
  688. public async Task<IActionResult> CreateAsync([FromBody] AdoS0QmsProcessInspectionSpecUpsertDto dto)
  689. {
  690. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  691. var items = AdoS0QmsSpecAggregateGuard.Meaningful(dto.Items);
  692. var guardError = AdoS0QmsSpecAggregateGuard.ValidateCreate(ProcessRequiredFields(dto), items.Count);
  693. if (guardError != null) return AdoS0ApiErrors.InvalidRequest(guardError);
  694. var db = _rep.Context;
  695. await db.Ado.BeginTranAsync();
  696. try
  697. {
  698. var master = new AdoS0QmsProcessInspectionSpec();
  699. ApplyProcessInspectionSpec(master, dto);
  700. master.TenantId = tenantId;
  701. await _rep.AsInsertable(master).ExecuteReturnEntityAsync();
  702. await SyncProcessInspectionSpecEntriesAsync(master.Id, items, tenantId);
  703. await db.Ado.CommitTranAsync();
  704. return await GetDetailAsync(master.Id);
  705. }
  706. catch
  707. {
  708. await db.Ado.RollbackTranAsync();
  709. throw;
  710. }
  711. }
  712. [HttpPut("{id:long}")]
  713. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0QmsProcessInspectionSpecUpsertDto dto)
  714. {
  715. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  716. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  717. if (master == null) return NotFound();
  718. // 写入集保留历史已持久化的明细行(含空行),只丢弃本次新补的空占位;
  719. // 「原有明细数」按 meaningful 计,避免全空明细的历史单被自己的空行锁死。
  720. var existingRows = await _entryRep.AsQueryable().Where(x => x.MasterId == id).ToListAsync();
  721. var items = AdoS0QmsSpecAggregateGuard.ForUpdateWrite(dto.Items);
  722. var guardError = AdoS0QmsSpecAggregateGuard.ValidateUpdate(
  723. [
  724. ("文件编号", master.FileNumber, dto.FileNumber),
  725. ("物料编码", master.MaterialCode, dto.MaterialCode),
  726. ("版本", master.VersionNo, dto.VersionNo)
  727. ],
  728. AdoS0QmsSpecAggregateGuard.CountMeaningful(existingRows),
  729. AdoS0QmsSpecAggregateGuard.Meaningful(dto.Items).Count);
  730. if (guardError != null) return AdoS0ApiErrors.InvalidRequest(guardError);
  731. var db = _rep.Context;
  732. await db.Ado.BeginTranAsync();
  733. try
  734. {
  735. ApplyProcessInspectionSpec(master, dto);
  736. await _rep.AsUpdateable(master).ExecuteCommandAsync();
  737. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  738. await SyncProcessInspectionSpecEntriesAsync(id, items, tenantId);
  739. await db.Ado.CommitTranAsync();
  740. return await GetDetailAsync(id);
  741. }
  742. catch
  743. {
  744. await db.Ado.RollbackTranAsync();
  745. throw;
  746. }
  747. }
  748. [HttpDelete("{id:long}")]
  749. public async Task<IActionResult> DeleteAsync(long id)
  750. {
  751. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  752. var master = await _rep.ByIdScopedByColumnAsync(id, tenantId);
  753. if (master == null) return NotFound();
  754. var db = _rep.Context;
  755. await db.Ado.BeginTranAsync();
  756. try
  757. {
  758. await _entryRep.AsDeleteable().Where(x => x.MasterId == id).ExecuteCommandAsync();
  759. await _rep.DeleteAsync(master);
  760. await db.Ado.CommitTranAsync();
  761. return Ok(new { message = "删除成功" });
  762. }
  763. catch
  764. {
  765. await db.Ado.RollbackTranAsync();
  766. throw;
  767. }
  768. }
  769. /// <summary>过程检规必填集(UAT-S0-10 拍板;本轮不含「适用型号」,缺业务依据)。</summary>
  770. private static IReadOnlyList<(string, string?)> ProcessRequiredFields(AdoS0QmsProcessInspectionSpecUpsertDto dto) =>
  771. [
  772. ("文件编号", dto.FileNumber),
  773. ("物料编码", dto.MaterialCode),
  774. ("版本", dto.VersionNo),
  775. ];
  776. private static void ApplyProcessInspectionSpec(AdoS0QmsProcessInspectionSpec entity, AdoS0QmsProcessInspectionSpecUpsertDto dto)
  777. {
  778. entity.ApplicableModel = NullIfWhiteSpace(dto.ApplicableModel);
  779. entity.FileNumber = NullIfWhiteSpace(dto.FileNumber);
  780. entity.VersionNo = NullIfWhiteSpace(dto.VersionNo);
  781. entity.EffectiveDate = NullIfWhiteSpace(dto.EffectiveDate);
  782. entity.Attachment = NullIfWhiteSpace(dto.Attachment);
  783. entity.MaterialCode = NullIfWhiteSpace(dto.MaterialCode);
  784. entity.Attachment2 = NullIfWhiteSpace(dto.Attachment2);
  785. entity.Version = dto.Version;
  786. }
  787. private async Task SyncProcessInspectionSpecEntriesAsync(long masterId, IEnumerable<AdoS0QmsProcessInspectionSpecEntryDto> items, long tenantId)
  788. {
  789. foreach (var item in items)
  790. {
  791. var entity = new AdoS0QmsProcessInspectionSpecEntry
  792. {
  793. TenantId = tenantId,
  794. MasterId = masterId,
  795. OperationCode = NullIfWhiteSpace(item.OperationCode),
  796. OperationName = NullIfWhiteSpace(item.OperationName),
  797. InspectionItem = NullIfWhiteSpace(item.InspectionItem),
  798. InspectionMethod = NullIfWhiteSpace(item.InspectionMethod),
  799. InspectionSpec = NullIfWhiteSpace(item.InspectionSpec),
  800. ImageCategory = NullIfWhiteSpace(item.ImageCategory),
  801. InspectionFrequency = NullIfWhiteSpace(item.InspectionFrequency),
  802. TechnicalStandard = NullIfWhiteSpace(item.TechnicalStandard),
  803. PeelingForce = item.PeelingForce,
  804. UpperLimit = NullIfWhiteSpace(item.UpperLimit),
  805. LowerLimit = NullIfWhiteSpace(item.LowerLimit)
  806. };
  807. await _entryRep.AsInsertable(entity).ExecuteCommandAsync();
  808. }
  809. }
  810. }