OrderReviewOrchestrationService.cs 46 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091929394959697989910010110210310410510610710810911011111211311411511611711811912012112212312412512612712812913013113213313413513613713813914014114214314414514614714814915015115215315415515615715815916016116216316416516616716816917017117217317417517617717817918018118218318418518618718818919019119219319419519619719819920020120220320420520620720820921021121221321421521621721821922022122222322422522622722822923023123223323423523623723823924024124224324424524624724824925025125225325425525625725825926026126226326426526626726826927027127227327427527627727827928028128228328428528628728828929029129229329429529629729829930030130230330430530630730830931031131231331431531631731831932032132232332432532632732832933033133233333433533633733833934034134234334434534634734834935035135235335435535635735835936036136236336436536636736836937037137237337437537637737837938038138238338438538638738838939039139239339439539639739839940040140240340440540640740840941041141241341441541641741841942042142242342442542642742842943043143243343443543643743843944044144244344444544644744844945045145245345445545645745845946046146246346446546646746846947047147247347447547647747847948048148248348448548648748848949049149249349449549649749849950050150250350450550650750850951051151251351451551651751851952052152252352452552652752852953053153253353453553653753853954054154254354454554654754854955055155255355455555655755855956056156256356456556656756856957057157257357457557657757857958058158258358458558658758858959059159259359459559659759859960060160260360460560660760860961061161261361461561661761861962062162262362462562662762862963063163263363463563663763863964064164264364464564664764864965065165265365465565665765865966066166266366466566666766866967067167267367467567667767867968068168268368468568668768868969069169269369469569669769869970070170270370470570670770870971071171271371471571671771871972072172272372472572672772872973073173273373473573673773873974074174274374474574674774874975075175275375475575675775875976076176276376476576676776876977077177277377477577677777877978078178278378478578678778878979079179279379479579679779879980080180280380480580680780880981081181281381481581681781881982082182282382482582682782882983083183283383483583683783883984084184284384484584684784884985085185285385485585685785885986086186286386486586686786886987087187287387487587687787887988088188288388488588688788888989089189289389489589689789889990090190290390490590690790890991091191291391491591691791891992092192292392492592692792892993093193293393493593693793893994094194294394494594694794894995095195295395495595695795895996096196296396496596696796896997097197297397497597697797897998098198298398498598698798898999099199299399499599699799899910001001100210031004100510061007100810091010101110121013101410151016101710181019102010211022102310241025
  1. using Admin.NET.Plugin.AiDOP.DataPlatform.S1Refresh;
  2. using Admin.NET.Plugin.AiDOP.DataPlatform.Wms;
  3. using Admin.NET.Plugin.AiDOP.Infrastructure;
  4. using Admin.NET.Plugin.AiDOP.Production;
  5. using Admin.NET.Plugin.AiDOP.Supply;
  6. using Admin.NET.Plugin.AiDOP.WorkOrder;
  7. using Microsoft.Extensions.DependencyInjection;
  8. using Yitter.IdGenerator;
  9. namespace Admin.NET.Plugin.AiDOP.Order;
  10. /// <summary>
  11. /// S1 订单评审编排:资源检查、状态更新、工单生成、运行日志。
  12. /// </summary>
  13. public class OrderReviewOrchestrationService : ITransient
  14. {
  15. public const string ActionReview = "S1_ORDER_REVIEW";
  16. public const string ActionConfirm = "S1_DELIVERY_CONFIRM";
  17. public const string ActionRefresh = "S1_ORDER_REFRESH_PLAN";
  18. /// <summary>当前评审批次 run_id(雪花),用于跨工单库存占用递减;每次评审/刷新重新分配。</summary>
  19. private long _currentReviewBangId;
  20. private readonly ISqlSugarClient _db;
  21. private readonly UserManager _userManager;
  22. private readonly OrderWorkOrderGenerationService _workOrderGen;
  23. private readonly OrderResourceCheckService _resourceCheck;
  24. private readonly WorkOrderMaterialDetailSyncService _materialDetailSync;
  25. private readonly WorkOrderRoutingSyncService _routingSync;
  26. private readonly MdpRefreshDispatcher _refreshDispatcher;
  27. private readonly AidopActionRunLogWriter _runLog;
  28. private readonly ProductionScheduleGenerationService _scheduleGen;
  29. private readonly ProcurementPipelineService _pipeline;
  30. private readonly WorkOrdMesPushService _workOrdMesPush;
  31. private readonly MaterialRequirementCalculator _calculator;
  32. public OrderReviewOrchestrationService(
  33. ISqlSugarClient db,
  34. UserManager userManager,
  35. OrderWorkOrderGenerationService workOrderGen,
  36. OrderResourceCheckService resourceCheck,
  37. WorkOrderMaterialDetailSyncService materialDetailSync,
  38. WorkOrderRoutingSyncService routingSync,
  39. MdpRefreshDispatcher refreshDispatcher,
  40. AidopActionRunLogWriter runLog,
  41. ProductionScheduleGenerationService scheduleGen,
  42. ProcurementPipelineService pipeline,
  43. WorkOrdMesPushService workOrdMesPush,
  44. MaterialRequirementCalculator calculator)
  45. {
  46. _db = db;
  47. _userManager = userManager;
  48. _workOrderGen = workOrderGen;
  49. _resourceCheck = resourceCheck;
  50. _materialDetailSync = materialDetailSync;
  51. _routingSync = routingSync;
  52. _refreshDispatcher = refreshDispatcher;
  53. _runLog = runLog;
  54. _scheduleGen = scheduleGen;
  55. _pipeline = pipeline;
  56. _workOrdMesPush = workOrdMesPush;
  57. _calculator = calculator;
  58. }
  59. public Task<SeOrderReviewExecuteResult> ReviewAsync(IReadOnlyList<long> orderIds) =>
  60. ExecuteBatchAsync(ActionReview, orderIds, ReviewOneOrderAsync);
  61. public Task<SeOrderReviewExecuteResult> ConfirmDeliveryAsync(IReadOnlyList<long> orderIds) =>
  62. ExecuteBatchAsync(ActionConfirm, orderIds, ConfirmOneOrderAsync);
  63. public Task<SeOrderReviewExecuteResult> RefreshPlanAsync(long orderId, string? reason) =>
  64. ExecuteSingleAsync(ActionRefresh, orderId, async (order, result, warnings, account) =>
  65. {
  66. // ── 第0步:物料编码变更校验 ──
  67. await ValidateMaterialNotChangedAsync(order.Id, order.TenantId);
  68. // ── 第1步:使用新 run_id 写入占用(旧版本在批次结束后清理,崩溃安全) ──
  69. EnsureReviewBangId();
  70. // ── 第2步:加载可重排明细行(确认 / 再评审) ──
  71. var entries = await LoadReviewableEntriesAsync(order.Id, order.TenantId, ["3", "0"]);
  72. if (entries.Count == 0)
  73. throw Oops.Oh("订单没有可重排的确认/再评审明细行");
  74. // ── 第3步:逐条处理(工单 + 资源检查 + 领料单 + 交期更新) ──
  75. foreach (var entry in entries)
  76. {
  77. ValidateEntryForResourceCheck(entry);
  78. var wo = await _workOrderGen.CreateOrUpdateForEntryAsync(order, entry, account, warnings);
  79. if (wo.Created) result.WorkOrderCreatedCount++;
  80. else result.WorkOrderUpdatedCount++;
  81. result.WorkOrders.Add(wo.WorkOrd);
  82. var check = await _resourceCheck.RunForEntryAsync(order, entry, wo.WorkOrd, account, warnings, _currentReviewBangId);
  83. result.ResourceCheckCount++;
  84. result.ResourceCheckLineCount += check.LineCount;
  85. await _materialDetailSync.EnsureFromResourceCheckAsync(entry.TenantId, wo.WorkOrd, account);
  86. await _routingSync.EnsureFromRoutingAsync(entry.TenantId, wo.WorkOrd, account);
  87. await _workOrdMesPush.TryEnqueueSnapshotSafeAsync(entry.TenantId, wo.WorkOrd, warnings);
  88. // 当工单状态为下达/投产/暂停(R、W、S)时,更新对应领料单数据
  89. await UpdatePickingListForActiveWorkOrderAsync(entry.TenantId, wo.WorkOrd, account, warnings);
  90. // 根据资源检查结果更新明细行系统建议交期
  91. await UpdateEntrySysCapacityDateAsync(entry.Id, check.KittingTime, account);
  92. }
  93. // ── 第4步:更新明细行进度为3 ──
  94. await UpdateEntriesProgressAsync(entries.Select(e => e.Id).ToList(), "3", account);
  95. // ── 第4.5步:重新进行生产排程(在事务提交前) ──
  96. try
  97. {
  98. var scheduleResult = await _scheduleGen.GenerateAsync(order.TenantId, order.TenantId.ToString(), account);
  99. if (!string.IsNullOrWhiteSpace(scheduleResult.Message))
  100. warnings.Add($"生产排程:{scheduleResult.Message}");
  101. }
  102. catch (Exception ex)
  103. {
  104. warnings.Add($"生产排程失败:{ex.Message}");
  105. }
  106. // ── 第4.5步:同步物料需求(MRP → PR → 采购闭环) ──
  107. try
  108. {
  109. var mrResult = await _pipeline.ExecuteCoreAsync(order.TenantId, account, createFromShortage: true);
  110. if (!string.IsNullOrWhiteSpace(mrResult.Message))
  111. warnings.Add($"物料需求同步:{mrResult.Message}");
  112. }
  113. catch (Exception ex)
  114. {
  115. warnings.Add($"物料需求同步失败:{ex.Message}");
  116. }
  117. result.EntryCount = entries.Count;
  118. result.Message = string.IsNullOrWhiteSpace(reason)
  119. ? "3级计划重排完成"
  120. : $"3级计划重排完成:{reason.Trim()}";
  121. });
  122. private async Task<SeOrderReviewExecuteResult> ExecuteBatchAsync(
  123. string actionCode,
  124. IReadOnlyList<long> orderIds,
  125. Func<OrderWorkOrderGenerationService.OrderHeader, SeOrderReviewExecuteResult, List<string>, string, Task> handler)
  126. {
  127. if (orderIds is null || orderIds.Count == 0)
  128. throw Oops.Oh("至少选择一条订单");
  129. var tenantId = _userManager.TenantId > 0
  130. ? _userManager.TenantId
  131. : AidopTenantHelper.Resolve(App.HttpContext);
  132. var account = _userManager.Account ?? "system";
  133. var distinctIds = orderIds.Distinct().ToList();
  134. var aggregate = new SeOrderReviewExecuteResult
  135. {
  136. ActionCode = actionCode,
  137. OrderCount = distinctIds.Count,
  138. Message = "执行成功"
  139. };
  140. var allWarnings = new List<string>();
  141. long? firstLogId = null;
  142. // 评审/重排:分配新 run_id,跨本批次订单共享以正确递减库存
  143. if (actionCode == ActionReview || actionCode == ActionRefresh)
  144. EnsureReviewBangId();
  145. foreach (var orderId in distinctIds)
  146. {
  147. var order = await LoadOrderAsync(orderId, tenantId)
  148. ?? throw Oops.Oh($"订单 {orderId} 不存在或不属于当前租户");
  149. var runLogId = await _runLog.StartAsync(actionCode, tenantId, "crm_seorder", order.Id, order.BillNo);
  150. if (firstLogId is null)
  151. firstLogId = runLogId;
  152. var perOrder = new SeOrderReviewExecuteResult { ActionCode = actionCode };
  153. var warnings = new List<string>();
  154. try
  155. {
  156. await _db.Ado.BeginTranAsync();
  157. await handler(order, perOrder, warnings, account);
  158. await _db.Ado.CommitTranAsync();
  159. aggregate.EntryCount += perOrder.EntryCount;
  160. aggregate.WorkOrderCreatedCount += perOrder.WorkOrderCreatedCount;
  161. aggregate.WorkOrderUpdatedCount += perOrder.WorkOrderUpdatedCount;
  162. aggregate.WorkOrderClosedCount += perOrder.WorkOrderClosedCount;
  163. aggregate.ResourceCheckCount += perOrder.ResourceCheckCount;
  164. aggregate.ResourceCheckLineCount += perOrder.ResourceCheckLineCount;
  165. aggregate.WorkOrders.AddRange(perOrder.WorkOrders);
  166. allWarnings.AddRange(warnings);
  167. await _runLog.SuccessAsync(runLogId, perOrder.Message, new
  168. {
  169. orderId = order.Id,
  170. billNo = order.BillNo,
  171. perOrder.EntryCount,
  172. perOrder.WorkOrderCreatedCount,
  173. perOrder.WorkOrderUpdatedCount,
  174. workOrders = perOrder.WorkOrders,
  175. warnings
  176. });
  177. }
  178. catch (Exception ex)
  179. {
  180. await _db.Ado.RollbackTranAsync();
  181. await _runLog.FailedAsync(runLogId, ex.Message, new { orderId = order.Id, billNo = order.BillNo });
  182. throw Oops.Oh(ex.Message);
  183. }
  184. }
  185. aggregate.RunLogId = firstLogId ?? 0;
  186. aggregate.Warnings = allWarnings.Distinct().ToList();
  187. aggregate.Message = BuildAggregateMessage(actionCode, aggregate);
  188. if ((actionCode == ActionReview || actionCode == ActionRefresh) && _currentReviewBangId > 0)
  189. await CleanupStaleReviewOccupyAsync(tenantId, _currentReviewBangId);
  190. if (actionCode == ActionReview && aggregate.ResourceCheckCount > 0)
  191. aggregate.Warnings.AddRange(TryTriggerMdpRefresh());
  192. return aggregate;
  193. }
  194. private async Task<SeOrderReviewExecuteResult> ExecuteSingleAsync(
  195. string actionCode,
  196. long orderId,
  197. Func<OrderWorkOrderGenerationService.OrderHeader, SeOrderReviewExecuteResult, List<string>, string, Task> handler)
  198. {
  199. var tenantId = _userManager.TenantId > 0
  200. ? _userManager.TenantId
  201. : AidopTenantHelper.Resolve(App.HttpContext);
  202. var account = _userManager.Account ?? "system";
  203. var order = await LoadOrderAsync(orderId, tenantId)
  204. ?? throw Oops.Oh("订单不存在或不属于当前租户");
  205. var result = new SeOrderReviewExecuteResult
  206. {
  207. ActionCode = actionCode,
  208. OrderCount = 1
  209. };
  210. var warnings = new List<string>();
  211. var runLogId = await _runLog.StartAsync(actionCode, tenantId, "crm_seorder", order.Id, order.BillNo);
  212. result.RunLogId = runLogId;
  213. try
  214. {
  215. await _db.Ado.BeginTranAsync();
  216. await handler(order, result, warnings, account);
  217. await _db.Ado.CommitTranAsync();
  218. result.Warnings = warnings;
  219. result.Message = BuildSingleMessage(result);
  220. await _runLog.SuccessAsync(runLogId, result.Message, new
  221. {
  222. orderId = order.Id,
  223. billNo = order.BillNo,
  224. result.EntryCount,
  225. result.WorkOrderCreatedCount,
  226. result.WorkOrderUpdatedCount,
  227. workOrders = result.WorkOrders,
  228. warnings
  229. });
  230. if (actionCode == ActionRefresh && _currentReviewBangId > 0)
  231. await CleanupStaleReviewOccupyAsync(tenantId, _currentReviewBangId);
  232. if (actionCode == ActionRefresh && result.ResourceCheckCount > 0)
  233. result.Warnings.AddRange(TryTriggerMdpRefresh());
  234. return result;
  235. }
  236. catch (Exception ex)
  237. {
  238. await _db.Ado.RollbackTranAsync();
  239. await _runLog.FailedAsync(runLogId, ex.Message, new { orderId = order.Id, billNo = order.BillNo });
  240. throw Oops.Oh(ex.Message);
  241. }
  242. }
  243. private void EnsureReviewBangId()
  244. {
  245. if (_currentReviewBangId <= 0)
  246. _currentReviewBangId = YitIdHelper.NextId();
  247. }
  248. /// <summary>
  249. /// 清理本租户非当前 S1 版本、且非当前 S2 版本的占用行(保留 legacy S2 bang_id=1 直至首次 S2 全量排程切换)。
  250. /// </summary>
  251. private async Task CleanupStaleReviewOccupyAsync(long tenantId, long currentS1BangId)
  252. {
  253. var s2BangId = await _db.Ado.GetLongAsync(
  254. """
  255. SELECT id FROM aidop_action_run_log
  256. WHERE tenant_id = @TenantId AND action_code = 'S2_SCHEDULE_GENERATE' AND status = 'SUCCESS'
  257. ORDER BY start_time DESC, id DESC
  258. LIMIT 1
  259. """,
  260. new List<SugarParameter> { new("@TenantId", tenantId) });
  261. const long legacyS2BangId = 1;
  262. await _db.Ado.ExecuteCommandAsync(
  263. """
  264. DELETE FROM ic_item_stockoccupy
  265. WHERE tenant_id = @TenantId
  266. AND bang_id <> @S1BangId
  267. AND bang_id <> @S2BangId
  268. AND bang_id <> @LegacyS2
  269. """,
  270. new SugarParameter("@TenantId", tenantId),
  271. new SugarParameter("@S1BangId", currentS1BangId),
  272. new SugarParameter("@S2BangId", s2BangId > 0 ? s2BangId : -1L),
  273. new SugarParameter("@LegacyS2", legacyS2BangId));
  274. await _db.Ado.ExecuteCommandAsync(
  275. """
  276. DELETE FROM srm_po_occupy
  277. WHERE tenant_id = @TenantId
  278. AND bang_id <> @S1BangId
  279. AND bang_id <> @S2BangId
  280. AND bang_id <> @LegacyS2
  281. """,
  282. new SugarParameter("@TenantId", tenantId),
  283. new SugarParameter("@S1BangId", currentS1BangId),
  284. new SugarParameter("@S2BangId", s2BangId > 0 ? s2BangId : -1L),
  285. new SugarParameter("@LegacyS2", legacyS2BangId));
  286. }
  287. /// <summary>
  288. /// 清理本订单所有明细行的旧 status=0 预占记录(b_stock_occupy / b_purchase_occupy / b_mo_occupy)。
  289. /// 每次评审前调用,确保幂等。
  290. /// </summary>
  291. private async Task CleanupReviewOccupyAsync(long tenantId, List<long> entryIds)
  292. {
  293. if (entryIds.Count == 0) return;
  294. var pars = new List<SugarParameter> { new("@TenantId", tenantId) };
  295. var placeholders = new List<string>();
  296. for (var i = 0; i < entryIds.Count; i++)
  297. {
  298. placeholders.Add($"@e{i}");
  299. pars.Add(new SugarParameter($"@e{i}", entryIds[i]));
  300. }
  301. var inClause = string.Join(",", placeholders);
  302. // b_stock_occupy(无 IsDeleted 字段)
  303. await _db.Ado.ExecuteCommandAsync(
  304. $"DELETE FROM b_stock_occupy WHERE tenant_id = @TenantId AND status = 0 AND entry_id IN ({inClause})",
  305. pars);
  306. // b_purchase_occupy(有 IsDeleted 字段)
  307. await _db.Ado.ExecuteCommandAsync(
  308. $"DELETE FROM b_purchase_occupy WHERE tenant_id = @TenantId AND status = 0 AND IFNULL(IsDeleted, 0) = 0 AND entry_id IN ({inClause})",
  309. pars);
  310. // b_mo_occupy(有 IsDeleted 字段)
  311. await _db.Ado.ExecuteCommandAsync(
  312. $"DELETE FROM b_mo_occupy WHERE tenant_id = @TenantId AND status = 0 AND IFNULL(IsDeleted, 0) = 0 AND entry_id IN ({inClause})",
  313. pars);
  314. }
  315. /// <summary>
  316. /// 交期确认时将指定明细行的三张占用表 status 从 0 更新为 1。
  317. /// </summary>
  318. private async Task ConfirmReviewOccupyAsync(long tenantId, long entryId)
  319. {
  320. var now = DateTime.Now;
  321. var pars = new List<SugarParameter>
  322. {
  323. new("@TenantId", tenantId),
  324. new("@EntryId", entryId),
  325. new("@Now", now)
  326. };
  327. // b_stock_occupy(无 IsDeleted 字段)
  328. await _db.Ado.ExecuteCommandAsync(
  329. "UPDATE b_stock_occupy SET status = 1, update_time = @Now WHERE tenant_id = @TenantId AND entry_id = @EntryId AND status = 0",
  330. pars);
  331. // b_purchase_occupy(有 IsDeleted 字段)
  332. await _db.Ado.ExecuteCommandAsync(
  333. "UPDATE b_purchase_occupy SET status = 1, update_time = @Now WHERE tenant_id = @TenantId AND entry_id = @EntryId AND status = 0 AND IFNULL(IsDeleted, 0) = 0",
  334. pars);
  335. // b_mo_occupy(有 IsDeleted 字段)
  336. await _db.Ado.ExecuteCommandAsync(
  337. "UPDATE b_mo_occupy SET status = 1, update_time = @Now WHERE tenant_id = @TenantId AND entry_id = @EntryId AND status = 0 AND IFNULL(IsDeleted, 0) = 0",
  338. pars);
  339. }
  340. private async Task ReviewOneOrderAsync(
  341. OrderWorkOrderGenerationService.OrderHeader order,
  342. SeOrderReviewExecuteResult result,
  343. List<string> warnings,
  344. string account)
  345. {
  346. var entries = await LoadReviewableEntriesAsync(order.Id, order.TenantId, ["1", "0", "2"]);
  347. if (entries.Count == 0)
  348. throw Oops.Oh($"订单 {order.BillNo} 没有可评审的明细行(须为新建,评审,再评审状态)");
  349. // 清理本订单所有明细行的旧 status=0 预占记录(三张表)
  350. await CleanupReviewOccupyAsync(order.TenantId, entries.Select(e => e.Id).ToList());
  351. foreach (var entry in entries)
  352. {
  353. ValidateEntryForResourceCheck(entry);
  354. if (entry.PlanDate is null)
  355. throw Oops.Oh($"订单行 {entry.EntrySeq} 缺少客户要求交期(plan_date)");
  356. // 1. 先做资源检查(纯 BOM 展开 + 库存计算,不依赖工单),记录库存占用
  357. EnsureReviewBangId();
  358. var (check, lines) = await _resourceCheck.CheckOnlyAsync(order, entry, warnings, _currentReviewBangId);
  359. result.ResourceCheckCount++;
  360. result.ResourceCheckLineCount += check.LineCount;
  361. long? examineId = null;
  362. // 2. 有缺料 → 才生成工单并写入资源检查结果;库存可满足则跳过工单
  363. if (check.HasShortage)
  364. {
  365. var wo = await _workOrderGen.CreateOrUpdateForEntryAsync(order, entry, account, warnings);
  366. if (wo.Created) result.WorkOrderCreatedCount++;
  367. else result.WorkOrderUpdatedCount++;
  368. result.WorkOrders.Add(wo.WorkOrd);
  369. var checkResult = await _resourceCheck.WriteResultAsync(order, entry, wo.WorkOrd, lines, account);
  370. examineId = checkResult.ExamineId;
  371. await _materialDetailSync.EnsureFromResourceCheckAsync(entry.TenantId, wo.WorkOrd, account);
  372. await _routingSync.EnsureFromRoutingAsync(entry.TenantId, wo.WorkOrd, account);
  373. await _workOrdMesPush.TryEnqueueSnapshotSafeAsync(entry.TenantId, wo.WorkOrd, warnings);
  374. warnings.Add($"订单行 {entry.EntrySeq} 存在缺料(工单 {wo.WorkOrd})");
  375. }
  376. else
  377. {
  378. // 3. 不缺料 → 若之前已生成工单则关闭(Status='C', IsActive=0)
  379. var closedCount = await CloseExistingWorkOrdersAsync(entry.TenantId, entry.Id, account);
  380. if (closedCount > 0)
  381. {
  382. result.WorkOrderClosedCount += closedCount;
  383. warnings.Add($"订单行 {entry.EntrySeq} 库存可满足,已关闭 {closedCount} 个历史工单");
  384. }
  385. }
  386. // 写入订单评审三表占用追踪(status=0 预占)
  387. await _calculator.WriteReviewOccupyAsync(
  388. lines, entry.TenantId, entry.Id, order.BillNo ?? "", examineId);
  389. await UpdateEntryAfterReviewAsync(entry.Id, check.KittingTime, account);
  390. }
  391. result.EntryCount = entries.Count;
  392. result.Message = $"订单 {order.BillNo} 评审完成(资源检查 {result.ResourceCheckCount} 条)";
  393. }
  394. private async Task ConfirmOneOrderAsync(
  395. OrderWorkOrderGenerationService.OrderHeader order,
  396. SeOrderReviewExecuteResult result,
  397. List<string> warnings,
  398. string account)
  399. {
  400. var entries = await LoadReviewableEntriesAsync(order.Id, order.TenantId, ["2"]);
  401. if (entries.Count == 0)
  402. throw Oops.Oh($"订单 {order.BillNo} 没有处于评审状态的明细行,请先完成订单评审");
  403. foreach (var entry in entries)
  404. {
  405. var woCnt = await _db.Ado.GetIntAsync(
  406. """
  407. SELECT COUNT(*) FROM WorkOrdMaster
  408. WHERE tenant_id = @TenantId AND BusinessID = @EntryId
  409. AND LOWER(TRIM(IFNULL(Status,''))) <> 'c'
  410. """,
  411. new SugarParameter("@TenantId", entry.TenantId),
  412. new SugarParameter("@EntryId", entry.Id));
  413. // 无活跃工单:可能从未生成(库存可满足)或已关闭 → 仍允许交期确认
  414. var confirmDate = entry.SysCapacityDate ?? entry.PlanDate;
  415. // 交期确认:三张占用表 status 0 -> 1
  416. await ConfirmReviewOccupyAsync(entry.TenantId, entry.Id);
  417. await UpdateEntryAfterConfirmAsync(entry.Id, confirmDate, account);
  418. result.EntryCount++;
  419. if (woCnt > 0)
  420. {
  421. var workOrd = await LoadWorkOrdForEntryAsync(entry.TenantId, entry.Id);
  422. result.WorkOrders.Add(workOrd);
  423. // 交期确认后将工单状态设为 p,同步 OrdDate 和 DueDate
  424. if (!string.IsNullOrWhiteSpace(workOrd))
  425. {
  426. var confirmDateForWo = confirmDate ?? DateTime.Now;
  427. await _db.Ado.ExecuteCommandAsync(
  428. """
  429. UPDATE WorkOrdMaster
  430. SET Status = 'p',
  431. OrdDate = COALESCE(OrdDate, @OrdDate),
  432. DueDate = @DueDate,
  433. UpdateUser = @User, UpdateTime = @Now
  434. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  435. AND IFNULL(TRIM(Status), '') = ''
  436. """,
  437. new SugarParameter("@TenantId", entry.TenantId),
  438. new SugarParameter("@WorkOrd", workOrd),
  439. new SugarParameter("@OrdDate", DateTime.Now.Date),
  440. new SugarParameter("@DueDate", confirmDateForWo.Date),
  441. new SugarParameter("@User", account),
  442. new SugarParameter("@Now", DateTime.Now));
  443. // 交期确认后同步工单物料明细,使其与资源检查子物料一致
  444. await _materialDetailSync.EnsureFromResourceCheckAsync(entry.TenantId, workOrd, account);
  445. await _workOrdMesPush.TryEnqueueSnapshotSafeAsync(entry.TenantId, workOrd, warnings);
  446. }
  447. }
  448. else
  449. warnings.Add($"订单行 {entry.EntrySeq} 无活跃工单(库存可满足或已关闭),已直接确认交期");
  450. }
  451. result.WorkOrders = result.WorkOrders.Where(x => !string.IsNullOrWhiteSpace(x)).Distinct().ToList();
  452. result.Message = $"订单 {order.BillNo} 交期确认完成";
  453. }
  454. private async Task<string> LoadWorkOrdForEntryAsync(long tenantId, long entryId)
  455. {
  456. var rows = await _db.Ado.SqlQueryAsync<string>(
  457. """
  458. SELECT WorkOrd FROM WorkOrdMaster
  459. WHERE tenant_id = @TenantId AND BusinessID = @EntryId
  460. ORDER BY RecID DESC LIMIT 1
  461. """,
  462. new SugarParameter("@TenantId", tenantId),
  463. new SugarParameter("@EntryId", entryId));
  464. return rows.FirstOrDefault() ?? string.Empty;
  465. }
  466. /// <summary>
  467. /// 关闭指定订单行已有的未关闭工单(WorkOrdMaster.Status='C', IsActive=0;mes_morder.morder_state='关闭')。
  468. /// 返回被关闭的工单数量。
  469. /// </summary>
  470. private async Task<int> CloseExistingWorkOrdersAsync(long tenantId, long entryId, string account)
  471. {
  472. // 查找该订单行下所有未关闭的工单号
  473. var openWorkOrds = await _db.Ado.SqlQueryAsync<string>(
  474. """
  475. SELECT WorkOrd FROM WorkOrdMaster
  476. WHERE tenant_id = @TenantId AND BusinessID = @EntryId
  477. AND LOWER(TRIM(IFNULL(Status,''))) <> 'c'
  478. AND IFNULL(IsActive, 0) = 1
  479. """,
  480. new SugarParameter("@TenantId", tenantId),
  481. new SugarParameter("@EntryId", entryId));
  482. if (openWorkOrds.Count == 0) return 0;
  483. var workOrdList = string.Join(",", openWorkOrds.Select(w => $"'{w}'"));
  484. var now = DateTime.Now;
  485. // 关闭 WorkOrdMaster
  486. await _db.Ado.ExecuteCommandAsync(
  487. $"""
  488. UPDATE WorkOrdMaster
  489. SET Status = 'C', IsActive = 0,
  490. UpdateUser = @User, UpdateTime = @Now
  491. WHERE tenant_id = @TenantId AND BusinessID = @EntryId
  492. AND LOWER(TRIM(IFNULL(Status,''))) <> 'c'
  493. AND IFNULL(IsActive, 0) = 1
  494. """,
  495. new SugarParameter("@TenantId", tenantId),
  496. new SugarParameter("@EntryId", entryId),
  497. new SugarParameter("@User", account),
  498. new SugarParameter("@Now", now));
  499. // 同步关闭 mes_morder
  500. await _db.Ado.ExecuteCommandAsync(
  501. $"""
  502. UPDATE mes_morder
  503. SET morder_state = '关闭',
  504. update_by_name = @User, update_time = @Now
  505. WHERE tenant_id = @TenantId AND morder_no IN ({workOrdList})
  506. AND IFNULL(morder_state, '') <> '关闭'
  507. """,
  508. new SugarParameter("@TenantId", tenantId),
  509. new SugarParameter("@User", account),
  510. new SugarParameter("@Now", now));
  511. return openWorkOrds.Count;
  512. }
  513. private static void ValidateEntryForResourceCheck(OrderWorkOrderGenerationService.OrderEntryLine entry)
  514. {
  515. if (string.IsNullOrWhiteSpace(entry.ItemNumber))
  516. throw Oops.Oh($"订单行 {entry.EntrySeq} 物料编码不能为空");
  517. if (entry.Qty is null or <= 0)
  518. throw Oops.Oh($"订单行 {entry.EntrySeq} 数量必须大于 0");
  519. if (entry.PlanDate is null && entry.SysCapacityDate is null)
  520. throw Oops.Oh($"订单行 {entry.EntrySeq} 缺少计划交期");
  521. }
  522. private async Task<OrderWorkOrderGenerationService.OrderHeader?> LoadOrderAsync(long orderId, long tenantId)
  523. {
  524. var rows = await _db.Ado.SqlQueryAsync<OrderWorkOrderGenerationService.OrderHeader>(
  525. """
  526. SELECT Id, bill_no AS BillNo, custom_no AS CustomNo, urgent AS Urgent,
  527. factory_id AS FactoryId, tenant_id AS TenantId
  528. FROM crm_seorder
  529. WHERE Id = @Id AND tenant_id = @TenantId AND IsDeleted = 0
  530. LIMIT 1
  531. """,
  532. new SugarParameter("@Id", orderId),
  533. new SugarParameter("@TenantId", tenantId));
  534. return rows.FirstOrDefault();
  535. }
  536. private async Task<List<OrderWorkOrderGenerationService.OrderEntryLine>> LoadReviewableEntriesAsync(
  537. long orderId,
  538. long tenantId,
  539. IReadOnlyList<string> progressList)
  540. {
  541. if (progressList.Count == 0)
  542. return new List<OrderWorkOrderGenerationService.OrderEntryLine>();
  543. var inClause = string.Join(", ", progressList.Select((_, i) => $"@P{i}"));
  544. var pars = new List<SugarParameter>
  545. {
  546. new("@OrderId", orderId),
  547. new("@TenantId", tenantId)
  548. };
  549. for (var i = 0; i < progressList.Count; i++)
  550. pars.Add(new SugarParameter($"@P{i}", progressList[i]));
  551. return await _db.Ado.SqlQueryAsync<OrderWorkOrderGenerationService.OrderEntryLine>(
  552. $"""
  553. SELECT
  554. Id, seorder_id AS SeOrderId, bill_no AS BillNo, entry_seq AS EntrySeq,
  555. item_number AS ItemNumber, item_name AS ItemName, specification AS Specification,
  556. unit AS Unit, bom_number AS BomNumber, qty AS Qty,
  557. plan_date AS PlanDate, sys_capacity_date AS SysCapacityDate,
  558. progress AS Progress, urgent AS Urgent,
  559. factory_id AS FactoryId, company_id AS CompanyId, tenant_id AS TenantId
  560. FROM crm_seorderentry
  561. WHERE seorder_id = @OrderId AND tenant_id = @TenantId AND IsDeleted = 0
  562. AND COALESCE(NULLIF(progress, ''), '1') IN ({inClause})
  563. ORDER BY entry_seq, Id
  564. """,
  565. pars);
  566. }
  567. private async Task UpdateEntryAfterReviewAsync(long entryId, DateTime? capacityDate, string account)
  568. {
  569. await _db.Ado.ExecuteCommandAsync(
  570. """
  571. UPDATE crm_seorderentry
  572. SET progress = '2',
  573. sys_capacity_date = @CapacityDate,
  574. update_time = @Now
  575. WHERE Id = @Id AND IsDeleted = 0
  576. """,
  577. new SugarParameter("@CapacityDate", capacityDate ?? (object)DBNull.Value),
  578. new SugarParameter("@Now", DateTime.Now),
  579. new SugarParameter("@Id", entryId));
  580. }
  581. private async Task UpdateEntryAfterConfirmAsync(long entryId, DateTime? confirmDate, string account)
  582. {
  583. await _db.Ado.ExecuteCommandAsync(
  584. """
  585. UPDATE crm_seorderentry
  586. SET progress = '3',
  587. date = COALESCE(date, @ConfirmDate),
  588. update_time = @Now
  589. WHERE Id = @Id AND IsDeleted = 0
  590. """,
  591. new SugarParameter("@ConfirmDate", confirmDate ?? (object)DBNull.Value),
  592. new SugarParameter("@Now", DateTime.Now),
  593. new SugarParameter("@Id", entryId));
  594. }
  595. private async Task UpdateEntriesProgressAsync(IReadOnlyList<long> entryIds, string progress, string account)
  596. {
  597. if (entryIds.Count == 0) return;
  598. var idList = string.Join(",", entryIds);
  599. await _db.Ado.ExecuteCommandAsync(
  600. $"""
  601. UPDATE crm_seorderentry
  602. SET progress = @Progress, update_time = @Now
  603. WHERE Id IN ({idList}) AND IsDeleted = 0
  604. """,
  605. new SugarParameter("@Progress", progress),
  606. new SugarParameter("@Now", DateTime.Now));
  607. }
  608. private static string BuildAggregateMessage(string actionCode, SeOrderReviewExecuteResult r)
  609. {
  610. var woPart = r.WorkOrders.Count > 0
  611. ? $",工单:{string.Join("、", r.WorkOrders.Distinct())}"
  612. : string.Empty;
  613. var closedPart = r.WorkOrderClosedCount > 0
  614. ? $"、关闭 {r.WorkOrderClosedCount}"
  615. : string.Empty;
  616. return actionCode switch
  617. {
  618. ActionReview => $"评审完成 {r.OrderCount} 单、{r.EntryCount} 行,新建工单 {r.WorkOrderCreatedCount}、更新 {r.WorkOrderUpdatedCount}{closedPart}、资源检查 {r.ResourceCheckCount} 条{woPart}",
  619. ActionConfirm => $"交期确认完成 {r.OrderCount} 单、{r.EntryCount} 行{woPart}",
  620. _ => r.Message
  621. };
  622. }
  623. private static string BuildSingleMessage(SeOrderReviewExecuteResult r)
  624. {
  625. if (r.WorkOrders.Count == 0)
  626. return r.Message;
  627. return $"{r.Message},工单:{string.Join("、", r.WorkOrders.Distinct())}";
  628. }
  629. private List<string> TryTriggerMdpRefresh()
  630. {
  631. if (_userManager.TenantId <= 0)
  632. return new List<string>();
  633. var tenantId = _userManager.TenantId;
  634. var factoryId = 1L;
  635. _refreshDispatcher.Enqueue("S1", async (sp, ct) =>
  636. {
  637. await sp.GetRequiredService<Admin.NET.Plugin.AiDOP.DataPlatform.MdpRebuild.ModuleRebuildService>()
  638. .EnqueueAsync("S1", tenantId, factoryId, null, "ORDER_REVIEW", ct);
  639. });
  640. return new List<string>();
  641. }
  642. // ══════════════════════════════════════════════════════════════
  643. // 3级计划重排 — 辅助方法
  644. // ══════════════════════════════════════════════════════════════
  645. /// <summary>
  646. /// 校验订单明细行的物料编码是否与已生成工单的物料编码一致。
  647. /// 若不一致则说明物料信息已变更,不允许重排。
  648. /// </summary>
  649. private async Task ValidateMaterialNotChangedAsync(long orderId, long tenantId)
  650. {
  651. var mismatches = await _db.Ado.SqlQueryAsync<dynamic>(
  652. """
  653. SELECT e.entry_seq AS EntrySeq,
  654. e.item_number AS EntryItemNum,
  655. w.ItemNum AS WoItemNum
  656. FROM crm_seorderentry e
  657. INNER JOIN WorkOrdMaster w
  658. ON w.BusinessID = e.Id AND w.tenant_id = e.tenant_id
  659. AND IFNULL(w.IsActive, 0) = 1
  660. AND LOWER(TRIM(IFNULL(w.Status, ''))) <> 'c'
  661. WHERE e.seorder_id = @OrderId AND e.tenant_id = @TenantId AND e.IsDeleted = 0
  662. AND TRIM(IFNULL(e.item_number, '')) <> ''
  663. AND TRIM(IFNULL(w.ItemNum, '')) <> ''
  664. AND TRIM(e.item_number) <> TRIM(w.ItemNum)
  665. """,
  666. new SugarParameter("@OrderId", orderId),
  667. new SugarParameter("@TenantId", tenantId));
  668. if (mismatches.Count > 0)
  669. throw Oops.Oh("此订单行的物料信息有变更无法重排");
  670. }
  671. /// <summary>
  672. /// 当工单状态为下达(R)/投产(W)/暂停(S)时,更新对应领料单明细数据。
  673. /// 重新从 WorkOrdDetail 汇总物料需求,覆盖 NbrDetail 中的 QtyOrd。
  674. /// </summary>
  675. private async Task UpdatePickingListForActiveWorkOrderAsync(
  676. long tenantId, string workOrd, string account, List<string> warnings)
  677. {
  678. // 获取工单状态
  679. var status = await _db.Ado.GetStringAsync(
  680. """
  681. SELECT IFNULL(LOWER(TRIM(Status)), '') FROM WorkOrdMaster
  682. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd
  683. LIMIT 1
  684. """,
  685. new SugarParameter("@TenantId", tenantId),
  686. new SugarParameter("@WorkOrd", workOrd));
  687. // 仅处理 下达(R)/投产(W)/暂停(S) 状态的工单
  688. if (status is not ("r" or "w" or "s"))
  689. return;
  690. // 查找领料单主记录
  691. var nbrRows = await _db.Ado.SqlQueryAsync<NbrMasterRow>(
  692. """
  693. SELECT RecID, Nbr, `Domain` FROM NbrMaster
  694. WHERE tenant_id = @TenantId AND WorkOrd = @WorkOrd AND Type = 'SM'
  695. AND IFNULL(TransType, '') = ''
  696. AND IFNULL(IsActive, 0) = 1
  697. """,
  698. new SugarParameter("@TenantId", tenantId),
  699. new SugarParameter("@WorkOrd", workOrd));
  700. if (nbrRows.Count == 0)
  701. {
  702. warnings.Add($"工单 {workOrd} 状态为 {status.ToUpper()} 但无领料单,跳过领料单更新");
  703. return;
  704. }
  705. var now = DateTime.Now;
  706. // 从 WorkOrdDetail 汇总最新物料需求
  707. var details = await _db.Ado.SqlQueryAsync<PickDetailRow>(
  708. """
  709. SELECT
  710. d.ItemNum,
  711. SUM(d.QtyRequired) AS QtyRequired,
  712. MAX(IFNULL(d.UM, im.Um)) AS Unit,
  713. MAX(im.Descr) AS ItemName
  714. FROM WorkOrdDetail d
  715. LEFT JOIN ItemMaster im ON d.ItemNum = im.ItemNum AND im.tenant_id = d.tenant_id
  716. WHERE d.tenant_id = @TenantId AND d.WorkOrd = @WorkOrd AND IFNULL(d.IsActive, 0) = 1
  717. GROUP BY d.ItemNum
  718. HAVING SUM(d.QtyRequired) > 0
  719. ORDER BY d.ItemNum
  720. """,
  721. new SugarParameter("@TenantId", tenantId),
  722. new SugarParameter("@WorkOrd", workOrd));
  723. foreach (var nbr in nbrRows)
  724. {
  725. var domain = string.IsNullOrWhiteSpace(nbr.Domain) ? tenantId.ToString() : nbr.Domain!.Trim();
  726. if (domain.Length > 8) domain = domain[..8];
  727. // 加载当前领料单明细行(仅未关闭的)
  728. var existingDetails = await _db.Ado.SqlQueryAsync<NbrDetailRow>(
  729. """
  730. SELECT RecID, ItemNum, QtyOrd, QtyRec, CurrQtyOpened, Line
  731. FROM NbrDetail
  732. WHERE tenant_id = @TenantId AND Nbr = @Nbr AND Type = 'SM'
  733. AND IFNULL(IsActive, 0) = 1
  734. """,
  735. new SugarParameter("@TenantId", tenantId),
  736. new SugarParameter("@Nbr", nbr.Nbr));
  737. var detailMap = details.ToDictionary(d => d.ItemNum.Trim(), d => d);
  738. var existingMap = existingDetails.ToDictionary(d => (d.ItemNum ?? "").Trim(), d => d);
  739. // ── 1. 处理已有明细行:按 ItemNum 匹配 ──
  740. foreach (var existing in existingDetails)
  741. {
  742. var key = (existing.ItemNum ?? "").Trim();
  743. if (detailMap.TryGetValue(key, out var newDetail))
  744. {
  745. // 物料在工单明细中存在
  746. var newQty = newDetail.QtyRequired;
  747. if (existing.QtyRec > 0)
  748. {
  749. // 已发料:判断新需求数是否大于已发料数
  750. if (newQty > existing.QtyRec)
  751. {
  752. // 新需求 > 已发料 → 更新需求数
  753. await _db.Ado.ExecuteCommandAsync(
  754. """
  755. UPDATE NbrDetail
  756. SET QtyOrd = @QtyOrd, CurrQtyOpened = @CurrQtyOpened,
  757. UM = @UM, ItemName = @ItemName,
  758. UpdateUser = @User, UpdateTime = @Now
  759. WHERE RecID = @RecId
  760. """,
  761. new SugarParameter("@QtyOrd", newQty),
  762. new SugarParameter("@CurrQtyOpened", newQty),
  763. new SugarParameter("@UM", (object?)newDetail.Unit ?? DBNull.Value),
  764. new SugarParameter("@ItemName", (object?)newDetail.ItemName ?? DBNull.Value),
  765. new SugarParameter("@User", account),
  766. new SugarParameter("@Now", now),
  767. new SugarParameter("@RecId", existing.RecID));
  768. }
  769. else
  770. {
  771. // 新需求 <= 已发料 → 关闭当前行
  772. await _db.Ado.ExecuteCommandAsync(
  773. """
  774. UPDATE NbrDetail
  775. SET Status = 'C', IsActive = 0,
  776. UpdateUser = @User, UpdateTime = @Now
  777. WHERE RecID = @RecId
  778. """,
  779. new SugarParameter("@User", account),
  780. new SugarParameter("@Now", now),
  781. new SugarParameter("@RecId", existing.RecID));
  782. }
  783. }
  784. else
  785. {
  786. // 未发料 → 直接修改需求数
  787. await _db.Ado.ExecuteCommandAsync(
  788. """
  789. UPDATE NbrDetail
  790. SET QtyOrd = @QtyOrd, CurrQtyOpened = @CurrQtyOpened,
  791. UM = @UM, ItemName = @ItemName,
  792. UpdateUser = @User, UpdateTime = @Now
  793. WHERE RecID = @RecId
  794. """,
  795. new SugarParameter("@QtyOrd", newQty),
  796. new SugarParameter("@CurrQtyOpened", newQty),
  797. new SugarParameter("@UM", (object?)newDetail.Unit ?? DBNull.Value),
  798. new SugarParameter("@ItemName", (object?)newDetail.ItemName ?? DBNull.Value),
  799. new SugarParameter("@User", account),
  800. new SugarParameter("@Now", now),
  801. new SugarParameter("@RecId", existing.RecID));
  802. }
  803. }
  804. else
  805. {
  806. // 物料明细中没有,但领料单明细有 → 关闭当前领料单明细行
  807. await _db.Ado.ExecuteCommandAsync(
  808. """
  809. UPDATE NbrDetail
  810. SET Status = 'C', IsActive = 0,
  811. UpdateUser = @User, UpdateTime = @Now
  812. WHERE RecID = @RecId
  813. """,
  814. new SugarParameter("@User", account),
  815. new SugarParameter("@Now", now),
  816. new SugarParameter("@RecId", existing.RecID));
  817. }
  818. }
  819. // ── 2. 新增:物料明细中有,领料单明细没有的 ──
  820. var nextDetailId = await _db.Ado.GetIntAsync("SELECT IFNULL(MAX(RecID), 0) + 1 FROM NbrDetail");
  821. short newLine = (short)(existingDetails.Count > 0 ? existingDetails.Max(d => d.Line) + 1 : 1);
  822. foreach (var d in details)
  823. {
  824. var key = d.ItemNum.Trim();
  825. if (existingMap.ContainsKey(key))
  826. continue; // 已处理
  827. await _db.Ado.ExecuteCommandAsync(
  828. """
  829. INSERT INTO NbrDetail (
  830. RecID, `Domain`, Type, Nbr, Line, ItemNum, Dimension1, Dimension2,
  831. LocationFrom, LocationTo, QtyFrom, QtyTo, QtyOrd, QtyRec,
  832. CurrQtyOpened, UM, WorkOrd, ItemName, Status,
  833. IsActive, IsConfirm, IsChanged, BusinessID, NbrRecID,
  834. CreateUser, CreateTime, UpdateUser, UpdateTime, tenant_id
  835. ) VALUES (
  836. @RecId, @Domain, 'SM', @Nbr, @Line, @ItemNum, '', '',
  837. '', '', 0, 0, @QtyOrd, 0,
  838. @CurrQtyOpened, @UM, @WorkOrd, @ItemName, '',
  839. 1, 0, 1, 0, @NbrRecId,
  840. @User, @Now, @User, @Now, @TenantId
  841. )
  842. """,
  843. new SugarParameter("@RecId", nextDetailId++),
  844. new SugarParameter("@Domain", domain),
  845. new SugarParameter("@Nbr", nbr.Nbr),
  846. new SugarParameter("@Line", newLine++),
  847. new SugarParameter("@ItemNum", d.ItemNum),
  848. new SugarParameter("@QtyOrd", d.QtyRequired),
  849. new SugarParameter("@CurrQtyOpened", d.QtyRequired),
  850. new SugarParameter("@UM", (object?)d.Unit ?? DBNull.Value),
  851. new SugarParameter("@WorkOrd", workOrd),
  852. new SugarParameter("@ItemName", (object?)d.ItemName ?? DBNull.Value),
  853. new SugarParameter("@NbrRecId", nbr.RecID),
  854. new SugarParameter("@User", account.Length > 24 ? account[..24] : account),
  855. new SugarParameter("@Now", now),
  856. new SugarParameter("@TenantId", tenantId));
  857. }
  858. // ── 3. 更新领料单主记录的更新时间和数量 ──
  859. await _db.Ado.ExecuteCommandAsync(
  860. """
  861. UPDATE NbrMaster
  862. SET QtyOrd = (SELECT IFNULL(SUM(QtyOrd), 0) FROM NbrDetail
  863. WHERE Nbr = @Nbr AND Type = 'SM' AND IFNULL(IsActive, 1) = 1),
  864. UpdateUser = @User, UpdateTime = @Now
  865. WHERE RecID = @RecId
  866. """,
  867. new SugarParameter("@Nbr", nbr.Nbr),
  868. new SugarParameter("@User", account),
  869. new SugarParameter("@Now", now),
  870. new SugarParameter("@RecId", nbr.RecID));
  871. }
  872. }
  873. /// <summary>
  874. /// 根据资源检查结果更新明细行系统建议交期(sys_capacity_date)。
  875. /// </summary>
  876. private async Task UpdateEntrySysCapacityDateAsync(long entryId, DateTime? kittingTime, string account)
  877. {
  878. await _db.Ado.ExecuteCommandAsync(
  879. """
  880. UPDATE crm_seorderentry
  881. SET sys_capacity_date = @CapacityDate,
  882. update_time = @Now
  883. WHERE Id = @Id AND IsDeleted = 0
  884. """,
  885. new SugarParameter("@CapacityDate", kittingTime ?? (object)DBNull.Value),
  886. new SugarParameter("@Now", DateTime.Now),
  887. new SugarParameter("@Id", entryId));
  888. }
  889. // ══════════════════════════════════════════════════════════════
  890. // 3级计划重排 — 内部 DTO
  891. // ══════════════════════════════════════════════════════════════
  892. private sealed class NbrMasterRow
  893. {
  894. public int RecID { get; set; }
  895. public string Nbr { get; set; } = string.Empty;
  896. public string? Domain { get; set; }
  897. }
  898. private sealed class NbrDetailRow
  899. {
  900. public int RecID { get; set; }
  901. public string? ItemNum { get; set; }
  902. public decimal QtyOrd { get; set; }
  903. public decimal QtyRec { get; set; }
  904. public decimal CurrQtyOpened { get; set; }
  905. public short Line { get; set; }
  906. }
  907. private sealed class PickDetailRow
  908. {
  909. public string ItemNum { get; set; } = string.Empty;
  910. public decimal QtyRequired { get; set; }
  911. public string? Unit { get; set; }
  912. public string? ItemName { get; set; }
  913. }
  914. }