| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264 |
- using Admin.NET.Plugin.AiDOP.Dto.S0.Manufacturing;
- using Admin.NET.Plugin.AiDOP.Entity.S0.Manufacturing;
- using Admin.NET.Plugin.AiDOP.Infrastructure;
- namespace Admin.NET.Plugin.AiDOP.Controllers.S0.Manufacturing;
- /// <summary>
- /// 工序流转卡主数据 CRUD(数据源:S0ProcessFlowCard 主表)。
- ///
- /// 恢复主表链路:本 Controller 完全读写 S0ProcessFlowCard,替换此前误接 legacy MissedPrint 的只读投影。
- /// 路由沿用 /api/s0/manufacturing/process-flow-cards,接口地址不变 → 前端 / 菜单 / 权限链路兼容。
- ///
- /// 组织兜底(后端强制,不只依赖前端 payload):
- /// - 新增:公司/工厂由后端在**当前租户内**解析组织并 stamp,忽略 payload 组织值 → 杜绝跨厂注入与跨租户组织引用;
- /// - 编辑:公司/工厂 pin 到既有记录原值,忽略 payload 组织值 → 杜绝跨公司/跨工厂篡改;
- /// - 详情/删除/启停:按 id 操作,不接受组织入参。
- /// 唯一性:依赖 DB 唯一索引 uk_S0ProcessFlowCard_factory_flowcard (factory_ref_id, flow_card_no);
- /// 预检友好 409,并发竞态由唯一索引兜底(AdoS0ExceptionFilter 将重复键映射为友好 409)。
- /// </summary>
- [ApiController]
- [Route("api/s0/manufacturing/process-flow-cards")]
- [NonUnify]
- public class AdoS0ProcessFlowCardsController : ControllerBase
- {
- /// <summary>租户内优先匹配的公司编码(仅作优先条件,取不到即按机构类型/根节点在本租户内兜底)。</summary>
- private const string PreferredCompanyCode = "S0-C001";
- /// <summary>租户内优先匹配的工厂编码(同上,绝不跨租户查找)。</summary>
- private const string PreferredFactoryCode = "S0-F001";
- /// <summary>机构类型-公司(SysOrg.Type 数据字典值)。</summary>
- private const string CompanyOrgType = "201";
- /// <summary>机构类型-工厂(SysOrg.Type 数据字典值)。</summary>
- private const string FactoryOrgType = "501";
- private readonly SqlSugarRepository<AdoS0ProcessFlowCard> _rep;
- private readonly SqlSugarRepository<AdoS0MfgRoutingOpDetail> _routingRep;
- private readonly SqlSugarRepository<SysOrg> _orgRep;
- public AdoS0ProcessFlowCardsController(
- SqlSugarRepository<AdoS0ProcessFlowCard> rep,
- SqlSugarRepository<AdoS0MfgRoutingOpDetail> routingRep,
- SqlSugarRepository<SysOrg> orgRep)
- {
- _rep = rep;
- _routingRep = routingRep;
- _orgRep = orgRep;
- }
- [HttpGet]
- public async Task<IActionResult> GetPagedAsync([FromQuery] AdoS0ProcessFlowCardQueryDto q)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var page = q.EffectivePage;
- var pageSize = q.PageSize;
- (page, pageSize) = PagingGuard.Normalize(page, 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.WorkOrderNo), x => x.WorkOrderNo.Contains(q.WorkOrderNo!))
- .WhereIF(!string.IsNullOrWhiteSpace(q.FlowCardNo), x => x.FlowCardNo.Contains(q.FlowCardNo!))
- .WhereIF(!string.IsNullOrWhiteSpace(q.ItemNum), x => x.ItemNum.Contains(q.ItemNum!))
- .WhereIF(q.IsActive.HasValue, x => x.IsActive == q.IsActive!.Value)
- .WhereIF(!string.IsNullOrWhiteSpace(q.Keyword),
- x => x.WorkOrderNo.Contains(q.Keyword!)
- || x.FlowCardNo.Contains(q.Keyword!)
- || x.ItemNum.Contains(q.Keyword!)
- || (x.ItemName != null && x.ItemName.Contains(q.Keyword!)));
- var total = await query.CountAsync();
- var list = await query
- .OrderByDescending(x => x.CreateTime)
- .OrderByDescending(x => x.Id)
- .Skip((page - 1) * pageSize).Take(pageSize)
- .ToListAsync();
- return Ok(new { total, page, 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 ? AdoS0ApiErrors.NotFound("流转卡不存在") : Ok(item);
- }
- [HttpPost]
- public async Task<IActionResult> CreateAsync([FromBody] AdoS0ProcessFlowCardUpsertDto dto)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var (companyId, factoryId) = await ResolveDefaultOrgAsync(tenantId);
- if (companyId <= 0 || factoryId <= 0)
- return AdoS0ApiErrors.InvalidRequest("当前租户未配置机构,无法确定流转卡的公司/工厂归属,请先在机构管理中维护");
- var flowCardNo = dto.FlowCardNo?.Trim() ?? string.Empty;
- if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.FactoryRefId == factoryId && x.FlowCardNo == flowCardNo))
- return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "流转卡号已存在");
- var now = DateTime.Now;
- var entity = new AdoS0ProcessFlowCard
- {
- TenantId = tenantId,
- // 组织字段后端强制 stamp 当前租户内解析出的组织,忽略 payload 组织值(杜绝跨厂注入与跨租户组织引用)。
- CompanyRefId = companyId,
- FactoryRefId = factoryId,
- DomainCode = dto.DomainCode?.Trim(),
- WorkOrderNo = dto.WorkOrderNo?.Trim() ?? string.Empty,
- WorkOrderBatchNo = dto.WorkOrderBatchNo?.Trim(),
- FlowCardNo = flowCardNo,
- Nature = dto.Nature?.Trim(),
- ItemNum = dto.ItemNum?.Trim() ?? string.Empty,
- ItemName = dto.ItemName?.Trim(),
- DrawingNo = dto.DrawingNo?.Trim(),
- BomVersion = dto.BomVersion?.Trim(),
- RoutingCode = dto.RoutingCode?.Trim(),
- Remarks = dto.Remarks?.Trim(),
- IsActive = dto.IsActive,
- CreateUser = dto.CreateUser,
- CreateTime = now,
- UpdateUser = dto.UpdateUser,
- UpdateTime = null
- };
- await _rep.AsInsertable(entity).ExecuteReturnEntityAsync();
- return Ok(entity);
- }
- [HttpPut("{id:long}")]
- public async Task<IActionResult> UpdateAsync(long id, [FromBody] AdoS0ProcessFlowCardUpsertDto 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 AdoS0ApiErrors.NotFound("流转卡不存在");
- var flowCardNo = dto.FlowCardNo?.Trim() ?? string.Empty;
- // 唯一性预检以既有记录的工厂为界(组织 pin 原值,不接受 payload 迁移工厂)。
- if (await _rep.IsAnyAsync(x => x.TenantId == tenantId && x.Id != id && x.FactoryRefId == entity.FactoryRefId && x.FlowCardNo == flowCardNo))
- return AdoS0ApiErrors.Conflict(AdoS0ErrorCodes.DuplicateCode, "流转卡号已存在");
- // 组织字段 pin 到既有原值,忽略 payload 组织值(杜绝跨公司/跨工厂篡改)。
- entity.WorkOrderNo = dto.WorkOrderNo?.Trim() ?? string.Empty;
- entity.WorkOrderBatchNo = dto.WorkOrderBatchNo?.Trim();
- entity.FlowCardNo = flowCardNo;
- entity.Nature = dto.Nature?.Trim();
- entity.ItemNum = dto.ItemNum?.Trim() ?? string.Empty;
- entity.ItemName = dto.ItemName?.Trim();
- entity.DrawingNo = dto.DrawingNo?.Trim();
- entity.BomVersion = dto.BomVersion?.Trim();
- entity.RoutingCode = dto.RoutingCode?.Trim();
- entity.Remarks = dto.Remarks?.Trim();
- entity.IsActive = dto.IsActive;
- entity.DomainCode = dto.DomainCode?.Trim();
- entity.UpdateUser = dto.UpdateUser;
- entity.UpdateTime = DateTime.Now;
- await _rep.AsUpdateable(entity)
- .IgnoreColumns(x => new { x.CompanyRefId, x.FactoryRefId, x.CreateUser, x.CreateTime })
- .ExecuteCommandAsync();
- return Ok(entity);
- }
- [HttpPatch("{id:long}/toggle-enabled")]
- public async Task<IActionResult> ToggleActiveAsync(long id, [FromBody] AdoS0ProcessFlowCardToggleActiveDto 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 AdoS0ApiErrors.NotFound("流转卡不存在");
- entity.IsActive = dto.IsEnabled;
- entity.UpdateTime = DateTime.Now;
- await _rep.AsUpdateable(entity)
- .UpdateColumns(x => new { x.IsActive, x.UpdateTime })
- .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 AdoS0ApiErrors.NotFound("流转卡不存在");
- await _rep.DeleteAsync(item);
- return Ok(new { message = "删除成功" });
- }
- /// <summary>
- /// 工艺路线联动选项:按所选物料编码过滤该物料关联的 RouteCode(去重)。
- /// 用稳定物料编码 ItemNum 关联(RoutingOpDetail.MaterialCode),不用物料名称。
- /// 返回空 → 前端允许手工填写兜底;返回非空 → 前端强制下拉。
- /// </summary>
- [HttpGet("routing-options")]
- public async Task<IActionResult> GetRoutingOptionsAsync([FromQuery] string? itemNum)
- {
- if (!AdoS0TenantScope.TryResolveRequired(out var tenantId, out var tenantError)) return tenantError!;
- var key = itemNum?.Trim();
- if (string.IsNullOrWhiteSpace(key))
- return Ok(Array.Empty<object>());
- var list = await _routingRep.AsQueryable()
- .Where(x => x.MaterialCode == key)
- .GroupBy(x => new { x.RouteCode, x.RouteName })
- .Select(x => new { routeCode = x.RouteCode, routeName = x.RouteName })
- .ToListAsync();
- var options = list
- .Where(x => !string.IsNullOrWhiteSpace(x.routeCode))
- .OrderBy(x => x.routeCode)
- .ToList();
- return Ok(options);
- }
- /// <summary>
- /// 解析当前租户的归属组织(公司 / 工厂)。
- ///
- /// 租户边界:只在 <paramref name="tenantId"/> 内解析,唯一查询显式带 <c>TenantId == tenantId</c>;
- /// **禁止 ClearFilter** —— SysOrg 的 Code 没有唯一约束(index_SysOrg_C 是普通索引、非 UNIQUE),
- /// 且 S0-C001 / S0-F001 只是 S0OrgSeedData 灌给 AIDOP-Demo 租户的示范种子、其余租户并无此组织;
- /// 清掉租户过滤器按 Code 取组织,会把他租户的 SysOrg.Id 写进本租户单据(跨租户组织引用)。
- ///
- /// Code 定位:S0-C001 / S0-F001 仅作"租户内优先匹配条件",取不到即在本租户内按机构类型 / 根节点兜底;
- /// 不跨租户查找、不复制种子、不新增组织。
- ///
- /// 优先级——公司:
- /// C1 本租户 Code=S0-C001 → C3 本租户根节点(Pid=0)且 Type=201 → C2 本租户任意 Type=201 → C4 本租户根节点(Pid=0)。
- /// 优先级——工厂:
- /// F1 本租户 Code=S0-F001 且父级为已解析公司 → F2 本租户 Type=501 且父级为已解析公司
- /// → F3 本租户任意 Type=501 → F4 回落到公司自身(兼容未建工厂节点的租户,不新增组织)。
- ///
- /// 确定性:一次取本租户机构并按 (OrderNo, Id) 稳定排序,各级用 FirstOrDefault 在有序集合上取首个,
- /// 避免多候选时结果随执行计划漂移(原实现的无序 FirstAsync 是不确定的)。
- ///
- /// 无解:返回 (0, 0) 交由调用方转 400 业务错误,**不抛异常** ——
- /// AdoS0ExceptionFilter 会把 /api/s0/* 上的未处理异常统一映射为 500 S01999
- /// (见 AdoS0ApiErrors.TryMapUnhandledException),抛异常会把"租户未配置机构"这类业务态误报成系统故障。
- /// </summary>
- /// <param name="tenantId">AdoS0TenantScope 解析出的可信租户(JWT claim),不接受 payload 传入。</param>
- private async Task<(long CompanyId, long FactoryId)> ResolveDefaultOrgAsync(long tenantId)
- {
- // 单次取数 + 内存分级,避免逐级往返;排序在 SQL 侧一次确定,后续各级取首个即稳定。
- var orgs = await _orgRep.AsQueryable()
- .Where(x => x.TenantId == tenantId)
- .OrderBy(x => new { x.OrderNo, x.Id })
- .Select(x => new { x.Id, x.Code, x.Type, x.Pid })
- .ToListAsync();
- if (orgs.Count == 0) return (0, 0);
- var company =
- orgs.FirstOrDefault(o => o.Code == PreferredCompanyCode) // C1
- ?? orgs.FirstOrDefault(o => o.Pid == 0 && o.Type == CompanyOrgType) // C3
- ?? orgs.FirstOrDefault(o => o.Type == CompanyOrgType) // C2
- ?? orgs.FirstOrDefault(o => o.Pid == 0); // C4
- if (company == null) return (0, 0);
- var factory =
- orgs.FirstOrDefault(o => o.Code == PreferredFactoryCode && o.Pid == company.Id) // F1
- ?? orgs.FirstOrDefault(o => o.Type == FactoryOrgType && o.Pid == company.Id) // F2
- ?? orgs.FirstOrDefault(o => o.Type == FactoryOrgType); // F3
- return (company.Id, factory?.Id ?? company.Id); // F4
- }
- }
|