AdoS0MfgPreprocessElementsController.cs 7.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166
  1. using Admin.NET.Plugin.AiDOP.Dto.S0.Manufacturing;
  2. using Admin.NET.Plugin.AiDOP.Dto.S0.Sales;
  3. using Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
  4. using Admin.NET.Plugin.AiDOP.Entity.S0.Sales;
  5. using Admin.NET.Plugin.AiDOP.Infrastructure;
  6. namespace Admin.NET.Plugin.AiDOP.Controllers.S0.Manufacturing;
  7. [ApiController]
  8. [Route("api/s0/manufacturing/preprocess-elements")]
  9. [NonUnify]
  10. public class AdoS0MfgPreprocessElementsController : ControllerBase
  11. {
  12. private readonly SqlSugarRepository<AdoS0MfgPreprocessElement> _rep;
  13. private readonly SqlSugarRepository<AdoS0ItemMaster> _itemRep;
  14. private readonly SqlSugarRepository<AdoS0GeneralizedCodeMaster> _codeRep;
  15. public AdoS0MfgPreprocessElementsController(
  16. SqlSugarRepository<AdoS0MfgPreprocessElement> rep,
  17. SqlSugarRepository<AdoS0ItemMaster> itemRep,
  18. SqlSugarRepository<AdoS0GeneralizedCodeMaster> codeRep)
  19. {
  20. _rep = rep;
  21. _itemRep = itemRep;
  22. _codeRep = codeRep;
  23. }
  24. [HttpGet]
  25. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0MfgPreprocessElementQueryDto q)
  26. {
  27. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  28. var page = q.EffectivePage;
  29. var pageSize = q.PageSize;
  30. (page, pageSize) = PagingGuard.Normalize(page, pageSize);
  31. // 去 domain 化(S0-DOMAIN-FILTER-REMOVAL-READONLY-1):主列表不再按 Domain 过滤、不再因缺 domain 返空,
  32. // 租户隔离由 ITenantIdFilter 自动生效。domain 仅保留供下方工序名(GeneralizedCode,无租户过滤)补显——
  33. // 该补显为 D 档例外,本批不去 domain(去掉会跨租户/ToDictionary 重复键),domain 空时工序名留空、不报错。
  34. var domain = q.Domain?.Trim() ?? string.Empty;
  35. var qsDomain = HttpContext.Request.Query["domain"].ToString();
  36. if (!string.IsNullOrWhiteSpace(qsDomain))
  37. domain = qsDomain.Trim();
  38. var query = _rep.ScopedTo(tenantId)
  39. .WhereIF(!string.IsNullOrWhiteSpace(q.MaterialCode), x => x.ItemNum.Contains(q.MaterialCode!))
  40. .WhereIF(!string.IsNullOrWhiteSpace(q.Op), x => x.Op != null && x.Op.Contains(q.Op!))
  41. .WhereIF(!string.IsNullOrWhiteSpace(q.ElementCode), x => x.ItemCode != null && x.ItemCode.Contains(q.ElementCode!))
  42. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword),
  43. x => x.ItemNum.Contains(q.Keyword!)
  44. || (x.Op != null && x.Op.Contains(q.Keyword!))
  45. || (x.ItemCode != null && x.ItemCode.Contains(q.Keyword!))
  46. || (x.Descr != null && x.Descr.Contains(q.Keyword!)));
  47. var total = await query.CountAsync();
  48. var list = await query
  49. .OrderByDescending(x => x.UpdateTime ?? x.CreateTime)
  50. .Skip((page - 1) * pageSize)
  51. .Take(pageSize)
  52. .ToListAsync();
  53. // 去 domain 化:物料名补显不再按 Domain 等值;ItemMaster 带 ITenantIdFilter,租户内 ItemNum 唯一,以 IsActive/RecID 稳定排序兜底确定性。
  54. var distinctItemNums = list.Select(x => x.ItemNum).Distinct().ToList();
  55. var items = await _itemRep.ScopedTo(tenantId)
  56. .Where(m => distinctItemNums.Contains(m.ItemNum))
  57. .OrderByDescending(m => m.IsActive)
  58. .OrderBy(m => m.Id)
  59. .Select(m => new { m.ItemNum, m.Descr })
  60. .ToListAsync();
  61. var itemDescrMap = items
  62. .GroupBy(x => x.ItemNum)
  63. .ToDictionary(g => g.Key, g => g.First().Descr);
  64. var opVals = list.Select(x => x.Op).Where(x => !string.IsNullOrWhiteSpace(x)).Cast<string>().Distinct().ToList();
  65. // 通用码表 ado_s0_mfg_generalized_code_master 是全局只读展示码表(无 tenant_id 列、无 ITenantIdFilter),
  66. // 仅用于把 Op 值翻成中文,不承载任何租户业务数据,故不施加租户条件。
  67. var opCodes = await _codeRep.AsQueryable()
  68. .Where(x => x.Domain == domain && x.FldName == "PrevProcessOp" && opVals.Contains(x.Val))
  69. .Select(x => new { x.Val, x.Comments })
  70. .ToListAsync();
  71. var opDescrMap = opCodes.ToDictionary(x => x.Val, x => x.Comments ?? "");
  72. var shaped = list.Select(x => new
  73. {
  74. id = x.Id,
  75. itemNum = x.ItemNum,
  76. itemDescr = itemDescrMap.TryGetValue(x.ItemNum, out var desc) ? desc : "",
  77. op = x.Op,
  78. opDescr = x.Op != null && opDescrMap.TryGetValue(x.Op, out var odesc) ? odesc : "",
  79. itemCode = x.ItemCode,
  80. descr = x.Descr,
  81. isMain = x.IsMain,
  82. domain = x.Domain,
  83. createUser = x.CreateUser,
  84. createTime = x.CreateTime,
  85. updateUser = x.UpdateUser,
  86. updateTime = x.UpdateTime,
  87. }).ToList();
  88. return Ok(new { total, page, pageSize, list = shaped });
  89. }
  90. [HttpGet("{id:long}")]
  91. public async Task<IActionResult> GetAsync(long id)
  92. {
  93. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  94. var item = await _rep.ByIdScopedAsync(id, tenantId);
  95. return item == null ? NotFound() : Ok(item);
  96. }
  97. [HttpPost]
  98. public async Task<IActionResult> CreateAsync([FromBody] AdoS0MfgPreprocessElementUpsertDto dto)
  99. {
  100. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  101. var now = DateTime.Now;
  102. var entity = new AdoS0MfgPreprocessElement
  103. {
  104. TenantId = tenantId,
  105. Domain = dto.Domain.Trim(),
  106. ItemNum = dto.ItemNum.Trim(),
  107. Op = dto.Op,
  108. Line = dto.Line,
  109. Typed = dto.Typed,
  110. ItemCode = dto.ItemCode,
  111. Descr = dto.Descr,
  112. IsMain = dto.IsMain,
  113. CreateUser = dto.CreateUser ?? dto.UpdateUser,
  114. CreateTime = dto.CreateTime ?? dto.UpdateTime ?? now,
  115. UpdateUser = dto.UpdateUser,
  116. UpdateTime = dto.UpdateTime
  117. };
  118. await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
  119. return Ok(entity);
  120. }
  121. [HttpPut("{id:long}")]
  122. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0MfgPreprocessElementUpsertDto dto)
  123. {
  124. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  125. var entity = await _rep.ByIdScopedAsync(id, tenantId);
  126. if (entity == null) return NotFound();
  127. entity.Domain = dto.Domain.Trim();
  128. entity.ItemNum = dto.ItemNum.Trim();
  129. entity.Op = dto.Op;
  130. entity.Line = dto.Line;
  131. entity.Typed = dto.Typed;
  132. entity.ItemCode = dto.ItemCode;
  133. entity.Descr = dto.Descr;
  134. entity.IsMain = dto.IsMain;
  135. entity.UpdateUser = dto.UpdateUser;
  136. entity.UpdateTime = dto.UpdateTime ?? DateTime.Now;
  137. await _rep.AsUpdateable(entity).ExecuteCommandAsync();
  138. return Ok(entity);
  139. }
  140. [HttpDelete("{id:long}")]
  141. public async Task<IActionResult> DeleteAsync(long id)
  142. {
  143. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  144. var item = await _rep.ByIdScopedAsync(id, tenantId);
  145. if (item == null) return NotFound();
  146. await _rep.DeleteAsync(item);
  147. return Ok(new { message = "删除成功" });
  148. }
  149. }