diff --git a/docs/HANDOFF.md b/docs/HANDOFF.md index 1159d53..94308a1 100644 --- a/docs/HANDOFF.md +++ b/docs/HANDOFF.md @@ -1,5 +1,13 @@ # 开发交接(2026-10-23) +## 2026-10-27 未发送订单顺延下一批 + +- 用户明确要求确认未发的订单恢复待汇总,下一时段重新合并;有证明的失败冻结批次保留历史后取消,新批次使用正常模板/新窗口草稿。已发送、sending/unknown、部分接受和无证明旧failed不自动重发。 +- 引入逐模式carryForward持久记录,复用列表/冻结/发送窗口资格,保持原到达时间、身份和PDF回执不变。原阻塞窗口结束后顺延,晚完成成员跟随集合决定;运行条件短暂失败仍能复核恢复,当前状态不再永久困住顺延订单。 +- 管理员可受控移出离开节点且从未归档编批的capture任务,保留证据及去重。匹配顺延模式的旧missed/build/batch异常退役并同步工作台,不把另一通知模式或其他未完成成员的问题隐藏。 +- 验证:282项业务回归通过;核心顺延/查询/发送/旧窗口专项95项通过,独立复核26项通过。额外覆盖运行条件失败后重新复核、旧窗口结果被覆盖后的晚完成成员、孤立编批引用与受阻记录移出保护。 +- 真实只读回放:六个海外更改单可进入当天17:00批次,两条sent批次不变。实施细节见docs/superpowers/plans/2026-10-27-unsent-next-batch.md,测试/部署/实机结果保存于忽略output/business-flow-test。 + ## 2026-10-27 统一邮件账户与DSH受控助手 - 邮件编辑默认共用邮箱/授权码,预设163/126/QQ/Foxmail/Yeah服务器;高级设置保留分开的SMTP/IMAP凭据。新账号可仅发信,IMAP能力与模板自动收信开关分开;旧账号默认保留原IMAP能力与密码,空输入不覆盖。连接检查不发送邮件。 diff --git a/docs/superpowers/plans/2026-10-27-unsent-next-batch.md b/docs/superpowers/plans/2026-10-27-unsent-next-batch.md new file mode 100644 index 0000000..5939916 --- /dev/null +++ b/docs/superpowers/plans/2026-10-27-unsent-next-batch.md @@ -0,0 +1,17 @@ +# 确认未发送订单顺延下一批(2026-10-27) + +## 已确认业务调整 +用户要求移出一条已离开节点、未归档的历史受阻任务,并将未发送成功订单恢复待汇总、归入下一批。已冻结但明确未提交/全部收件人拒绝的失败邮件也重组,而非原正文单独重试。原批次保留为已取消及顺延依据,不删除证据。 + +## 实施边界 +- 已成功归档、采集证据完整、原通知任务身份及及时接收窗口明确的订单才可自动顺延。原receivedAt、BPM身份、原intake、PDF回执/代次与规则快照不重写。 +- 按订单与普通/惠州通知分别保存carryForward:原截止、目标截止、证据摘要、原因和历史。读取资格与当前运行健康分离,暂时SMB故障不能使订单永久无法复核;冻结/发送仍须完整扫描与运行条件。 +- 原窗口已受阻,截止后一分钟未完成即顺延;一般慢采集保留原三十分钟宽限。已经顺延的整个集合保持决定,晚完成的同窗口成员也进入下一批。按业务日历选下一未来时点,不追发多个旧窗口。 +- 新写入失败证明区分not_submitted、all_recipients_rejected;人工核验未发可写manual_confirmed_unsent。无证明的历史failed、已发送、发送中、unknown和部分接受不得自动重置。按所有历史批次逐模式检查,不能仅凭pending/null batchId判定未发。 +- 失败旧批次只有所有成员均可接续时才整体取消并重组;新窗口使用当前模板/该窗口草稿,原冻结内容留历史。不得追加到已冻结目标批次。 +- 只移出尚未归档/编批/发送且确认已离开节点的capture任务,管理员版本和幂等校验。保留行、字段证据、历史及去重标识;关联异常通过正式归档/退役投影收口,不办理BPM。 + +## 验收 +只读运行数据回放确认六个海外更改单归入今天17:00,原有两条sent批次完全不变;不写业务数据或发送邮件。专项覆盖普通/惠州、明确失败/unknown、跨日/周末、晚完成成员、暂停/期限、重启/幂等、运行复核恢复、权限与移出保护。 + +部署先备份原本机代码及数据库,保留账号/规则/模板/归档/发送回执/五天期限,更新后通过受控入口移出用户指定旧任务,并验证六单已在下一批。仅按原11:00/17:00调度发信,不手工发信。 diff --git a/package.json b/package.json index 6fec6d3..7001099 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "service:stop": "node scripts/service.cjs stop", "service:restart": "node scripts/service.cjs restart", "test": "npm run test:business", - "test:business": "node --test --test-concurrency=1 tests/mail/unified-account.test.cjs tests/mail/unified-account-ui.test.cjs tests/assistant/assistant.test.cjs tests/assistant/assistant-http-ui.test.cjs tests/assistant/controlled-operations.test.cjs tests/assistant/dsh-runtime.test.cjs tests/assistant/dsh-runtime-installer.test.cjs tests/assistant/repair-runner.test.cjs tests/app/automatic-pdf-ledger.test.cjs tests/app/job-records.test.cjs tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs", + "test:business": "node --test --test-concurrency=1 tests/order-rules/carry-forward-core.test.cjs tests/order-rules/carry-forward-integration.test.cjs tests/order-rules/dispatch-unsent-proof.test.cjs tests/order-rules/dismiss-task.test.cjs tests/app/carry-dismiss-ui.test.cjs tests/workspace/business-issues.test.cjs tests/mail/unified-account.test.cjs tests/mail/unified-account-ui.test.cjs tests/assistant/assistant.test.cjs tests/assistant/assistant-http-ui.test.cjs tests/assistant/controlled-operations.test.cjs tests/assistant/dsh-runtime.test.cjs tests/assistant/dsh-runtime-installer.test.cjs tests/assistant/repair-runner.test.cjs tests/app/automatic-pdf-ledger.test.cjs tests/app/job-records.test.cjs tests/order-rules/version-compatibility.test.cjs tests/bpm-display-policy.test.cjs tests/bpm-dynamicarea.test.cjs tests/bpm-readonly-form.test.cjs tests/bpm-form-contracts.test.cjs tests/bpm-obsolete-display-fields.test.cjs tests/order-rules/snapshot-read-context.test.cjs tests/order-rules/summary.test.cjs tests/order-rules/execution-single-flight.test.cjs tests/order-rules/execution-responsiveness.test.cjs tests/order-rules/readiness-pending-ui.test.cjs tests/dependency-compatibility.test.cjs tests/order-rules/slow-cutoff.test.cjs tests/order-rules/removed-discovery-barrier.test.cjs tests/mail/sample-send.test.cjs tests/mail/template-editing.test.cjs tests/mail/template-editor-ui.test.cjs tests/order-rules/scope-catalog.test.cjs tests/order-rules/field-mapping-ui.test.cjs tests/order-rules/scope-search-ui.test.cjs tests/order-rules/excel-import-contract.test.cjs tests/order-rules/excel-execution-bridge.test.cjs tests/order-rules/excel-import-flow-ui.test.cjs tests/order-rules/collecting-batches.test.cjs tests/order-rules/collecting-batches-ui.test.cjs tests/order-rules/query.test.cjs tests/order-rules/scheduled-mail-policy.test.cjs", "test:full": "node --test --test-concurrency=2 \"tests/**/*.test.cjs\"" }, "engines": { diff --git a/src/modules/order-execution/api.cjs b/src/modules/order-execution/api.cjs index de0515f..3b3ab79 100644 --- a/src/modules/order-execution/api.cjs +++ b/src/modules/order-execution/api.cjs @@ -1,7 +1,7 @@ 'use strict'; const {fail}=require('../order-rules/validation.cjs'); async function orderExecutionApi({execution,orderRules,dispatcher,workspace,user,sessionId,url,route,method,body,reply}){ - const task=/^\/api\/order-execution\/tasks\/([\w-]+)\/(retry|resolve)$/.exec(route),resend=/^\/api\/order-rules\/batches\/([\w-]+)\/resend$/.exec(route); + const task=/^\/api\/order-execution\/tasks\/([\w-]+)\/(retry|resolve|dismiss)$/.exec(route),resend=/^\/api\/order-rules\/batches\/([\w-]+)\/resend$/.exec(route); const sample=/^\/api\/order-rules\/field-samples\/(list|capture)$/.exec(route),mapping=/^\/api\/order-rules\/field-mappings\/(draft|check|activate)$/.exec(route); const catalog=route==='/api/order-rules/field-samples/catalog',propose=route==='/api/order-rules/field-mappings/propose'; const scopeSettings=route==='/api/order-rules/field-mappings/catalog-settings'; @@ -30,7 +30,7 @@ async function orderExecutionApi({execution,orderRules,dispatcher,workspace,user const principal={user,sessionId};let result; if(route==='/api/order-execution/scan'){ if(!body||Object.keys(body).some(k=>!['connectionId','idempotencyKey'].includes(k)))fail('扫描参数无效。');result=await execution.scan(body,principal); - }else if(task){if(!body||Object.keys(body).some(k=>!(task[2]==='resolve'?['version','idempotencyKey','note','resolution']:['version','idempotencyKey','note']).includes(k)))fail('重试参数无效。');result=await execution[task[2]](task[1],body,principal);} + }else if(task){if(!body||Object.keys(body).some(k=>!(task[2]==='resolve'?['version','idempotencyKey','note','resolution']:['version','idempotencyKey','note']).includes(k)))fail('重试参数无效。');if(task[2]==='dismiss'){result=require('./dismiss-task.cjs').dismissTask(orderRules,task[1],body,user);const members=execution.dashboard?.users?.()||[user];workspace?.syncBusinessIssues?.(orderRules.all('business-issues'),members);const id=orderRules.get('execution-tasks',task[1])?.exceptionId,item=id&&workspace?.snapshot?.().exceptions?.find(e=>e.id===id);if(item&&item.status!=='retired'&&!item.sourceIssueId)workspace.actOnException(item.id,{version:item.version,action:'archive',note:body.note},user,members);}else result=await execution[task[2]](task[1],body,principal);} else{ if(user?.role!=='admin')fail('仅管理员可维护字段适配或人工补发。',403); if(sample){ diff --git a/src/modules/order-execution/coordinator.cjs b/src/modules/order-execution/coordinator.cjs index fd8ce3c..0cbaf41 100644 --- a/src/modules/order-execution/coordinator.cjs +++ b/src/modules/order-execution/coordinator.cjs @@ -251,7 +251,7 @@ class OrderExecutionCoordinator{ const eligibleAt=eligibility.eventTime(this.store,row); if(testing&&(row.configurationOnly||Date.parse(eligibleAt)this.store.executionRule(r)||(!testing?r.draft:null)).filter(rule=>rule&&matchesScope(rule,row)); if(!rules.length&&!task)continue; const id=task?.id||taskIdentity.taskIdentity(row); @@ -260,7 +260,8 @@ class OrderExecutionCoordinator{ // Pre-activation backlog requires explicit admission. Eligible missed-window work is // retained below without recapturing, archiving, or widening frozen mail. if(baseline&&receivedrules.some(rule=>rule.categoryId===batch.categoryId)&&batch.window&&inWindow(eligibleAt,batch.window)); if(historical&&!baseline&&!frozen)continue; considered++; @@ -332,7 +333,7 @@ class OrderExecutionCoordinator{ this.reconcileArchive(task); const order=task.orderId&&this.store.get('orders',task.orderId); if(!needsRuntimeCheck(order))continue; - if(window&&!reserved(order)&&Date.parse(eligibility.orderTime(this.store,order))!['version','note','idempotencyKey'].includes(k))||!Number.isSafeInteger(input.version)||input.version<1||typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000||typeof input.idempotencyKey!=='string'||!input.idempotencyKey.trim()||input.idempotencyKey.length>200)fail('须提供当前版本、至少五字的操作依据和幂等标识。'); + const inputHash=identity.digest({version:input.version,note:input.note.trim(),actor:user.username}); + return store.transaction(()=>{ + const task=store.get('execution-tasks',id);if(!task)fail('执行任务不存在。',404); + const safe=()=>({id:task.id,status:task.status,removedAt:task.removedAt}); + if(task.removal?.idempotencyKey===input.idempotencyKey){if(task.removal.inputHash!==inputHash)fail('幂等标识已用于不同操作。',409);return safe();} + if(task.version!==input.version||task.removedAt)fail('记录已变化,请刷新后重试。',409); + const referenced=row=>row.taskId===id||row.executionTaskId===id||row.identity===id||row.taskIds?.includes(id)||row.id===id||String(row.id||'').startsWith(id+':'); + if(task.orderId||store.get('orders',id)||task.blockedByBatchId||task.conflict||!['blocked','failed'].includes(task.status)||task.step!=='capture'||!(task.errorCode==='BPM_TASK_NOT_CURRENT'||task.recovery?.status==='requires-history-verification')||store.all('archive-intents').some(referenced)||store.all('processed-task-receipts').some(r=>referenced(r)||identity.sameTask(r,task.row))||store.all('batches').some(b=>referenced(b)||b.orderIds?.includes(id)||b.orderIds?.includes('task:'+id)))fail('仅可移出尚未归档、编批或发送的离开节点采集任务。',409); + const at=store.now();task.removedAt=at;task.removal={at,actor:user.username,note:input.note.trim(),idempotencyKey:input.idempotencyKey,inputHash};task.revisionIgnored=true;task.status='ignored';task.version++;task.updatedAt=at;task.history=[...(task.history||[]),{at,actor:user.username,action:'dismiss',status:'ignored',step:task.step,note:input.note.trim()}];store.put('execution-tasks',task); + for(const issue of store.all('business-issues'))if(issue.taskId===id||issue.taskIds?.includes(id))store.put('business-issues',{...issue,status:'retired',retiredAt:at,updatedAt:at,retirement:{actor:user.username,note:input.note.trim(),taskId:id}}); + store.audit(user.username,'移出未处理采集任务',id+':'+input.note.trim());return safe(); + }); +} +module.exports={dismissTask}; diff --git a/src/modules/order-rules/batch.cjs b/src/modules/order-rules/batch.cjs index e060381..4d2888d 100644 --- a/src/modules/order-rules/batch.cjs +++ b/src/modules/order-rules/batch.cjs @@ -40,7 +40,7 @@ function buildBatch(rule,orders,cutoff,{maxMessageBytes=20971520,window,notifica if(order.ruleSnapshot[binding]!==rule[binding])fail('同一批次不能混合不同模板绑定。'); if(order.status&&order.status!=='pending')fail('此类别包含未准备完成的订单。'); const received=Date.parse(store?require('./restricted-test.cjs').orderTime(store,order):order.event?.receivedAt); - if(window&&(store?!require('./restricted-test.cjs').orderInWindow(store,order,window):!require('./window.cjs').inWindow(order.event?.receivedAt,window)))fail('订单接收时间不属于本批时段窗口。'); + if(window&&(store?!require('./restricted-test.cjs').orderInWindow(store,order,window,notificationMode):!require('./window.cjs').inWindow(order.event?.receivedAt,window)))fail('订单接收时间不属于本批时段窗口。'); if(!Number.isFinite(received)||received>limit)fail('订单接收时间超出本批截止范围。'); const number=order.event?.orderNo; if(typeof number!=='string'||!number.trim()||/[\r\n\x00-\x1f]/.test(number))fail('订单号无效。'); diff --git a/src/modules/order-rules/carry-forward.cjs b/src/modules/order-rules/carry-forward.cjs new file mode 100644 index 0000000..cf1463f --- /dev/null +++ b/src/modules/order-rules/carry-forward.cjs @@ -0,0 +1,100 @@ +'use strict'; +const path=require('node:path'); +const identity=require('./task-identity.cjs'),eligibility=require('./restricted-test.cjs'); +const {delivery,updateDelivery,modeOf}=require('./delivery.cjs'); +const {windowForCutoff}=require('./window.cjs'),{nextSlots}=require('../../shared/schedule.cjs'); +const validDate=value=>typeof value==='string'&&Number.isFinite(Date.parse(value)); +function receipt(archive){return !!archive&&validDate(archive.archivedAt)&&Array.isArray(archive.files)&&archive.files.some(f=>f?.kind==='pdf'&&/\.pdf$/i.test(f.name))&&archive.files.every(f=>f&&typeof f.name==='string'&&f.name&&!/[\\/\x00-\x1f]/.test(f.name)&&typeof f.path==='string'&&path.win32.isAbsolute(f.path)&&/^[a-f\d]{64}$/i.test(f.sha256)&&Number.isSafeInteger(f.size)&&f.size>0&&['pdf','notice'].includes(f.kind));} +function basis(order){return identity.digest([order.sourceHash,order.sample,order.ruleSnapshot,order.archiveGeneration,order.archive]);} +function proof(batch){const p=batch.deliveryEvidence;return !!p&&['not_submitted','all_recipients_rejected','manual_confirmed_unsent'].includes(p.outcome)&&typeof p.phase==='string'&&!!p.phase&&validDate(p.at);} +function associated(store,order,mode){return store.all('batches').filter(b=>modeOf(b)===mode&&b.orderIds?.includes(order.id));} +function safeHistory(batches){return batches.every(b=>proof(b)&&(b.status==='failed'||b.status==='cancelled'&&b.resolution?.resolution==='carry_forward'));} +function qualified(store,order,{active=true}={}){ + if(!order||order.removedAt||!order.categoryId||!order.sample||!receipt(order.archive)||!order.ruleSnapshot)return null; + const tasks=store.all('execution-tasks').filter(t=>t.orderId===order.id);if(tasks.length!==1)return null;const task=tasks[0]; + if(task.removedAt||task.supersededBy||task.revisionIgnored||task.conflict||task.blockedByBatchId||!['complete','missed_window'].includes(task.step))return null; + if(!identity.sameTask(task.row,order.sample)||['source','portalSource','taskId','instanceId','revision','processName','nodeName','receivedAt'].some(k=>String(task.row?.[k])!==String(order.sample[k])))return null; + const captured=store.get('capture-samples',task.sampleId||'');if(captured?.provenance!=='server-provider'||captured.taskId!==task.id||typeof captured.snapshot?.html!=='string'||!captured.snapshot.html.trim()||!captured.sample||identity.fingerprint(captured.sample)!==identity.fingerprint(order.sample))return null; + let original;try{original=store.intakeWindow(order.sample,{includeExpired:true});}catch{return null;}if(!original)return null; + if(active){ + if(task.sourceUnavailableAt||task.runtimeCheck?.status==='blocked'||typeof store.executionSources==='function'&&!store.executionSources().includes(task.connectionId))return null; + let current;try{current=store.executionRule(store.get('rules',order.ruleSnapshot.id));eligibility.assertOrder(store,order);}catch{return null;} + if(current?.status!=='enabled'||current.version!==order.ruleSnapshot.version)return null; + } + return {task,original}; +} +function windowForOrder(store,value,mode='normal'){ + if(!['normal','huizhou'].includes(mode))return null; + // A Hui projection replaces event/order numbers. Always validate the persisted source. + const order=value?.id&&store.get('orders',value.id),stamp=order?.carryForward?.[mode];if(!stamp||stamp.basisHash!==basis(order)||!qualified(store,order,{active:false}))return null; + try{return windowForCutoff(stamp.targetCutoff,store.schedule(),store.calendar());}catch{return null;} +} +function hasCarry(store,order,mode='normal'){return !!windowForOrder(store,order,mode);} +function knownMissed(store,value,original,stamp){ + if(!value)return true; + if(![original.end,stamp?.targetCutoff].includes(value.end))return false; + let expected;try{expected=windowForCutoff(value.end,store.schedule(),store.calendar());}catch{return false;} + return ['start','end','collectionStart','collectionEnd','collectionLeadMinutes','policyVersion','startInclusive','endInclusive'].every(key=>value[key]===expected[key]); +} +function candidate(store,order,mode){ + const q=qualified(store,order),state=delivery(order,mode);if(!q||!state||order.blockedByBatchId||state.blockedByBatchId||!['pending','blocked','archived'].includes(state.status))return null; + const batches=associated(store,order,mode);if(!safeHistory(batches))return null; + const failed=batches.filter(b=>b.status==='failed');if(state.batchId&&!failed.some(b=>b.id===state.batchId))return null; + if(mode==='normal'&&['unknown','sending','sent','ignored','archiving','capturing','failed'].includes(q.task.status))return null; + if(mode==='huizhou'&&(order.ruleSnapshot.huizhouEnabled!==true||!state.orderNos?.length||state.issues?.length||!['pending','blocked','archived','batched','sent','unknown'].includes(order.status)||q.task.step!=='complete'&&q.task.step!=='missed_window'))return null; + const stamp=order.carryForward?.[mode];if(stamp&&!windowForOrder(store,order,mode))return null; + if(!knownMissed(store,mode==='normal'?order.missedWindow:state.missedWindow,q.original,stamp)||mode==='normal'&&!knownMissed(store,q.task.missedWindow,q.original,stamp))return null; + return {...q,order,mode,state,stamp,failed,previous:stamp?.targetCutoff||q.original.end}; +} +function nextWindow(store,item,now){ + let cursor=new Date(Math.max(+now,Date.parse(item.previous)));const batches=store.all('batches'); + for(let n=0;n<740;n++){const cutoff=nextSlots(store.schedule(),cursor,1,store.calendar())[0];if(!cutoff)return null; + if(!batches.some(b=>b.categoryId===item.order.categoryId&&modeOf(b)===item.mode&&b.cutoff===cutoff))return windowForCutoff(cutoff,store.schedule(),store.calendar());cursor=new Date(cutoff); + }return null; +} +function retireIssue(store,id,targetCutoff,at){ + const issue=store.get('business-issues',id);if(!issue||['retired','resolved'].includes(issue.status))return; + store.put('business-issues',{...issue,previousStatus:issue.status,status:'retired',retiredAt:at,updatedAt:at,retirement:{reason:'carry_forward',targetCutoff,at}}); +} +function advance(store,actor='系统调度'){ + return store.transaction(()=>{ + const moved=[],config=store.settings(),now=store.clock();if(config.enabled!==true||config.processingEnabled!==true||require('./stability-period.cjs').period(store)?.expired)return {moved}; + const candidates=new Map(),deferredCollections=new Set(); + for(const order of store.all('orders'))for(const mode of ['normal','huizhou']){ + if(windowForOrder(store,order,mode))for(const entry of order.carryForward[mode].history||[])deferredCollections.add(JSON.stringify([order.categoryId,mode,entry.fromCutoff])); + const item=candidate(store,order,mode);if(item)candidates.set(order.id+':'+mode,item); + } + // Remove the entire failed collection if any member is unsafe, including linked failures. + let changed=true;while(changed){changed=false;for(const [key,item] of candidates)if(item.failed.some(b=>!b.orderIds?.length||b.orderIds.some(id=>!candidates.has(id+':'+item.mode)))){candidates.delete(key);changed=true;}} + for(const [key,item] of candidates){ + const result=store.get('window-results',item.order.categoryId+':'+item.previous+(item.mode==='huizhou'?':huizhou':'')); + // Once a collection has deferred, its admitted slow members must join that + // decision even if a later prepare pass overwrote the old result as empty. + const deferred=deferredCollections.has(JSON.stringify([item.order.categoryId,item.mode,item.previous])); + const elapsed=+now-Date.parse(item.previous);if(!item.failed.length&&elapsed<=(result?.status==='blocked'||deferred?60000:1800000))continue; + item.target=nextWindow(store,item,now);if(!item.target)candidates.delete(key); + } + // Each failed collection gets one target; no members may be cancelled in isolation. + changed=true;while(changed){changed=false;for(const [key,item] of candidates)if(item.failed.some(b=>b.orderIds.some(id=>!candidates.get(id+':'+item.mode)?.target||candidates.get(id+':'+item.mode).target.end!==item.target?.end))){candidates.delete(key);changed=true;}} + for(const item of candidates.values()){ + if(!item.target)continue; + const order=store.get('orders',item.order.id),state=delivery(order,item.mode),at=now.toISOString(),reason=item.failed.length?'confirmed_unsent':item.stamp?'carry_window_missed':'original_window_missed'; + const entry={fromCutoff:item.previous,targetCutoff:item.target.end,at,reason,lastError:state.error||null,batchIds:item.failed.map(b=>b.id)}; + order.carryForward={...(order.carryForward||{}),[item.mode]:{originCutoff:item.stamp?.originCutoff||item.original.end,targetCutoff:item.target.end,basisHash:basis(order),reason,lastError:state.error||null,updatedAt:at,history:[...(item.stamp?.history||[]),entry]}}; + updateDelivery(order,item.mode,{status:'pending',batchId:null,error:null});if(item.mode==='normal')delete order.missedWindow;else delete order.notifications.huizhou.missedWindow; + order.updatedAt=at;store.put('orders',order); + for(const id of item.mode==='normal'?['missed:'+order.id,'missed:'+order.id+':normal']:['missed:'+order.id+':huizhou'])retireIssue(store,id,item.target.end,at); + if(item.mode==='normal'){const task=store.get('execution-tasks',item.task.id);task.status='pending';task.step='complete';task.error=null;delete task.missedWindow;task.version=(task.version||0)+1;task.updatedAt=at;store.put('execution-tasks',task);} + for(const old of item.failed){const batch=store.get('batches',old.id);if(batch.status!=='failed')continue;batch.status='cancelled';batch.version=(batch.version||0)+1;batch.resolution={...(batch.resolution||{}),resolution:'carry_forward',targetCutoff:item.target.end,at,actor:actor?.username||actor};store.put('batches',batch);retireIssue(store,'batch:'+batch.id,item.target.end,at);} + store.audit(actor?.username||actor,'未发送订单顺延',order.id+' '+item.mode+' '+item.previous+' → '+item.target.end);moved.push({orderId:order.id,mode:item.mode,targetCutoff:item.target.end}); + } + // Evaluate shared build issues only after all member updates are persisted. + for(const item of candidates.values()){ + if(!item.target)continue; + const id='build:'+item.order.categoryId+':'+item.previous+(item.mode==='huizhou'?':huizhou':''),issue=store.get('business-issues',id); + if(issue?.orderIds?.length&&issue.orderIds.every(orderId=>store.get('orders',orderId)?.carryForward?.[item.mode]?.history?.some(entry=>entry.fromCutoff===item.previous&&entry.targetCutoff===item.target.end)))retireIssue(store,id,item.target.end,now.toISOString()); + } + return {moved}; + }); +} +module.exports={advance,windowForOrder,hasCarry}; diff --git a/src/modules/order-rules/collecting-batches.cjs b/src/modules/order-rules/collecting-batches.cjs index 4f0b745..35049ba 100644 --- a/src/modules/order-rules/collecting-batches.cjs +++ b/src/modules/order-rules/collecting-batches.cjs @@ -20,8 +20,9 @@ function list(store,{cutoff}={}){ const groups=new Map(),frozen=store.all('batches'); for(const order of store.all('orders')){ const rule=order.ruleSnapshot;if(order.removedAt||!rule?.id||!rule.categoryId||!require('./scopes.cjs').matchesScope(rule,order.event||{}))continue; - if(order.blockedByBatchId||order.missedWindow||order.status==='ignored'||!require('./restricted-test.cjs').orderInWindow(store,order,window))continue; + if(order.blockedByBatchId||order.status==='ignored')continue; for(const mode of ['normal','huizhou']){ + const carried=require('./carry-forward.cjs').windowForOrder(store,order,mode);if(order.missedWindow&&!carried||!require('./restricted-test.cjs').orderInWindow(store,order,window,mode))continue; const notice=delivery(order,mode);if(!notice||notice.batchId||!['identified','preparing','archived','pending','blocked','failed'].includes(notice.status))continue; if(mode==='huizhou'&&rule.huizhouEnabled!==true)continue; if(frozen.some(b=>b.categoryId===rule.categoryId&&(b.notificationMode||'normal')===mode&&b.cutoff===window.end))continue; @@ -30,7 +31,7 @@ function list(store,{cutoff}={}){ } return [...groups.values()].map(group=>{ const {rule,orders,...value}=group,saved=store.get('batch-content-drafts',group.id);let template,sourceError;try{template=store.templateResolver?.(rule.categoryId,rule,group.notificationMode);}catch(error){sourceError=error.message;}let base;try{base=definition(store,rule,window.end,group.notificationMode,template);}catch(error){sourceError=error.message;base={context:digest([rule,window.end,group.notificationMode]),subject:rule.subjectPrefix||rule.name,format:'text',body:'{{订单明细}}\n{{存放地址}}'};} - const row={...value,version:saved?.version||0,context:base.context,editor:saved?{subject:saved.subject,format:saved.format,body:saved.body}:base,edited:!!saved,editable:!sourceError&&+store.clock()o.event?.orderNo).filter(Boolean),ruleSnapshot:rule}; + const row={...value,carriedOrderIds:orders.filter(o=>require('./carry-forward.cjs').windowForOrder(store,o,group.notificationMode)?.end===window.end).map(o=>o.id),version:saved?.version||0,context:base.context,editor:saved?{subject:saved.subject,format:saved.format,body:saved.body}:base,edited:!!saved,editable:!sourceError&&+store.clock()o.event?.orderNo).filter(Boolean),ruleSnapshot:rule}; try{if(sourceError)fail(sourceError,409);const snapshot=require('./template.cjs').composeBatch(rule,require('./huizhou.cjs').ordersForMode(orders,group.notificationMode),window.end,store,{window,notificationMode:group.notificationMode});Object.assign(row,{subject:snapshot.subject,text:snapshot.text,html:snapshot.html,template:snapshot.template,signature:snapshot.signature});} catch(error){row.error=error.message;row.text='';row.html='';} return row; diff --git a/src/modules/order-rules/discovery-barrier.cjs b/src/modules/order-rules/discovery-barrier.cjs index 3abcdf0..c0e9713 100644 --- a/src/modules/order-rules/discovery-barrier.cjs +++ b/src/modules/order-rules/discovery-barrier.cjs @@ -4,7 +4,7 @@ const eligibility=require('./restricted-test.cjs'); function discoveryBlockers(store,cutoff,allowed=()=>true){ if(!store.executionSources)return (store.deliveryBlockers?.(allowed)||[]).map(id=>'连接 '+id+' 本地执行线索尚未交付。'); const window=cutoff?windowForCutoff(cutoff,store.schedule(),store.calendar()):null; - const relevant=store.all('execution-tasks').filter(task=>!task.removedAt&&!['sent','ignored'].includes(task.status)&&(!window||eligibility.eventInWindow(store,task.row,window))); + const relevant=store.all('execution-tasks').filter(task=>!task.removedAt&&!['sent','ignored'].includes(task.status)&&(!window||eligibility.eventInWindow(store,task.row,window)||['normal','huizhou'].some(mode=>require('./carry-forward.cjs').windowForOrder(store,task.orderId&&store.get('orders',task.orderId),mode)?.end===window.end))); const sources=new Set([...store.executionSources(),...relevant.map(task=>task.connectionId)].filter(allowed)); // Inactive sources cannot consume hints. Retain their evidence without // blocking unrelated work, unless a retained task still needs that source. diff --git a/src/modules/order-rules/dispatcher.cjs b/src/modules/order-rules/dispatcher.cjs index 6f4c7e7..a4c31db 100644 --- a/src/modules/order-rules/dispatcher.cjs +++ b/src/modules/order-rules/dispatcher.cjs @@ -35,7 +35,7 @@ class OrderRuleDispatcher{ } async perform(now){ this.store.expireIntakes?.(); - for(const batch of this.store.snapshot().batches||[])if(batch.status==='prepared'&&!batch.manual&&now-Date.parse(batch.cutoff)>1800000)this.store.finishSending(batch.id,'failed','冻结发送队列超过30分钟,请负责人核验后受控补发。'); + for(const batch of this.store.snapshot().batches||[])if(batch.status==='prepared'&&!batch.manual&&now-Date.parse(batch.cutoff)>1800000)this.store.finishSending(batch.id,'failed','冻结发送队列超过30分钟,请负责人核验后受控补发。',{outcome:'not_submitted',phase:'queue_expired',at:this.clock().toISOString()}); if(!this.ready())return; const config=freeze(structuredClone(this.store.settings())),schedule=this.settings()?.schedule,calendar=this.calendar(); if(!schedule?.times?.length)return; @@ -54,7 +54,7 @@ class OrderRuleDispatcher{ let expected;try{expected=windowForCutoff(batch.cutoff,schedule,calendar);}catch{continue;} const legacyStart=new Date(Date.parse(batch.cutoff)+8*3600000).toISOString().slice(0,10)+'T00:00:00+08:00'; if(!batch.window||batch.window.end!==expected.end||![Date.parse(expected.start),Date.parse(legacyStart)].includes(Date.parse(batch.window.start))||batch.window.startInclusive!==true||batch.window.endInclusive!==false)continue; - const grace=batch.intakeGrace?.cutoff===batch.cutoff&&Date.parse(batch.intakeGrace.expiresAt)===Date.parse(batch.cutoff)+1800000&&Date.parse(batch.createdAt)<=Date.parse(batch.intakeGrace.expiresAt)&&batch.orderIds?.every(id=>{const order=this.store.get('orders',id);return order&&this.store.intakeWindow(order.sample||order.event)?.end===batch.cutoff;}); + const grace=batch.intakeGrace?.cutoff===batch.cutoff&&Date.parse(batch.intakeGrace.expiresAt)===Date.parse(batch.cutoff)+1800000&&Date.parse(batch.createdAt)<=Date.parse(batch.intakeGrace.expiresAt)&&batch.orderIds?.every(id=>{const order=this.store.get('orders',id);return order&&(this.store.intakeWindow(order.sample||order.event)?.end===batch.cutoff||require('./carry-forward.cjs').windowForOrder(this.store,order,modeOf(batch))?.end===batch.cutoff);}); if(batch.createdAt&&(Date.parse(batch.createdAt)>Date.parse(batch.cutoff)+60000&&!grace||Date.parse(batch.createdAt)1800000)throw Error('冻结发送队列超过30分钟。'); @@ -106,7 +106,8 @@ class OrderRuleDispatcher{ }catch(error){ if(!sending&&!manual&&error.code==='DISCOVERY_INCOMPLETE')return false; const rejected=error.code==='EENVELOPE'&&error.command==='RCPT TO'&&Array.isArray(error.rejected)&&error.rejected.length>0&&(!error.accepted||error.accepted.length===0)&&[...batch.to,...batch.cc].every(address=>error.rejected.some(r=>String(r.address||r).toLowerCase()===address.toLowerCase())); - this.store.finishSending(batch.id,sending&&!rejected?'unknown':'failed',sending&&!rejected?'发送结果待核实,请核对邮件服务器记录后决定是否重试。':`发送前验证失败:${error.code==='MAIL_POLICY_BLOCKED'?error.message:error.code==='ENOENT'?'归档文件不存在。':error.message==='归档文件校验失败。'?error.message:'请检查归档证据、SMTP 与启用状态。'}`); + const evidence=!sending?{outcome:'not_submitted',phase:'preflight',at:this.clock().toISOString()}:rejected?{outcome:'all_recipients_rejected',phase:'smtp_envelope',at:this.clock().toISOString()}:undefined; + this.store.finishSending(batch.id,sending&&!rejected?'unknown':'failed',sending&&!rejected?'发送结果待核实,请核对邮件服务器记录后决定是否重试。':`发送前验证失败:${error.code==='MAIL_POLICY_BLOCKED'?error.message:error.code==='ENOENT'?'归档文件不存在。':error.message==='归档文件校验失败。'?error.message:'请检查归档证据、SMTP 与启用状态。'}`,evidence); }finally{ try{transport?.close?.();}finally{if(transport)this.mail.clients?.delete(transport);} } @@ -129,7 +130,7 @@ class OrderRuleDispatcher{ const root=source.rootBatchId||source.id; if(this.store.all('batches').some(b=>b.id!==source.id&&(b.rootBatchId||b.id)===root&&['sent','sending','unknown','prepared'].includes(b.status)))fail('此批次已发送、结果待核实或已有补发尝试。',409); if(source.orderIds.some(oid=>{const state=delivery(this.store.get('orders',oid),modeOf(source));return !state||['sent','unknown','batched','sending'].includes(state.status);}))fail('原订单关联已发送或结果待核实。',409); - const next={...structuredClone(source),id:crypto.randomUUID(),version:1,parentBatchId:source.id,rootBatchId:root,status:'prepared',manual:true,createdAt:this.clock().toISOString(),error:null,resolution:null,finishedAt:null,resend:{actor:actor.username,note:input.note.trim(),at:this.clock().toISOString()}}; + const next={...structuredClone(source),id:crypto.randomUUID(),version:1,parentBatchId:source.id,rootBatchId:root,status:'prepared',deliveryEvidence:null,submissionAttemptedAt:null,manual:true,createdAt:this.clock().toISOString(),error:null,resolution:null,finishedAt:null,resend:{actor:actor.username,note:input.note.trim(),at:this.clock().toISOString()}}; this.store.put('batches',next);for(const oid of next.orderIds){const o=this.store.get('orders',oid);updateDelivery(o,modeOf(next),{batchId:next.id,status:'batched',error:null});this.store.put('orders',o);} this.store.put('resend-requests',{id:requestId,batchId:next.id,inputHash});this.store.audit(actor.username,'人工补发冻结分类邮件',source.id+':'+input.note.trim());return next; }); diff --git a/src/modules/order-rules/query.cjs b/src/modules/order-rules/query.cjs index 4df7e83..3ad08de 100644 --- a/src/modules/order-rules/query.cjs +++ b/src/modules/order-rules/query.cjs @@ -49,7 +49,7 @@ function captureEvidence(context,task,user){ } function orderRow(order,task){ const event=identity(order?.event||task?.row); - return {...event,...pick(order,['id','status','categoryId','error','reason','batchId','createdAt','updatedAt','orderNo','receivedAt']),...(order?{notifications:notifications(order),...(order.ruleSnapshot?.testRunId?{testRunId:order.ruleSnapshot.testRunId}:{})}:{}), + return {...event,...pick(order,['id','status','categoryId','error','reason','batchId','createdAt','updatedAt','orderNo','receivedAt']),...(order?{notifications:notifications(order),carryForward:Object.fromEntries(['normal','huizhou'].filter(mode=>order.carryForward?.[mode]).map(mode=>[mode,pick(order.carryForward[mode],['originCutoff','targetCutoff','reason','lastError','updatedAt'])])),...(order.ruleSnapshot?.testRunId?{testRunId:order.ruleSnapshot.testRunId}:{})}:{}), id:order?.id||'task:'+task.id,connectionId:order?.sample?.connectionId||event.connectionId||task?.connectionId, error:task?.error||order?.error,executionTaskId:task?.id,executionStatus:task?.status,executionStep:task?.step,deferredUntil:task?.deferredUntil,deferredSendAt:task?.deferredSendAt,exceptionId:task?.exceptionId,orderNo:order?.orderNo||event.orderNo||event.serialNum||event.taskId, categoryName:order?.ruleSnapshot?.name||'',categoryId:order?.categoryId||order?.ruleSnapshot?.categoryId||order?.ruleSnapshot?.id||task?.categoryIds?.[0]||'',status:task&&['failed','blocked','unknown','capturing','archiving'].includes(task.status)?task.status:order?.status||task?.status}; @@ -91,7 +91,7 @@ function publicRevision(context,user){ } function queryOrders(context,input,user){const rows=visibleOrders(context,user),revision=crypto.createHash('sha256').update(publicRevision(context,user)+JSON.stringify(rows.map(r=>[r.id,r.collectingBatches]))).digest('hex').slice(0,24);return page(rows,filters(input,'orders'),revision);} function batchRow(context,batch){ - return {...pick(batch,['id','version','categoryId','subject','status','error','createdAt','sentAt','resolvedAt','windowStart','windowEnd','cutoff','orderNos','testRunId']),categoryName:batch.ruleSnapshot?.name||context.orderRules.get('rules',batch.categoryId)?.draft?.name||batch.categoryId,notificationMode:modeOf(batch),collectionStart:batch.window?.collectionStart,collectionEnd:batch.window?.collectionEnd,windowStart:batch.windowStart||batch.window?.start,windowEnd:batch.windowEnd||batch.window?.end||batch.cutoff,orderCount:batch.orderIds?.length||0,connectionIds:[...new Set((batch.orderIds||[]).map(id=>{const o=context.orderRules.get('orders',id);return o?.sample?.connectionId||o?.event?.connectionId||o?.connectionId;}).filter(Boolean))]}; + return {carryCount:batch.carriedOrderIds?.length||0,...pick(batch,['id','version','categoryId','subject','status','error','createdAt','sentAt','resolvedAt','windowStart','windowEnd','cutoff','orderNos','testRunId']),categoryName:batch.ruleSnapshot?.name||context.orderRules.get('rules',batch.categoryId)?.draft?.name||batch.categoryId,notificationMode:modeOf(batch),collectionStart:batch.window?.collectionStart,collectionEnd:batch.window?.collectionEnd,windowStart:batch.windowStart||batch.window?.start,windowEnd:batch.windowEnd||batch.window?.end||batch.cutoff,orderCount:batch.orderIds?.length||0,connectionIds:[...new Set((batch.orderIds||[]).map(id=>{const o=context.orderRules.get('orders',id);return o?.sample?.connectionId||o?.event?.connectionId||o?.connectionId;}).filter(Boolean))]}; } function queryBatches(context,input,user){ const f=filters(input,'batches'),data=records(context.orderRules); diff --git a/src/modules/order-rules/restricted-test.cjs b/src/modules/order-rules/restricted-test.cjs index 17f6cae..8ffbe76 100644 --- a/src/modules/order-rules/restricted-test.cjs +++ b/src/modules/order-rules/restricted-test.cjs @@ -157,7 +157,7 @@ function eventInWindow(store,row,window){ } return require('./window.cjs').inWindow(at,window); } -function orderInWindow(store,order,window){const row=order?.sample||order?.event;return store.intakeWindow?.(row)?.end===window.end||eventInWindow(store,row,window);} +function orderInWindow(store,order,window,mode='normal'){const carried=require('./carry-forward.cjs').windowForOrder(store,order,mode);if(carried)return carried.end===window.end;const row=order?.sample||order?.event;return store.intakeWindow?.(row)?.end===window.end||eventInWindow(store,row,window);} function assertCurrentPresence(store,row){ const run=state(store),entry=(run?.currentBacklog||[]).find(item=>taskIdentity.sameTask(item.snapshot,row));if(!entry)return; const scan=store.get('current-task-scans',entry.scanConnectionId),matches=scan?.rows.filter(observed=>taskIdentity.sameTask(observed,row))||[]; diff --git a/src/modules/order-rules/store.cjs b/src/modules/order-rules/store.cjs index 702edf3..c2ed145 100644 --- a/src/modules/order-rules/store.cjs +++ b/src/modules/order-rules/store.cjs @@ -152,22 +152,25 @@ class RuleStore{ return window; } pendingIntakeCutoffs(){ - const now=+this.clock(); - return [...new Set(this.all('execution-tasks').filter(task=>!['sent','ignored','unknown','sending'].includes(task.status)||task.step==='complete'&&this.pendingCompanion(task.orderId&&this.get('orders',task.orderId))).map(task=>this.intakeWindow(task.row)?.end).filter(cutoff=>cutoff&&now>=Date.parse(cutoff)&&now<=Date.parse(cutoff)+1800000))].sort(); + const now=+this.clock(),carry=require('./carry-forward.cjs'),cutoffs=[]; + for(const task of this.all('execution-tasks')){const order=task.orderId&&this.get('orders',task.orderId);if(!['sent','ignored','unknown','sending'].includes(task.status)&&!carry.hasCarry(this,order)||task.step==='complete'&&this.pendingCompanion(order)&&!carry.hasCarry(this,order,'huizhou'))cutoffs.push(this.intakeWindow(task.row)?.end);} + for(const order of this.all('orders'))for(const mode of ['normal','huizhou']){const state=delivery(order,mode);if(state&&!state.batchId&&['pending','blocked','archived'].includes(state.status))cutoffs.push(carry.windowForOrder(this,order,mode)?.end);} + return [...new Set(cutoffs.filter(cutoff=>cutoff&&now>=Date.parse(cutoff)&&now<=Date.parse(cutoff)+1800000))].sort(); } pendingCompanion(order){ const hui=delivery(order,'huizhou'),normal=order?.batchId&&this.get('batches',order.batchId); return !!order?.archive&&order.ruleSnapshot?.huizhouEnabled===true&&['batched','sending','sent','unknown'].includes(order.status)&&!!hui&&['pending','blocked'].includes(hui.status)&&!hui.batchId&&!hui.missedWindow&&normal?.huizhouPlanned===true&&modeOf(normal)==='normal'&&normal.orderIds?.includes(order.id)&&normal.cutoff===this.intakeWindow(order.sample||order.event,{includeExpired:true})?.end; } expireIntakes(){return this.transaction(()=>{ + const carry=require('./carry-forward.cjs');carry.advance(this); for(const order of this.all('orders')){ const window=this.intakeWindow(order.sample||order.event,{includeExpired:true}); if(!window||+this.clock()<=Date.parse(window.end)+1800000)continue; - if(this.pendingCompanion(order)){ + if(this.pendingCompanion(order)&&!carry.hasCarry(this,order,'huizhou')){ updateDelivery(order,'huizhou',{status:'blocked',error:'原处理时段超过30分钟,等待负责人核验。',missedWindow:window});order.updatedAt=this.now();this.put('orders',order); this.recordIssue('missed:'+order.id+':huizhou',{component:'rules',notificationMode:'huizhou',error:delivery(order,'huizhou').error,window,orderIds:[order.id]}); } - if(!['identified','preparing','archived','pending','blocked'].includes(order.status)||order.batchId||order.missedWindow)continue; + if(carry.hasCarry(this,order)||!['identified','preparing','archived','pending','blocked'].includes(order.status)||order.batchId||order.missedWindow)continue; order.status='blocked';order.error='原处理时段超过30分钟,等待负责人核验。';order.missedWindow=window;order.updatedAt=this.now();this.put('orders',order); for(const task of this.all('execution-tasks').filter(task=>task.orderId===order.id&&!['unknown','sending','sent','ignored'].includes(task.status)))this.put('execution-tasks',{...task,status:'blocked',step:'missed_window',missedWindow:window,error:order.error,version:(task.version||0)+1,updatedAt:this.now()}); this.recordIssue('missed:'+order.id,{component:'rules',error:order.error,window,orderIds:[order.id]}); @@ -243,8 +246,8 @@ class RuleStore{ discoveryBlockers(cutoff,allowed=()=>true){ return require('./discovery-barrier.cjs').discoveryBlockers(this,cutoff,allowed); } - categoryIncomplete(categoryId,window){ - return this.all('execution-tasks').some(task=>!task.removedAt&&task.categoryIds?.includes(categoryId)&&(!Number.isFinite(Date.parse(eligibility.eventTime(this,task.row)))||eligibility.eventInWindow(this,task.row,window)||this.intakeWindow(task.row)?.end===window.end)&&(task.conflict||['identified','blocked','failed','capturing','archiving'].includes(task.status)||task.status==='unknown'&&task.step!=='complete'||task.runtimeCheck?.status==='blocked')); + categoryIncomplete(categoryId,window,mode='normal'){ + return this.all('execution-tasks').some(task=>!task.removedAt&&task.categoryIds?.includes(categoryId)&&(!Number.isFinite(Date.parse(eligibility.eventTime(this,task.row)))||eligibility.eventInWindow(this,task.row,window)||this.intakeWindow(task.row)?.end===window.end||require('./carry-forward.cjs').windowForOrder(this,task.orderId&&this.get('orders',task.orderId),mode)?.end===window.end)&&(task.conflict||['identified','blocked','failed','capturing','archiving'].includes(task.status)||task.status==='unknown'&&task.step!=='complete'||task.runtimeCheck?.status==='blocked')); } batchIncomplete(batch){ return this.all('execution-tasks').some(task=>batch.orderIds.includes(task.orderId)&&(task.conflict||task.runtimeCheck?.status==='blocked'||['failed','capturing','archiving'].includes(task.status)||task.status==='unknown'&&task.step!=='complete')); @@ -285,17 +288,18 @@ class RuleStore{ if(blockers.length)return []; const grouped=new Map(),batches=[]; for(const order of this.all('orders'))for(const mode of ['normal','huizhou']){ - const state=delivery(order,mode); - if(!state||!['identified','preparing','archived','pending','blocked'].includes(state.status)||state.missedWindow||!order.categoryId||order.blockedByBatchId||order.missedWindow||order.status==='ignored')continue; - if(resuming&&this.intakeWindow(order.sample||order.event)?.end!==window.end)continue; + const state=delivery(order,mode),carryWindow=require('./carry-forward.cjs').windowForOrder(this,order,mode); + if(carryWindow&&carryWindow.end!==window.end)continue; + if(!state||!['identified','preparing','archived','pending','blocked'].includes(state.status)||state.missedWindow&&!carryWindow||!order.categoryId||order.blockedByBatchId||order.missedWindow&&!carryWindow||order.status==='ignored')continue; + if(resuming&&carryWindow?.end!==window.end&&this.intakeWindow(order.sample||order.event)?.end!==window.end)continue; if(mode==='huizhou'&&(order.ruleSnapshot?.huizhouEnabled!==true||(!state.orderNos?.length&&!state.issues?.length)))continue; const at=eligibility.orderTime(this,order); - if(validDate(at)&&Date.parse(at)delivery(o,mode).issues?.length))error=orders.flatMap(o=>delivery(o,mode).issues||[]).join(';'); if(!error&&orders.some(o=>mode==='normal'?o.status!=='pending':!o.archive||!['pending','batched','sent','unknown'].includes(o.status)))error='本类别存在字段、文件或归档尚未准备完成的订单。'; let snapshot; if(!error)try{for(const order of orders)require('./restricted-test.cjs').assertOrder(this,order);snapshot=composeBatch(rule,ordersForMode(orders,mode),cutoff,this,{window,notificationMode:mode});}catch(cause){error=cause.message;} const key=resultId(rule.categoryId,mode); if(error){this.put('window-results',{id:key,categoryId:rule.categoryId,notificationMode:mode,cutoff,status:'blocked',error,updatedAt:this.now()});this.recordIssue('build:'+key,{component:'rules',notificationMode:mode,error,cutoff,categoryId:rule.categoryId,orderIds:orders.map(o=>o.id)});for(const original of orders){const order=this.get('orders',original.id);updateDelivery(order,mode,{error,...(mode==='huizhou'?{status:'blocked'}:{})});this.put('orders',order);}continue;} - const batch={...snapshot,id:crypto.randomUUID(),version:1,status:'prepared',createdAt:this.now(),ruleSnapshot:copy(rule),channelId:this.settings().channelId,error:null}; + const batch={...snapshot,carriedOrderIds:orders.filter(order=>require('./carry-forward.cjs').windowForOrder(this,order,mode)?.end===window.end).map(o=>o.id),id:crypto.randomUUID(),version:1,status:'prepared',createdAt:this.now(),ruleSnapshot:copy(rule),channelId:this.settings().channelId,error:null}; if(resuming)batch.intakeGrace={cutoff:window.end,expiresAt:new Date(Date.parse(window.end)+1800000).toISOString()}; if(rule.testRunId)batch.testRunId=rule.testRunId; require('./restricted-test.cjs').assertBatch(this,batch,this.settings()); @@ -337,11 +341,13 @@ class RuleStore{ const orders=batch.orderIds.map(oid=>this.get('orders',oid)); if(this.all('execution-tasks').some(task=>batch.orderIds.includes(task.orderId)&&task.runtimeCheck?.status==='blocked'))fail('已归档订单的运行条件复核未通过,批次不能进入发送。',409); if(orders.some(o=>!o||delivery(o,modeOf(batch))?.batchId!==id||delivery(o,modeOf(batch))?.status!=='batched'))fail('批次订单预留已变化。',409); - batch.version=(batch.version||1)+1;batch.status=transition('batch',batch.status,'send');this.put('batches',batch);return batch; + batch.version=(batch.version||1)+1;batch.status=transition('batch',batch.status,'send');batch.submissionAttemptedAt=this.now();delete batch.deliveryEvidence;this.put('batches',batch);return batch; });} - finishSending(id,status,message=null){return this.transaction(()=>{ + finishSending(id,status,message=null,evidence){return this.transaction(()=>{ const batch=this.get('batches',id);if(!batch)fail('批次不存在。',404); if(!['sent','unknown','failed'].includes(status))fail('发送结果无效。'); + if(evidence&&!(status==='failed'&&validDate(evidence.at)&&((evidence.outcome==='not_submitted'&&['preflight','queue_expired'].includes(evidence.phase)&&batch.status==='prepared')||(evidence.outcome==='all_recipients_rejected'&&evidence.phase==='smtp_envelope'&&batch.status==='sending'))))fail('未发送证明与批次阶段不一致。',409); + if(evidence)batch.deliveryEvidence=copy(evidence);else delete batch.deliveryEvidence; batch.version=(batch.version||1)+1;batch.status=transition('batch',batch.status,{sent:'sent',unknown:'unknown',failed:'fail'}[status]);batch.error=message;batch.finishedAt=this.now();this.put('batches',batch); this.updateBatchOrders(batch,status==='failed'?'pending':status,message); if(status==='failed')this.releaseBatchOrders(batch); @@ -358,7 +364,7 @@ class RuleStore{ const batch=this.get('batches',id);if(!batch)fail('批次不存在。',404); if(controlled&&input.version!==(batch.version||1))fail('批次版本已变化,请刷新。',409); if(!input||!['sent','retry'].includes(input.resolution)||typeof input.note!=='string'||input.note.trim().length<5||input.note.length>2000)fail('请选择核验结果并填写至少5字依据。'); - batch.version=(batch.version||1)+1;batch.status=transition('batch',batch.status,input.resolution==='sent'?'resolve_sent':'retry');batch.resolution={...input,actor,at:this.now()};if(input.resolution==='retry'){batch.status='failed';batch.error='人工已核验未发送,等待受控人工补发。';}this.put('batches',batch); + batch.version=(batch.version||1)+1;batch.status=transition('batch',batch.status,input.resolution==='sent'?'resolve_sent':'retry');batch.resolution={...input,actor,at:this.now()};if(input.resolution==='retry'){if(controlled)batch.deliveryEvidence={outcome:'manual_confirmed_unsent',phase:'manual_review',at:this.now(),actor};batch.status='failed';batch.error='人工已核验未发送,等待受控人工补发。';}this.put('batches',batch); this.updateBatchOrders(batch,input.resolution==='sent'?'sent':'pending',null); if(input.resolution==='retry')this.releaseBatchOrders(batch); if(controlled)this.put('resolve-requests',{id:requestId,batchId:id,inputHash,at:this.now()});this.audit(actor,'核验分类邮件结果',id+':'+input.note.trim());return batch; diff --git a/src/modules/workspace/business-issues.cjs b/src/modules/workspace/business-issues.cjs index a68955d..271ecb6 100644 --- a/src/modules/workspace/business-issues.cjs +++ b/src/modules/workspace/business-issues.cjs @@ -4,11 +4,12 @@ function issueId(id){return 'business-'+crypto.createHash('sha256').update(id).d // The source ledger is durable first. Reconciliation is idempotent and requires no cross-DB commit. function reconcile(store,issues,members){return store.transaction(()=>{ for(const issue of issues){const id=issueId(issue.id),row=store.db.prepare('SELECT value FROM exceptions WHERE id=?').get(id),old=row?JSON.parse(row.value):null;if(old?.sourceUpdatedAt===issue.updatedAt&&old?.sourceStatus===issue.status)continue; - const at=new Date().toISOString(),owner=(issue.owners||[]).find(name=>members.some(m=>m.username===name&&m.enabled!==false&&m.role!=='viewer'))||'',recovered=issue.status==='awaiting_verification',freshFailure=old&&old.sourceUpdatedAt!==issue.updatedAt&&!recovered; + const at=new Date().toISOString(),owner=(issue.owners||[]).find(name=>members.some(m=>m.username===name&&m.enabled!==false&&m.role!=='viewer'))||'',recovered=issue.status==='awaiting_verification',retired=issue.status==='retired',freshFailure=old&&old.sourceUpdatedAt!==issue.updatedAt&&!recovered&&!retired; const item=old||{id,sourceIssueId:issue.id,version:0,owner,status:owner?'in_progress':'open',createdAt:issue.createdAt||at,history:[],priority:issue.component==='mail'?'critical':'high'}; Object.assign(item,{title:'业务异常:'+(issue.component==='mail'?'邮件结果需要处理':'订单处理受阻'),description:issue.error||issue.message||'请核对关联订单和批次。',component:issue.component||'rules',sourceUpdatedAt:issue.updatedAt,sourceStatus:issue.status,batchId:issue.batchId||null,orderIds:issue.orderIds||[],taskIds:issue.taskIds||[],updatedAt:at}); if(!old)item.history.push({at,actor:'system',action:'create',note:'由持久业务问题建立;关闭异常不会更改批次或重新发信。'}); else if(freshFailure&&['resolved','verifying','retired'].includes(item.status)){item.status=item.owner?'in_progress':'open';item.history.push({at,actor:'system',action:'source_reopened',note:'来源再次报告失败,恢复为待处理。'});} + if(retired){item.status='retired';item.retiredAt=issue.retiredAt||at;item.history.push({at,actor:'system',action:'source_retired',note:'来源记录已移出或顺延,原错误与证据保留。'});} if(recovered&&!['resolved','retired'].includes(item.status)){item.status='verifying';item.history.push({at,actor:'system',action:'verify',note:'来源报告恢复,仍须人工核验。'});} item.version++;store.db.prepare('INSERT INTO exceptions VALUES(?,?) ON CONFLICT(id) DO UPDATE SET value=excluded.value').run(id,JSON.stringify(item)); }return true; diff --git a/tests/app/carry-dismiss-ui.test.cjs b/tests/app/carry-dismiss-ui.test.cjs new file mode 100644 index 0000000..3380ec4 --- /dev/null +++ b/tests/app/carry-dismiss-ui.test.cjs @@ -0,0 +1,6 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),vm=require('node:vm'),fs=require('node:fs'); +async function render(role='admin',overrides={}){let html='',submitted;const form={dataset:{businessAction:'dismiss'},elements:{note:{value:'已核对原任务离开节点'}},querySelector:q=>q==='button'?button:notice},button={disabled:false},notice={};const element={querySelector:()=>null,querySelectorAll:()=>[],addEventListener(){}};const window={RecordUi:{details:()=>({element,show:s=>html=s}),field:(esc,label,value)=>'
'+label+'
'+esc(value||'')+'
'},PageLifecycle:{guard:f=>f(),onDispose(){},requestKey:()=> 'key'},BatchContentEditor:{bind(){},render:()=>''}};vm.runInNewContext(fs.readFileSync('web/modules/order-notifications/detail.js','utf8'),{window,AbortController});const d={id:'task:t',status:'blocked',executionTask:{id:'t',version:3,status:'blocked',step:'capture',errorCode:'BPM_TASK_NOT_CURRENT'},event:{},files:[],batches:[],carryForward:{normal:{targetCutoff:'next-normal',reason:'普通未发顺延'},huizhou:{targetCutoff:'next-huizhou',reason:'惠州未发顺延'}},...overrides};const detail=window.BusinessRecordDetail.mount({querySelectorAll:()=>[form]},{api:async(path,body)=>{if(body){submitted={path,body};return {};}return d;},esc:v=>String(v),formatDate:v=>v||'',user:{role},isActive:()=>true,onChanged(){}});await detail.open('orders',d.id);return {html,submit:async()=>{await form.onsubmit({preventDefault(){}});return submitted;}};} +test('admin departed task detail shows dismiss with preserved evidence explanation and submits task version',async()=>{const view=await render();assert.match(view.html,/data-business-action="dismiss"/);assert.match(view.html,/移出待处理记录/);assert.match(view.html,/去重/);const sent=await view.submit();assert.equal(sent.path,'/order-execution/tasks/t/dismiss');assert.equal(sent.body.version,3);assert.equal(sent.body.idempotencyKey,'key');}); +test('dismiss never appears to operators or processed or uncertain orders',async()=>{for(const [role,patch] of [['operator',{}],['admin',{id:'order-id'}],['admin',{executionTask:{status:'unknown',step:'capture',errorCode:'BPM_TASK_NOT_CURRENT'}}],['admin',{executionTask:{status:'blocked',step:'archive',errorCode:'BPM_TASK_NOT_CURRENT'}}]])assert.doesNotMatch((await render(role,patch)).html,/data-business-action="dismiss"/);}); +test('detail shows independent carry-forward send times and reasons',async()=>{const {html}=await render();assert.match(html,/next-normal/);assert.match(html,/next-huizhou/);assert.match(html,/普通未发顺延/);assert.match(html,/惠州未发顺延/);}); diff --git a/tests/order-rules/carry-forward-core.test.cjs b/tests/order-rules/carry-forward-core.test.cjs new file mode 100644 index 0000000..9a689d9 --- /dev/null +++ b/tests/order-rules/carry-forward-core.test.cjs @@ -0,0 +1,79 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'); +const carry=require('../../src/modules/order-rules/carry-forward.cjs'); +const {windowForCutoff}=require('../../src/modules/order-rules/window.cjs'); +const cutoff='2026-10-26T03:00:00.000Z'; +function fixture(){ + const rows=new Map(),schedule={times:['11:00','17:00'],weekends:false};let now=new Date('2026-10-26T03:31:00Z'); + const store={get:(k,id)=>structuredClone(rows.get(k+':'+id)),put:(k,v)=>rows.set(k+':'+v.id,structuredClone(v)),all:k=>[...rows].filter(([key])=>key.startsWith(k+':')).map(([,v])=>structuredClone(v)),transaction:fn=>fn(),now:()=>now.toISOString(),clock:()=>now,schedule:()=>schedule,calendar:()=>[],settings:()=>({enabled:true,processingEnabled:true}),executionRule:r=>r?.published,intakeWindow:()=>windowForCutoff(cutoff,schedule),audit:()=>{},setNow:x=>{now=new Date(x);}}; + const sample={source:'todo',taskId:'t',instanceId:'i',processName:'p',nodeName:'n',receivedAt:'2026-10-26T02:00:00Z'}; + const rule={id:'r',categoryId:'r',version:1,status:'enabled',huizhouEnabled:true}; + store.put('rules',{id:'r',published:rule});store.put('orders',{id:'o',sample,event:sample,sourceHash:'source',ruleSnapshot:rule,categoryId:'r',status:'blocked',error:'old error',archive:{archivedAt:'2026-10-26T02:30:00Z',files:[{name:'x.pdf',path:'C:\\x.pdf',sha256:'a'.repeat(64),size:1,kind:'pdf'}]},notifications:{huizhou:{status:'pending',orderNos:['H1'],issues:[]}}}); + store.put('execution-tasks',{id:'t',orderId:'o',row:sample,sampleId:'s',status:'pending',step:'complete'});store.put('capture-samples',{id:'s',taskId:'t',sample,provenance:'server-provider',snapshot:{html:'

captured

'}}); + return store; +} +test('rollover persists modes independently and survives reconstruction without rewriting source evidence',()=>{ + const s=fixture(),before=s.get('orders','o');assert.equal(carry.advance(s).moved.length,2); + const o=s.get('orders','o');assert.equal(o.status,'pending');assert.deepEqual(o.sample,before.sample);assert.deepEqual(o.archive,before.archive);assert.equal(o.carryForward.normal.lastError,'old error');assert.equal(carry.windowForOrder(s,o).end,'2026-10-26T09:00:00.000Z');assert.equal(carry.advance({...s}).moved.length,0); + o.status='sent';s.put('orders',o);assert.equal(carry.hasCarry(s,o),true);o.archive.files[0].sha256='b'.repeat(64);s.put('orders',o);assert.equal(carry.hasCarry(s,o),false); +}); +for(const status of ['sent','sending','unknown','prepared','failed'])test('historical '+status+' without unsent proof blocks normal only',()=>{ + const s=fixture();s.put('batches',{id:'b',categoryId:'r',cutoff,status,orderIds:['o']});assert.deepEqual(carry.advance(s).moved.map(x=>x.mode),['huizhou']); +}); +test('proven failed batch cancels only if every member qualifies and preserves frozen evidence',()=>{ + const s=fixture(),b={id:'b',categoryId:'r',cutoff,status:'failed',orderIds:['o','missing'],text:'frozen',error:'smtp',deliveryEvidence:{outcome:'not_submitted',phase:'preflight',at:s.now()}};s.put('batches',b);assert.equal(carry.advance(s).moved.some(x=>x.mode==='normal'),false);assert.equal(s.get('batches','b').status,'failed'); + b.orderIds=['o'];s.put('batches',b);assert.equal(carry.advance(s).moved.length,1);const after=s.get('batches','b');assert.equal(after.status,'cancelled');assert.equal(after.resolution.resolution,'carry_forward');assert.equal(after.text,b.text);assert.deepEqual(after.deliveryEvidence,b.deliveryEvidence); +}); +test('blocked window moves after 60 seconds, ordinary window waits 30 minutes',()=>{ + const s=fixture();s.setNow('2026-10-26T03:01:01Z');assert.equal(carry.advance(s).moved.length,0);s.put('window-results',{id:'r:'+cutoff,status:'blocked'});assert.deepEqual(carry.advance(s).moved.map(x=>x.mode),['normal']); +}); +test('paused, expired, missing archive, untrusted captures and conflicting tasks stay untouched',()=>{ + for(const mutate of [s=>{s.settings=()=>({enabled:false,processingEnabled:true});},s=>s.put('stability-test',{id:'main',enabled:true,startedAt:'2026-10-20T00:00:00Z',endsAt:'2026-10-21T00:00:00Z'}),s=>{const o=s.get('orders','o');o.archive=null;s.put('orders',o);},s=>{const c=s.get('capture-samples','s');c.snapshot.html='';s.put('capture-samples',c);},s=>{const t=s.get('execution-tasks','t');t.conflict=true;s.put('execution-tasks',t);}]){const s=fixture();mutate(s);const before=s.all('orders');assert.equal(carry.advance(s).moved.length,0);assert.deepEqual(s.all('orders'),before);} +}); +test('future slot skips calendar pause and a frozen target category',()=>{ + const s=fixture();s.calendar=()=>[{date:'2026-10-27',kind:'pause'}];s.put('batches',{id:'other',categoryId:'r',cutoff:'2026-10-26T09:00:00.000Z',status:'sent',orderIds:['other']});carry.advance(s);assert.equal(s.get('orders','o').carryForward.normal.targetCutoff,'2026-10-28T03:00:00.000Z'); +}); +test('unrecognized missed-window evidence is never silently cleared',()=>{ + const s=fixture(),o=s.get('orders','o');o.missedWindow={...s.intakeWindow(),start:'2020-01-01T00:00:00Z'};s.put('orders',o);assert.equal(carry.advance(s).moved.some(x=>x.mode==='normal'),false); +}); +test('second explicit failed send can roll again through cancelled proven history',()=>{ + const s=fixture(),evidence={outcome:'not_submitted',phase:'preflight',at:s.now()};s.put('batches',{id:'b',status:'failed',categoryId:'r',cutoff,orderIds:['o'],deliveryEvidence:evidence});carry.advance(s); + s.setNow('2026-10-26T09:01:00Z');s.put('batches',{id:'b2',status:'failed',categoryId:'r',cutoff:'2026-10-26T09:00:00.000Z',orderIds:['o'],deliveryEvidence:evidence});assert.equal(carry.advance(s).moved.filter(x=>x.mode==='normal').length,1);assert.equal(s.get('orders','o').carryForward.normal.history.length,2); +}); +test('capture must belong to the linked task and archive must contain an actual named PDF receipt',()=>{ + for(const mutate of [s=>{const c=s.get('capture-samples','s');c.taskId='different';s.put('capture-samples',c);},s=>{const o=s.get('orders','o');o.archive.files[0].kind='notice';s.put('orders',o);},s=>{const o=s.get('orders','o');o.archive.files[0].name='notice.html';s.put('orders',o);}]){const s=fixture();mutate(s);assert.equal(carry.advance(s).moved.length,0);} +}); +test('failed collection with divergent persisted targets cannot partially cancel or split',()=>{ + const s=fixture();carry.advance(s);const second=s.get('orders','o');second.id='o2';second.carryForward.normal.targetCutoff='2026-10-27T09:00:00.000Z';s.put('orders',second); + s.put('execution-tasks',{...s.get('execution-tasks','t'),id:'t2',orderId:'o2',sampleId:'s2'});s.put('capture-samples',{...s.get('capture-samples','s'),id:'s2',taskId:'t2'}); + s.put('batches',{id:'b',categoryId:'r',status:'failed',cutoff:'2026-10-26T09:00:00.000Z',orderIds:['o','o2'],deliveryEvidence:{outcome:'not_submitted',phase:'preflight',at:s.now()}}); + assert.equal(carry.advance(s).moved.length,0);assert.equal(s.get('batches','b').status,'failed'); +}); +test('rollover retires old batch and fully moved build issues preserving their error evidence',()=>{ + const s=fixture(),build='build:r:'+cutoff; + s.put('batches',{id:'b',categoryId:'r',status:'failed',cutoff,orderIds:['o'],deliveryEvidence:{outcome:'not_submitted',phase:'preflight',at:s.now()}}); + for(const id of ['batch:b',build])s.put('business-issues',{id,status:'open',orderIds:['o'],error:'original error'}); + carry.advance(s);for(const id of ['batch:b',build]){const issue=s.get('business-issues',id);assert.equal(issue.status,'retired');assert.equal(issue.error,'original error');assert.equal(issue.retirement.reason,'carry_forward');assert.equal(issue.retirement.targetCutoff,'2026-10-26T09:00:00.000Z');} + assert.equal(s.get('orders','o').carryForward.normal.updatedAt,s.now()); +}); +test('build issue remains active when any original member has not safely moved',()=>{ + const s=fixture(),id='build:r:'+cutoff;s.put('business-issues',{id,status:'open',orderIds:['o','unsafe'],error:'original error'});carry.advance(s);assert.equal(s.get('business-issues',id).status,'open'); +}); +test('durable carry window survives temporary runtime, source and rule pauses without allowing a move',()=>{ + for(const pause of [s=>{const task=s.get('execution-tasks','t');task.runtimeCheck={status:'blocked'};s.put('execution-tasks',task);},s=>{s.executionSources=()=>[];},s=>{s.executionRule=()=>null;}]){const s=fixture();carry.advance(s);const before=s.get('orders','o');pause(s);s.setNow('2026-10-26T10:00:00Z');assert.equal(carry.windowForOrder(s,before).end,'2026-10-26T09:00:00.000Z');assert.equal(carry.advance(s).moved.length,0);assert.deepEqual(s.get('orders','o'),before);} +}); +test('normal rollover retires only normal missed issues and preserves Hui evidence',()=>{ + const s=fixture(),o=s.get('orders','o');o.notifications.huizhou.status='unknown';s.put('orders',o); + for(const id of ['missed:o','missed:o:normal','missed:o:huizhou'])s.put('business-issues',{id,status:'open',error:'missed evidence'}); + carry.advance(s);for(const id of ['missed:o','missed:o:normal']){assert.equal(s.get('business-issues',id).status,'retired');assert.equal(s.get('business-issues',id).error,'missed evidence');}assert.equal(s.get('business-issues','missed:o:huizhou').status,'open'); +}); +test('Hui rollover retires only Hui missed issues without altering normal evidence',()=>{ + const s=fixture(),o=s.get('orders','o');o.status='sent';s.put('orders',o); + for(const id of ['missed:o','missed:o:normal','missed:o:huizhou'])s.put('business-issues',{id,status:'open',error:'missed evidence'}); + carry.advance(s);assert.equal(s.get('business-issues','missed:o:huizhou').status,'retired');for(const id of ['missed:o','missed:o:normal'])assert.equal(s.get('business-issues',id).status,'open'); +}); +test('already deferred category carries a timely admitted slow member even after old result becomes empty',()=>{ + const s=fixture(),second=s.get('orders','o');second.id='slow';s.setNow('2026-10-26T03:01:01Z');s.put('window-results',{id:'r:'+cutoff,status:'blocked'});carry.advance(s); + s.put('window-results',{id:'r:'+cutoff,status:'empty'});s.setNow('2026-10-26T03:02:00Z');s.put('orders',second);s.put('execution-tasks',{...s.get('execution-tasks','t'),id:'slow-task',orderId:'slow',sampleId:'slow-sample'});s.put('capture-samples',{...s.get('capture-samples','s'),id:'slow-sample',taskId:'slow-task'}); + assert.deepEqual(carry.advance(s).moved,[{orderId:'slow',mode:'normal',targetCutoff:'2026-10-26T09:00:00.000Z'}]);assert.equal(s.get('orders','slow').carryForward.normal.targetCutoff,s.get('orders','o').carryForward.normal.targetCutoff); +}); diff --git a/tests/order-rules/carry-forward-integration.test.cjs b/tests/order-rules/carry-forward-integration.test.cjs new file mode 100644 index 0000000..55ec798 --- /dev/null +++ b/tests/order-rules/carry-forward-integration.test.cjs @@ -0,0 +1,10 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'),fs=require('node:fs'),os=require('node:os'),path=require('node:path'); +const {RuleStore}=require('../../src/modules/order-rules/store.cjs'),{OrderExecutionCoordinator}=require('../../src/modules/order-execution/coordinator.cjs'),{activateReferenceMapping}=require('../fixtures/activate-field-mapping.cjs'); +const morning='2026-10-27T03:00:00.000Z',afternoon='2026-10-27T09:00:00.000Z',actor={user:{username:'admin',role:'admin'},sessionId:'test'}; +async function fixture(t){const dir=fs.mkdtempSync(path.join(os.tmpdir(),'carry-flow-'));let now=new Date('2026-10-27T02:00:00Z'),captures=0,archives=0;const s=new RuleStore(dir,{clock:()=>now});t.after(()=>{s.close();fs.rmSync(dir,{recursive:true,force:true});});const base=activateReferenceMapping(s).sample,r=s.saveRule({...s.get('rules','bs-change').draft,archiveDirectory:'\\\\fixture\\orders',to:['2639266652@qq.com'],cc:[],filenameDate:'receivedAt',bodyTemplateId:''},'fixture');s.put('rules',{...s.get('rules',r.id),published:{...r,status:'enabled'}});s.put('settings',{...s.get('settings','main'),enabled:true,processingEnabled:true,channelId:'mail'});const row={...base,connectionId:'c',taskId:'task',instanceId:'instance',receivedAt:'2026-10-27T01:00:00Z'},connection={id:'c',owner:'admin',status:'connected'},workspace={snapshot:()=>({connections:[connection]}),getConnection:()=>connection};const provider={scan:async()=>[row],capabilities:async()=>({liveTodo:true,pdfExport:true}),capture:async()=>{captures++;return {sample:row,snapshot:{html:'
verified
',processVersion:row.processVersion,fields:[]}};}};const archive={supportsRecovery:true,capabilities:async()=>({automaticArchive:true,pdfExport:true}),archive:async()=>{archives++;return {archivedAt:now.toISOString(),files:[{name:'x.pdf',path:'C:\\fixture\\x.pdf',sha256:'a'.repeat(64),size:1,kind:'pdf'}]};},read:async()=>Buffer.from('fixture')};const ex=new OrderExecutionCoordinator({store:s,workspace,provider,archive,clock:()=>now,onException:async()=>{}});await ex.scan({connectionId:'c',idempotencyKey:'first'},actor);return {s,ex,row,clock:()=>now,setNow:x=>now=new Date(x),counts:()=>({captures,archives})};} +test('blocked unfrozen collection rolls into next batch and keeps original identity PDF and arrival',async t=>{const f=await fixture(t),s=f.s,original=s.all('orders')[0];s.put('window-results',{id:'bs-change:'+morning,status:'blocked'});f.setNow('2026-10-27T03:02:00Z');s.expireIntakes();const order=s.get('orders',original.id);assert.equal(order.carryForward?.normal.targetCutoff,afternoon);assert.equal(order.event.receivedAt,original.event.receivedAt);assert.deepEqual(order.archive,original.archive);assert.equal(require('../../src/modules/order-rules/collecting-batches.cjs').list(s)[0].orderIds[0],order.id);f.setNow(afternoon);s.put('execution-scans',{id:'c',status:'complete',startedAt:afternoon});assert.equal(s.prepare(afternoon,'fixture').length,1);assert.equal(s.prepare(afternoon,'fixture').length,0);assert.deepEqual(f.counts(),{captures:1,archives:1});}); +test('carried archived order is not changed back to missed-window on subsequent source scan',async t=>{const f=await fixture(t);f.s.put('window-results',{id:'bs-change:'+morning,status:'blocked'});f.setNow('2026-10-27T03:31:00Z');f.s.expireIntakes();f.ex.checkArchivedRuntime=async()=>{};await f.ex.scan({connectionId:'c',idempotencyKey:'next'},actor);const order=f.s.all('orders')[0],task=f.s.all('execution-tasks')[0];assert.equal(order.status,'pending');assert.equal(task.missedWindow,undefined);assert.equal(task.step,'complete');assert.deepEqual(f.counts(),{captures:1,archives:1});}); +test('frozen proven preflight failure is cancelled and remerged, but unknown cannot carry',async t=>{const f=await fixture(t),s=f.s;f.setNow(morning);s.put('execution-scans',{id:'c',status:'complete',startedAt:morning});const b=s.prepare(morning,'fixture')[0];s.finishSending(b.id,'failed','SMTP verify failed',{outcome:'not_submitted',phase:'preflight',at:s.now()});s.expireIntakes();assert.equal(s.get('batches',b.id).status,'cancelled');assert.equal(s.get('batches',b.id).resolution.resolution,'carry_forward');assert.equal(s.all('orders')[0].carryForward.normal.targetCutoff,afternoon);const old=s.get('batches',b.id);old.status='unknown';s.put('batches',old);s.put('orders',{...s.all('orders')[0],status:'unknown'});f.setNow('2026-10-27T09:31:00Z');s.expireIntakes();assert.equal(s.all('orders')[0].status,'unknown');}); +for(const present of [true,false])test('temporary runtime failure on a carried order can recover with original task '+(present?'present':'absent'),async t=>{const f=await fixture(t),s=f.s;s.put('window-results',{id:'bs-change:'+morning,status:'blocked'});f.setNow('2026-10-27T03:31:00Z');s.expireIntakes();const task=s.all('execution-tasks')[0];task.runtimeCheck={status:'blocked',error:'temporary archive failure'};s.put('execution-tasks',task);let checks=0;f.ex.checkArchivedRuntime=async current=>{checks++;current.runtimeCheck={status:'ready'};s.put('execution-tasks',current);};f.ex.provider.scan=async()=>present?[f.row]:[];await f.ex.scan({connectionId:'c',idempotencyKey:'recovery'},actor);assert.equal(checks,1);assert.equal(s.all('execution-tasks')[0].runtimeCheck.status,'ready');assert.equal(s.all('execution-tasks')[0].missedWindow,undefined);}); +test('carried orders retain the normal post-cutoff grace without returning to the original batch',async t=>{const f=await fixture(t),s=f.s;s.put('window-results',{id:'bs-change:'+morning,status:'blocked'});f.setNow('2026-10-27T03:02:00Z');s.expireIntakes();assert(!s.pendingIntakeCutoffs().includes(morning));f.setNow('2026-10-27T09:01:01Z');s.put('execution-scans',{id:'c',status:'complete',startedAt:s.now()});assert(s.pendingIntakeCutoffs().includes(afternoon));const b=s.prepare(afternoon,'fixture')[0];assert.equal(b.intakeGrace.cutoff,afternoon);assert.equal(b.carriedOrderIds.length,1);}); diff --git a/tests/order-rules/dismiss-task.test.cjs b/tests/order-rules/dismiss-task.test.cjs new file mode 100644 index 0000000..ac68983 --- /dev/null +++ b/tests/order-rules/dismiss-task.test.cjs @@ -0,0 +1,10 @@ +'use strict'; +const test=require('node:test'),assert=require('node:assert/strict'); +const mod='../../src/modules/order-execution/dismiss-task.cjs'; +function fixture(){const data={'execution-tasks':[{id:'t',version:3,status:'blocked',step:'capture',errorCode:'BPM_TASK_NOT_CURRENT',row:{source:'bpm',taskId:'native'},captureEvidenceId:'e',history:[{step:'capture'}]}],'business-issues':[{id:'i',status:'open',taskIds:['t']}]};return {all:k=>data[k]||[],get(k,id){return this.all(k).find(v=>v.id===id);},put(k,v){data[k]??=[];data[k]=data[k].filter(x=>x.id!==v.id).concat(structuredClone(v));return v;},now:()=> '2026-10-27T01:00:00Z',transaction:f=>f(),audit(){this.audits=(this.audits||0)+1;}};} +const input={version:3,note:'已核对原任务离开节点',idempotencyKey:'request-one'},admin={username:'admin',role:'admin'}; +test('dismiss preserves evidence and dedup row, retires issue and only exact replay is idempotent',()=>{const {dismissTask}=require(mod),s=fixture(),result=dismissTask(s,'t',input,admin);assert.deepEqual(Object.keys(result).sort(),['id','removedAt','status']);const t=s.get('execution-tasks','t');assert.equal(t.version,4);assert.equal(t.revisionIgnored,true);assert.equal(t.captureEvidenceId,'e');assert.equal(t.row.taskId,'native');assert.equal(t.history.length,2);assert.equal(s.get('business-issues','i').status,'retired');assert.deepEqual(dismissTask(s,'t',input,admin),result);assert.equal(s.audits,1);assert.throws(()=>dismissTask(s,'t',{...input,note:'另一个移除理由'},admin),e=>e.status===409);assert.throws(()=>dismissTask(s,'t',{...input,idempotencyKey:'other'},admin),e=>e.status===409);}); +test('dismiss rejects permission, stale versions, uncertain or processed work',()=>{const {dismissTask}=require(mod);for(const mutate of [s=>s.get('execution-tasks','t').status='unknown',s=>s.get('execution-tasks','t').orderId='o',s=>s.put('archive-intents',{id:'t:g1'}),s=>s.put('processed-task-receipts',{id:'receipt',source:'bpm',taskId:'native'}),s=>s.put('batches',{id:'b',taskIds:['t'],status:'sent'}),s=>s.put('batches',{id:'b',taskId:'t',status:'unknown'})]){const s=fixture();mutate(s);assert.throws(()=>dismissTask(s,'t',input,admin),e=>e.status===409);assert.equal(s.get('execution-tasks','t').removedAt,undefined);}assert.throws(()=>dismissTask(fixture(),'t',input,{role:'operator'}),e=>e.status===403);assert.throws(()=>dismissTask(fixture(),'t',{...input,version:2},admin),e=>e.status===409);assert.throws(()=>dismissTask(fixture(),'t',{...input,note:'短'},admin));}); +test('query publishes only approved carry-forward fields for each mode',()=>{const {queryOrders}=require('../../src/modules/order-rules/query.cjs'),s=fixture();s.put('orders',{id:'o',status:'pending',categoryId:'cat',carryForward:{normal:{originCutoff:'old',targetCutoff:'next',reason:'expired',lastError:'failure',updatedAt:'now',secret:'PRIVATE'},huizhou:{targetCutoff:'later',cookie:'PRIVATE'},other:{secret:'PRIVATE'}}});const row=queryOrders({orderRules:s},{},admin).items.find(r=>r.id==='o');assert.equal(row.carryForward.normal.targetCutoff,'next');assert.equal(row.carryForward.huizhou.targetCutoff,'later');assert.equal(JSON.stringify(row).includes('PRIVATE'),false);assert.equal(row.carryForward.other,undefined);}); +test('dismiss API invokes guarded helper and returns only safe task receipt',async()=>{const {orderExecutionApi}=require('../../src/modules/order-execution/api.cjs'),s=fixture();let response;const request={execution:{},orderRules:s,user:admin,route:'/api/order-execution/tasks/t/dismiss',method:'POST',body:input,reply:(status,data)=>response={status,data}};assert.equal(await orderExecutionApi(request),true);assert.equal(response.status,200);assert.equal(response.data.status,'ignored');assert.equal(response.data.row,undefined);await assert.rejects(()=>orderExecutionApi({...request,orderRules:fixture(),user:{role:'operator'}}),e=>e.status===403);}); +test('dismiss refuses detached task links when a batch already references its order identity',()=>{const {dismissTask}=require(mod),s=fixture();s.put('batches',{id:'detached',status:'unknown',orderIds:['t']});assert.throws(()=>dismissTask(s,'t',input,admin),e=>e.status===409);assert.equal(s.get('execution-tasks','t').removedAt,undefined);}); diff --git a/tests/order-rules/dispatch-unsent-proof.test.cjs b/tests/order-rules/dispatch-unsent-proof.test.cjs new file mode 100644 index 0000000..b782b83 --- /dev/null +++ b/tests/order-rules/dispatch-unsent-proof.test.cjs @@ -0,0 +1,37 @@ +'use strict'; +const test=require('node:test'); +const assert=require('node:assert/strict'); +const {OrderRuleDispatcher}=require('../../src/modules/order-rules/dispatcher.cjs'); +const at='2026-10-27T03:30:00.000Z'; +function fixture({verifyError,sendError,result,channelId='mail',expired=false}={}){ + const batch={id:'batch',status:'prepared',cutoff:expired?'2026-10-27T02:00:00.000Z':at,channelId,to:['2639266652@qq.com'],cc:[],attachments:[],orderIds:['order'],ruleSnapshot:{}}; + const completions=[];let submissions=0,begun=0; + const store={get:()=>null,now:()=>at,settings:()=>({enabled:true,channelId:'mail'}),snapshot:()=>({batches:[batch],capabilities:{liveTodo:true,pdfExport:true,automaticArchive:true}}),discoveryBlockers:()=>[],batchIncomplete:()=>false,beginSending:()=>{begun++;},finishSending:(...args)=>completions.push(args)}; + const mail={store:{channelSecret:()=>({id:'mail',version:1,email:'sender@example.com',smtp:{}}),guard:()=>{}},smtpFactory:()=>({verify:async()=>{if(verifyError)throw verifyError;},sendMail:async()=>{submissions++;if(sendError)throw sendError;return result||{accepted:['2639266652@qq.com'],rejected:[]};},close:()=>{}})}; + const dispatcher=new OrderRuleDispatcher({store,mail,settings:()=>({}),clock:()=>new Date(at),providersReady:()=>true}); + return {dispatcher,batch,store,completions,counts:()=>({submissions,begun})}; +} +test('SMTP verify failure proves no submission and can safely be considered for carry-forward',async()=>{ + const f=fixture({verifyError:Error('offline')});await f.dispatcher.dispatch(f.batch,f.store.settings()); + assert.equal(f.completions[0][1],'failed');assert.deepEqual(f.completions[0][3],{outcome:'not_submitted',phase:'preflight',at});assert.deepEqual(f.counts(),{submissions:0,begun:0}); +}); +test('expired prepared queue records definite no submission',async()=>{ + const f=fixture({expired:true});await f.dispatcher.perform(new Date(at)); + assert.deepEqual(f.completions[0][3],{outcome:'not_submitted',phase:'queue_expired',at});assert.equal(f.counts().submissions,0); +}); +test('channel mismatch is rejected before SMTP with no submission evidence',async()=>{ + const f=fixture({channelId:'previous'});await f.dispatcher.dispatch(f.batch,f.store.settings()); + assert.deepEqual(f.completions[0][3],{outcome:'not_submitted',phase:'preflight',at});assert.equal(f.counts().submissions,0); +}); +test('strict complete RCPT rejection records an unsent envelope outcome',async()=>{ + const f=fixture({sendError:Object.assign(Error('rejected'),{code:'EENVELOPE',command:'RCPT TO',rejected:['2639266652@qq.com'],accepted:[]})});await f.dispatcher.dispatch(f.batch,f.store.settings()); + assert.equal(f.completions[0][1],'failed');assert.deepEqual(f.completions[0][3],{outcome:'all_recipients_rejected',phase:'smtp_envelope',at});assert.equal(f.counts().submissions,1); +}); +for(const [name,options] of [ + ['SMTP timeout',{sendError:Object.assign(Error('timeout'),{code:'ETIMEDOUT'})}], + ['partial SMTP acceptance',{result:{accepted:['2639266652@qq.com'],rejected:['other@example.com']}}], + ['RCPT error with accepted recipients',{sendError:Object.assign(Error('mixed'),{code:'EENVELOPE',command:'RCPT TO',rejected:['2639266652@qq.com'],accepted:['2639266652@qq.com']})}], + ['unproven recipient rejection',{sendError:Object.assign(Error('other'),{code:'EENVELOPE',command:'RCPT TO',rejected:['other@example.com'],accepted:[]})}], +])test(name+' remains unknown without an unsent proof',async()=>{ + const f=fixture(options);await f.dispatcher.dispatch(f.batch,f.store.settings());assert.equal(f.completions[0][1],'unknown');assert.equal(f.completions[0][3],undefined);assert.equal(f.counts().submissions,1); +}); diff --git a/tests/workspace/business-issues.test.cjs b/tests/workspace/business-issues.test.cjs index 585553d..6764cb3 100644 --- a/tests/workspace/business-issues.test.cjs +++ b/tests/workspace/business-issues.test.cjs @@ -11,3 +11,4 @@ test('administrators can explicitly archive obsolete manual exceptions with evid const dir=fs.mkdtempSync(path.join(os.tmpdir(),'obsolete-issues-')),store=new WorkspaceStore(dir),admin={username:'admin',role:'admin'},members=[admin];t.after(()=>{store.close();fs.rmSync(dir,{recursive:true,force:true});});const item=store.createException({title:'旧演示',component:'system',priority:'normal',description:'合成历史演示',owner:''},admin,members); assert.throws(()=>store.actOnException(item.id,{version:1,action:'archive',note:''},admin,members));const saved=store.actOnException(item.id,{version:1,action:'archive',note:'已核对为历史演示,不代表业务核验通过。'},admin,members);assert.equal(saved.status,'retired');assert.equal(saved.history.at(-1).action,'archive'); }); +test('retired source issues remain retired on reconciliation and genuine later failure may reopen',t=>{const dir=fs.mkdtempSync(path.join(os.tmpdir(),'retired-source-')),store=new WorkspaceStore(dir),members=[{username:'admin',role:'admin'}];t.after(()=>{store.close();fs.rmSync(dir,{recursive:true,force:true});});const issue={id:'old-blocker',component:'rules',owners:['admin'],error:'original failure',status:'open',updatedAt:'2026-10-27T01:00:00Z'};store.syncBusinessIssues([issue],members);const retired={...issue,status:'retired',retiredAt:'2026-10-27T03:00:00Z',updatedAt:'2026-10-27T03:00:00Z'};store.syncBusinessIssues([retired],members);assert.equal(store.snapshot().exceptions[0].status,'retired');const version=store.snapshot().exceptions[0].version;store.syncBusinessIssues([retired],members);assert.equal(store.snapshot().exceptions[0].version,version);store.syncBusinessIssues([{...issue,updatedAt:'2026-10-28T01:00:00Z'}],members);assert.equal(store.snapshot().exceptions[0].status,'in_progress');}); diff --git a/web/modules/order-notifications/detail.js b/web/modules/order-notifications/detail.js index 464ac0d..f9e9cda 100644 --- a/web/modules/order-notifications/detail.js +++ b/web/modules/order-notifications/detail.js @@ -21,9 +21,9 @@ window.BusinessRecordDetail=(()=>{ function orderBody(d){ const t=d.executionTask,e=d.event||{}; if(d.status==='candidate')return '

未匹配通知规则

当前流程或节点未命中 Excel 通知规则,不会归档或发送邮件。

'+field('原因',d.reason)+field('流程',e.processName)+field('当前节点',e.nodeName)+field('BPM任务',e.taskId)+field('接收时间',formatDate(e.receivedAt))+'
'; - return `

处理进度

${field('订单',d.orderNo)}${field('状态',statuses[d.status]||d.status)}${field('原因',t?.error||d.error||d.reason)}${field('执行步骤',t?.step==='waiting_window'?'等待下一批处理':t?.step)}${t?.step==='waiting_window'?field('下一批发送时间',formatDate(t.deferredSendAt)):''}${field('执行任务',t?.id)}${field('规则版本',d.ruleVersion)}
${captureBody(d)}${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}

来源

${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}

订单摘要

${esc(e.brief||e.title||'未取得摘要')}

PDF / 归档

归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}

${d.files.map(f=>`

${esc(f.name||'下载归档 PDF')} · ${esc(f.size)} 字节

`).join('')||'

尚无可验证归档文件

'}

邮件批次

${d.batches.map(b=>`

· ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}

`).join('')||'

尚未编入批次

'}${t?.exceptionId?`处理关联异常`:''}${t?.revisionEvidence?`

修订核对

${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>``).join('')}
信息原修订新修订
${esc(key)}${esc(t.revisionEvidence.previous[key]||'—')}${esc(t.revisionEvidence.incoming[key]||'—')}
`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对',''):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)?form('retry',taskLeftNode(t)?'核验当前任务并重试':t.retryPolicy==='manual'?'核验后重试采集':'重试失败任务',taskLeftNode(t)?'':t.retryPolicy==='manual'?'':''):''}`; + return `

处理进度

${field('订单',d.orderNo)}${field('状态',statuses[d.status]||d.status)}${field('原因',t?.error||d.error||d.reason)}${field('执行步骤',t?.step==='waiting_window'?'等待下一批处理':t?.step)}${t?.step==='waiting_window'?field('下一批发送时间',formatDate(t.deferredSendAt)):''}${field('执行任务',t?.id)}${field('规则版本',d.ruleVersion)}
${captureBody(d)}${['normal','huizhou'].filter(mode=>d.carryForward?.[mode]).map(mode=>'

'+(mode==='normal'?'普通通知':'惠州通知')+'顺延

'+field('下一发送时间',formatDate(d.carryForward[mode].targetCutoff))+field('顺延原因',({confirmed_unsent:'已确认未发送,重新归入下一批',carry_window_missed:'上一批仍未发送,继续顺延',original_window_missed:'原发送时段未完成汇总'})[d.carryForward[mode].reason]||d.carryForward[mode].reason)+field('上次受阻原因',d.carryForward[mode].lastError)+'
').join('')}${notificationBody('normal',d.notifications?.normal)}${notificationBody('huizhou',d.notifications?.huizhou)}

来源

${field('连接',d.connectionId)}${field('流程',e.processName)}${field('节点',e.nodeName)}${field('流程实例',e.instanceId)}${field('BPM任务',e.taskId)}${field('来源版本',e.revision)}${field('接收时间',formatDate(e.receivedAt))}

订单摘要

${esc(e.brief||e.title||'未取得摘要')}

PDF / 归档

归档代次 ${esc(d.archiveGeneration)} · ${esc(formatDate(d.archivedAt))}

${d.files.map(f=>`

${esc(f.name||'下载归档 PDF')} · ${esc(f.size)} 字节

`).join('')||'

尚无可验证归档文件

'}

邮件批次

${d.batches.map(b=>`

· ${b.notificationMode==='huizhou'?'惠州通知':'普通通知'} · ${esc(statuses[b.status]||b.status)}

`).join('')||'

尚未编入批次

'}${t?.exceptionId?`处理关联异常`:''}${t?.revisionEvidence?`

修订核对

${['revision','orderNo','title','receivedAt','processName','nodeName','quantity','brief'].map(key=>``).join('')}
信息原修订新修订
${esc(key)}${esc(t.revisionEvidence.previous[key]||'—')}${esc(t.revisionEvidence.incoming[key]||'—')}
`:''}${user.role==='admin'&&t?.conflict&&!t.missedWindow&&!['unknown','sent','sending','batched'].includes(d.status)?form('revision','保存修订核对',''):''}${user.role==='admin'&&d.id.startsWith('task:')&&t?.step==='capture'&&['blocked','failed'].includes(t.status)&&!t.conflict&&(t.errorCode==='BPM_TASK_NOT_CURRENT'||t.recovery?.status==='requires-history-verification')?form('dismiss','移出待处理记录','

仅移出尚未处理的任务;保留原始采集证据、历史和去重记录,不生成归档、不发信。

'):''}${user.role!=='viewer'&&t&&!t.conflict&&!t.missedWindow&&['failed','blocked'].includes(t.status)?form('retry',taskLeftNode(t)?'核验当前任务并重试':t.retryPolicy==='manual'?'核验后重试采集':'重试失败任务',taskLeftNode(t)?'':t.retryPolicy==='manual'?'':''):''}`; } - function batchBody(d){return `
${field('主题',d.subject)}${field('通知模式',d.notificationMode==='huizhou'?'惠州通知':'普通通知')}${field('类别',d.categoryName||d.categoryId)}${field('状态',statuses[d.status]||d.status)}${d.status==='sent'?field('发送时间',formatDate(d.sentAt||d.resolvedAt)):''}${field('原因 / 超时说明',d.error)}${field('到达范围起点',formatDate(d.collectionStart||d.window?.collectionStart||d.windowStart||d.window?.start))}${field('计划发送时间',formatDate(d.windowEnd||d.cutoff||d.window?.end))}${d.collectionEnd||d.window?.collectionEnd?field('到达截止(不含此时刻)',formatDate(d.collectionEnd||d.window.collectionEnd)):''}${field('收件人',(d.to||[]).join('、'))}${field('抄送',(d.cc||[]).join('、'))}

${d.status==='collecting'?'当前汇总正文':'冻结正文'}

${esc(d.text||'无正文')}
查看实际HTML邮件预览
${window.BatchContentEditor.render(d,{esc,user})}

附件

${d.attachments.map(a=>`

${esc(a.name||a.filename)} · ${esc(a.size||'—')} 字节

`).join('')||'无附件'}

关联订单

${d.orders.map(o=>`

`).join('')}

SMTP 接受不代表最终送达。结果不明时必须先核验,不会自动补发。

${user.role==='admin'&&d.status==='unknown'?form('resolve','保存核验结论',''):''}${user.role==='admin'&&d.status==='failed'?form('resend','人工补发原冻结批次'):''}`;} + function batchBody(d){return `
${field('主题',d.subject)}${field('通知模式',d.notificationMode==='huizhou'?'惠州通知':'普通通知')}${field('类别',d.categoryName||d.categoryId)}${field('状态',statuses[d.status]||d.status)}${d.status==='sent'?field('发送时间',formatDate(d.sentAt||d.resolvedAt)):''}${field('原因 / 超时说明',d.error)}${d.resolution?.resolution==='carry_forward'?field('处理结果','未发送,已重新归入 '+formatDate(d.resolution.targetCutoff)+' 批次'):''}${d.carryCount?field('其中顺延订单',d.carryCount+' 单(保留原接收时间)'):''}${field('到达范围起点',formatDate(d.collectionStart||d.window?.collectionStart||d.windowStart||d.window?.start))}${field('计划发送时间',formatDate(d.windowEnd||d.cutoff||d.window?.end))}${d.collectionEnd||d.window?.collectionEnd?field('到达截止(不含此时刻)',formatDate(d.collectionEnd||d.window.collectionEnd)):''}${field('收件人',(d.to||[]).join('、'))}${field('抄送',(d.cc||[]).join('、'))}

${d.status==='collecting'?'当前汇总正文':'冻结正文'}

${esc(d.text||'无正文')}
查看实际HTML邮件预览
${window.BatchContentEditor.render(d,{esc,user})}

附件

${d.attachments.map(a=>`

${esc(a.name||a.filename)} · ${esc(a.size||'—')} 字节

`).join('')||'无附件'}

关联订单

${d.orders.map(o=>`

`).join('')}

SMTP 接受不代表最终送达。结果不明时必须先核验,不会自动补发。

${user.role==='admin'&&d.status==='unknown'?form('resolve','保存核验结论',''):''}${user.role==='admin'&&d.status==='failed'?form('resend','人工补发原冻结批次'):''}`;} async function load(kind,id,trigger,back=null){ const request=++revision;editor?.dispose();controller?.abort();controller=new AbortController();panel.show('

正在加载详情…

',trigger); try{const d=await api('/order-rules/'+kind+'/'+encodeURIComponent(id),undefined,{signal:controller.signal});if(!isActive()||request!==revision)return; @@ -39,10 +39,10 @@ window.BusinessRecordDetail=(()=>{ editor=window.BatchContentEditor.bind(panel.element,d,{api,isActive:()=>isActive()&&request===revision,onSaved:async saved=>{if(!isActive()||request!==revision)return;show(kind,saved,trigger,request,back);onChanged();const notice=panel.element.querySelector('[data-batch-content-editor] [role=alert]');if(notice)notice.textContent='批次内容已保存,按计划自动发送。';}}); container.querySelectorAll('[data-business-action]').forEach(form=>form.onsubmit=async event=>{ event.preventDefault();const button=form.querySelector('button'),notice=form.querySelector('[role=alert]');if(button.disabled)return; - const action=form.dataset.businessAction,t=d.executionTask,body={version:t&&['revision','retry'].includes(action)?t.version:d.version,note:form.elements.note.value}; + const action=form.dataset.businessAction,t=d.executionTask,body={version:t&&['revision','retry','dismiss'].includes(action)?t.version:d.version,note:form.elements.note.value}; if(form.elements.resolution)body.resolution=form.elements.resolution.value; const signature=JSON.stringify(body);if(form.dataset.signature!==signature){form.dataset.signature=signature;form.dataset.key=window.PageLifecycle.requestKey();}body.idempotencyKey=form.dataset.key; - const path=action==='revision'||action==='retry'?'/order-execution/tasks/'+encodeURIComponent(t.id)+'/'+(action==='revision'?'resolve':'retry'):'/order-rules/batches/'+encodeURIComponent(d.id)+'/'+action; + const path=['revision','retry','dismiss'].includes(action)?'/order-execution/tasks/'+encodeURIComponent(t.id)+'/'+(action==='revision'?'resolve':action):'/order-rules/batches/'+encodeURIComponent(d.id)+'/'+action; button.disabled=true;try{await api(path,body);if(!isActive()||request!==revision)return;notice.textContent='操作已提交,请关闭详情并刷新列表核对实际结果。';onChanged();}catch(error){if(isActive()&&request===revision){notice.textContent=error.message;button.disabled=false;}} }); } diff --git a/web/modules/order-notifications/records.js b/web/modules/order-notifications/records.js index 0dee20c..deb02a5 100644 --- a/web/modules/order-notifications/records.js +++ b/web/modules/order-notifications/records.js @@ -9,7 +9,7 @@ window.BusinessRecordViews=(()=>{ const input=(name,label,type='text')=>``; container.innerHTML=`

${kind==='orders'?'订单中心':'邮件批次'}

${kind==='batches'?'
':''}
${input('q','搜索订单 / 标识 / 主题')}
${select('categoryId','类别')}
${select('connectionId','来源连接')}
${kind==='batches'?'':''}
${input('from',kind==='batches'?'窗口截止日期从(北京时间)':'接收日期从(北京时间)','date')}
${input('to',kind==='batches'?'窗口截止日期至':'接收日期至','date')}
${window.RecordUi.footer}
${kind==='orders'&&user.role!=='viewer'?'

扫描并处理订单

读取授权待办、采集真实字段、生成 PDF 并归档;BPM 节点由人工办理。邮件按独立开关和批次调度发送。

':''}`; let table;const detail=window.BusinessRecordDetail.mount(container,{...options,onChanged:()=>{const error=container.querySelector('[data-record-error]');error.hidden=false;error.textContent='业务状态已变化,请刷新记录核对。';}}); - function draw(data){const host=container.querySelector('[data-arrival-list]');host.innerHTML=`
${data.items.map((row,index)=>``).join('')||''}
${kind==='orders'?'订单 / 类别':'主题 / 类别'}状态与原因${kind==='batches'?'创建 / 发送时间':'接收 / 创建时间'}详情
${esc(row.orderNo||row.subject||row.id)}
${esc(catalogs.categories.get(row.categoryId)||row.categoryName||row.categoryId||'未分类')}
${row.testRunId?'受限测试':''}${kind==='batches'?'
'+Number(row.orderCount||0)+' 个订单 · '+esc(formatDate(row.windowEnd||row.cutoff))+' 截止
':(row.collectingBatches||[]).map(b=>'').join('')}${kind==='batches'?''+(row.notificationMode==='huizhou'?'惠州通知':'普通通知')+'':''}
${esc(row.executionStep==='waiting_window'?'等待下一批处理':labels[row.status]||row.status)}${row.executionStep==='waiting_window'?'
已过本批到达截止,顺延下一批'+(row.deferredSendAt?' · '+esc(formatDate(row.deferredSendAt))+' 发送':'')+'
':''}${kind==='orders'&&row.notifications?['normal','huizhou'].map(mode=>{const notice=row.notifications[mode];return notice?'
'+(mode==='huizhou'?'惠州通知':'普通通知')+':'+esc(labels[notice.status]||notice.status)+'
'+esc(notice.error||'')+'
'+(notice.issues?.length?'
'+notice.issues.map(esc).join(';')+'
':'')+'
':'';}).join(''):''}
${esc(row.error||row.reason||'')}
${esc(formatDate(row.receivedAt||row.createdAt))}${kind==='batches'&&row.status==='sent'?'
发送:'+esc(formatDate(row.sentAt||row.resolvedAt)||'未记录')+'
':''}
暂无匹配记录
`;host.querySelectorAll('[data-collecting-detail]').forEach(button=>button.onclick=()=>detail.open('batches',button.dataset.collectingDetail,button));host.querySelectorAll('[data-business-detail]').forEach(button=>button.onclick=()=>detail.open(kind,data.items[Number(button.dataset.businessDetail)].id,button));} + function draw(data){const host=container.querySelector('[data-arrival-list]');host.innerHTML=`
${data.items.map((row,index)=>``).join('')||''}
${kind==='orders'?'订单 / 类别':'主题 / 类别'}状态与原因${kind==='batches'?'创建 / 发送时间':'接收 / 创建时间'}详情
${esc(row.orderNo||row.subject||row.id)}
${esc(catalogs.categories.get(row.categoryId)||row.categoryName||row.categoryId||'未分类')}
${row.testRunId?'受限测试':''}${kind==='batches'?'
'+Number(row.orderCount||0)+' 个订单 · '+esc(formatDate(row.windowEnd||row.cutoff))+' 截止
':(row.collectingBatches||[]).map(b=>'').join('')}${kind==='batches'?''+(row.notificationMode==='huizhou'?'惠州通知':'普通通知')+'':''}
${esc(row.executionStep==='waiting_window'?'等待下一批处理':labels[row.status]||row.status)}${row.executionStep==='waiting_window'?'
已过本批到达截止,顺延下一批'+(row.deferredSendAt?' · '+esc(formatDate(row.deferredSendAt))+' 发送':'')+'
':''}${kind==='orders'&&row.carryForward?.normal?.targetCutoff?'
顺延至 '+esc(formatDate(row.carryForward.normal.targetCutoff))+'
':''}${kind==='orders'&&row.notifications?['normal','huizhou'].map(mode=>{const notice=row.notifications[mode];return notice?'
'+(mode==='huizhou'?'惠州通知':'普通通知')+':'+esc(labels[notice.status]||notice.status)+'
'+esc(notice.error||'')+'
'+(notice.issues?.length?'
'+notice.issues.map(esc).join(';')+'
':'')+'
':'';}).join(''):''}
${esc(row.error||row.reason||'')}
${esc(formatDate(row.receivedAt||row.createdAt))}${kind==='batches'&&row.status==='sent'?'
发送:'+esc(formatDate(row.sentAt||row.resolvedAt)||'未记录')+'
':''}
暂无匹配记录
`;host.querySelectorAll('[data-collecting-detail]').forEach(button=>button.onclick=()=>detail.open('batches',button.dataset.collectingDetail,button));host.querySelectorAll('[data-business-detail]').forEach(button=>button.onclick=()=>detail.open(kind,data.items[Number(button.dataset.businessDetail)].id,button));} function tabs(next){ container.querySelectorAll('[data-batch-scope]').forEach(link=>{ const selected=link.dataset.batchScope===next.scope;