AdoS0MfgMaterialProcessElementsController.cs 7.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172
  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. /// <summary>
  8. /// S0 物料工序条件(ItemOpCondition 语义)。
  9. /// 多租户隔离:所有读写显式限定当前请求租户(AdoS0TenantScope.TryResolveRequired),不依赖全局 AOP 兜底。
  10. /// </summary>
  11. [ApiController]
  12. [Route("api/s0/manufacturing/material-process-elements")]
  13. [NonUnify]
  14. public class AdoS0MfgMaterialProcessElementsController : ControllerBase
  15. {
  16. private readonly SqlSugarRepository<AdoS0ItemOpCondition> _rep;
  17. public AdoS0MfgMaterialProcessElementsController(SqlSugarRepository<AdoS0ItemOpCondition> rep)
  18. {
  19. _rep = rep;
  20. }
  21. [HttpGet]
  22. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0ItemOpConditionQueryDto q)
  23. {
  24. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  25. var page = q.Page;
  26. var pageSize = q.PageSize;
  27. (page, pageSize) = PagingGuard.Normalize(page, pageSize);
  28. // 显式租户隔离:不依赖全局 AOP,直接按当前请求租户过滤;保留 CodeType 业务条件。
  29. var query = _rep.AsQueryable()
  30. .Where(x => x.TenantId == tenantId)
  31. .Where(x => x.CodeType == "Prod")
  32. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword),
  33. x =>
  34. x.ItemNum.Contains(q.Keyword!)
  35. || (x.ItemCode != null && x.ItemCode.Contains(q.Keyword!))
  36. || (x.Descr != null && x.Descr.Contains(q.Keyword!))
  37. || (x.Op != null && x.Op.Contains(q.Keyword!))
  38. || (x.Typed != null && x.Typed.Contains(q.Keyword!)))
  39. .WhereIF(!string.IsNullOrWhiteSpace(q.ItemNum), x => x.ItemNum.Contains(q.ItemNum!))
  40. .WhereIF(!string.IsNullOrWhiteSpace(q.Op), x => x.Op != null && x.Op.Contains(q.Op!))
  41. .WhereIF(!string.IsNullOrWhiteSpace(q.Line), x => x.Line != null && x.Line.Contains(q.Line!))
  42. .WhereIF(!string.IsNullOrWhiteSpace(q.Typed), x => x.Typed != null && x.Typed.Contains(q.Typed!))
  43. .WhereIF(!string.IsNullOrWhiteSpace(q.ItemCode), x => x.ItemCode != null && x.ItemCode.Contains(q.ItemCode!));
  44. var total = await query.CountAsync();
  45. var list = await query.OrderByDescending(x => x.UpdateTime ?? x.CreateTime).Skip((page - 1) * pageSize).Take(pageSize).ToListAsync();
  46. // 展示字段:ItemDescr / OpDescr / TypedDescr(当前阶段仅能稳定补 ItemDescr 与 OpDescr;TypedDescr 先留空)
  47. var itemNums = list.Select(x => x.ItemNum).Distinct().ToList();
  48. // 去 domain 化:物料名补显不再按 Domain 等值;ItemMaster 带 ITenantIdFilter,租户内 ItemNum 唯一,确定性以 IsActive/RecID 稳定排序兜底。
  49. var items = await _rep.Context.Queryable<AdoS0ItemMaster>()
  50. .Where(m => m.TenantId == tenantId && itemNums.Contains(m.ItemNum))
  51. .OrderByDescending(m => m.IsActive)
  52. .OrderBy(m => m.Id)
  53. .Select(m => new { m.ItemNum, m.Descr })
  54. .ToListAsync();
  55. var itemDescrMap = items
  56. .GroupBy(x => x.ItemNum)
  57. .ToDictionary(g => g.Key, g => g.First().Descr);
  58. var opKeys = list
  59. .Where(x => !string.IsNullOrWhiteSpace(x.Op))
  60. .Select(x => new { x.ItemNum, Op = x.Op! })
  61. .Distinct()
  62. .ToList();
  63. var opDescrMap = new Dictionary<string, string>();
  64. if (opKeys.Count > 0)
  65. {
  66. var r = await _rep.Context.Queryable<AdoS0MfgRoutingOpDetail>()
  67. .Where(x => x.TenantId == tenantId && x.MaterialCode != null && itemNums.Contains(x.MaterialCode))
  68. .ToListAsync();
  69. foreach (var k in opKeys)
  70. {
  71. var match = r.FirstOrDefault(x => x.MaterialCode == k.ItemNum && x.OperationCode == k.Op);
  72. if (match != null) opDescrMap[$"{k.ItemNum}::{k.Op}"] = match.OperationDescription;
  73. }
  74. }
  75. var shaped = list.Select(x => new
  76. {
  77. id = x.Id,
  78. itemNum = x.ItemNum,
  79. itemDescr = itemDescrMap.TryGetValue(x.ItemNum, out var idesc) ? idesc : "",
  80. op = x.Op,
  81. opDescr = x.Op != null && opDescrMap.TryGetValue($"{x.ItemNum}::{x.Op}", out var odesc) ? odesc : "",
  82. line = x.Line,
  83. typed = x.Typed,
  84. typedDescr = "",
  85. itemCode = x.ItemCode,
  86. descr = x.Descr,
  87. isMain = x.IsMain,
  88. codeType = x.CodeType,
  89. domain = x.Domain,
  90. createUser = x.CreateUser,
  91. createTime = x.CreateTime,
  92. updateUser = x.UpdateUser,
  93. updateTime = x.UpdateTime,
  94. }).ToList();
  95. return Ok(new { total, page, pageSize, list = shaped });
  96. }
  97. [HttpGet("{id:long}")]
  98. public async Task<IActionResult> GetAsync(long id)
  99. {
  100. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  101. var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  102. return item == null ? NotFound() : Ok(item);
  103. }
  104. [HttpPost]
  105. public async Task<IActionResult> CreateAsync([FromBody] AdoS0ItemOpConditionUpsertDto dto)
  106. {
  107. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  108. var now = DateTime.Now;
  109. var entity = new AdoS0ItemOpCondition
  110. {
  111. TenantId = tenantId,
  112. Domain = dto.Domain.Trim(),
  113. CodeType = "Prod",
  114. ItemNum = dto.ItemNum.Trim(),
  115. Op = dto.Op,
  116. Line = dto.Line,
  117. Typed = dto.Typed,
  118. ItemCode = dto.ItemCode,
  119. Descr = dto.Descr,
  120. IsMain = dto.IsMain,
  121. CreateUser = dto.CreateUser ?? dto.UpdateUser,
  122. CreateTime = dto.CreateTime ?? dto.UpdateTime ?? now,
  123. UpdateUser = dto.UpdateUser,
  124. UpdateTime = dto.UpdateTime
  125. };
  126. await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
  127. return Ok(entity);
  128. }
  129. [HttpPut("{id:long}")]
  130. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0ItemOpConditionUpsertDto dto)
  131. {
  132. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  133. var entity = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  134. if (entity == null) return NotFound();
  135. entity.Domain = dto.Domain.Trim();
  136. entity.CodeType = "Prod";
  137. entity.ItemNum = dto.ItemNum.Trim();
  138. entity.Op = dto.Op;
  139. entity.Line = dto.Line;
  140. entity.Typed = dto.Typed;
  141. entity.ItemCode = dto.ItemCode;
  142. entity.Descr = dto.Descr;
  143. entity.IsMain = dto.IsMain;
  144. entity.UpdateUser = dto.UpdateUser;
  145. entity.UpdateTime = dto.UpdateTime ?? DateTime.Now;
  146. await _rep.AsUpdateable(entity).ExecuteCommandAsync();
  147. return Ok(entity);
  148. }
  149. [HttpDelete("{id:long}")]
  150. public async Task<IActionResult> DeleteAsync(long id)
  151. {
  152. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  153. var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  154. if (item == null) return NotFound();
  155. await _rep.DeleteAsync(item);
  156. return Ok(new { message = "删除成功" });
  157. }
  158. }