| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175 |
- using Admin.NET.Plugin.AiDOP.Dto.S0.Warehouse;
- using Admin.NET.Plugin.AiDOP.Entity.S0.Sales;
- using Admin.NET.Plugin.AiDOP.Entity.S0.Warehouse;
- using Admin.NET.Plugin.AiDOP.Infrastructure;
- namespace Admin.NET.Plugin.AiDOP.Controllers.S0.Warehouse;
- /// <summary>
- /// S0 零件包装规格(ItemPackMaster 语义)。
- /// 多租户隔离:所有读写显式限定当前请求租户(AdoS0TenantScope.TryResolveRequired),不依赖全局 AOP。
- /// </summary>
- [ApiController]
- [Route("api/s0/warehouse/item-packs")]
- [NonUnify]
- public class AdoS0ItemPacksController : ControllerBase
- {
- private readonly SqlSugarRepository<AdoS0ItemPackMaster> _rep;
- public AdoS0ItemPacksController(SqlSugarRepository<AdoS0ItemPackMaster> rep)
- {
- _rep = rep;
- }
- [HttpGet]
- public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0ItemPackQueryDto q)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- (q.Page, q.PageSize) = PagingGuard.Normalize(q.Page, q.PageSize);
- var query = _rep.AsQueryable()
- .Where(x => x.TenantId == tenantId)
- .WhereIF(q.CompanyRefId.HasValue, x => x.CompanyRefId == q.CompanyRefId!.Value)
- .WhereIF(q.FactoryRefId.HasValue, x => x.FactoryRefId == q.FactoryRefId!.Value)
- .WhereIF(!string.IsNullOrWhiteSpace(q.DomainCode), x => x.DomainCode == q.DomainCode)
- .WhereIF(!string.IsNullOrWhiteSpace(q.PackingType), x => x.PackingType == q.PackingType)
- .WhereIF(q.IsActive.HasValue, x => x.IsActive == q.IsActive!.Value)
- .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword),
- x => x.ItemNum.Contains(q.Keyword!));
- var total = await query.CountAsync();
- var list = await query
- .OrderBy(x => x.ItemNum)
- .Skip((q.Page - 1) * q.PageSize)
- .Take(q.PageSize)
- .ToListAsync();
- // 补显 ItemDescr / ItemDescr1:实体已按设计声明这两个 [SugarColumn(IsIgnore = true)] 展示字段
- //(注释即写明「来自 ItemMaster.Descr / Descr1」),但此前 controller 从未填充,
- // 导致页面「物料名称」「型号」两列恒为空。
- // 沿用本仓既有范式(AdoS0MfgMaterialProcessElementsController):单次 ItemMaster 查询 + 字典映射,
- // 不做逐行查询,杜绝 N+1;ItemMaster 显式限定当前租户,不跨租户取名。
- await FillItemDisplayAsync(list, tenantId);
- return Ok(new { total, page = q.Page, pageSize = q.PageSize, list });
- }
- [HttpGet("{id:long}")]
- public async Task<IActionResult> GetAsync(long id)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
- return item == null ? NotFound() : Ok(item);
- }
- [HttpPost]
- public async Task<IActionResult> CreateAsync([FromBody] AdoS0ItemPackUpsertDto dto)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- // 唯一口径对齐数据库 uk_ItemPackMaster_tenant_domain_itemnum (tenant_id, Domain, ItemNum)
- if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
- return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
- var entity = new AdoS0ItemPackMaster
- {
- TenantId = tenantId,
- CompanyRefId = dto.CompanyRefId,
- FactoryRefId = dto.FactoryRefId,
- DomainCode = dto.DomainCode ?? string.Empty,
- ItemNum = dto.ItemNum,
- PackingQty = dto.PackingQty,
- SmallPackingQty = dto.SmallPackingQty,
- PackingType = dto.PackingType,
- NetWeight = dto.NetWeight,
- WeightUM = dto.WeightUM,
- Length = dto.Length,
- Width = dto.Width,
- High = dto.High,
- IssSpecific = dto.IssSpecific,
- CustItem = dto.CustItem,
- Remark = dto.Remark,
- IsActive = dto.IsActive,
- CreateUser = dto.CreateUser,
- CreateTime = DateTime.Now
- };
- await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
- return Ok(entity);
- }
- [HttpPut("{id:long}")]
- public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0ItemPackUpsertDto dto)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var entity = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
- if (entity == null) return NotFound();
- if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.Id != id && x.DomainCode == (dto.DomainCode ?? string.Empty) && x.ItemNum == dto.ItemNum))
- return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "物料包装规格已存在");
- // entity.TenantId 保持不变(== tenantId);不接受前端修改 tenant
- entity.CompanyRefId = dto.CompanyRefId;
- entity.FactoryRefId = dto.FactoryRefId;
- entity.DomainCode = dto.DomainCode ?? string.Empty;
- entity.ItemNum = dto.ItemNum;
- entity.PackingQty = dto.PackingQty;
- entity.SmallPackingQty = dto.SmallPackingQty;
- entity.PackingType = dto.PackingType;
- entity.NetWeight = dto.NetWeight;
- entity.WeightUM = dto.WeightUM;
- entity.Length = dto.Length;
- entity.Width = dto.Width;
- entity.High = dto.High;
- entity.IssSpecific = dto.IssSpecific;
- entity.CustItem = dto.CustItem;
- entity.Remark = dto.Remark;
- entity.IsActive = dto.IsActive;
- entity.UpdateUser = dto.UpdateUser;
- entity.UpdateTime = DateTime.Now;
- await _rep.AsUpdateable(entity).ExecuteCommandAsync();
- return Ok(entity);
- }
- [HttpDelete("{id:long}")]
- public async Task<IActionResult> DeleteAsync(long id)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var item = await _rep.AsQueryable().Where(x => x.Id == id && x.TenantId == tenantId).FirstAsync();
- if (item == null) return NotFound();
- await _rep.DeleteAsync(item);
- return Ok(new { message = "删除成功" });
- }
- /// <summary>
- /// 批量补显物料名称/型号:一次 ItemMaster 查询 + 字典映射(无 N+1),显式限定当前租户。
- /// ItemDescr / ItemDescr1 为 [SugarColumn(IsIgnore = true)] 展示字段,不落库。
- /// </summary>
- private async Task FillItemDisplayAsync(List<AdoS0ItemPackMaster> rows, long tenantId)
- {
- var itemNums = rows.Select(x => x.ItemNum)
- .Where(x => !string.IsNullOrWhiteSpace(x))
- .Distinct()
- .ToList();
- if (itemNums.Count == 0) return;
- var items = await _rep.Context.Queryable<AdoS0ItemMaster>()
- .Where(m => m.TenantId == tenantId && itemNums.Contains(m.ItemNum))
- .OrderByDescending(m => m.IsActive)
- .OrderBy(m => m.Id)
- .Select(m => new { m.ItemNum, m.Descr, m.Descr1 })
- .ToListAsync();
- var map = items.GroupBy(x => x.ItemNum).ToDictionary(g => g.Key, g => g.First());
- foreach (var r in rows)
- {
- if (r.ItemNum != null && map.TryGetValue(r.ItemNum, out var m))
- {
- r.ItemDescr = m.Descr;
- r.ItemDescr1 = m.Descr1;
- }
- }
- }
- }
|