ProductionSchedulingActionService.cs 34 KB

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