AdoS0ItemPacksController.cs 7.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175
  1. using Admin.NET.Plugin.AiDOP.Dto.S0.Warehouse;
  2. using Admin.NET.Plugin.AiDOP.Entity.S0.Sales;
  3. using Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
  4. using Admin.NET.Plugin.AiDOP.Infrastructure;
  5. namespace Admin.NET.Plugin.AiDOP.Controllers.S0.Warehouse;
  6. /// <summary>
  7. /// S0 零件包装规格(ItemPackMaster 语义)。
  8. /// 多租户隔离:所有读写显式限定当前请求租户(AdoS0TenantScope.TryResolveRequired),不依赖全局 AOP。
  9. /// </summary>
  10. [ApiController]
  11. [Route("api/s0/warehouse/item-packs")]
  12. [NonUnify]
  13. public class AdoS0ItemPacksController : ControllerBase
  14. {
  15. private readonly SqlSugarRepository<AdoS0ItemPackMaster> _rep;
  16. public AdoS0ItemPacksController(SqlSugarRepository<AdoS0ItemPackMaster> rep)
  17. {
  18. _rep = rep;
  19. }
  20. [HttpGet]
  21. public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0ItemPackQueryDto 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()
  26. .Where(x => x.TenantId == tenantId)
  27. .WhereIF(q.CompanyRefId.HasValue, x => x.CompanyRefId == q.CompanyRefId!.Value)
  28. .WhereIF(q.FactoryRefId.HasValue, x => x.FactoryRefId == q.FactoryRefId!.Value)
  29. .WhereIF(!string.IsNullOrWhiteSpace(q.DomainCode), x => x.DomainCode == q.DomainCode)
  30. .WhereIF(!string.IsNullOrWhiteSpace(q.PackingType), x => x.PackingType == q.PackingType)
  31. .WhereIF(q.IsActive.HasValue, x => x.IsActive == q.IsActive!.Value)
  32. .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword),
  33. x => x.ItemNum.Contains(q.Keyword!));
  34. var total = await query.CountAsync();
  35. var list = await query
  36. .OrderBy(x => x.ItemNum)
  37. .Skip((q.Page - 1) * q.PageSize)
  38. .Take(q.PageSize)
  39. .ToListAsync();
  40. // 补显 ItemDescr / ItemDescr1:实体已按设计声明这两个 [SugarColumn(IsIgnore = true)] 展示字段
  41. //(注释即写明「来自 ItemMaster.Descr / Descr1」),但此前 controller 从未填充,
  42. // 导致页面「物料名称」「型号」两列恒为空。
  43. // 沿用本仓既有范式(AdoS0MfgMaterialProcessElementsController):单次 ItemMaster 查询 + 字典映射,
  44. // 不做逐行查询,杜绝 N+1;ItemMaster 显式限定当前租户,不跨租户取名。
  45. await FillItemDisplayAsync(list, tenantId);
  46. return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
  47. }
  48. [HttpGet("{id:long}")]
  49. public async Task<IActionResult> GetAsync(long id)
  50. {
  51. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  52. var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  53. return item == null ? NotFound() : Ok(item);
  54. }
  55. [HttpPost]
  56. public async Task<IActionResult> CreateAsync([FromBody] AdoS0ItemPackUpsertDto dto)
  57. {
  58. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  59. // 唯一口径对齐数据库 uk_ItemPackMaster_tenant_domain_itemnum (tenant_id, Domain, ItemNum)
  60. if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
  61. return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
  62. var entity = new AdoS0ItemPackMaster
  63. {
  64. TenantId = tenantId,
  65. CompanyRefId = dto.CompanyRefId,
  66. FactoryRefId = dto.FactoryRefId,
  67. DomainCode = dto.DomainCode ?? string.Empty,
  68. ItemNum = dto.ItemNum,
  69. PackingQty = dto.PackingQty,
  70. SmallPackingQty = dto.SmallPackingQty,
  71. PackingType = dto.PackingType,
  72. NetWeight = dto.NetWeight,
  73. WeightUM = dto.WeightUM,
  74. Length = dto.Length,
  75. Width = dto.Width,
  76. High = dto.High,
  77. IssSpecific = dto.IssSpecific,
  78. CustItem = dto.CustItem,
  79. Remark = dto.Remark,
  80. IsActive = dto.IsActive,
  81. CreateUser = dto.CreateUser,
  82. CreateTime = DateTime.Now
  83. };
  84. await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
  85. return Ok(entity);
  86. }
  87. [HttpPut("{id:long}")]
  88. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0ItemPackUpsertDto dto)
  89. {
  90. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  91. var entity = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  92. if (entity == null) return NotFound();
  93. if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.Id != id && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
  94. return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
  95. // entity.TenantId 保持不变(== tenantId);不接受前端修改 tenant
  96. entity.CompanyRefId = dto.CompanyRefId;
  97. entity.FactoryRefId = dto.FactoryRefId;
  98. entity.DomainCode = dto.DomainCode ?? string.Empty;
  99. entity.ItemNum = dto.ItemNum;
  100. entity.PackingQty = dto.PackingQty;
  101. entity.SmallPackingQty = dto.SmallPackingQty;
  102. entity.PackingType = dto.PackingType;
  103. entity.NetWeight = dto.NetWeight;
  104. entity.WeightUM = dto.WeightUM;
  105. entity.Length = dto.Length;
  106. entity.Width = dto.Width;
  107. entity.High = dto.High;
  108. entity.IssSpecific = dto.IssSpecific;
  109. entity.CustItem = dto.CustItem;
  110. entity.Remark = dto.Remark;
  111. entity.IsActive = dto.IsActive;
  112. entity.UpdateUser = dto.UpdateUser;
  113. entity.UpdateTime = DateTime.Now;
  114. await _rep.AsUpdateable(entity).ExecuteCommandAsync();
  115. return Ok(entity);
  116. }
  117. [HttpDelete("{id:long}")]
  118. public async Task<IActionResult> DeleteAsync(long id)
  119. {
  120. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  121. var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  122. if (item == null) return NotFound();
  123. await _rep.DeleteAsync(item);
  124. return Ok(new { message = "删除成功" });
  125. }
  126. /// <summary>
  127. /// 批量补显物料名称/型号:一次 ItemMaster 查询 + 字典映射(无 N+1),显式限定当前租户。
  128. /// ItemDescr / ItemDescr1 为 [SugarColumn(IsIgnore = true)] 展示字段,不落库。
  129. /// </summary>
  130. private async Task FillItemDisplayAsync(List<AdoS0ItemPackMaster> rows, long tenantId)
  131. {
  132. var itemNums = rows.Select(x => x.ItemNum)
  133. .Where(x => !string.IsNullOrWhiteSpace(x))
  134. .Distinct()
  135. .ToList();
  136. if (itemNums.Count == 0) return;
  137. var items = await _rep.Context.Queryable<AdoS0ItemMaster>()
  138. .Where(m => m.TenantId == tenantId && itemNums.Contains(m.ItemNum))
  139. .OrderByDescending(m => m.IsActive)
  140. .OrderBy(m => m.Id)
  141. .Select(m => new { m.ItemNum, m.Descr, m.Descr1 })
  142. .ToListAsync();
  143. var map = items.GroupBy(x => x.ItemNum).ToDictionary(g => g.Key, g => g.First());
  144. foreach (var r in rows)
  145. {
  146. if (r.ItemNum != null && map.TryGetValue(r.ItemNum, out var m))
  147. {
  148. r.ItemDescr = m.Descr;
  149. r.ItemDescr1 = m.Descr1;
  150. }
  151. }
  152. }
  153. }