AdoS0ItemPacksController.cs 8.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179
  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. var (companyId, factoryId) = await AdoS0OrgScope.ResolveAsync(_rep.Context, tenantId);
  60. if (companyId <= 0 || factoryId <= 0) return AdoS0OrgScope.NotConfiguredError("零件包装规格");
  61. // 唯一口径对齐数据库 uk_ItemPackMaster_tenant_domain_itemnum (tenant_id, Domain, ItemNum)
  62. if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
  63. return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
  64. var entity = new AdoS0ItemPackMaster
  65. {
  66. TenantId = tenantId,
  67. // 组织字段后端强制 stamp 当前租户内解析出的组织,忽略 payload 组织值(杜绝跨租户组织引用)。
  68. CompanyRefId = companyId,
  69. FactoryRefId = factoryId,
  70. DomainCode = dto.DomainCode ?? string.Empty,
  71. ItemNum = dto.ItemNum,
  72. PackingQty = dto.PackingQty,
  73. SmallPackingQty = dto.SmallPackingQty,
  74. PackingType = dto.PackingType,
  75. NetWeight = dto.NetWeight,
  76. WeightUM = dto.WeightUM,
  77. Length = dto.Length,
  78. Width = dto.Width,
  79. High = dto.High,
  80. IssSpecific = dto.IssSpecific,
  81. CustItem = dto.CustItem,
  82. Remark = dto.Remark,
  83. IsActive = dto.IsActive,
  84. CreateUser = dto.CreateUser,
  85. CreateTime = DateTime.Now
  86. };
  87. await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
  88. return Ok(entity);
  89. }
  90. [HttpPut("{id:long}")]
  91. public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0ItemPackUpsertDto dto)
  92. {
  93. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  94. var entity = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  95. if (entity == null) return NotFound();
  96. if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.Id != id && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
  97. return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
  98. // entity.TenantId 保持不变(== tenantId);不接受前端修改 tenant
  99. // 组织字段 pin 到既有原值,忽略 payload 组织值:既杜绝篡改成他租户组织,
  100. // 也不因一次普通编辑就顺手迁移历史 CROSS-TENANT 存量(存量迁移属 B-2,另批处理)。
  101. entity.DomainCode = dto.DomainCode ?? string.Empty;
  102. entity.ItemNum = dto.ItemNum;
  103. entity.PackingQty = dto.PackingQty;
  104. entity.SmallPackingQty = dto.SmallPackingQty;
  105. entity.PackingType = dto.PackingType;
  106. entity.NetWeight = dto.NetWeight;
  107. entity.WeightUM = dto.WeightUM;
  108. entity.Length = dto.Length;
  109. entity.Width = dto.Width;
  110. entity.High = dto.High;
  111. entity.IssSpecific = dto.IssSpecific;
  112. entity.CustItem = dto.CustItem;
  113. entity.Remark = dto.Remark;
  114. entity.IsActive = dto.IsActive;
  115. entity.UpdateUser = dto.UpdateUser;
  116. entity.UpdateTime = DateTime.Now;
  117. await _rep.AsUpdateable(entity).ExecuteCommandAsync();
  118. return Ok(entity);
  119. }
  120. [HttpDelete("{id:long}")]
  121. public async Task<IActionResult> DeleteAsync(long id)
  122. {
  123. if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
  124. var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
  125. if (item == null) return NotFound();
  126. await _rep.DeleteAsync(item);
  127. return Ok(new { message = "删除成功" });
  128. }
  129. /// <summary>
  130. /// 批量补显物料名称/型号:一次 ItemMaster 查询 + 字典映射(无 N+1),显式限定当前租户。
  131. /// ItemDescr / ItemDescr1 为 [SugarColumn(IsIgnore = true)] 展示字段,不落库。
  132. /// </summary>
  133. private async Task FillItemDisplayAsync(List<AdoS0ItemPackMaster> rows, long tenantId)
  134. {
  135. var itemNums = rows.Select(x => x.ItemNum)
  136. .Where(x => !string.IsNullOrWhiteSpace(x))
  137. .Distinct()
  138. .ToList();
  139. if (itemNums.Count == 0) return;
  140. var items = await _rep.Context.Queryable<AdoS0ItemMaster>()
  141. .Where(m => m.TenantId == tenantId && itemNums.Contains(m.ItemNum))
  142. .OrderByDescending(m => m.IsActive)
  143. .OrderBy(m => m.Id)
  144. .Select(m => new { m.ItemNum, m.Descr, m.Descr1 })
  145. .ToListAsync();
  146. var map = items.GroupBy(x => x.ItemNum).ToDictionary(g => g.Key, g => g.First());
  147. foreach (var r in rows)
  148. {
  149. if (r.ItemNum != null && map.TryGetValue(r.ItemNum, out var m))
  150. {
  151. r.ItemDescr = m.Descr;
  152. r.ItemDescr1 = m.Descr1;
  153. }
  154. }
  155. }
  156. }