yindie-erp-mcp 2.0.5 → 2.0.7

package/dist/client.js

@@ -1,6 +1,7 @@
 import { mkdir, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { basename, join } from 'node:path';
+import { parseJsonSafe } from './tool-helpers.js';
 /** ERP API 客户端 */
 export class YindieClient {
     /** 后端根地址 */
@@ -86,7 +87,7 @@ export class YindieClient {
         const response = await fetch(url, init);
         const contentType = response.headers.get('content-type') ?? '';
         if (contentType.includes('application/json')) {
-            const result = (await response.json());
+            const result = (await parseJsonSafe(await response.text()));
             if (result.code === 401 && !retried) {
                 this.token = await this.relogin();
                 return this.download(method, path, fileName, options, true);
@@ -125,7 +126,7 @@ export class YindieClient {
             init.body = JSON.stringify(body);
         }
         const response = await fetch(url, init);
-        const result = (await response.json());
+        const result = (await parseJsonSafe(await response.text()));
         if (result.code === 401 && !retried) {
             this.token = await this.relogin();
             return this.request(method, path, body, params, true);
@@ -151,7 +152,7 @@ export class YindieClient {
         };
         const form = await formFactory();
         const response = await fetch(url, { method: 'POST', headers, body: form });
-        const result = (await response.json());
+        const result = (await parseJsonSafe(await response.text()));
         if (result.code === 401 && !retried) {
             this.token = await this.relogin();
             return this.requestForm(path, formFactory, true);

package/dist/craft/guide.js

@@ -77,7 +77,10 @@ function buildHowTo(item) {
         }
         text += `可多选部位：${(item.options || []).join('／')}；勾选后每项再选尺寸 ${(item.sizeOptions || []).join('/')}`;
         if (item.allowCustomSize) {
-            text += '或手填';
+            text += '或手填尺寸';
+        }
+        if (item.allowAdd) {
+            text += '；自定义部位写入 customOptions[] 并同步进 checkbox/combineMap';
         }
         if (item.syncSizeOptions?.length) {
             text += `；${item.syncSizeOptions.join('／')} 尺寸联动`;
@@ -193,13 +196,13 @@ export const CRAFT_SELECTION_GUIDE = {
         radio: '单选 → {"radio":"选项"}；howToSelect 提示可填备注时再带 note',
         checkbox: '多选 → {"checkbox":["a","b"]}',
         'checkbox+perItemSize': '多选+尺寸 → {"checkbox":["领"],"combineMap":{"领":"0.15"}}',
-        'checkbox+gateNone': '先有无再多选 → 无:{"radio":"无","checkbox":["无"]}；有:{"radio":"有","checkbox":["领"],"combineMap":{"领":"0.15"}}',
+        'checkbox+gateNone': '先有无再多选 → 无:{"radio":"无","checkbox":["无"]}；有:{"radio":"有","checkbox":["领"],"combineMap":{"领":"0.15"}}；allowAdd:true 自定义部位须同时写 customOptions[]+checkbox（+combineMap 尺寸），缺 checkbox 拒写（导出也不显示）',
         combine: '结合单选 → {"combineKey":"净脚口三折光压线","combineValue":"3"}；needValue=false 可不带 combineValue',
         'combine+multiFill': '多填 → {"combineMap":{"28L＊":"2","24L＊":"1"}}',
         input: '输入 → {"input":"文案"}；各模块末尾 xxNote 备注、人工填写项同此'
     },
     colorCardFields: COLOR_CARD_FIELDS,
-    colorCardNote: '色卡选料写在 style_save colors[].colorCardJson（JSON 字符串，键=上面 fieldKey，值={materialCode,materialName,titleCn}；pantsPocketCloth 列仅裤子前后袋工艺有值时可填）',
+    colorCardNote: '色卡选料写在 style_save colors[].colorCardJson（JSON 字符串，键=上面 fieldKey，值={materialCode,materialName,titleCn}；pantsPocketCloth 列仅裤子前后袋工艺有值时可填）。color_card_export 只读 colorCardJson，无选料拒写；工艺 onCard 只影响前端可选列，不是导出数据源；备注走 color_card_save',
     jacket: flattenGroups('jacket', JACKET_STYLE_GROUPS),
     pants: flattenGroups('pants', PANTS_STYLE_GROUPS)
 };

package/dist/craft/normalize-self-check.js

@@ -19,6 +19,101 @@ function main() {
     if (normalized.garmentPart !== undefined || normalized.craft !== undefined) {
         throw new Error('兼容键应删除');
     }
+    let rejected = false;
+    try {
+        normalizeCraftSavePayload({
+            styleId: '1',
+            crafts: [{ garmentPart: 'jacket', craftModule: 'style', fieldKey: 'description', fieldValue: '{"radio":"单挂9扣瞎填"}' }]
+        });
+    }
+    catch {
+        rejected = true;
+    }
+    if (!rejected) {
+        throw new Error('非法选项应拒');
+    }
+    normalizeCraftSavePayload({
+        styleId: '1',
+        crafts: [
+            {
+                garmentPart: 'jacket',
+                craftModule: 'edge',
+                fieldKey: 'outerNeedle',
+                fieldValue: '{"radio":"有","checkbox":["领"],"combineMap":{"领":"0.15"}}'
+            }
+        ]
+    });
+    let badPress = false;
+    try {
+        normalizeCraftSavePayload({
+            styleId: '1',
+            crafts: [
+                {
+                    garmentPart: 'jacket',
+                    craftModule: 'edge',
+                    fieldKey: 'outerPress',
+                    fieldValue: '{"radio":"瞎填","checkbox":["瞎填部位"]}'
+                }
+            ]
+        });
+    }
+    catch {
+        badPress = true;
+    }
+    if (!badPress) {
+        throw new Error('outerPress 非法 gate 应拒');
+    }
+    let badPressBox = false;
+    try {
+        normalizeCraftSavePayload({
+            styleId: '1',
+            crafts: [
+                {
+                    garmentPart: 'jacket',
+                    craftModule: 'edge',
+                    fieldKey: 'outerPress',
+                    fieldValue: '{"radio":"有","checkbox":["瞎填部位A"]}'
+                }
+            ]
+        });
+    }
+    catch {
+        badPressBox = true;
+    }
+    if (!badPressBox) {
+        throw new Error('outerPress 非法 checkbox 应拒');
+    }
+    normalizeCraftSavePayload({
+        styleId: '1',
+        crafts: [
+            {
+                garmentPart: 'jacket',
+                craftModule: 'edge',
+                fieldKey: 'outerPress',
+                fieldValue: '{"radio":"有","checkbox":["自定义部位"],"customOptions":["自定义部位"],"combineMap":{"自定义部位":"0.15"}}'
+            }
+        ]
+    });
+    let customOnly = false;
+    try {
+        normalizeCraftSavePayload({
+            styleId: '1',
+            crafts: [
+                {
+                    garmentPart: 'jacket',
+                    craftModule: 'edge',
+                    fieldKey: 'outerPress',
+                    fieldValue: '{"radio":"有","checkbox":["领"],"customOptions":["前门襟"],"combineMap":{"领":"0.15"}}'
+                }
+            ]
+        });
+    }
+    catch {
+        customOnly = true;
+    }
+    if (!customOnly) {
+        throw new Error('customOptions 未进 checkbox 应拒');
+    }
     console.log('normalizeCraftSavePayload self-check ok');
 }
 main();

package/dist/craft/validate-options.js

@@ -0,0 +1,118 @@
+import { JACKET_STYLE_GROUPS, PANTS_STYLE_GROUPS } from './template.js';
+/** 字段索引 key=garmentPart.fieldKey */
+const FIELD_INDEX = buildIndex();
+/** 构建字段索引 */
+function buildIndex() {
+    const map = new Map();
+    indexPart(map, 'jacket', JACKET_STYLE_GROUPS);
+    indexPart(map, 'pants', PANTS_STYLE_GROUPS);
+    return map;
+}
+/** 索引一个部位 */
+function indexPart(map, part, groups) {
+    for (const group of groups) {
+        for (const item of group.items) {
+            map.set(`${part}.${item.key}`, item);
+        }
+    }
+}
+/** 校验 crafts 选项值（按 control / gateNone） */
+export function assertCraftOptionValues(crafts) {
+    if (!Array.isArray(crafts)) {
+        return;
+    }
+    crafts.forEach((row, index) => {
+        if (!row || typeof row !== 'object' || Array.isArray(row)) {
+            return;
+        }
+        const craft = row;
+        const part = craft.garmentPart;
+        const fieldKey = craft.fieldKey;
+        const fieldValue = craft.fieldValue;
+        if (typeof part !== 'string' || typeof fieldKey !== 'string' || typeof fieldValue !== 'string') {
+            return;
+        }
+        const def = FIELD_INDEX.get(`${part}.${fieldKey}`);
+        if (!def || def.control === 'input' || !fieldValue.startsWith('{')) {
+            return;
+        }
+        const json = JSON.parse(fieldValue);
+        const prefix = `crafts[${index}] ${part}.${fieldKey}`;
+        const custom = new Set(json.customOptions || []);
+        const optionSet = new Set([...(def.options || []), ...custom]);
+        const combineSet = new Set((def.combineOptions || []).map((o) => o.label));
+        for (const label of custom) {
+            combineSet.add(label);
+        }
+        const noneLabel = def.noneLabel || '无';
+        if (def.control === 'radio') {
+            if (json.radio != null && json.radio !== '') {
+                assertIn(prefix, 'radio', json.radio, optionSet);
+            }
+            return;
+        }
+        if (def.control === 'combine') {
+            if (json.combineKey != null && json.combineKey !== '') {
+                assertIn(prefix, 'combineKey', json.combineKey, combineSet);
+            }
+            if (json.combineMap) {
+                for (const key of Object.keys(json.combineMap)) {
+                    assertIn(prefix, 'combineMap', key, combineSet);
+                }
+            }
+            return;
+        }
+        if (def.control === 'checkbox') {
+            if (def.gateNone) {
+                const gateSet = new Set(['有', noneLabel]);
+                if (json.radio != null && json.radio !== '') {
+                    assertIn(prefix, 'radio', json.radio, gateSet);
+                }
+                const bodyAllowed = new Set(optionSet);
+                bodyAllowed.add(noneLabel);
+                if (Array.isArray(json.checkbox)) {
+                    for (const value of json.checkbox) {
+                        assertIn(prefix, 'checkbox', value, bodyAllowed);
+                    }
+                }
+                if (json.combineMap) {
+                    for (const key of Object.keys(json.combineMap)) {
+                        assertIn(prefix, 'combineMap', key, bodyAllowed);
+                    }
+                }
+                assertCustomInCheckbox(prefix, json.customOptions, json.checkbox);
+                return;
+            }
+            if (Array.isArray(json.checkbox)) {
+                for (const value of json.checkbox) {
+                    assertIn(prefix, 'checkbox', value, optionSet);
+                }
+            }
+            if (json.combineMap) {
+                for (const key of Object.keys(json.combineMap)) {
+                    assertIn(prefix, 'combineMap', key, optionSet);
+                }
+            }
+            assertCustomInCheckbox(prefix, json.customOptions, json.checkbox);
+        }
+    });
+}
+/** customOptions 须同步进 checkbox，否则导出不显示 */
+function assertCustomInCheckbox(prefix, customOptions, checkbox) {
+    if (!Array.isArray(customOptions) || customOptions.length === 0) {
+        return;
+    }
+    const boxes = new Set(Array.isArray(checkbox) ? checkbox : []);
+    for (const opt of customOptions) {
+        if (!boxes.has(opt)) {
+            throw new Error(`${prefix} customOptions 中的「${opt}」须同时写入 checkbox，否则导出不显示`);
+        }
+    }
+}
+/** 断言取值在白名单（allowAdd 自定义项须写入 customOptions 后才进白名单） */
+function assertIn(prefix, kind, value, allowed) {
+    if (allowed.has(value)) {
+        return;
+    }
+    throw new Error(`${prefix} 取值非法：${value}，可选：${[...allowed].join('/')}`);
+}

package/dist/index.js

@@ -21,7 +21,7 @@ async function main() {
     const moduleActions = legacy ? undefined : buildModuleActions(permissions);
     const server = new McpServer({
         name: 'yindie-erp',
-        version: '2.0.1'
+        version: '2.0.17'
     }, {
         instructions: ERP_MCP_INSTRUCTIONS
     });

package/dist/tool-helpers.js

@@ -1,21 +1,143 @@
 import { z } from 'zod';
+import { assertCraftOptionValues } from './craft/validate-options.js';
 /** JSON 请求体字段 */
 export const payloadField = z.string().describe('JSON 请求体，字段与后端 BO 一致');
 /** 主键字段 */
 export const idsField = z.string().describe('主键 ID，多个用英文逗号分隔');
 /** 单个主键字段，字符串避免雪花 ID 精度丢失 */
 export const idField = z.string().describe('主键 ID');
+/** 样衣类型白名单 */
+export const SAMPLE_TYPES = new Set(['proto', 'pre_prod', 'bulk', 'mass', 'sales', 'photo']);
+/** ≥16 位数字字面量改成字符串，避免雪花 ID 精度丢失 */
+export function preserveSnowflakeIds(text) {
+    return text.replace(/([:\[,]\s*)(\d{16,})(\s*[,\]}])/g, '$1"$2"$3');
+}
+/** 解析保真后的 JSON */
+export function parseJsonSafe(text) {
+    return JSON.parse(preserveSnowflakeIds(text));
+}
+/** 校验对象内 id 类字段不为 number */
+function assertNoNumberIds(value, path = '') {
+    if (value == null || typeof value !== 'object') {
+        return;
+    }
+    if (Array.isArray(value)) {
+        value.forEach((item, i) => assertNoNumberIds(item, `${path}[${i}]`));
+        return;
+    }
+    for (const [key, child] of Object.entries(value)) {
+        const here = path ? `${path}.${key}` : key;
+        if (typeof child === 'number' && (key === 'id' || key === 'ids' || /Id$/.test(key))) {
+            throw new Error(`雪花 ID 必须字符串：${here}=${child}（勿用 JSON number）`);
+        }
+        assertNoNumberIds(child, here);
+    }
+}
 /** 解析 JSON 请求体 */
 export function parsePayload(args) {
     const raw = args.payload;
     if (typeof raw === 'string') {
-        return JSON.parse(raw);
+        const parsed = parseJsonSafe(raw);
+        assertNoNumberIds(parsed);
+        return parsed;
     }
     if (raw && typeof raw === 'object') {
+        assertNoNumberIds(raw);
         return raw;
     }
     throw new Error('payload 必须是 JSON 字符串');
 }
+/** 解析 get 主键：顶层 id|orderId → payload.id|orderId */
+export function resolveGetId(args) {
+    const top = args.id ?? args.orderId;
+    if (top != null && top !== '') {
+        return String(top);
+    }
+    if (args.payload == null) {
+        return undefined;
+    }
+    const payload = parsePayload(args);
+    const id = payload.id ?? payload.orderId;
+    if (id == null || id === '') {
+        return undefined;
+    }
+    return String(id);
+}
+/** 解析逗号分隔或数组 ID 列表 */
+export function asIdList(value) {
+    if (value == null || value === '') {
+        return undefined;
+    }
+    const raw = Array.isArray(value) ? value : String(value).split(',');
+    const ids = raw.map((item) => String(item).trim()).filter((item) => item !== '');
+    return ids.length > 0 ? ids : undefined;
+}
+/** 按逗号字段白名单裁剪对象/数组 */
+export function pickFields(data, fields) {
+    if (fields == null || fields === '') {
+        return data;
+    }
+    const keys = fields.split(',').map((s) => s.trim()).filter((s) => s !== '');
+    if (keys.length === 0) {
+        return data;
+    }
+    if (Array.isArray(data)) {
+        return data.map((item) => pickFields(item, fields));
+    }
+    if (data == null || typeof data !== 'object') {
+        return data;
+    }
+    const src = data;
+    const out = {};
+    for (const key of keys) {
+        if (key in src) {
+            out[key] = src[key];
+        }
+    }
+    return out;
+}
+/** 解析 include 列表 */
+export function parseInclude(value) {
+    if (value == null || value === '') {
+        return new Set();
+    }
+    const raw = Array.isArray(value) ? value : String(value).split(',');
+    return new Set(raw.map((item) => String(item).trim()).filter((item) => item !== ''));
+}
+/** 规整 style_save：自动包 styles，禁止空列表 */
+export function normalizeStyleSavePayload(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error('style_save payload 须为对象');
+    }
+    const input = raw;
+    let styles = input.styles;
+    if (!Array.isArray(styles)) {
+        if (input.styleNo != null || input.colors != null || input.styleName != null) {
+            const { orderId, ...rest } = input;
+            return { orderId, styles: [rest] };
+        }
+        throw new Error('style_save 须 payload.styles:[{...}]，勿把款式字段放顶层');
+    }
+    if (styles.length === 0) {
+        throw new Error('style_save 的 styles 不能为空数组');
+    }
+    return { ...input, styles };
+}
+/** 规整样衣写入：类型白名单 + sampleNo→roundName */
+export function normalizeSamplePayload(raw) {
+    if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+        throw new Error('样衣 payload 须为对象');
+    }
+    const payload = { ...raw };
+    if (payload.sampleType != null && !SAMPLE_TYPES.has(String(payload.sampleType))) {
+        throw new Error(`sampleType 仅允许 proto/pre_prod/bulk/mass/sales/photo，收到：${payload.sampleType}`);
+    }
+    if (payload.roundName == null && payload.sampleNo != null) {
+        payload.roundName = payload.sampleNo;
+        delete payload.sampleNo;
+    }
+    return payload;
+}
 /** 规整工艺保存入参 */
 export function normalizeCraftSavePayload(raw) {
     if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
@@ -46,6 +168,7 @@ export function normalizeCraftSavePayload(raw) {
     if (topPart !== undefined) {
         delete payload.garmentPart;
     }
+    assertCraftOptionValues(payload.crafts);
     return payload;
 }
 /** 解析删除主键 */