ProductionSchedulingActionService.cs 34 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701702703704705706707708709710711712713714715716717718719720721722723724725726727728729730731732733734735736737738739740741742743744745746747748749750751752753754755756757758759760761762763764765766767768769770771772773774775776777778779780781782783784785786787788789790791792793794795796797798799800801802803804805806807808809810
  1. using System.Globalization;
  2. using System.Text.Json;
  3. using Admin.NET.Plugin.AiDOP.Infrastructure;
  4. using Admin.NET.Plugin.AiDOP.Order;
  5. using Admin.NET.Plugin.AiDOP.WorkOrder;
  6. using Microsoft.Extensions.DependencyInjection;
  7. using Microsoft.Extensions.Logging;
  8. namespace Admin.NET.Plugin.AiDOP.Production;
  9. /// <summary>工单排产动作:生成排程、优先级调整并重检。</summary>
  10. [ApiDescriptionSettings(Order = 264, Description = "工单排产动作")]
  11. [Route("api/Production")]
  12. [AllowAnonymous]
  13. [NonUnify]
  14. public class ProductionSchedulingActionService : IDynamicApiController, ITransient
  15. {
  16. private readonly ISqlSugarClient _db;
  17. private readonly UserManager _userManager;
  18. private readonly ProductionScheduleGenerationService _scheduleGen;
  19. private readonly WorkOrderRoutingSyncService _routingSync;
  20. private readonly AidopActionRunLogWriter _runLog;
  21. private readonly MdpRefreshDispatcher _dispatcher;
  22. private readonly ILogger<ProductionSchedulingActionService> _logger;
  23. /// <summary>RUNNING 超过此时长视为僵死并自动关闭(防单飞永久堵死)。</summary>
  24. private static readonly TimeSpan StaleRunningAge = TimeSpan.FromHours(3);
  25. public ProductionSchedulingActionService(
  26. ISqlSugarClient db,
  27. UserManager userManager,
  28. ProductionScheduleGenerationService scheduleGen,
  29. WorkOrderRoutingSyncService routingSync,
  30. AidopActionRunLogWriter runLog,
  31. MdpRefreshDispatcher dispatcher,
  32. ILogger<ProductionSchedulingActionService> logger)
  33. {
  34. _db = db;
  35. _userManager = userManager;
  36. _scheduleGen = scheduleGen;
  37. _routingSync = routingSync;
  38. _runLog = runLog;
  39. _dispatcher = dispatcher;
  40. _logger = logger;
  41. }
  42. public const string ActionScheduleGenerate = "S2_SCHEDULE_GENERATE";
  43. /// <summary>
  44. /// 提交全量生产排程(异步)。立即返回 runId,后台执行;前端轮询 status。
  45. /// </summary>
  46. [DisplayName("生成生产排程")]
  47. [HttpPost("scheduling/generate")]
  48. public async Task<object> GenerateSchedule([FromQuery] string domain, [FromQuery] bool enableCapacityConstraint = false)
  49. {
  50. var tenantId = ResolveTenantId(domain);
  51. var account = _userManager.Account ?? "system";
  52. return await SubmitGenerateAsync(tenantId, domain, account, enableCapacityConstraint, trigger: "manual");
  53. }
  54. /// <summary>查询排程运行状态(供前端轮询)。</summary>
  55. [DisplayName("生产排程运行状态")]
  56. [HttpGet("scheduling/generate-status")]
  57. public async Task<object> GetGenerateStatus([FromQuery] long runId)
  58. {
  59. var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
  60. var row = (await _db.Ado.SqlQueryAsync<ScheduleRunStatusRow>(
  61. """
  62. SELECT id AS Id, status AS Status, message AS Message, detail_json AS DetailJson,
  63. start_time AS StartTime, end_time AS EndTime
  64. FROM aidop_action_run_log
  65. WHERE id = @Id AND tenant_id = @TenantId AND action_code = @ActionCode
  66. LIMIT 1
  67. """,
  68. new SugarParameter("@Id", runId),
  69. new SugarParameter("@TenantId", tenantId),
  70. new SugarParameter("@ActionCode", ActionScheduleGenerate))).FirstOrDefault()
  71. ?? throw Oops.Oh("排程运行记录不存在");
  72. object? detail = null;
  73. if (!string.IsNullOrWhiteSpace(row.DetailJson))
  74. {
  75. try { detail = JsonSerializer.Deserialize<JsonElement>(row.DetailJson); }
  76. catch { detail = row.DetailJson; }
  77. }
  78. return new
  79. {
  80. runId = row.Id,
  81. status = row.Status,
  82. message = row.Message,
  83. detail,
  84. startTime = row.StartTime,
  85. endTime = row.EndTime
  86. };
  87. }
  88. /// <summary>
  89. /// 供 HTTP 与定时作业共用:单飞校验 → 写 RUNNING → 后台派发。
  90. /// </summary>
  91. public async Task<object> SubmitGenerateAsync(
  92. long tenantId,
  93. string domain,
  94. string account,
  95. bool enableCapacityConstraint,
  96. string trigger)
  97. {
  98. await _runLog.FailStaleRunningAsync(ActionScheduleGenerate, tenantId, StaleRunningAge);
  99. if (await _runLog.HasRunningAsync(ActionScheduleGenerate, tenantId))
  100. throw Oops.Oh("生产排程进行中,请稍后再试(同租户同时只允许一个排程运行)");
  101. var logId = await _runLog.StartAsync(
  102. ActionScheduleGenerate, tenantId, "WorkOrdMaster", null, $"domain={domain};trigger={trigger}");
  103. await _runLog.UpdateProgressAsync(logId, "已提交,后台执行中…", new
  104. {
  105. tenantId,
  106. domain,
  107. runId = logId,
  108. trigger,
  109. phase = "queued"
  110. });
  111. // 按租户保留各自委托与运行日志;底层生成服务使用全局门闩串行分配旧表主键号段。
  112. var key = $"S2_SCHEDULE:{tenantId}";
  113. _dispatcher.Enqueue(key, async (sp, _) =>
  114. {
  115. var runLog = sp.GetRequiredService<AidopActionRunLogWriter>();
  116. var gen = sp.GetRequiredService<ProductionScheduleGenerationService>();
  117. var routingSync = sp.GetRequiredService<WorkOrderRoutingSyncService>();
  118. var log = sp.GetRequiredService<ILogger<ProductionSchedulingActionService>>();
  119. try
  120. {
  121. await runLog.UpdateProgressAsync(logId, "排程计算中…", new
  122. {
  123. tenantId,
  124. domain,
  125. runId = logId,
  126. trigger,
  127. phase = "running"
  128. });
  129. await routingSync.EnsureAllPendingAsync(tenantId, account);
  130. var result = await gen.GenerateAsync(tenantId, domain, account, enableCapacityConstraint, runId: logId);
  131. await runLog.SuccessAsync(logId, result.Message, new
  132. {
  133. tenantId,
  134. domain,
  135. runId = logId,
  136. trigger,
  137. phase = "done",
  138. workOrderCount = result.WorkOrderCount,
  139. scheduleRowCount = result.ScheduleRowCount,
  140. pushEnqueuedCount = result.PushEnqueuedCount,
  141. frozenWorkOrderCount = result.FrozenWorkOrderCount,
  142. frozenOpCount = result.FrozenOpCount,
  143. usedWorkCenterCalendar = result.UsedWorkCenterCalendar,
  144. skippedWorkOrders = result.SkippedWorkOrders,
  145. psdMismatchCount = result.PsdMismatchCount,
  146. psdDuplicateActiveCount = result.PsdDuplicateActiveCount,
  147. outboxDeadCount = result.OutboxDeadCount,
  148. mesLineMissingCount = result.MesLineMissingCount,
  149. mesRoutingMissingCount = result.MesRoutingMissingCount
  150. });
  151. }
  152. catch (Exception ex)
  153. {
  154. log.LogError(ex, "S2 异步排程失败 tenant={TenantId} runId={RunId}", tenantId, logId);
  155. await runLog.FailedAsync(logId, ex.Message, new { tenantId, domain, runId = logId, trigger });
  156. }
  157. });
  158. _logger.LogInformation("S2 排程已提交异步执行 tenant={TenantId} runId={RunId} trigger={Trigger}", tenantId, logId, trigger);
  159. return new
  160. {
  161. message = "生产排程已提交,后台执行中",
  162. runId = logId,
  163. status = "RUNNING",
  164. async = true
  165. };
  166. }
  167. private sealed class ScheduleRunStatusRow
  168. {
  169. public long Id { get; set; }
  170. public string? Status { get; set; }
  171. public string? Message { get; set; }
  172. public string? DetailJson { get; set; }
  173. public DateTime? StartTime { get; set; }
  174. public DateTime? EndTime { get; set; }
  175. }
  176. /// <summary>优先级/数量/交期调整并重做资源检查。</summary>
  177. [DisplayName("优先级调整并重检")]
  178. [HttpPost("scheduling/update-priority-and-recheck")]
  179. public async Task<object> UpdatePriorityAndRecheck([FromBody] WorkOrderPriorityRecheckInput input)
  180. {
  181. var tenantId = AidopTenantHelper.Resolve(App.HttpContext);
  182. var account = string.IsNullOrWhiteSpace(input.UserAccount)
  183. ? (_userManager.Account ?? "system")
  184. : input.UserAccount.Trim();
  185. var workOrd = input.Workord.Trim();
  186. var logId = await _runLog.StartAsync("S2_PRIORITY_RECHECK", tenantId, "WorkOrdMaster", null, workOrd);
  187. try
  188. {
  189. var before = await LoadWorkOrderSnapshotAsync(tenantId, workOrd);
  190. DateTime? dueDate = null;
  191. if (!string.IsNullOrWhiteSpace(input.Instockdate))
  192. dueDate = DateTime.Parse(input.Instockdate.Trim(), CultureInfo.InvariantCulture).Date;
  193. decimal? qty = null;
  194. if (!string.IsNullOrWhiteSpace(input.Qty) && decimal.TryParse(input.Qty.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out var q))
  195. qty = q;
  196. var pars = new List<SugarParameter>
  197. {
  198. new("@WorkOrd", workOrd),
  199. new("@TenantId", tenantId),
  200. new("@Priority", string.IsNullOrWhiteSpace(input.Priority) ? (object)DBNull.Value : input.Priority.Trim()),
  201. new("@LotSerial", string.IsNullOrWhiteSpace(input.LotSerial) ? (object)DBNull.Value : input.LotSerial.Trim()),
  202. new("@Qty", qty ?? (object)DBNull.Value),
  203. new("@DueDate", dueDate ?? (object)DBNull.Value),
  204. new("@User", account),
  205. new("@Now", DateTime.Now)
  206. };
  207. var affected = await _db.Ado.ExecuteCommandAsync(
  208. """
  209. UPDATE WorkOrdMaster
  210. SET Priority = COALESCE(@Priority, Priority),
  211. LotSerial = COALESCE(@LotSerial, LotSerial),
  212. QtyOrded = COALESCE(@Qty, QtyOrded),
  213. DueDate = COALESCE(@DueDate, DueDate),
  214. UpdateUser = @User,
  215. UpdateTime = @Now
  216. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  217. """,
  218. pars);
  219. if (affected == 0)
  220. throw Oops.Oh("工单不存在或未更新");
  221. var qtyChanged = qty.HasValue && before?.QtyOrded != qty;
  222. var dueChanged = dueDate.HasValue && before?.DueDate?.Date != dueDate.Value.Date;
  223. var priorityChanged = !string.IsNullOrWhiteSpace(input.Priority)
  224. && !string.Equals(before?.Priority?.Trim(), input.Priority.Trim(), StringComparison.Ordinal);
  225. var warnings = new List<string>();
  226. // ── 同步 crm_seorderentry,避免后续齐套检查重新加载时读到旧值 ──
  227. if (qtyChanged || dueChanged)
  228. {
  229. var link = await LoadWorkOrderEntryLinkAsync(tenantId, workOrd);
  230. if (link is not null)
  231. {
  232. await _db.Ado.ExecuteCommandAsync(
  233. """
  234. UPDATE crm_seorderentry
  235. SET qty = COALESCE(@Qty, qty),
  236. sys_capacity_date = COALESCE(@SysCapacityDate, sys_capacity_date),
  237. update_time = NOW()
  238. WHERE Id = @EntryId AND tenant_id = @TenantId AND IsDeleted = 0
  239. """,
  240. new SugarParameter("@Qty", qty ?? (object)DBNull.Value),
  241. new SugarParameter("@SysCapacityDate", dueDate ?? (object)DBNull.Value),
  242. new SugarParameter("@EntryId", link.Entry.Id),
  243. new SugarParameter("@TenantId", tenantId));
  244. }
  245. }
  246. // 数量变更时同步更新 mes_morder 和 mes_moentry
  247. if (qtyChanged && qty.HasValue)
  248. {
  249. await UpdateMesOrderQuantityAsync(tenantId, workOrd, qty.Value, account);
  250. // 同步更新 WorkOrdRouting.QtyOrded(EnsureFromRoutingAsync 已有数据时不会更新数量)
  251. await _db.Ado.ExecuteCommandAsync(
  252. """
  253. UPDATE WorkOrdRouting
  254. SET QtyOrded = @Qty,
  255. UpdateUser = @User, UpdateTime = @Now
  256. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  257. AND IFNULL(IsActive, 0) = 1
  258. """,
  259. new SugarParameter("@Qty", qty.Value),
  260. new SugarParameter("@User", account),
  261. new SugarParameter("@Now", DateTime.Now),
  262. new SugarParameter("@TenantId", tenantId),
  263. new SugarParameter("@WorkOrd", workOrd));
  264. }
  265. // 数量变更时同步更新领料单明细(NbrDetail)
  266. if (qtyChanged)
  267. {
  268. await SyncPickingListDetailsAsync(tenantId, workOrd, account, warnings);
  269. }
  270. ProductionScheduleGenerationService.ScheduleGenerationResult? reschedule = null;
  271. if (qtyChanged || dueChanged)
  272. {
  273. reschedule = await _scheduleGen.RegenerateForWorkOrderAsync(tenantId, workOrd, input.Domain, account, input.EnableCapacityConstraint);
  274. warnings.Add(reschedule.Message);
  275. // 排程后确保工艺路线数据存在
  276. await _routingSync.EnsureFromRoutingAsync(tenantId, workOrd, account);
  277. }
  278. else if (priorityChanged)
  279. {
  280. warnings.Add("优先级已更新,将在下次全量重排时参与排序(现有日计划保持不变)");
  281. }
  282. var pendingReorder = priorityChanged && !qtyChanged && !dueChanged;
  283. await _runLog.SuccessAsync(logId, "优先级调整并重检完成", new
  284. {
  285. workOrd,
  286. before,
  287. after = new
  288. {
  289. qty,
  290. dueDate,
  291. priority = input.Priority,
  292. lotSerial = input.LotSerial
  293. },
  294. qtyChanged,
  295. dueChanged,
  296. priorityChanged,
  297. pendingReorder,
  298. resourceRechecked = qtyChanged || dueChanged,
  299. reschedule = reschedule is null
  300. ? null
  301. : new
  302. {
  303. reschedule.WorkOrderCount,
  304. reschedule.ScheduleRowCount,
  305. reschedule.UsedWorkCenterCalendar
  306. },
  307. warnings
  308. });
  309. return new
  310. {
  311. message = "ok",
  312. warnings,
  313. resourceRechecked = qtyChanged || dueChanged,
  314. rescheduleTriggered = reschedule is not null,
  315. scheduleRowCount = reschedule?.ScheduleRowCount ?? 0,
  316. pendingReorder
  317. };
  318. }
  319. catch (Exception ex)
  320. {
  321. await _runLog.FailedAsync(logId, ex.Message, new { workOrd, tenantId });
  322. throw;
  323. }
  324. }
  325. private long ResolveTenantId(string? domain)
  326. {
  327. if (!string.IsNullOrWhiteSpace(domain) && long.TryParse(domain.Trim(), out var tid) && tid > 0)
  328. return tid;
  329. return AidopTenantHelper.Resolve(App.HttpContext);
  330. }
  331. /// <summary>
  332. /// 数量变更时同步更新 mes_morder(制造工单)和 mes_moentry(工单明细)的数量字段。
  333. /// </summary>
  334. private async Task UpdateMesOrderQuantityAsync(long tenantId, string workOrd, decimal newQty, string account)
  335. {
  336. var now = DateTime.Now;
  337. // 更新 mes_morder
  338. await _db.Ado.ExecuteCommandAsync(
  339. """
  340. UPDATE mes_morder
  341. SET need_number = @Qty,
  342. morder_production_number = @Qty,
  343. update_by_name = @User,
  344. update_time = @Now
  345. WHERE morder_no = @MorderNo
  346. AND tenant_id = @TenantId
  347. AND IsDeleted = 0
  348. """,
  349. new SugarParameter("@Qty", newQty),
  350. new SugarParameter("@User", account),
  351. new SugarParameter("@Now", now),
  352. new SugarParameter("@MorderNo", workOrd),
  353. new SugarParameter("@TenantId", tenantId));
  354. // 更新 mes_moentry(remaining_number 仅在未开始生产时才更新)
  355. await _db.Ado.ExecuteCommandAsync(
  356. """
  357. UPDATE mes_moentry
  358. SET need_number = @Qty,
  359. morder_production_number = @Qty,
  360. remaining_number = CASE
  361. WHEN IFNULL(remaining_number, 0) = IFNULL(need_number, 0)
  362. OR IFNULL(morder_production_number, 0) = 0
  363. THEN @Qty
  364. ELSE remaining_number
  365. END,
  366. update_by_name = @User,
  367. update_time = @Now
  368. WHERE moentry_mono = @Mono
  369. AND tenant_id = @TenantId
  370. AND IsDeleted = 0
  371. """,
  372. new SugarParameter("@Qty", newQty),
  373. new SugarParameter("@User", account),
  374. new SugarParameter("@Now", now),
  375. new SugarParameter("@Mono", workOrd),
  376. new SugarParameter("@TenantId", tenantId));
  377. }
  378. /// <summary>
  379. /// 数量变更后同步领料单明细(NbrDetail),按物料逐行比对更新。
  380. /// 规则:
  381. /// 已发料(QtyRec>0) + 新需求>已发料 → 更新 QtyOrd/CurrQtyOpened
  382. /// 已发料(QtyRec>0) + 新需求≤已发料 → 关闭该行
  383. /// 未发料 → 直接修改 QtyOrd/CurrQtyOpened
  384. /// 工单明细有但领料单无 → 新增
  385. /// 领料单有但工单明细无 → 关闭
  386. /// </summary>
  387. private async Task SyncPickingListDetailsAsync(
  388. long tenantId, string workOrd, string account, List<string> warnings)
  389. {
  390. // 获取工单状态
  391. var status = await _db.Ado.GetStringAsync(
  392. """
  393. SELECT IFNULL(LOWER(TRIM(Status)), '') FROM WorkOrdMaster
  394. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  395. LIMIT 1
  396. """,
  397. new SugarParameter("@TenantId", tenantId),
  398. new SugarParameter("@WorkOrd", workOrd));
  399. // 仅处理 下达(R)/投产(W)/暂停(S) 状态的工单
  400. if (status is not ("r" or "w" or "s"))
  401. {
  402. // 初始(P)状态无领料单,无需同步
  403. return;
  404. }
  405. // 查找领料单主记录
  406. var nbrRows = await _db.Ado.SqlQueryAsync<NbrMasterRow>(
  407. """
  408. SELECT RecID, Nbr, `Domain` FROM NbrMaster
  409. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd AND Type = 'SM'
  410. AND IFNULL(TransType, '') = ''
  411. AND IFNULL(IsActive, 0) = 1
  412. """,
  413. new SugarParameter("@TenantId", tenantId),
  414. new SugarParameter("@WorkOrd", workOrd));
  415. if (nbrRows.Count == 0)
  416. {
  417. warnings.Add($"工单 {workOrd} 状态为 {status.ToUpper()} 但无领料单,跳过领料单同步");
  418. return;
  419. }
  420. var now = DateTime.Now;
  421. // 从 WorkOrdDetail 汇总最新物料需求
  422. var details = await _db.Ado.SqlQueryAsync<PickDetailRow>(
  423. """
  424. SELECT
  425. d.ItemNum,
  426. SUM(d.QtyRequired) AS QtyRequired,
  427. MAX(IFNULL(d.UM, im.Um)) AS Unit,
  428. MAX(im.Descr) AS ItemName
  429. FROM WorkOrdDetail d
  430. LEFT JOIN ItemMaster im ON d.ItemNum = im.ItemNum AND im.tenant_id = d.tenant_id
  431. WHERE d.tenant_id = @TenantId AND d.WorkOrd = @WorkOrd AND IFNULL(d.IsActive, 0) = 1
  432. GROUP BY d.ItemNum
  433. HAVING SUM(d.QtyRequired) > 0
  434. ORDER BY d.ItemNum
  435. """,
  436. new SugarParameter("@TenantId", tenantId),
  437. new SugarParameter("@WorkOrd", workOrd));
  438. foreach (var nbr in nbrRows)
  439. {
  440. var domain = string.IsNullOrWhiteSpace(nbr.Domain) ? tenantId.ToString() : nbr.Domain!.Trim();
  441. if (domain.Length > 8) domain = domain[..8];
  442. // 加载当前领料单明细行(仅未关闭的)
  443. var existingDetails = await _db.Ado.SqlQueryAsync<NbrDetailRow>(
  444. """
  445. SELECT RecID, ItemNum, QtyOrd, QtyRec, CurrQtyOpened, Line
  446. FROM NbrDetail
  447. WHERE tenant_id = @TenantId AND Nbr = @Nbr AND Type = 'SM'
  448. AND IFNULL(IsActive, 0) = 1
  449. """,
  450. new SugarParameter("@TenantId", tenantId),
  451. new SugarParameter("@Nbr", nbr.Nbr));
  452. var detailMap = details.ToDictionary(d => d.ItemNum.Trim(), d => d);
  453. var existingMap = existingDetails.ToDictionary(d => (d.ItemNum ?? "").Trim(), d => d);
  454. // ── 1. 处理已有明细行:按 ItemNum 匹配 ──
  455. foreach (var existing in existingDetails)
  456. {
  457. var key = (existing.ItemNum ?? "").Trim();
  458. if (detailMap.TryGetValue(key, out var newDetail))
  459. {
  460. var newQty = newDetail.QtyRequired;
  461. if (existing.QtyRec > 0)
  462. {
  463. if (newQty > existing.QtyRec)
  464. {
  465. // 新需求 > 已发料 → 更新需求数
  466. await _db.Ado.ExecuteCommandAsync(
  467. """
  468. UPDATE NbrDetail
  469. SET QtyOrd = @QtyOrd, CurrQtyOpened = @CurrQtyOpened,
  470. UM = @UM, ItemName = @ItemName,
  471. UpdateUser = @User, UpdateTime = @Now
  472. WHERE RecID = @RecId
  473. """,
  474. new SugarParameter("@QtyOrd", newQty),
  475. new SugarParameter("@CurrQtyOpened", newQty),
  476. new SugarParameter("@UM", (object?)newDetail.Unit ?? DBNull.Value),
  477. new SugarParameter("@ItemName", (object?)newDetail.ItemName ?? DBNull.Value),
  478. new SugarParameter("@User", account),
  479. new SugarParameter("@Now", now),
  480. new SugarParameter("@RecId", existing.RecID));
  481. }
  482. else
  483. {
  484. // 新需求 <= 已发料 → 关闭当前行
  485. await _db.Ado.ExecuteCommandAsync(
  486. """
  487. UPDATE NbrDetail
  488. SET Status = 'C', IsActive = 0,
  489. UpdateUser = @User, UpdateTime = @Now
  490. WHERE RecID = @RecId
  491. """,
  492. new SugarParameter("@User", account),
  493. new SugarParameter("@Now", now),
  494. new SugarParameter("@RecId", existing.RecID));
  495. }
  496. }
  497. else
  498. {
  499. // 未发料 → 直接修改需求数
  500. await _db.Ado.ExecuteCommandAsync(
  501. """
  502. UPDATE NbrDetail
  503. SET QtyOrd = @QtyOrd, CurrQtyOpened = @CurrQtyOpened,
  504. UM = @UM, ItemName = @ItemName,
  505. UpdateUser = @User, UpdateTime = @Now
  506. WHERE RecID = @RecId
  507. """,
  508. new SugarParameter("@QtyOrd", newQty),
  509. new SugarParameter("@CurrQtyOpened", newQty),
  510. new SugarParameter("@UM", (object?)newDetail.Unit ?? DBNull.Value),
  511. new SugarParameter("@ItemName", (object?)newDetail.ItemName ?? DBNull.Value),
  512. new SugarParameter("@User", account),
  513. new SugarParameter("@Now", now),
  514. new SugarParameter("@RecId", existing.RecID));
  515. }
  516. }
  517. else
  518. {
  519. // 物料明细中没有,但领料单明细有 → 关闭当前领料单明细行
  520. await _db.Ado.ExecuteCommandAsync(
  521. """
  522. UPDATE NbrDetail
  523. SET Status = 'C', IsActive = 0,
  524. UpdateUser = @User, UpdateTime = @Now
  525. WHERE RecID = @RecId
  526. """,
  527. new SugarParameter("@User", account),
  528. new SugarParameter("@Now", now),
  529. new SugarParameter("@RecId", existing.RecID));
  530. }
  531. }
  532. // ── 2. 新增:物料明细中有,领料单明细没有的 ──
  533. var nextDetailId = await _db.Ado.GetIntAsync("SELECT IFNULL(MAX(RecID), 0) + 1 FROM NbrDetail");
  534. short newLine = (short)(existingDetails.Count > 0 ? existingDetails.Max(d => d.Line) + 1 : 1);
  535. foreach (var d in details)
  536. {
  537. var key = d.ItemNum.Trim();
  538. if (existingMap.ContainsKey(key))
  539. continue;
  540. await _db.Ado.ExecuteCommandAsync(
  541. """
  542. INSERT INTO NbrDetail (
  543. RecID, `Domain`, Type, Nbr, Line, ItemNum, Dimension1, Dimension2,
  544. LocationFrom, LocationTo, QtyFrom, QtyTo, QtyOrd, QtyRec,
  545. CurrQtyOpened, UM, WorkOrd, ItemName, Status,
  546. IsActive, IsConfirm, IsChanged, BusinessID, NbrRecID,
  547. CreateUser, CreateTime, UpdateUser, UpdateTime, tenant_id
  548. ) VALUES (
  549. @RecId, @Domain, 'SM', @Nbr, @Line, @ItemNum, '', '',
  550. '', '', 0, 0, @QtyOrd, 0,
  551. @CurrQtyOpened, @UM, @WorkOrd, @ItemName, '',
  552. 1, 0, 1, 0, @NbrRecId,
  553. @User, @Now, @User, @Now, @TenantId
  554. )
  555. """,
  556. new SugarParameter("@RecId", nextDetailId++),
  557. new SugarParameter("@Domain", domain),
  558. new SugarParameter("@Nbr", nbr.Nbr),
  559. new SugarParameter("@Line", newLine++),
  560. new SugarParameter("@ItemNum", d.ItemNum),
  561. new SugarParameter("@QtyOrd", d.QtyRequired),
  562. new SugarParameter("@CurrQtyOpened", d.QtyRequired),
  563. new SugarParameter("@UM", (object?)d.Unit ?? DBNull.Value),
  564. new SugarParameter("@WorkOrd", workOrd),
  565. new SugarParameter("@ItemName", (object?)d.ItemName ?? DBNull.Value),
  566. new SugarParameter("@NbrRecId", nbr.RecID),
  567. new SugarParameter("@User", account.Length > 24 ? account[..24] : account),
  568. new SugarParameter("@Now", now),
  569. new SugarParameter("@TenantId", tenantId));
  570. }
  571. // ── 3. 更新领料单主记录的更新时间和数量 ──
  572. await _db.Ado.ExecuteCommandAsync(
  573. """
  574. UPDATE NbrMaster
  575. SET QtyOrd = (SELECT IFNULL(SUM(QtyOrd), 0) FROM NbrDetail
  576. WHERE Nbr = @Nbr AND Type = 'SM' AND IFNULL(IsActive, 1) = 1),
  577. UpdateUser = @User, UpdateTime = @Now
  578. WHERE RecID = @RecId
  579. """,
  580. new SugarParameter("@Nbr", nbr.Nbr),
  581. new SugarParameter("@User", account),
  582. new SugarParameter("@Now", now),
  583. new SugarParameter("@RecId", nbr.RecID));
  584. }
  585. }
  586. // ══════════════════════════════════════════════════════════════
  587. // 内部 DTO
  588. // ══════════════════════════════════════════════════════════════
  589. private sealed class NbrMasterRow
  590. {
  591. public int RecID { get; set; }
  592. public string Nbr { get; set; } = string.Empty;
  593. public string? Domain { get; set; }
  594. }
  595. private sealed class NbrDetailRow
  596. {
  597. public int RecID { get; set; }
  598. public string? ItemNum { get; set; }
  599. public decimal QtyOrd { get; set; }
  600. public decimal QtyRec { get; set; }
  601. public decimal CurrQtyOpened { get; set; }
  602. public short Line { get; set; }
  603. }
  604. private sealed class PickDetailRow
  605. {
  606. public string ItemNum { get; set; } = string.Empty;
  607. public decimal QtyRequired { get; set; }
  608. public string? Unit { get; set; }
  609. public string? ItemName { get; set; }
  610. }
  611. private async Task<WorkOrderSnapshotRow?> LoadWorkOrderSnapshotAsync(long tenantId, string workOrd)
  612. {
  613. var rows = await _db.Ado.SqlQueryAsync<WorkOrderSnapshotRow>(
  614. """
  615. SELECT WorkOrd, Priority, QtyOrded, DueDate, LotSerial, `Domain`
  616. FROM WorkOrdMaster
  617. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  618. LIMIT 1
  619. """,
  620. new SugarParameter("@TenantId", tenantId),
  621. new SugarParameter("@WorkOrd", workOrd));
  622. return rows.FirstOrDefault();
  623. }
  624. private async Task<WorkOrderEntryLink?> LoadWorkOrderEntryLinkAsync(long tenantId, string workOrd)
  625. {
  626. var rows = await _db.Ado.SqlQueryAsync<WorkOrderEntryLinkRow>(
  627. """
  628. SELECT
  629. w.BusinessID AS EntryId,
  630. e.seorder_id AS SeOrderId,
  631. e.bill_no AS BillNo,
  632. e.entry_seq AS EntrySeq,
  633. e.item_number AS ItemNumber,
  634. e.item_name AS ItemName,
  635. e.specification AS Specification,
  636. e.unit AS Unit,
  637. e.bom_number AS BomNumber,
  638. e.qty AS Qty,
  639. e.plan_date AS PlanDate,
  640. e.sys_capacity_date AS SysCapacityDate,
  641. e.progress AS Progress,
  642. e.urgent AS Urgent,
  643. e.factory_id AS FactoryId,
  644. e.company_id AS CompanyId,
  645. e.tenant_id AS TenantId,
  646. o.Id AS OrderId,
  647. o.bill_no AS OrderBillNo,
  648. o.custom_no AS CustomNo,
  649. o.urgent AS OrderUrgent,
  650. o.factory_id AS OrderFactoryId
  651. FROM WorkOrdMaster w
  652. INNER JOIN crm_seorderentry e ON e.Id = w.BusinessID AND e.tenant_id = w.tenant_id AND e.IsDeleted = 0
  653. INNER JOIN crm_seorder o ON o.Id = e.seorder_id AND o.tenant_id = e.tenant_id AND o.IsDeleted = 0
  654. WHERE w.tenant_id = @TenantId AND w.WorkOrd = @WorkOrd
  655. LIMIT 1
  656. """,
  657. new SugarParameter("@TenantId", tenantId),
  658. new SugarParameter("@WorkOrd", workOrd));
  659. var row = rows.FirstOrDefault();
  660. if (row is null || row.EntryId <= 0)
  661. return null;
  662. return new WorkOrderEntryLink
  663. {
  664. Order = new OrderWorkOrderGenerationService.OrderHeader
  665. {
  666. Id = row.OrderId,
  667. BillNo = row.OrderBillNo ?? row.BillNo,
  668. CustomNo = row.CustomNo,
  669. Urgent = row.OrderUrgent,
  670. FactoryId = row.OrderFactoryId,
  671. TenantId = tenantId
  672. },
  673. Entry = new OrderWorkOrderGenerationService.OrderEntryLine
  674. {
  675. Id = row.EntryId,
  676. SeOrderId = row.SeOrderId,
  677. BillNo = row.BillNo,
  678. EntrySeq = row.EntrySeq,
  679. ItemNumber = row.ItemNumber,
  680. ItemName = row.ItemName,
  681. Specification = row.Specification,
  682. Unit = row.Unit,
  683. BomNumber = row.BomNumber,
  684. Qty = row.Qty,
  685. PlanDate = row.PlanDate,
  686. SysCapacityDate = row.SysCapacityDate,
  687. Progress = row.Progress,
  688. Urgent = row.Urgent,
  689. FactoryId = row.FactoryId,
  690. CompanyId = row.CompanyId,
  691. TenantId = row.TenantId
  692. }
  693. };
  694. }
  695. private sealed class WorkOrderSnapshotRow
  696. {
  697. public string? WorkOrd { get; set; }
  698. public string? Priority { get; set; }
  699. public decimal? QtyOrded { get; set; }
  700. public DateTime? DueDate { get; set; }
  701. public string? LotSerial { get; set; }
  702. public string? Domain { get; set; }
  703. }
  704. private sealed class WorkOrderEntryLink
  705. {
  706. public OrderWorkOrderGenerationService.OrderHeader Order { get; set; } = new();
  707. public OrderWorkOrderGenerationService.OrderEntryLine Entry { get; set; } = new();
  708. }
  709. private sealed class WorkOrderEntryLinkRow
  710. {
  711. public long EntryId { get; set; }
  712. public long SeOrderId { get; set; }
  713. public string? BillNo { get; set; }
  714. public int? EntrySeq { get; set; }
  715. public string? ItemNumber { get; set; }
  716. public string? ItemName { get; set; }
  717. public string? Specification { get; set; }
  718. public string? Unit { get; set; }
  719. public string? BomNumber { get; set; }
  720. public decimal? Qty { get; set; }
  721. public DateTime? PlanDate { get; set; }
  722. public DateTime? SysCapacityDate { get; set; }
  723. public string? Progress { get; set; }
  724. public int? Urgent { get; set; }
  725. public long? FactoryId { get; set; }
  726. public long? CompanyId { get; set; }
  727. public long TenantId { get; set; }
  728. public long OrderId { get; set; }
  729. public string? OrderBillNo { get; set; }
  730. public string? CustomNo { get; set; }
  731. public int? OrderUrgent { get; set; }
  732. public long? OrderFactoryId { get; set; }
  733. }
  734. }
  735. public class WorkOrderPriorityRecheckInput
  736. {
  737. public string Workord { get; set; } = string.Empty;
  738. public string? Qty { get; set; }
  739. public string? Instockdate { get; set; }
  740. public string? Priority { get; set; }
  741. public string Domain { get; set; } = string.Empty;
  742. public string? UserAccount { get; set; }
  743. public string? LotSerial { get; set; }
  744. public bool EnableCapacityConstraint { get; set; }
  745. }