Compare commits
14 Commits
897bbd2afd
...
3e02c3e393
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e02c3e393 | |||
| 06952d8a04 | |||
| f69d26796e | |||
| a928135a63 | |||
|
|
5302b22fc1 | ||
| fd89eb64d2 | |||
|
|
31a4b0aebb | ||
| 611165dded | |||
|
|
e1c2ad1ea6 | ||
| 2b096ed2e2 | |||
|
|
986174076f | ||
| ecfd97787d | |||
|
|
80028665c5 | ||
|
|
3a87d8ecba |
@ -6,7 +6,7 @@
|
||||
- 保留他人的未提交修改和已有提交,仅暂存本任务内容;不得清理或覆盖未知工作。
|
||||
- 推送前同步远端,逐项检查最终差异并验证;被拒绝后先查明并合并更新,禁止任何形式的强推。
|
||||
- 不改写已发布历史,不批量选择冲突的某一方;不明确的行为取舍需要负责人确认。
|
||||
- 所有变更通过 PR 进入 `main`,不得直接推送主分支;独立审核与最新内容的验证通过后由维护者合并。
|
||||
- 所有变更通过 PR 进入 `main`,不得直接推送主分支;默认由非提交者审核。仓库所有者或管理员明确授权某个 PR 合并时,该书面授权可以代替独立审核,但仍必须同步最新主分支、验证最终提交并保留授权记录。
|
||||
- 不提交凭据、私钥、环境秘密或真实业务数据;不把合并授权当成生产部署授权。
|
||||
- 新建或修改数据表、映射表、查询和同步任务时,必须按实际过滤、关联、排序和唯一性设计索引,用执行计划和有代表性数据验证负载;禁止无边界全表扫描、无节制并发和重复全量同步。
|
||||
- 开发机器使用中央系统数据库和公网 TLS Redis,无需安装本地数据库;生产部署必须先将代码通过 PR 合入 `main`,并在 `/opt/cangku/deploy.lock` 锁内从服务器 Git 工作区快进拉取和验证。
|
||||
|
||||
@ -4,6 +4,11 @@
|
||||
//
|
||||
// 业务口径(2026-09-17 业务确认):
|
||||
// ① 推送范围:缺货(可用天数 ≤ 0)+ 3 天内预警商品(默认,可在页面里改成仅缺货)
|
||||
// · 含「订单驱动」商品:近7日日销 = 0、但存在未发货订单的 MKH 成品
|
||||
// (口径与取数见 mkhBomService 文件头 ⑩;正文里以「待发货订单 N 件」代替日销展示)
|
||||
// · 含「配件不足」商品:配件现有库存可组装数 = 0(口径见 mkhBomService 文件头 ⑪)
|
||||
// —— 这类商品**补不出去**,正文里明确写「配件不足,无法补货」并列出短板配件,
|
||||
// 不给出建议补货量(否则业务会照着补不到的目标去采购)
|
||||
// ② 只提醒**新出现**的预警 —— 已经在「已推送」记录里的商品不重复推送,
|
||||
// 商品补货完成恢复到正常范围后会从记录里移除,下次再预警会重新提醒
|
||||
// ③ 收件人:单独配置(配置为空时回退环境变量 → 统一通知中心默认收件人)
|
||||
@ -123,12 +128,41 @@ function buildAlertSignature(alerts = []) {
|
||||
return crypto.createHash('sha1').update(parts.join('|'), 'utf8').digest('hex').slice(0, 16);
|
||||
}
|
||||
|
||||
/**
|
||||
* 短板配件文案(见 mkhBomService 文件头 ⑪):只列「可支配数 ≤ 0」的配件,
|
||||
* 即真正卡住组装的那些,最多 2 个,避免正文过长。
|
||||
*/
|
||||
function formatShortageNote(row) {
|
||||
const bottlenecks = Array.isArray(row?.bottleneckComponents) ? row.bottleneckComponents : [];
|
||||
const detail = bottlenecks
|
||||
.filter((item) => Number(item?.available) <= 0)
|
||||
.slice(0, 2)
|
||||
.map((item) => {
|
||||
const occupied = Number(item.occupied) || 0;
|
||||
return `${item.code}(库存 ${formatQty(item.stock)}`
|
||||
+ `${occupied > 0 ? ` − 加工单占用 ${formatQty(occupied)}` : ''})`;
|
||||
})
|
||||
.join('、');
|
||||
return detail ? `,短板配件:${detail}` : '';
|
||||
}
|
||||
|
||||
function describeAlert(row) {
|
||||
// 配件不足(见 mkhBomService 文件头 ⑪):可组装数 = 0 → 补不出来,
|
||||
// 建议补货量不再给数字(显示「—」),与页面口径保持一致。
|
||||
const replenishText = row.componentShortage ? '建议补货 —' : `建议补货 ${formatQty(row.replenishQty)}`;
|
||||
// 订单驱动(近7日日销=0 但有未发货订单,见 mkhBomService 文件头 ⑩):
|
||||
// 此时日销必然是 0,直接显示会让人误以为「没销量却要补货」,改展示待发货订单量
|
||||
const metric = row.orderDriven
|
||||
? `待发货订单 ${formatQty(row.pendingOrderQty)} 件 | 现有库存 ${formatQty(row.stock)} | ${replenishText}(近7日暂无日销,按订单补)`
|
||||
: `日销 ${formatQty(row.dailySale)} | 现有库存 ${formatQty(row.stock)} | ${replenishText}`;
|
||||
const lines = [
|
||||
`**${row.warningLevel === OUT_OF_STOCK ? '🔴 缺货' : '🟠 预警'}** — \`${row.skuId}\``,
|
||||
String(row.productName || '').trim() || '(无名称)',
|
||||
`日销 ${formatQty(row.dailySale)} | 现有库存 ${formatQty(row.stock)} | 建议补货 ${formatQty(row.replenishQty)}`,
|
||||
metric,
|
||||
];
|
||||
if (row.componentShortage) {
|
||||
lines.splice(2, 0, `⚠️ **配件不足,无法补货**(现有配件可组装 ${formatQty(row.assemblableQty)} 台${formatShortageNote(row)})`);
|
||||
}
|
||||
return lines.join('\n');
|
||||
}
|
||||
|
||||
@ -168,9 +202,21 @@ function buildMkhReplenishNotification({
|
||||
`---`,
|
||||
`当前共 **${totalCount}** 个 MKH 商品需要补货(缺货 ${totalOutOfStock} | ${snapshot.replenishDaysThreshold || 3}天内预警 ${totalWarningOnly})。`,
|
||||
`建议补货合计 ${formatQty(snapshot.replenishQtyTotal)} 件。`,
|
||||
Number(snapshot.orderDrivenCount) > 0
|
||||
? `其中 **${snapshot.orderDrivenCount}** 个近7日无日销、因有未发货订单(合计 ${formatQty(snapshot.pendingOrderQtyTotal)} 件)而列入预警。`
|
||||
: '',
|
||||
Number(snapshot.componentShortageCount) > 0
|
||||
? `其中 **${snapshot.componentShortageCount}** 个因**配件库存不足**(可组装数 = 0)暂时补不出来,建议补货量显示「—」,需先采购配件。`
|
||||
: '',
|
||||
snapshot.workOrderDegraded === true
|
||||
? `> ⚠️ 加工单数据源暂不可用,在途量按 0 处理,预警数量可能偏多。`
|
||||
: '',
|
||||
snapshot.pendingOrderDegraded === true
|
||||
? `> ⚠️ 待发货订单数据源暂不可用,待发货量按 0 处理,可能遗漏「无日销但有订单」的商品。`
|
||||
: '',
|
||||
snapshot.componentStockDegraded === true
|
||||
? `> ⚠️ 配件库存数据源暂不可用,本次**未做**「配件不足」判定,可能存在补不出来的商品。`
|
||||
: '',
|
||||
].filter(Boolean).join('\n\n')
|
||||
);
|
||||
|
||||
@ -211,11 +257,18 @@ async function checkMkhReplenishAlerts(options = {}) {
|
||||
outOfStockCount: snapshot.outOfStockCount,
|
||||
warningOnlyCount: snapshot.warningOnlyCount,
|
||||
replenishQtyTotal: snapshot.replenishQtyTotal,
|
||||
// 订单驱动(近7日无日销但有未发货订单)的商品数 / 待发货件数,口径见 mkhBomService 文件头 ⑩
|
||||
orderDrivenCount: snapshot.orderDrivenCount,
|
||||
pendingOrderQtyTotal: snapshot.pendingOrderQtyTotal,
|
||||
// 配件不足(可组装数 = 0)的商品数,口径见 mkhBomService 文件头 ⑪
|
||||
componentShortageCount: snapshot.componentShortageCount,
|
||||
freshCount: fresh.length,
|
||||
persistedCount: persisted.length,
|
||||
restoredCount: restored.length,
|
||||
monitorDate: snapshot.monitorDate,
|
||||
workOrderDegraded: snapshot.workOrderDegraded,
|
||||
pendingOrderDegraded: snapshot.pendingOrderDegraded,
|
||||
componentStockDegraded: snapshot.componentStockDegraded,
|
||||
};
|
||||
|
||||
if (!config.enabled) return { sent: false, reason: 'disabled', summary };
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -5,7 +5,7 @@
|
||||
// 需求来源:《模块化库存监控.xlsx》
|
||||
// 一级功能:模块化库存监控 二级功能:配件库存监控
|
||||
// 表头:图片 | 预警 | SKU编码 | 名称 | 当日入库库存 | 当日出库库存 | 实时库存 |
|
||||
// 仓位 | 近7日日均发货量 | 库存可用天数 | 所在仓库
|
||||
// 仓位 | 近15天日均发货量 | 库存可用天数 | 所在仓库
|
||||
// 数据范围:仅取「简尚-崔桥工厂半成品包装项目仓」仓库下的 SKU 编码
|
||||
//
|
||||
// 数据来源(业务库 JSReportReplica / schema=rpt,2026-09-12 实测确认):
|
||||
@ -14,7 +14,7 @@
|
||||
// 库存 rpt.jst_inventoryInfo —— 实时库存 qty;按 wms_co_id 区分仓库
|
||||
// 目标仓库 wms_co_id = 15718196(rpt.jst_warehouseInfo 查得)
|
||||
// 监控 rpt.pm_stockMonitor —— 日更快照,目标仓每天 794 行,覆盖全部 SKU:
|
||||
// sevenAvgSale 近7日日均发货量
|
||||
// fifteenAvgSale 近15天日均发货量(2026-09-17 由 7 天改 15 天,见下)
|
||||
// jsUseDays 库存可用天数
|
||||
// safetyDays 安全天数(默认 15)
|
||||
// suggestStock 建议备货量
|
||||
@ -76,7 +76,7 @@ const SORTABLE_FIELDS = Object.freeze({
|
||||
productName: 's.name',
|
||||
category: 's.category',
|
||||
realtimeStock: 'realtimeStock',
|
||||
avgShip7d: 'm.sevenAvgSale',
|
||||
avgShip15d: 'm.fifteenAvgSale',
|
||||
stockDays: 'm.jsUseDays',
|
||||
warningLevel: 'warningOrder',
|
||||
mkhStatus: 'mkhStatus',
|
||||
@ -108,7 +108,7 @@ OUTER APPLY (
|
||||
ORDER BY i.updateTime DESC
|
||||
) inv
|
||||
OUTER APPLY (
|
||||
SELECT TOP 1 m2.sevenAvgSale, m2.jsUseDays, m2.safetyDays, m2.suggestStock,
|
||||
SELECT TOP 1 m2.fifteenAvgSale, m2.jsUseDays, m2.safetyDays, m2.suggestStock,
|
||||
m2.date, m2.jsStock, m2.nearSecondSale
|
||||
FROM dbo.pm_stockMonitor m2
|
||||
WHERE m2.sku_id = s.sku_id AND m2.warehouse = @warehouseName
|
||||
@ -352,7 +352,7 @@ const mapRow = (row = {}) => {
|
||||
outQtyToday: toNumber(row.outQtyToday) ?? 0,
|
||||
realtimeStock,
|
||||
location: toText(row.location),
|
||||
avgShip7d: toNumber(row.avgShip7d),
|
||||
avgShip15d: toNumber(row.avgShip15d),
|
||||
stockDays,
|
||||
safetyDays,
|
||||
suggestStock: toNumber(row.suggestStock),
|
||||
@ -368,7 +368,7 @@ const buildProjection = () => `
|
||||
ISNULL(pin.inQty, 0) AS inQtyToday,
|
||||
ISNULL(m.nearSecondSale, 0) AS outQtyToday,
|
||||
COALESCE(NULLIF(LTRIM(RTRIM(s.bin)), N''), NULLIF(LTRIM(RTRIM(s.other_bin)), N'')) AS location,
|
||||
m.sevenAvgSale AS avgShip7d,
|
||||
m.fifteenAvgSale AS avgShip15d,
|
||||
m.jsUseDays AS stockDays,
|
||||
m.safetyDays AS safetyDays,
|
||||
m.suggestStock AS suggestStock,
|
||||
|
||||
@ -155,42 +155,52 @@ test('pack inventory locations match a BOM component and its package suffixes',
|
||||
test('pack inventory location prefers bins and falls back to positive-stock box ids', () => {
|
||||
const locations = _private.buildPackLocationMap([
|
||||
{
|
||||
skuId: 'PART-1-1', warehouseId: 1, warehouseName: '半成品仓', binGroup: '成品区', bin: 'A-01', packId: 'BOX-1', qty: 2,
|
||||
skuId: 'PART-1-1', warehouseId: 1, binGroup: '成品区', bin: 'A-01', packId: 'BOX-1', qty: 2,
|
||||
},
|
||||
{
|
||||
skuId: 'PART-1-2', warehouseId: 1, binGroup: null, bin: '', packId: 'BOX-2', qty: 1,
|
||||
},
|
||||
], ['PART-1']);
|
||||
|
||||
assert.equal(locations.get('PART-1'), '半成品仓 · 成品区 / A-01、仓库 1 · 箱号 BOX-2');
|
||||
assert.equal(locations.get('PART-1'), '仓库 1 · 成品区 / A-01、仓库 1 · 箱号 BOX-2');
|
||||
});
|
||||
|
||||
test('inventory warehouse fallback distinguishes unboxed stock from a warehouse with no box record', () => {
|
||||
const locations = _private.buildInventoryWarehouseMap([
|
||||
{
|
||||
skuId: 'PART-1', defaultWarehouse: '默认半成品仓', warehouseName: '实际库存仓', availableQty: 12,
|
||||
},
|
||||
{
|
||||
skuId: 'PART-2', defaultWarehouse: '默认半成品仓', warehouseName: '实际库存仓', availableQty: 0,
|
||||
},
|
||||
], ['PART-1', 'PART-2', 'PART-3']);
|
||||
|
||||
assert.equal(locations.get('PART-1'), '实际库存仓(未分箱)');
|
||||
assert.equal(locations.get('PART-2'), '默认半成品仓(暂无箱号)');
|
||||
assert.equal(locations.has('PART-3'), false);
|
||||
test('components without pack inventory rows do not receive a fallback warehouse location', () => {
|
||||
const locations = _private.buildPackLocationMap([], ['PART-1']);
|
||||
assert.equal(locations.has('PART-1'), false);
|
||||
});
|
||||
|
||||
// ── 补货预警:近 7 日日销 > 0 且 现有库存 < 3 天日销 ────────────────
|
||||
// ── 配件仓位:只认「箱及仓位库存」,不做库存表/商品档案仓回退(2026-09-17 业务口径)──
|
||||
test('component location is sourced only from the pack inventory table', () => {
|
||||
assert.equal(typeof _private.loadComponentLocations, 'function');
|
||||
// 兜底链已删除:这两个符号不应再存在(存在即有代码走回退)
|
||||
assert.equal(_private.loadComponentLocationData, undefined);
|
||||
assert.equal(_private.buildInventoryWarehouseMap, undefined);
|
||||
});
|
||||
|
||||
test('pack inventory without bin/bin_group falls back to the box id, never to a warehouse', () => {
|
||||
const locations = _private.buildPackLocationMap([
|
||||
{
|
||||
skuId: 'PART-1-1', warehouseId: 1, warehouseName: '半成品仓', binGroup: null, bin: null, packId: 'BOX-9', qty: 3,
|
||||
},
|
||||
], ['PART-1', 'PART-2']);
|
||||
|
||||
assert.equal(locations.get('PART-1'), '半成品仓 · 箱号 BOX-9');
|
||||
// 该表没有记录 → 无仓位,交给前端显示「未维护」,不回退任何仓库
|
||||
assert.equal(locations.has('PART-2'), false);
|
||||
});
|
||||
|
||||
// ── 补货预警:近 15 天日销 > 0 且 现有库存 < 3 天日销 ───────────────
|
||||
const metrics = (row) => _private.buildReplenishMetrics(row);
|
||||
|
||||
test('replenish: stock below 3 days of sales is flagged as stockout or warning', () => {
|
||||
const stockout = metrics({ sevenAvgSale: 2.55, realtimeStock: 0, monitorStock: 0 });
|
||||
const stockout = metrics({ avgSale: 2.55, realtimeStock: 0, monitorStock: 0 });
|
||||
assert.equal(stockout.stockDays, 0);
|
||||
assert.equal(stockout.warningLevel, '缺货');
|
||||
assert.equal(stockout.hasWarning, true);
|
||||
assert.equal(stockout.replenishQty, 8); // ceil(3 * 2.55 - 0) = ceil(7.65)
|
||||
|
||||
const warning = metrics({ sevenAvgSale: 2, realtimeStock: 1, monitorStock: 1 });
|
||||
const warning = metrics({ avgSale: 2, realtimeStock: 1, monitorStock: 1 });
|
||||
assert.equal(warning.stockDays, 0.5);
|
||||
assert.equal(warning.warningLevel, '预警');
|
||||
assert.equal(warning.hasWarning, true);
|
||||
@ -198,34 +208,34 @@ test('replenish: stock below 3 days of sales is flagged as stockout or warning',
|
||||
});
|
||||
|
||||
test('replenish: the threshold is exactly 3 days of sales', () => {
|
||||
const atThreshold = metrics({ sevenAvgSale: 2, realtimeStock: 6, monitorStock: 6 });
|
||||
const atThreshold = metrics({ avgSale: 2, realtimeStock: 6, monitorStock: 6 });
|
||||
assert.equal(atThreshold.stockDays, 3);
|
||||
assert.equal(atThreshold.warningLevel, '正常');
|
||||
assert.equal(atThreshold.hasWarning, false);
|
||||
assert.equal(atThreshold.replenishQty, 0);
|
||||
|
||||
const below = metrics({ sevenAvgSale: 2, realtimeStock: 5.9, monitorStock: 5.9 });
|
||||
const below = metrics({ avgSale: 2, realtimeStock: 5.9, monitorStock: 5.9 });
|
||||
assert.equal(below.hasWarning, true);
|
||||
});
|
||||
|
||||
test('replenish: stock prefers the brand-warehouse realtime value, snapshot only as fallback', () => {
|
||||
const realtime = metrics({ sevenAvgSale: 1, realtimeStock: 4, monitorStock: 9 });
|
||||
const realtime = metrics({ avgSale: 1, realtimeStock: 4, monitorStock: 9 });
|
||||
assert.equal(realtime.stock, 4);
|
||||
assert.equal(realtime.stockSource, 'realtime');
|
||||
|
||||
// 实时库存「无记录」(null)才回退监控快照
|
||||
const fallback = metrics({ sevenAvgSale: 1, realtimeStock: null, monitorStock: 9 });
|
||||
const fallback = metrics({ avgSale: 1, realtimeStock: null, monitorStock: 9 });
|
||||
assert.equal(fallback.stock, 9);
|
||||
assert.equal(fallback.stockSource, 'monitor');
|
||||
|
||||
// 实时库存为 0 是有效值,不得被快照覆盖
|
||||
const zero = metrics({ sevenAvgSale: 1, realtimeStock: 0, monitorStock: 9 });
|
||||
const zero = metrics({ avgSale: 1, realtimeStock: 0, monitorStock: 9 });
|
||||
assert.equal(zero.stock, 0);
|
||||
assert.equal(zero.warningLevel, '缺货');
|
||||
});
|
||||
|
||||
test('replenish: products without 7-day sales never warn', () => {
|
||||
const noSale = metrics({ sevenAvgSale: 0, realtimeStock: 0, monitorStock: 0 });
|
||||
const noSale = metrics({ avgSale: 0, realtimeStock: 0, monitorStock: 0 });
|
||||
assert.equal(noSale.hasWarning, false);
|
||||
assert.equal(noSale.warningLevel, '无销量');
|
||||
assert.equal(noSale.stockDays, null);
|
||||
@ -276,7 +286,7 @@ test('replenish sort puts the most urgent first and no-sale products last', () =
|
||||
test('replenish: a pending work order suppresses the replenish warning', () => {
|
||||
// 库存为 0、本该判「缺货」,但半成品包装项目仓已有未完成加工单
|
||||
const scheduled = metrics({
|
||||
sevenAvgSale: 2,
|
||||
avgSale: 2,
|
||||
realtimeStock: 0,
|
||||
monitorStock: 0,
|
||||
pendingWorkOrderQty: 20,
|
||||
@ -297,13 +307,13 @@ test('replenish: a pending work order suppresses the replenish warning', () => {
|
||||
assert.equal(scheduled.stockDays, 0);
|
||||
|
||||
// 同样库存但无加工单时仍然预警 —— 确认抑制效果确实来自加工单
|
||||
const bare = metrics({ sevenAvgSale: 2, realtimeStock: 0, monitorStock: 0 });
|
||||
const bare = metrics({ avgSale: 2, realtimeStock: 0, monitorStock: 0 });
|
||||
assert.equal(bare.hasWarning, true);
|
||||
assert.equal(bare.warningLevel, '缺货');
|
||||
});
|
||||
|
||||
test('replenish: pending work order fields default to empty without any order', () => {
|
||||
const none = metrics({ sevenAvgSale: 1, realtimeStock: 0 });
|
||||
const none = metrics({ avgSale: 1, realtimeStock: 0 });
|
||||
assert.equal(none.hasPendingWorkOrder, false);
|
||||
assert.equal(none.pendingWorkOrderQty, 0);
|
||||
assert.equal(none.pendingWorkOrderCount, 0);
|
||||
@ -312,7 +322,7 @@ test('replenish: pending work order fields default to empty without any order',
|
||||
|
||||
// 数量为 0 但确实挂着加工单(未入库)时,同样按「已排产」处理
|
||||
const zeroQty = metrics({
|
||||
sevenAvgSale: 1,
|
||||
avgSale: 1,
|
||||
realtimeStock: 0,
|
||||
pendingWorkOrderQty: 0,
|
||||
pendingWorkOrderCount: 2,
|
||||
@ -324,7 +334,7 @@ test('replenish: pending work order fields default to empty without any order',
|
||||
|
||||
test('replenish: products without sales stay "no sale" even with a pending work order', () => {
|
||||
const noSale = metrics({
|
||||
sevenAvgSale: 0,
|
||||
avgSale: 0,
|
||||
realtimeStock: 0,
|
||||
pendingWorkOrderQty: 5,
|
||||
pendingWorkOrderCount: 1,
|
||||
@ -342,6 +352,107 @@ test('pending work order filters keep the business-confirmed source and exclusio
|
||||
assert.equal(_private.WARNING_LEVEL.SCHEDULED, '已排产');
|
||||
});
|
||||
|
||||
// ── 待发货订单(见服务文件头 ⑩)──────────────────────────────────
|
||||
test('pending order: jst_Orders.skus text column is parsed into code/quantity pairs', () => {
|
||||
// 单商品、省略 *数量
|
||||
assert.deepEqual(_private.parseOrderSkus('1.MKHDNZ0409260700426'), [
|
||||
{ code: 'MKHDNZ0409260700426', qty: 1 },
|
||||
]);
|
||||
// 多商品、每个带 *数量(总件数前缀 2. 不参与计算)
|
||||
assert.deepEqual(_private.parseOrderSkus('2.A*1,B*1'), [
|
||||
{ code: 'A', qty: 1 },
|
||||
{ code: 'B', qty: 1 },
|
||||
]);
|
||||
// 同一单里成品与组合装混排:文本照常解析,是否成品由 isMkhProductCode 判定
|
||||
assert.deepEqual(
|
||||
_private.parseOrderSkus('3.GBGJ-ZWJ024903AN1407V01*1,GBGJ-ZWJ024903BN1407V01*1,MKHDNZ0409260600022*1'),
|
||||
[
|
||||
{ code: 'GBGJ-ZWJ024903AN1407V01', qty: 1 },
|
||||
{ code: 'GBGJ-ZWJ024903BN1407V01', qty: 1 },
|
||||
{ code: 'MKHDNZ0409260600022', qty: 1 },
|
||||
]
|
||||
);
|
||||
// 空值 / 空汇总(实测 23% 的普通订单是 `0.`,必须安全返回空数组)
|
||||
assert.deepEqual(_private.parseOrderSkus('0.'), []);
|
||||
assert.deepEqual(_private.parseOrderSkus(''), []);
|
||||
assert.deepEqual(_private.parseOrderSkus(null), []);
|
||||
assert.deepEqual(_private.parseOrderSkus('2.MKHDNZ0409260601388*2'), [
|
||||
{ code: 'MKHDNZ0409260601388', qty: 2 },
|
||||
]);
|
||||
});
|
||||
|
||||
test('pending order: only MKH finished products count, combination codes are excluded', () => {
|
||||
assert.equal(_private.isMkhProductCode('MKHDNZ0409260700426'), true);
|
||||
assert.equal(_private.isMkhProductCode('MKHSJ0425080100098'), true);
|
||||
// `MKH-` 打头的是组合装(拼接码),不是成品,不计入成品需求
|
||||
assert.equal(_private.isMkhProductCode('MKH-DNZ038522N1280V01-1-GBGJ-DNZ038403N1440V01-1'), false);
|
||||
assert.equal(_private.isMkhProductCode('GBGJ-ZWJ024903AN1407V01'), false);
|
||||
assert.equal(_private.isMkhProductCode(''), false);
|
||||
assert.deepEqual([..._private.PENDING_ORDER_EXCLUDED_STATUS], ['Cancelled', 'Merged']);
|
||||
});
|
||||
|
||||
test('replenish: no sales but unshipped orders still trigger the warning', () => {
|
||||
// 库存不够发货 → 缺货,补货量 = 待发货件数 − 现有库存
|
||||
const notEnough = metrics({
|
||||
avgSale: 0, realtimeStock: 1, monitorStock: 1, pendingOrderQty: 4, pendingOrderCount: 2,
|
||||
});
|
||||
assert.equal(notEnough.hasWarning, true);
|
||||
assert.equal(notEnough.warningLevel, '缺货');
|
||||
assert.equal(notEnough.replenishQty, 3);
|
||||
assert.equal(notEnough.orderDriven, true);
|
||||
// 无日销基数 → 缺货时记 0,保证排在预警清单最前
|
||||
assert.equal(notEnough.stockDays, 0);
|
||||
assert.equal(notEnough.pendingOrderQty, 4);
|
||||
assert.equal(notEnough.pendingOrderCount, 2);
|
||||
|
||||
// 库存刚好够发 → 预警(不再缺货),补货量为 0
|
||||
const exactlyEnough = metrics({
|
||||
avgSale: 0, realtimeStock: 4, monitorStock: 4, pendingOrderQty: 4,
|
||||
});
|
||||
assert.equal(exactlyEnough.warningLevel, '预警');
|
||||
assert.equal(exactlyEnough.hasWarning, true);
|
||||
assert.equal(exactlyEnough.replenishQty, 0);
|
||||
// 库存已够发时算不出可用天数,记 null(页面显示「按订单」)
|
||||
assert.equal(exactlyEnough.stockDays, null);
|
||||
});
|
||||
|
||||
test('replenish: order-driven warning does not override the pending work order exemption', () => {
|
||||
const scheduled = metrics({
|
||||
avgSale: 0,
|
||||
realtimeStock: 0,
|
||||
pendingOrderQty: 5,
|
||||
pendingOrderCount: 1,
|
||||
pendingWorkOrderQty: 6,
|
||||
pendingWorkOrderCount: 1,
|
||||
});
|
||||
assert.equal(scheduled.warningLevel, '已排产');
|
||||
assert.equal(scheduled.hasWarning, false);
|
||||
assert.equal(scheduled.replenishQty, 0);
|
||||
// 待发货量仍要透出,页面上应能看到
|
||||
assert.equal(scheduled.pendingOrderQty, 5);
|
||||
assert.equal(scheduled.orderDriven, true);
|
||||
});
|
||||
|
||||
test('replenish: pending order fields default to empty without any unshipped order', () => {
|
||||
const none = metrics({ avgSale: 1, realtimeStock: 0 });
|
||||
assert.equal(none.pendingOrderQty, 0);
|
||||
assert.equal(none.pendingOrderCount, 0);
|
||||
assert.equal(none.pendingOrderEarliest, null);
|
||||
assert.equal(none.orderDriven, false);
|
||||
|
||||
// 无日销且无订单 → 仍是「无销量」,不参与预警
|
||||
const noSale = metrics({ avgSale: 0, realtimeStock: 0, pendingOrderQty: 0 });
|
||||
assert.equal(noSale.warningLevel, '无销量');
|
||||
assert.equal(noSale.orderDriven, false);
|
||||
|
||||
// 有日销的商品照旧走原口径,但待发货量也要带上(页面新增列)
|
||||
const withSale = metrics({ avgSale: 2, realtimeStock: 0, pendingOrderQty: 3 });
|
||||
assert.equal(withSale.warningLevel, '缺货');
|
||||
assert.equal(withSale.orderDriven, false);
|
||||
assert.equal(withSale.pendingOrderQty, 3);
|
||||
assert.equal(withSale.replenishQty, 6); // ceil(3 × 2 − 0),不受订单量影响
|
||||
});
|
||||
|
||||
// ── 导出(见服务文件头 ⑨)────────────────────────────────────────
|
||||
test('export: product rows follow the page table columns', () => {
|
||||
const rows = _private.buildProductExportRows([
|
||||
@ -381,8 +492,11 @@ test('export: product rows follow the page table columns', () => {
|
||||
dailySale: 2.97,
|
||||
stock: 0,
|
||||
pendingWorkOrderQty: 0,
|
||||
pendingOrderQty: 0,
|
||||
stockDays: 0,
|
||||
replenishQty: 9,
|
||||
componentShortage: '',
|
||||
assemblableQty: null,
|
||||
bomConfigured: '已配置',
|
||||
accessoryCount: 2,
|
||||
accessoryQtySum: 16,
|
||||
@ -390,6 +504,7 @@ test('export: product rows follow the page table columns', () => {
|
||||
// 无销量 → stockDays 为 null(前端导出时渲染成「无销量」),在途量缺省归 0
|
||||
assert.equal(rows[1].stockDays, null);
|
||||
assert.equal(rows[1].pendingWorkOrderQty, 0);
|
||||
assert.equal(rows[1].pendingOrderQty, 0);
|
||||
assert.equal(rows[1].bomConfigured, '未配置');
|
||||
assert.equal(rows[1].accessoryQtySum, 0);
|
||||
});
|
||||
@ -475,3 +590,117 @@ test('pack inventory location chunk size stays under the MSSQL parameter limit',
|
||||
// 每个编码占 2 个参数(精确匹配 @lcN + 带后缀前缀匹配 @lpN),MSSQL 单语句上限 2100
|
||||
assert.equal(_private.COMPONENT_LOCATION_CHUNK_SIZE * 2 <= 2000, true);
|
||||
});
|
||||
|
||||
// ── 配件不足 / 可组装数(见服务文件头 ⑪)──────────────────────────
|
||||
test('component readiness: assemblable qty is limited by the tightest component', () => {
|
||||
const components = [
|
||||
{ barcode: 'A', name: '配件A', qty: 1 },
|
||||
{ barcode: 'B', name: '配件B', qty: 2 },
|
||||
];
|
||||
// A: floor(10 / 1) = 10,B: floor(7 / 2) = 3 → 木桶短板是 B
|
||||
const ready = _private.buildComponentReadiness(components, new Map([['A', 10], ['B', 7]]), new Map());
|
||||
|
||||
assert.equal(ready.assemblableQty, 3);
|
||||
assert.equal(ready.shortage, false);
|
||||
assert.equal(ready.bottlenecks[0].code, 'B');
|
||||
assert.equal(ready.bottlenecks[0].can, 3);
|
||||
// Tooltip 要能显示「单台用量」,不能默认当 1
|
||||
assert.equal(ready.bottlenecks[0].perQty, 2);
|
||||
});
|
||||
|
||||
test('component readiness: zero assemblable qty marks 配件不足', () => {
|
||||
const components = [
|
||||
{ barcode: 'A', name: '配件A', qty: 1 },
|
||||
{ barcode: 'B', name: '配件B', qty: 1 },
|
||||
];
|
||||
// B 在该仓没有库存记录 → 视为 0(loadComponentStock 会缓存 0),一台都凑不出来
|
||||
const ready = _private.buildComponentReadiness(components, new Map([['A', 500]]), new Map());
|
||||
|
||||
assert.equal(ready.assemblableQty, 0);
|
||||
assert.equal(ready.shortage, true);
|
||||
assert.equal(ready.bottlenecks[0].code, 'B');
|
||||
assert.equal(ready.bottlenecks[0].stock, 0);
|
||||
assert.equal(ready.bottlenecks[0].available, 0);
|
||||
});
|
||||
|
||||
test('component readiness: pending work order occupation is deducted from stock', () => {
|
||||
const components = [{ barcode: 'A', name: '配件A', qty: 2 }];
|
||||
// 库存 10、单台用量 2 → 5 台;扣掉加工单占用 6 件 → floor((10 − 6) / 2) = 2
|
||||
const ready = _private.buildComponentReadiness(
|
||||
components,
|
||||
new Map([['A', 10]]),
|
||||
new Map([['A', 6]])
|
||||
);
|
||||
assert.equal(ready.assemblableQty, 2);
|
||||
assert.equal(ready.bottlenecks[0].occupied, 6);
|
||||
assert.equal(ready.bottlenecks[0].available, 4);
|
||||
|
||||
// 占用超过库存 → 可支配数归 0,不能算成负数
|
||||
const exhausted = _private.buildComponentReadiness(
|
||||
components,
|
||||
new Map([['A', 10]]),
|
||||
new Map([['A', 20]])
|
||||
);
|
||||
assert.equal(exhausted.assemblableQty, 0);
|
||||
assert.equal(exhausted.shortage, true);
|
||||
assert.equal(exhausted.bottlenecks[0].available, 0);
|
||||
});
|
||||
|
||||
test('component readiness: missing BOM detail means unknown, not 配件不足', () => {
|
||||
// 没有配件明细 → 判不了(组件缺失 ≠ 配件不足),返回 null 让调用方跳过标记
|
||||
assert.equal(_private.buildComponentReadiness([], new Map(), new Map()), null);
|
||||
assert.equal(_private.buildComponentReadiness(null, new Map(), new Map()), null);
|
||||
assert.equal(_private.buildComponentReadiness(undefined, new Map(), new Map()), null);
|
||||
});
|
||||
|
||||
test('component occupation: pending work orders expand into component quantities', () => {
|
||||
const bomBySku = new Map([['MKHA1', [
|
||||
{ barcode: 'A', qty: 2 },
|
||||
{ barcode: 'B', qty: 1 },
|
||||
]]]);
|
||||
const occupation = _private.buildComponentOccupation([
|
||||
{ skuId: 'MKHA1', pendingWorkOrderQty: 5 },
|
||||
// 加工单商品没有 BOM → 不产生占用(不抛错、不写脏数据)
|
||||
{ skuId: 'MKH-NO-BOM', pendingWorkOrderQty: 9 },
|
||||
// 在途 0 或非数字 → 忽略
|
||||
{ skuId: 'MKHA1', pendingWorkOrderQty: 0 },
|
||||
{ skuId: 'MKHA1', pendingWorkOrderQty: null },
|
||||
], bomBySku);
|
||||
|
||||
assert.equal(occupation.get('A'), 10);
|
||||
assert.equal(occupation.get('B'), 5);
|
||||
assert.equal(occupation.size, 2);
|
||||
});
|
||||
|
||||
test('component shortage keeps the business-confirmed source and scope', () => {
|
||||
// 配件库存只认半成品包装仓、只判现有库存(不含采购在途)
|
||||
assert.equal(_private.COMPONENT_STOCK_WMS_CO_ID, 15718196);
|
||||
assert.equal(_private.COMPONENT_STOCK_WAREHOUSE, '简尚-崔桥工厂半成品包装项目仓');
|
||||
// 每个编码占 1 个参数,MSSQL 单语句上限 2100
|
||||
assert.equal(_private.COMPONENT_STOCK_CHUNK_SIZE <= 2000, true);
|
||||
assert.equal(typeof _private.loadComponentStock, 'function');
|
||||
assert.equal(typeof _private.loadMkhComponentReadiness, 'function');
|
||||
});
|
||||
|
||||
test('export: 配件不足 rows are flagged and carry no replenish target', () => {
|
||||
const rows = _private.buildProductExportRows([
|
||||
{
|
||||
row: {
|
||||
skuId: 'MKHDNZ0409260600843',
|
||||
productName: 'K字单板基础',
|
||||
warningLevel: '缺货',
|
||||
dailySale: 0,
|
||||
stock: 0,
|
||||
pendingOrderQty: 1,
|
||||
replenishQty: 1,
|
||||
componentShortage: true,
|
||||
assemblableQty: 0,
|
||||
},
|
||||
components: [{ barcode: 'DNZ040958N1440V01', name: '白架通用前拉杆', qty: 1 }],
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(rows[0].componentShortage, '配件不足');
|
||||
// 可组装数一并导出,便于业务核对短板
|
||||
assert.equal(rows[0].assemblableQty, 0);
|
||||
});
|
||||
|
||||
@ -83,7 +83,7 @@ test('notification carries recipient, idempotency key and shortfall details', ()
|
||||
const all = [...fresh, alert('MKHDNZ0409260700486', '预警', { dailySale: 2, stock: 1, replenishQty: 5 })];
|
||||
const snapshot = {
|
||||
monitorDate: '2026-09-16',
|
||||
saleWindowDays: 7,
|
||||
saleWindowDays: 15,
|
||||
replenishDaysThreshold: 3,
|
||||
outOfStockCount: 1,
|
||||
warningOnlyCount: 1,
|
||||
@ -137,3 +137,58 @@ test('notification flags degraded work-order source', () => {
|
||||
});
|
||||
assert.ok(payload.content.includes('加工单数据源暂不可用'));
|
||||
});
|
||||
|
||||
// ── 配件不足(见 mkhBomService 文件头 ⑪)──────────────────────────
|
||||
test('notification spells out 配件不足 and drops the replenish target', () => {
|
||||
const shortage = alert('MKHDNZ0409260600843', '缺货', {
|
||||
dailySale: 0,
|
||||
stock: 0,
|
||||
replenishQty: 1,
|
||||
componentShortage: true,
|
||||
assemblableQty: 0,
|
||||
bottleneckComponents: [
|
||||
{ code: 'DNZ040958N1440V01', name: '白架通用前拉杆', perQty: 1, stock: 0, occupied: 0, available: 0, can: 0 },
|
||||
{ code: 'DNZ041106B01V01', name: '通用小K', perQty: 1, stock: 23, occupied: 0, available: 23, can: 23 },
|
||||
],
|
||||
});
|
||||
|
||||
const payload = buildMkhReplenishNotification({
|
||||
alerts: [shortage],
|
||||
allAlerts: [shortage],
|
||||
snapshot: {
|
||||
outOfStockCount: 1,
|
||||
warningOnlyCount: 0,
|
||||
replenishQtyTotal: 1,
|
||||
componentShortageCount: 1,
|
||||
},
|
||||
recipientAlias: '苏适',
|
||||
dateKey: '20260917',
|
||||
});
|
||||
|
||||
assert.ok(payload.content.includes('配件不足,无法补货'));
|
||||
// 补不出来的商品不再给补货数字,避免业务照着一个补不到的目标去采购
|
||||
assert.ok(payload.content.includes('建议补货 —'));
|
||||
assert.equal(payload.content.includes('建议补货 1'), false);
|
||||
// 只列真正卡住的短板(可支配数 ≤ 0),库存充足的不列
|
||||
assert.ok(payload.content.includes('DNZ040958N1440V01'));
|
||||
assert.equal(payload.content.includes('DNZ041106B01V01'), false);
|
||||
// 汇总段说明本批里有几个配件不足
|
||||
assert.ok(payload.content.includes('因**配件库存不足**'));
|
||||
});
|
||||
|
||||
test('notification flags degraded component stock source', () => {
|
||||
const payload = buildMkhReplenishNotification({
|
||||
alerts: [alert('A')],
|
||||
allAlerts: [alert('A')],
|
||||
snapshot: {
|
||||
outOfStockCount: 1,
|
||||
warningOnlyCount: 0,
|
||||
replenishQtyTotal: 3,
|
||||
componentStockDegraded: true,
|
||||
},
|
||||
recipientAlias: '苏适',
|
||||
dateKey: '20260917',
|
||||
});
|
||||
assert.ok(payload.content.includes('配件库存数据源暂不可用'));
|
||||
assert.ok(payload.content.includes('未做'));
|
||||
});
|
||||
|
||||
43
deploy/production/build-frontend.sh
Executable file
43
deploy/production/build-frontend.sh
Executable file
@ -0,0 +1,43 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
REPO_DIR="$(cd "$SCRIPT_DIR/../.." && pwd)"
|
||||
FRONTEND_DIR="$REPO_DIR/frontend"
|
||||
SOURCE_GIT_FULL_SHA="$(cd "$REPO_DIR" && git rev-parse HEAD)"
|
||||
SOURCE_GIT_SHA="$(cd "$REPO_DIR" && git rev-parse --short HEAD)"
|
||||
SOURCE_GIT_REF="$(cd "$REPO_DIR" && git symbolic-ref --quiet --short HEAD 2>/dev/null || true)"
|
||||
SOURCE_GIT_REF="${SOURCE_GIT_REF:-main}"
|
||||
|
||||
test -f "$FRONTEND_DIR/package-lock.json" || {
|
||||
echo 'frontend/package-lock.json 不存在,停止构建' >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
docker run --rm \
|
||||
-e "SOURCE_GIT_SHA=$SOURCE_GIT_SHA" \
|
||||
-e "SOURCE_GIT_FULL_SHA=$SOURCE_GIT_FULL_SHA" \
|
||||
-e "SOURCE_GIT_REF=$SOURCE_GIT_REF" \
|
||||
-v "$FRONTEND_DIR:/host-frontend" \
|
||||
node:22-bookworm-slim \
|
||||
sh -lc '
|
||||
set -eu
|
||||
mkdir -p /workspace
|
||||
tar -C /host-frontend --exclude=node_modules --exclude=dist -cf - . | tar -C /workspace -xf -
|
||||
cd /workspace
|
||||
npm ci --no-audit --no-fund
|
||||
npm run build
|
||||
mkdir -p /host-frontend/dist
|
||||
find /host-frontend/dist -mindepth 1 -delete
|
||||
cp -a /workspace/dist/. /host-frontend/dist/
|
||||
'
|
||||
|
||||
node - "$FRONTEND_DIR/dist/__build_version__.json" "$SOURCE_GIT_FULL_SHA" <<'NODE'
|
||||
const fs = require('node:fs');
|
||||
const [versionPath, expectedSha] = process.argv.slice(2);
|
||||
const metadata = JSON.parse(fs.readFileSync(versionPath, 'utf8'));
|
||||
if (metadata.sourceGitFullSha !== expectedSha) {
|
||||
throw new Error(`前端构建 SHA 不匹配:${metadata.sourceGitFullSha} != ${expectedSha}`);
|
||||
}
|
||||
process.stdout.write(`前端构建已验证:${metadata.version}\n`);
|
||||
NODE
|
||||
1042
frontend/package-lock.json
generated
1042
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -37,9 +37,6 @@
|
||||
"eslint-plugin-react-hooks": "^7.0.1",
|
||||
"eslint-plugin-react-refresh": "^0.4.24",
|
||||
"globals": "^16.5.0",
|
||||
"vite": "npm:rolldown-vite@7.2.5"
|
||||
},
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@7.2.5"
|
||||
"vite": "7.2.7"
|
||||
}
|
||||
}
|
||||
|
||||
@ -41,6 +41,23 @@ const WARNING_TONE = {
|
||||
无销量: 'muted',
|
||||
};
|
||||
|
||||
// 配件不足说明(口径见后端 mkhBomService 文件头 ⑪):
|
||||
// 可组装数 = min(⌊(配件库存 − 未完成加工单占用) ÷ 单台用量⌋),为 0 即凑不出一台、补不出来
|
||||
const shortageTooltip = (row) => {
|
||||
const bottlenecks = Array.isArray(row.bottleneckComponents) ? row.bottleneckComponents : [];
|
||||
const details = bottlenecks
|
||||
.filter((item) => Number(item.available) <= 0)
|
||||
.map((item) => `短板 ${item.code}${item.name ? `(${item.name})` : ''}`
|
||||
+ `:库存 ${number(item.stock)}`
|
||||
+ `${Number(item.occupied) > 0 ? `,未完成加工单占用 ${number(item.occupied)}` : ''}`
|
||||
+ `,单台用量 ${number(item.perQty)}`);
|
||||
return [
|
||||
`配件不足,无法补货:现有配件最多只能组装 ${number(row.assemblableQty)} 台`,
|
||||
...details,
|
||||
'口径:可组装数 = 各配件 ⌊(库存 − 未完成加工单占用) ÷ 单台用量⌋ 取最小;为 0 即补不出来',
|
||||
].filter(Boolean).join(';');
|
||||
};
|
||||
|
||||
// 展示范围切换
|
||||
const SCOPE_OPTIONS = [
|
||||
{ label: '仅预警', value: 'warning' },
|
||||
@ -54,23 +71,30 @@ const PRODUCT_EXPORT_COLUMNS = [
|
||||
{ title: 'MKH商品编码', dataIndex: 'skuId' },
|
||||
{ title: '商品名称', dataIndex: 'productName' },
|
||||
{ title: '预警', dataIndex: 'warningLevel' },
|
||||
{ title: '近7日日销', dataIndex: 'dailySale' },
|
||||
{ title: '近15天日销', dataIndex: 'dailySale' },
|
||||
{ title: '现有库存', dataIndex: 'stock' },
|
||||
{ title: '在途加工量', dataIndex: 'pendingWorkOrderQty' },
|
||||
{ title: '待发货订单', dataIndex: 'pendingOrderQty' },
|
||||
{
|
||||
title: '可用天数',
|
||||
dataIndex: 'stockDays',
|
||||
// 无销量商品 stockDays 为 null,导出成文字而非空白,一眼能分辨
|
||||
exportValue: (value) => (value === null || value === undefined ? '无销量' : value),
|
||||
// 无销量商品 stockDays 为 null,导出成文字而非空白,一眼能分辨;
|
||||
// 订单驱动(日销=0 但有未发货订单)同样是 null,口径不同要分开说明
|
||||
exportValue: (value, row) => {
|
||||
if (value !== null && value !== undefined) return value;
|
||||
return row.orderDriven ? '无日销·按订单' : '无销量';
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '建议补货量',
|
||||
dataIndex: 'replenishQty',
|
||||
// 与页面一致:非预警商品不显示数字,避免被当成「需要补 0 件」
|
||||
exportValue: (value, row) => (
|
||||
(row.warningLevel === '缺货' || row.warningLevel === '预警') && Number(value) > 0 ? value : ''
|
||||
),
|
||||
// 与页面一致:非预警商品不显示数字;配件不足(可组装数 = 0)时显示「—」不给补货目标
|
||||
exportValue: (value, row) => {
|
||||
if (row.componentShortage) return '—';
|
||||
return (row.warningLevel === '缺货' || row.warningLevel === '预警') && Number(value) > 0 ? value : '';
|
||||
},
|
||||
},
|
||||
{ title: '配件不足', dataIndex: 'componentShortage' },
|
||||
{ title: 'BOM 状态', dataIndex: 'bomConfigured' },
|
||||
{ title: '配件种类', dataIndex: 'accessoryCount' },
|
||||
{ title: '配件总数量', dataIndex: 'accessoryQtySum' },
|
||||
@ -182,7 +206,7 @@ const PrintPreview = ({ data, onClose }) => {
|
||||
<div className="mkh-print-foot">
|
||||
<span>
|
||||
MKH 商品编码取自指定仓库商品主档;配件优先取聚水潭商品 BOM,业务组合 BOM 与产品资料系统作为补充;
|
||||
配件仓位优先取包装箱与具体仓位,尚未分箱时显示库存仓库或商品档案仓库。
|
||||
配件仓位只取聚水潭「箱及仓位库存」,未维护货位时显示箱号,无装箱记录显示「未维护」。
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@ -473,14 +497,22 @@ const MkhBomData = () => {
|
||||
{
|
||||
title: '预警',
|
||||
dataIndex: 'warningLevel',
|
||||
width: 84,
|
||||
width: 140,
|
||||
align: 'center',
|
||||
render: (value) => (
|
||||
<span className={`mkh-tag mkh-tag--${WARNING_TONE[value] || 'muted'}`}>{text(value)}</span>
|
||||
render: (value, row) => (
|
||||
<Space size={4}>
|
||||
<span className={`mkh-tag mkh-tag--${WARNING_TONE[value] || 'muted'}`}>{text(value)}</span>
|
||||
{/* 配件不足(后端文件头 ⑪):可组装数 = 0,补不出来 —— 只加标记,不改变预警级别 */}
|
||||
{row.componentShortage ? (
|
||||
<Tooltip title={shortageTooltip(row)}>
|
||||
<span className="mkh-tag mkh-tag--shortage">配件不足</span>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
</Space>
|
||||
),
|
||||
},
|
||||
{
|
||||
title: '近7日日销',
|
||||
title: '近15天日销',
|
||||
dataIndex: 'dailySale',
|
||||
width: 106,
|
||||
align: 'right',
|
||||
@ -519,24 +551,58 @@ const MkhBomData = () => {
|
||||
</Tooltip>
|
||||
) : <span className="mkh-muted">—</span>),
|
||||
},
|
||||
{
|
||||
title: '待发货订单',
|
||||
dataIndex: 'pendingOrderQty',
|
||||
width: 116,
|
||||
align: 'right',
|
||||
render: (value, row) => (Number(value) > 0 ? (
|
||||
<Tooltip
|
||||
title={[
|
||||
`聚水潭未发货订单 ${row.pendingOrderCount || 0} 单,合计 ${number(value)} 件`,
|
||||
row.pendingOrderEarliest ? `最早一单下单于 ${row.pendingOrderEarliest}` : '',
|
||||
'已取消 / 已合并单据不核算',
|
||||
row.orderDriven ? '该商品近 15 天暂无日销,按待发货订单量列入补货预警' : '',
|
||||
].filter(Boolean).join(';')}
|
||||
>
|
||||
<span className="mkh-order">{number(value)}</span>
|
||||
</Tooltip>
|
||||
) : <span className="mkh-muted">—</span>),
|
||||
},
|
||||
{
|
||||
title: '可用天数',
|
||||
dataIndex: 'stockDays',
|
||||
width: 106,
|
||||
align: 'right',
|
||||
sorter: true,
|
||||
render: (value, row) => (value === null || value === undefined
|
||||
? <span className="mkh-muted">无销量</span>
|
||||
: <span className={row.hasWarning ? 'mkh-days--warn' : undefined}>{number(value, 2)}</span>),
|
||||
render: (value, row) => {
|
||||
if (value === null || value === undefined) {
|
||||
// 订单驱动(近15天无日销、按待发货订单预警)与「无销量」都算不出天数,但含义不同
|
||||
return row.orderDriven
|
||||
? <Tooltip title="近 15 天暂无日销,无日销基数可算天数,按待发货订单量预警"><span className="mkh-muted">按订单</span></Tooltip>
|
||||
: <span className="mkh-muted">无销量</span>;
|
||||
}
|
||||
return <span className={row.hasWarning ? 'mkh-days--warn' : undefined}>{number(value, 2)}</span>;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '建议补货量',
|
||||
dataIndex: 'replenishQty',
|
||||
width: 116,
|
||||
width: 130,
|
||||
align: 'right',
|
||||
render: (value, row) => (row.hasWarning && Number(value) > 0
|
||||
? <span className="mkh-replenish">{number(value)}</span>
|
||||
: <span className="mkh-muted">—</span>),
|
||||
render: (value, row) => {
|
||||
// 配件不足(后端文件头 ⑪):凑不出一台,不给补货目标,避免业务照着补不到的量去采购
|
||||
if (row.componentShortage) {
|
||||
return (
|
||||
<Tooltip title={shortageTooltip(row)}>
|
||||
<span className="mkh-muted">—</span>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
return row.hasWarning && Number(value) > 0
|
||||
? <span className="mkh-replenish">{number(value)}</span>
|
||||
: <span className="mkh-muted">—</span>;
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'BOM 状态',
|
||||
@ -634,7 +700,7 @@ const MkhBomData = () => {
|
||||
dataIndex: 'location',
|
||||
width: 140,
|
||||
render: (v) => (v ? text(v) : (
|
||||
<Tooltip title="上游未回传库位数据">
|
||||
<Tooltip title="箱及仓位库存表中没有该配件的有效记录">
|
||||
<span className="mkh-muted">未维护</span>
|
||||
</Tooltip>
|
||||
)),
|
||||
@ -651,20 +717,29 @@ const MkhBomData = () => {
|
||||
<div className="mkh-header__heading">
|
||||
<Title level={3}>MKH-BOM 资料</Title>
|
||||
<Text type="secondary">
|
||||
模块化(MKH 开头)成品的配件明细与补货预警:近 7 日日销核算,库存低于 3 天日销即预警
|
||||
模块化(MKH 开头)成品的配件明细与补货预警:近 15 天日销核算,库存低于 3 天日销即预警
|
||||
</Text>
|
||||
<Text type="secondary" className="mkh-note">
|
||||
数据口径:MKH 商品编码仅取自业务库 jst_sku 中“简尚-崔桥工厂品牌仓”的成品(当前 4408 条);
|
||||
配件明细与数量优先取自聚水潭商品 BOM,业务中台组合商品 BOM 与产品资料系统数据库中维护的配件作为补充。
|
||||
无指定仓库商品档案的 BOM 组合编码不会进入列表;配件仓位优先显示箱号或具体仓位,
|
||||
尚未分箱时显示实际库存仓库,没有库存记录时显示商品档案仓库。
|
||||
数据口径:MKH 商品编码取自业务库 jst_sku 中“简尚-崔桥工厂品牌仓”,并且必须是聚水潭正式 BOM 的父项;
|
||||
配件明细与数量优先取自聚水潭商品 BOM,业务中台组合商品 BOM 与产品资料系统数据库中维护的配件作为补充;
|
||||
无指定仓库商品档案的 BOM 组合编码不会进入列表;配件仓位只取 rpt.jst_packInventoryInfo,
|
||||
优先显示具体仓位,没有具体仓位时显示箱号,表中没有有效记录时显示「未维护」。
|
||||
<br />
|
||||
补货预警:近7日日销取聚水潭库存监控快照(监控日 {data.monitorDate || '—'}),现有库存优先取品牌仓实时库存、
|
||||
该仓无记录时回退监控快照库存;可用天数 = 现有库存 ÷ 近7日日销,低于 3 天即预警,缺货单独标识;
|
||||
建议补货量 = 3 × 近7日日销 − 现有库存(向上取整)。无近7日日销的商品不参与预警。
|
||||
补货预警:近15天日销取聚水潭库存监控快照(监控日 {data.monitorDate || '—'}),现有库存优先取品牌仓实时库存、
|
||||
该仓无记录时回退监控快照库存;可用天数 = 现有库存 ÷ 近15天日销,低于 3 天即预警,缺货单独标识;
|
||||
建议补货量 = 3 × 近15天日销 − 现有库存(向上取整)。无日销且无订单的商品不参与预警。
|
||||
<br />
|
||||
待发货订单:近15天暂无日销、但聚水潭存在「未发货订单」的 MKH 成品同样列入补货预警
|
||||
(新品刚接到订单时监控快照的日销还是 0,避免漏备货)。未发货 = 订单无发货时间且状态非「取消 / 已合并」;
|
||||
预警级别按「现有库存 < 待发货件数 → 缺货,否则预警」,建议补货量 = 待发货件数 − 现有库存,
|
||||
可用天数因无日销基数而显示「按订单」。
|
||||
<br />
|
||||
在途加工单:「{data.workOrderWarehouse || '简尚-崔桥工厂半成品包装项目仓'}」中已存在且未完成的加工单已纳入核算
|
||||
(作废单据不核算);只要该 MKH 商品存在未完成加工单,即视为已排产、不再列入补货预警。
|
||||
<br />
|
||||
配件不足:缺货 / 预警的成品若配件「可组装数 = 0」则无法补货,标记「配件不足」、建议补货量显示「—」。
|
||||
可组装数 = 各配件 ⌊(现有库存 − 未完成加工单占用) ÷ BOM 单台用量⌋ 取最小值(木桶短板决定),
|
||||
配件库存取「{data.componentStockWarehouse || '简尚-崔桥工厂半成品包装项目仓'}」的现有库存,不含采购在途。
|
||||
</Text>
|
||||
</div>
|
||||
</header>
|
||||
@ -713,18 +788,45 @@ const MkhBomData = () => {
|
||||
/>
|
||||
) : null}
|
||||
|
||||
{!loading && !error && data.pendingOrderDegraded ? (
|
||||
<Alert
|
||||
className="mkh-alert"
|
||||
type="warning"
|
||||
showIcon
|
||||
message="待发货订单数据源暂时不可用,待发货量按 0 处理,可能遗漏「近15天无日销但有订单」的商品,请稍后点击「刷新数据」重试。"
|
||||
action={<Button size="small" onClick={load}>刷新数据</Button>}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
{!loading && !error && data.componentStockDegraded ? (
|
||||
<Alert
|
||||
className="mkh-alert"
|
||||
type="warning"
|
||||
showIcon
|
||||
message="配件库存数据源暂时不可用,本次未做「配件不足」判定,可能存在配件凑不齐、补不出来的商品,请稍后点击「刷新数据」重试。"
|
||||
action={<Button size="small" onClick={load}>刷新数据</Button>}
|
||||
/>
|
||||
) : null}
|
||||
|
||||
{!loading && (data.warningCount || 0) > 0 ? (
|
||||
<Alert
|
||||
className="mkh-alert"
|
||||
type="warning"
|
||||
showIcon
|
||||
message={`补货预警:${data.warningCount} 个 MKH 商品现有库存低于 ${data.replenishDaysThreshold || 3} 天日销`}
|
||||
message={`补货预警:${data.warningCount} 个 MKH 商品需要补货`}
|
||||
description={(
|
||||
<span>
|
||||
按近 {data.saleWindowDays || 7} 日日销核算(监控日 {data.monitorDate || '—'}):
|
||||
按近 {data.saleWindowDays || 15} 天日销核算(监控日 {data.monitorDate || '—'}):
|
||||
其中 <b>{data.outOfStockCount || 0}</b> 个已缺货,
|
||||
<b>{Math.max(0, (data.warningCount || 0) - (data.outOfStockCount || 0))}</b> 个可用天数不足 {data.replenishDaysThreshold || 3} 天。
|
||||
建议补货量 = {data.replenishDaysThreshold || 3} × 近7日日销 − 现有库存。点「只看预警」即为补货清单。
|
||||
建议补货量 = {data.replenishDaysThreshold || 3} × 近15天日销 − 现有库存。点「只看预警」即为补货清单。
|
||||
{(data.orderDrivenCount || 0) > 0 ? (
|
||||
<>
|
||||
<br />
|
||||
其中 <b>{data.orderDrivenCount}</b> 个近 15 天暂无日销,因聚水潭存在未发货订单
|
||||
(待发货合计 {number(data.pendingOrderQtyTotal || 0)} 件)而列入预警,建议补货量按待发货件数核算。
|
||||
</>
|
||||
) : null}
|
||||
{(data.scheduledCount || 0) > 0 ? (
|
||||
<>
|
||||
<br />
|
||||
@ -732,6 +834,14 @@ const MkhBomData = () => {
|
||||
(在途合计 {number(data.pendingWorkOrderQtyTotal || 0)} 件),已排除在预警之外。
|
||||
</>
|
||||
) : null}
|
||||
{(data.componentShortageCount || 0) > 0 ? (
|
||||
<>
|
||||
<br />
|
||||
其中 <b>{data.componentShortageCount}</b> 个商品<span className="mkh-tag mkh-tag--shortage">配件不足</span>
|
||||
:现有配件最多只能组装 0 台(已扣除未完成加工单占用的配件),<b>补不出来</b>,
|
||||
建议补货量显示「—」,需先采购配件。
|
||||
</>
|
||||
) : null}
|
||||
</span>
|
||||
)}
|
||||
action={(
|
||||
@ -751,7 +861,7 @@ const MkhBomData = () => {
|
||||
: '聚水潭商品 BOM 及补充来源中尚无可用的模块化商品配件明细'}
|
||||
description={(
|
||||
<span>
|
||||
MKH 商品编码({data.total || 0} 条)仅取自业务库 jst_sku 中“简尚-崔桥工厂品牌仓”;
|
||||
MKH 商品编码({data.total || 0} 条)取自业务库 jst_sku 中“简尚-崔桥工厂品牌仓”的正式 BOM 父项;
|
||||
配件明细优先取自聚水潭商品 BOM({data.bomOfficialRowCount || 0} 个),
|
||||
业务组合 BOM({data.bomBusinessRowCount || 0} 个)与产品资料系统({data.bomProductDbRowCount || 0} 个)作为补充。
|
||||
BOM 中没有指定仓库商品档案的组合编码不会加入商品列表。
|
||||
@ -799,7 +909,7 @@ const MkhBomData = () => {
|
||||
pageSizeOptions: [50, 100, 200],
|
||||
showTotal: (total) => `共 ${total} 条`,
|
||||
}}
|
||||
scroll={{ x: 1696, y: bodyHeight }}
|
||||
scroll={{ x: 1766, y: bodyHeight }}
|
||||
/>
|
||||
</div>
|
||||
</Spin>
|
||||
|
||||
@ -123,6 +123,19 @@
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* 待发货订单(聚水潭未发货订单件数,见文件头 ⑩) */
|
||||
.mkh-order {
|
||||
color: #ad4e00;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
/* 配件不足(可组装数 = 0,补不出来,见文件头 ⑪):与「缺货」红标签并排,用紫灰区分 */
|
||||
.mkh-tag--shortage {
|
||||
color: #722ed1;
|
||||
background: rgba(114, 46, 209, 0.14);
|
||||
border-color: rgba(114, 46, 209, 0.35);
|
||||
}
|
||||
|
||||
/* ============ A4 打印预览 ============ */
|
||||
.mkh-print-mask {
|
||||
position: fixed;
|
||||
|
||||
@ -233,8 +233,8 @@ const AccessoryStockPanel = () => {
|
||||
</Tooltip>),
|
||||
},
|
||||
{
|
||||
title: '近7日日均发货量',
|
||||
dataIndex: 'avgShip7d',
|
||||
title: '近15天日均发货量',
|
||||
dataIndex: 'avgShip15d',
|
||||
width: 138,
|
||||
align: 'right',
|
||||
sorter: true,
|
||||
@ -402,13 +402,15 @@ const ModularStockMonitor = () => (
|
||||
<div className="msm-header__heading">
|
||||
<Title level={3}>模块化库存监控</Title>
|
||||
<Text type="secondary">
|
||||
配件库存监控:仅统计「简尚-崔桥工厂半成品包装项目仓」下的 SKU 实时库存、近 7 日日均发货量与可用天数
|
||||
配件库存监控:仅统计「简尚-崔桥工厂半成品包装项目仓」下的 SKU 实时库存、近 15 天日均发货量与可用天数
|
||||
</Text>
|
||||
<Text type="secondary" className="msm-note">
|
||||
数据口径:实时库存取 jst_inventoryInfo(wms_co_id 15718196);近 7 日日均发货量、
|
||||
数据口径:实时库存取 jst_inventoryInfo(wms_co_id 15718196);近 15 天日均发货量、
|
||||
库存可用天数、安全天数取 pm_stockMonitor 最新快照(按完整 SKU 编码关联,794 个 SKU 全覆盖);
|
||||
当日入库取采购到货、当日出库取近一日发货量,均以监控日为基准;仓位上游未回传,暂显示「未维护」;
|
||||
图片取自「产品资料系统数据库」商品档案(业务库图片字段均为空)。
|
||||
注:日均发货量 2026-09-17 起由近 7 天改为近 15 天(业务原要求 30 天,但业务库无 30 天日销,最长只到 15 天);
|
||||
库存可用天数仍沿用监控表 jsUseDays(源系统口径),故两者并非同一时间窗。
|
||||
状态列:基于「产品资料系统数据库」判断该 SKU 是否已建立商品档案——已配置MKH = 资料库中可查到该 SKU;未配置MKH = 查不到。
|
||||
</Text>
|
||||
</div>
|
||||
|
||||
11
仓库提交与合并规范.md
11
仓库提交与合并规范.md
@ -168,12 +168,12 @@ npm --prefix frontend run check
|
||||
|
||||
合并要求:
|
||||
|
||||
1. 至少一名非提交者的维护者或开发者审核最终差异;AI 自我复查可以辅助,但不代替独立审核。提交 AI 不得用另一个会话或共享账号冒充独立审核者。
|
||||
1. 默认由至少一名非提交者的维护者或开发者审核最终差异;AI 自我复查可以辅助,但不代替独立审核。仓库所有者或管理员对明确的 PR 作出书面合并指令时,该授权可以代替独立审核,但必须在 PR 中记录授权人、授权范围和当时的最终提交 SHA。提交 AI 不得伪造授权、冒用其他账号或把模糊的日常开发指令解释为合并授权。
|
||||
2. 审核需关注是否撤销他人逻辑、丢失配置/依赖、改变接口与权限、破坏已上线功能,不能只看有无冲突或测试绿灯。
|
||||
3. 审核和检查必须对应最终待合并提交;后续新提交或冲突解决后需要重新确认,不能沿用失效的批准。
|
||||
4. 合并前再次确认最新 `main` 已被纳入任务分支,并验证组合后的行为。其他 PR 先合并导致主分支前进时,更新本 PR、重新检查并确认审核后再合并。
|
||||
3. 审核、所有者/管理员授权和检查必须对应最终待合并提交;后续新增业务代码、依赖变更或冲突解决后需要重新确认,不能沿用失效的批准。授权后仅补充不改变行为的合并记录或文档时,应在 PR 中说明并重新检查最终差异。
|
||||
4. 合并前再次确认最新 `main` 已被纳入任务分支,并验证组合后的行为。其他 PR 先合并导致主分支前进时,更新本 PR、重新检查并确认审核或所有者/管理员授权仍适用于最终提交后再合并。
|
||||
5. 由维护者通过仓库 PR 合并功能依次处理;同时有多个待合并 PR 时串行合并。有合并队列时使用针对最新组合提交的检查,避免两份旧验证同时放行。
|
||||
6. 未解决冲突、必需检查失败、尚未审核或同步状态不清楚时不得合并。缺少独立审核者时保持 PR 待审核,不自行批准。
|
||||
6. 未解决冲突、必需检查失败、同步状态不清楚,或既无独立审核也无所有者/管理员明确授权时不得合并。授权例外不允许绕过失败检查、未解决冲突、数据库风险证据或分支保护,也不允许直接推送 `main`。
|
||||
7. 合并后核对主分支结果。删除任务分支前确认已合并且无人继续使用,不删除其他开发者的分支。
|
||||
|
||||
## 7. 发现误合并或代码被覆盖
|
||||
@ -190,6 +190,7 @@ npm --prefix frontend run check
|
||||
- [ ] 涉及数据表、索引、映射、查询或同步时,已验证执行计划、数据量边界和负载控制,并在 PR 记录真实证据。
|
||||
- [ ] 已同步最新主分支及远端任务分支,未强推、未改写已发布历史。
|
||||
- [ ] 已逐项审核最终差异;冲突处理保留双方有效行为,疑点已确认。
|
||||
- [ ] 已取得独立审核,或已在 PR 中记录仓库所有者/管理员针对最终提交的明确合并授权。
|
||||
- [ ] 已完成受影响的验证,记录准确结果和提交 SHA。
|
||||
- [ ] PR 已说明范围、兼容性、验证、风险和回退方法。
|
||||
- [ ] 已明确报告当前状态:本地提交 / 已推送 / PR 待审核 / 已合并;没有把推送成功说成合并或部署成功。
|
||||
@ -198,6 +199,6 @@ npm --prefix frontend run check
|
||||
|
||||
本文件规定协作流程,`AGENTS.md` 提供 AI 读取入口;它们不是权限控制,不能保证每个 AI 工具自动读取或遵守。使用不自动读取这些文件的工具时,开发者必须主动提供规则。
|
||||
|
||||
仓库管理员应在服务端落实以下保护,并以实际设置为准:保护 `main`、禁止直接及强制推送和删除、要求 PR 与独立审核、使过期审核失效、绑定真实运行的必需检查、限制合并权限、按个人发放最小权限凭据。没有真正运行的检查不能仅凭同名状态作为合并依据。
|
||||
仓库管理员应在服务端落实以下保护,并以实际设置为准:保护 `main`、禁止直接及强制推送和删除、要求通过 PR 合并、使过期审核失效、绑定真实运行的必需检查、限制合并权限、按个人发放最小权限凭据。团队可默认要求独立审核;需要允许所有者/管理员授权例外时,应确保只有真实所有者或管理员能够执行并保留可审计记录。没有真正运行的检查不能仅凭同名状态作为合并依据。
|
||||
|
||||
**添加本文件不等于上述保护已经启用。** 此文档变更不修改仓库权限、分支保护、CI 或生产部署;如需启用服务端限制,应由管理员单独配置并验证。
|
||||
|
||||
@ -59,8 +59,8 @@ git diff --stat origin/main...HEAD
|
||||
2. 本地已有修改先按 `仓库提交与合并规范.md` 提交到唯一任务分支,再同步最新 `origin/main`。
|
||||
3. 如果主仓库已有更新,先合并到任务分支,逐处处理冲突,重新检查最终差异并运行受影响测试。
|
||||
4. 禁止使用强制推送、`git reset --hard`、批量选择 `ours/theirs` 或复制旧目录覆盖新代码来解决冲突。
|
||||
5. 将任务分支推送到主仓库,创建 PR,经过审核和验证后合并到 `main`。这里的“先推送主仓库”指推送任务分支并通过 PR 合并,禁止直接推送 `main`。
|
||||
6. PR 合并后再次执行 `git fetch origin`,记录准备部署的 `origin/main` 完整 SHA。部署 SHA 必须与审核通过的最终提交一致。
|
||||
5. 将任务分支推送到主仓库并创建 PR;经过独立审核,或取得仓库所有者/管理员针对该 PR 最终提交的明确授权,并完成验证后合并到 `main`。这里的“先推送主仓库”指推送任务分支并通过 PR 合并,禁止直接推送 `main`。
|
||||
6. PR 合并后再次执行 `git fetch origin`,记录准备部署的 `origin/main` 完整 SHA。部署 SHA 必须与审核或所有者/管理员授权覆盖的最终提交一致。
|
||||
|
||||
如果本次变更涉及数据表、索引、查询、数据映射或同步任务,部署者还必须确认 PR 已按《仓库提交与合并规范》记录索引与执行计划证据、分批/并发/超时边界、大表锁影响和回退方式。证据缺失、依赖全表扫描、可能对系统库或第三方云库造成不可控负载时,不得部署。
|
||||
|
||||
@ -112,15 +112,14 @@ test "$(git rev-parse "origin/main^{commit}")" = "$DEPLOY_SHA" || {
|
||||
exit 1
|
||||
}
|
||||
|
||||
git switch main
|
||||
git checkout main
|
||||
git pull --ff-only origin main
|
||||
test "$(git rev-parse HEAD)" = "$DEPLOY_SHA" || {
|
||||
echo '服务器 HEAD 与待部署 SHA 不一致,停止部署'
|
||||
exit 1
|
||||
}
|
||||
|
||||
npm --prefix frontend ci
|
||||
npm --prefix frontend run build
|
||||
bash deploy/production/build-frontend.sh
|
||||
if grep -q '^SOURCE_GIT_SHA=' /opt/cangku/shared/backend.env; then
|
||||
sed -i "s/^SOURCE_GIT_SHA=.*/SOURCE_GIT_SHA=$DEPLOY_SHA/" /opt/cangku/shared/backend.env
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user