@gct-paas/excel 0.1.28-beta.2 → 0.1.28-beta.21

package/dist/src/adapter/adapter.d.ts

@@ -98,6 +98,10 @@ export declare abstract class CodeHelper {
     /** 异步加载 Babel（宿主实现） */
     static abstract loadBabel(): Promise<any>;
 }
+/** Monaco 懒加载 */
+export interface ExcelMonacoLoader {
+    loadMonaco: () => Promise<any>;
+}
 /** 宿主注入的工具方法 */
 export interface ExcelHostUtils {
     /** 全局模态 / 抽屉等呈现控制器 */
@@ -118,6 +122,12 @@ export interface ExcelHostUtils {
      * - 业务：`window.NocodeAdapter.utils!.CodeHelper!.babel`
      */
     CodeHelper?: typeof CodeHelper;
+    /**
+     * Monaco 加载器（须由宿主注入）
+     * - 宿主：`setupExcel({ utils: { monacoLoader } })`
+     * - 业务：`await window.NocodeAdapter.utils!.monacoLoader!.loadMonaco()`
+     */
+    monacoLoader?: ExcelMonacoLoader;
     /** 打开公式编辑弹窗 */
     openFormulaEditor?: OpenFormulaEditor;
     formulaIdentify?: FormulaIdentify;

package/dist/src/adapter/setup.d.ts

@@ -77,6 +77,10 @@ export interface ExcelSetupOptions {
      * CodeHelper：须由宿主注入实现类（包内仅抽象类型）
      * - `await setupExcel({ utils: { CodeHelper } })` 内调用 loadBabel，结果写入 babel
      * - 业务：`window.NocodeAdapter.utils!.CodeHelper!.babel`
+     *
+     * monacoLoader：须由宿主注入
+     * - 宿主：`setupExcel({ utils: { monacoLoader } })`
+     * - 业务：`await window.NocodeAdapter.utils!.monacoLoader!.loadMonaco()`
      */
     utils?: ExcelHostUtils;
 }
@@ -84,8 +88,15 @@ export interface ExcelSetupOptions {
  * 主工程 bootstrap 时调用一次（async：CodeHelper.loadBabel / AsyncGctOnlineComponents.init）。
  */
 export declare function setupExcel(options?: ExcelSetupOptions): Promise<typeof NocodeAdapter>;
+/**
+ * 每个 Vue app（主应用 / Overlay 独立 app）都应调用一次。
+ * 安装 FormBaseModalPlugin（写入 modalManager.appContext），并兜底 globalProperties.$t，
+ * 避免命令式弹窗模板里出现 `$t is not a function`。
+ */
+export declare function installFormBaseModal(app: App): void;
 /**
  * 将 setupExcel 注入的宿主组件注册到指定 Vue app（含 popup / dialog 独立应用）。
  * 例：`app.component('MobileBasicPopup', ...)` 后模板可直接使用 `<MobileBasicPopup>`。
+ * 无论是否有宿主组件，都会安装 FormBaseModalPlugin。
  */
 export declare function registerExcelHostComponents(app: App): void;

package/dist/src/domain/table/business/warehouse/warehouse-inventory/profile/field-keys.d.ts

@@ -108,7 +108,5 @@ export declare const CLEAR_ON_PRODUCT_SWITCH: readonly ["production_identificati
 export declare const STOCKTAKE_DERIVED_WATCH_FIELDS: readonly ["stocktake_num_", "stock_num_"];
 /** 按批次+物料+仓库分组（initLoad / 汇总） */
 export declare const WAREHOUSE_IDENTITY_GROUP_KEYS: readonly ["production_identification_id_", "product_id_", "warehouse_id_"];
-/** 扫码合并键（含库位） */
-export declare const SCAN_MERGE_GROUP_KEYS: readonly ["production_identification_id_", "product_id_", "warehouse_id_", "location_id_"];
 /** 库存记录映射基础字段 */
 export declare const INVENTORY_BASE_FIELDS: readonly ["production_identification_id_", "product_id_", "product_id_name_", "product_id_code_", "product_id_spec_", "warehouse_id_"];

package/dist/src/index.d.ts

@@ -4,7 +4,6 @@ import { default as ApaasDpPrint } from './online-form/src/views/integration/apa
 import { default as ApaasDpPrintSheetView } from './online-form/src/views/integration/apaas_dp/designer/apaas-dp-print-sheet-view.vue';
 import { default as BomEditorModal } from './online-form/src/views/designer/modules/panel/sub-table/material-consumption/bom-modal.vue';
 import { default as SelectCheckDsModal } from './online-form/src/views/designer/modules/panel/sub-table/panel-check-table/select-check-ds-modal.vue';
-import { default as ObjectInitModal } from './online-form/src/views/designer/modules/panel/panel-data-init-config/object-init/object-init-modal.vue';
 import { default as OutParamModal } from './online-form/src/views/designer/modules/panel/panel-data-init-config/common/add-ipaas/out-param-modal.vue';
 import { default as InputParamModal } from './online-form/src/views/designer/modules/panel/panel-data-init-config/common/add-ipaas/input-param-modal.vue';
 import { default as SignatureConfigModal } from './online-form/src/views/designer/modules/panel/comps/signature-config/config-modal.vue';
@@ -27,4 +26,4 @@ export type { CellWidget } from './online-form/src/views/designer/types/cell-wid
 export type { PaperWidget } from './online-form/src/views/types/paper-widget';
 export type * from './online-form/src/views/designer/types';
 export { default as PanelTmplConfig } from './online-form/src/views/designer/modules/panel/panel-tmpl-config/panel-tmpl-config.vue';
-export { ApaasCollect, ApaasCollectSheetView, ApaasDpPrint, ApaasDpPrintSheetView, BomEditorModal, SelectCheckDsModal, ObjectInitModal, OutParamModal, InputParamModal, SignatureConfigModal, RenderFieldWrapper, };
+export { ApaasCollect, ApaasCollectSheetView, ApaasDpPrint, ApaasDpPrintSheetView, BomEditorModal, SelectCheckDsModal, OutParamModal, InputParamModal, SignatureConfigModal, RenderFieldWrapper, };

package/dist/src/nocode-base/src/core/sub-table/allocate-table-core.d.ts

@@ -1,10 +1,11 @@
 import { ProfileDrivenSubTableCore } from './profile-driven-sub-table-core';
 import { SubTableCore } from './sub-table-core';
+import { ScanModalInput } from './utils/scan';
 /**
  * 库存调拨表 Core
  * - Profile：禁用字段 / 行默认值 / 物料清空
  * - 物料走库存选择（allocateProduct）+ FILL_FROM_INVENTORY_OPTION
- * - 保留扫码、提交源/目标仓校验、库位查询
+ * - 扫码：库存匹配，连续扫码每次新增一行
  */
 export declare class AllocateTableCore extends ProfileDrivenSubTableCore {
     /** 绘制UI相关工具 */
@@ -21,8 +22,6 @@ export declare class AllocateTableCore extends ProfileDrivenSubTableCore {
         value: any;
         option?: any;
     }): void;
-    protected onScan({ str }: {
-        str: string;
-    }): Promise<void>;
+    protected onScan(input: ScanModalInput): Promise<void>;
     beforeBtnClick: SubTableCore['beforeBtnClick'];
 }

package/dist/src/nocode-base/src/core/sub-table/index.d.ts

@@ -4,3 +4,5 @@ export * from './stocktake-table-core';
 export * from './allocate-table-core';
 export * from './sterilize-batch-table-core';
 export * from './pretreatment-list-table-core';
+export * from './warehouse-in-table-core';
+export * from './warehouse-out-table-core';

package/dist/src/nocode-base/src/core/sub-table/pretreatment-list-table-core.d.ts

@@ -1,7 +1,7 @@
 import { ProfileDrivenSubTableCore } from './profile-driven-sub-table-core';
 import { SubTableCore } from './sub-table-core';
 import { IFieldStatus } from '../types';
-import { SubTableActionEnum } from '../../components/document-sub-table-action';
+import { ScanModalInput } from './utils/scan';
 /**
  * 预处理表 Core
  * - Profile：禁用字段 / 身份字段清空
@@ -9,18 +9,11 @@ import { SubTableActionEnum } from '../../components/document-sub-table-action';
  * - 选中后 fillFromOption 回填
  */
 export declare class PretreatmentListTableCore extends ProfileDrivenSubTableCore {
-    /** 触发扫码时的目标行 */
-    private scanTargetRow?;
-    /** 绘制UI相关工具，一期复用调拨表扫码弹窗 */
+    /** 绘制UI相关工具，复用调拨表扫码弹窗 */
     get render(): import('../..').ISubTableRender;
     compUnmount(): Promise<void>;
     init(): Promise<void>;
     calcSubTableActionMenu: SubTableCore['calcSubTableActionMenu'];
-    handleMenuClick(params: {
-        rowData: any;
-        dataIdx: number;
-        actionKey: SubTableActionEnum;
-    }): void;
     calcFieldStatus(params: {
         rowData: any;
         field: string;
@@ -32,7 +25,5 @@ export declare class PretreatmentListTableCore extends ProfileDrivenSubTableCore
         value: any;
         option?: any;
     }): void;
-    protected onScan({ str }: {
-        str: string;
-    }): Promise<void>;
+    protected onScan(input: ScanModalInput): Promise<void>;
 }

package/dist/src/nocode-base/src/core/sub-table/profile-driven-sub-table-core.d.ts

@@ -21,25 +21,14 @@ export declare class ProfileDrivenSubTableCore extends SubTableCore {
     }): void;
 }
 /**
- * 入库明细表 Core
- */
-export declare class WarehouseInTableCore extends ProfileDrivenSubTableCore {
-}
-/**
- * EQM 入库明细表 Core
+ * EQM 入库明细表 Core（备件主数据联动靠 autofillTemplates）
  */
 export declare class WarehouseInboundTableCore extends ProfileDrivenSubTableCore {
 }
 /**
- * 出库明细表 Core
- * - 物料走库存选择（allocateProduct）
- * - 选中后按 FILL_FROM_INVENTORY_OPTION 回填
- * - 查询条件带页面仓库 id
+ * EQM 出库：Profile + 库存 option 回填（备件库存选择组件就绪后生效）
  */
-export declare class WarehouseOutTableCore extends ProfileDrivenSubTableCore {
-    get warehouseId(): any;
-    handleFieldTd: SubTableCore['handleFieldTd'];
-    calcFieldQuery: SubTableCore['calcFieldQuery'];
+export declare class WarehouseOutboundTableCore extends ProfileDrivenSubTableCore {
     handleChange(params: {
         rowData: any;
         field: string;
@@ -48,13 +37,26 @@ export declare class WarehouseOutTableCore extends ProfileDrivenSubTableCore {
     }): void;
 }
 /**
- * EQM 出库 / 盘点 / 消耗：Profile 驱动（库存选择后续按备件能力补齐）
+ * EQM 备件盘点：Profile + 库存 option 回填，并刷新差异 / 状态
  */
-export declare class WarehouseOutboundTableCore extends ProfileDrivenSubTableCore {
-}
 export declare class PartStocktakeTableCore extends ProfileDrivenSubTableCore {
+    handleChange(params: {
+        rowData: any;
+        field: string;
+        value: any;
+        option?: any;
+    }): void;
 }
+/**
+ * EQM 备件消耗：Profile + 库存 option 回填
+ */
 export declare class DevicePartConsumeTableCore extends ProfileDrivenSubTableCore {
+    handleChange(params: {
+        rowData: any;
+        field: string;
+        value: any;
+        option?: any;
+    }): void;
 }
 /** 生产收料表 Core */
 export declare class MaterialRequisitionTableCore extends ProfileDrivenSubTableCore {

package/dist/src/nocode-base/src/core/sub-table/sterilize-batch-table-core.d.ts

@@ -1,24 +1,15 @@
 import { SubTableCore } from './sub-table-core';
 import { IFieldStatus } from '../types';
-import { SubTableActionEnum } from '../../components/document-sub-table-action';
+import { ScanModalInput } from './utils/scan';
 /**
  * 委托灭菌生产批次列表核心
- * @export
- * @class SterilizeBatchTableCore
  */
 export declare class SterilizeBatchTableCore extends SubTableCore {
-    /** 触发扫码时的目标行 */
-    private scanTargetRow?;
-    /** 绘制UI相关工具，一期复用调拨表扫码弹窗 */
+    /** 绘制UI相关工具，复用调拨表扫码弹窗 */
     get render(): import('../..').ISubTableRender;
     compUnmount(): Promise<void>;
     init(): Promise<void>;
     calcSubTableActionMenu: SubTableCore['calcSubTableActionMenu'];
-    handleMenuClick(params: {
-        rowData: any;
-        dataIdx: number;
-        actionKey: SubTableActionEnum;
-    }): void;
     handleFieldTd: SubTableCore['handleFieldTd'];
     calcFieldStatus(params: {
         rowData: any;
@@ -26,7 +17,5 @@ export declare class SterilizeBatchTableCore extends SubTableCore {
     }): IFieldStatus;
     calcFieldDataSource: SubTableCore['calcFieldDataSource'];
     handleChange: SubTableCore['handleChange'];
-    protected onScan({ str }: {
-        str: string;
-    }): Promise<void>;
+    protected onScan(input: ScanModalInput): Promise<void>;
 }

package/dist/src/nocode-base/src/core/sub-table/stocktake-table-core.d.ts

@@ -1,11 +1,12 @@
 import { ProfileDrivenSubTableCore } from './profile-driven-sub-table-core';
 import { SubTableCore } from './sub-table-core';
 import { IFieldStatus } from '../types';
+import { ScanModalInput } from './utils/scan';
 /**
  * 库存盘点表 Core
  * - Profile：只读信息字段 / 行默认仓库 / 物料清空 / 盘点衍生
  * - 物料：allocateProduct + FILL_FROM_INVENTORY_OPTION
- * - 保留：按 row_source_ 禁用、自动加载、扫码合并
+ * - 扫码：库存生产标识匹配；同身份累加实盘，否则新增行
  */
 export declare class StocktakeTableCore extends ProfileDrivenSubTableCore {
     initData: any[];
@@ -35,8 +36,8 @@ export declare class StocktakeTableCore extends ProfileDrivenSubTableCore {
         value: any;
         option?: any;
     }): void;
-    protected onScan({ barcode, type }: {
-        barcode: any;
-        type: any;
-    }): Promise<void>;
+    /**
+     * 盘点扫码弹窗回传 { barcode, type }；在此解析并走库存扫码接口
+     */
+    protected onScan(input: ScanModalInput): Promise<void>;
 }

package/dist/src/nocode-base/src/core/sub-table/sub-table-core.d.ts

@@ -176,6 +176,17 @@ export declare class SubTableCore {
      * @param opts
      */
     openScanModal(): Promise<void>;
+    /** 解析子表默认值（函数默认值先求值），扫码填空行时忽略这些字段 */
+    private resolveScanIgnoreValues;
+    /**
+     * 扫码入行：优先回填首个空壳占位行，否则追加到表尾。
+     * 对齐 Word appendOrFillScanRow，避免仅一行空壳时扫码落到第二行。
+     */
+    protected appendOrFillScanRow(row: Record<string, unknown>): void;
+    /**
+     * 扫码多条候选时选择一行（1 条自动选中）
+     */
+    protected pickScanRecord(records: Record<string, unknown>[]): Promise<Record<string, unknown> | undefined>;
     /**
      * 处理扫码弹窗回调
      * 参数由扫码弹窗决定

package/dist/src/nocode-base/src/core/sub-table/utils/scan/index.d.ts

@@ -0,0 +1,3 @@
+export * from './scan-helpers';
+export * from './inventory-scan-api';
+export * from './production-identification-scan-api';

package/dist/src/nocode-base/src/core/sub-table/utils/scan/inventory-scan-api.d.ts

@@ -0,0 +1,9 @@
+import { IRuleParseData } from '../../../../hooks/label-parse-rule';
+export declare const SCAN_NOT_FOUND_MSG = "\u626B\u63CF\u7684\u7269\u6599\u4E0D\u5B58\u5728";
+export declare const SCAN_LOT_OR_UNIQUE_REQUIRED_MSG = "\u6761\u7801\u4E2D\u672A\u89E3\u6790\u5230\u7269\u6599\u6279\u53F7\u6216\u552F\u4E00\u7801";
+/** 物料批号、唯一码至少有一个非空 */
+export declare function hasLotOrUniqueCode(parsed: IRuleParseData): boolean;
+/** 条码解析结果 + 当前仓库 → 扫码接口入参 */
+export declare function buildInventoryScanRequestBody(parsed: IRuleParseData, warehouseId?: string): Record<string, unknown>;
+/** 调用库存扫码匹配接口，返回 0/1/N 条候选 */
+export declare function matchInventoryScanRecords(parsed: IRuleParseData, warehouseId?: string): Promise<Record<string, unknown>[]>;

package/dist/src/nocode-base/src/core/sub-table/utils/scan/production-identification-scan-api.d.ts

@@ -0,0 +1,9 @@
+import { IRuleParseData } from '../../../../hooks/label-parse-rule';
+export declare const PRODUCTION_IDENTIFICATION_SCAN_NOT_FOUND_MSG = "\u626B\u63CF\u7684\u7269\u6599\u4E0D\u5B58\u5728";
+export declare const PRODUCTION_IDENTIFICATION_SCAN_LOT_OR_UNIQUE_REQUIRED_MSG = "\u6761\u7801\u4E2D\u672A\u89E3\u6790\u5230\u7269\u6599\u6279\u53F7\u6216\u552F\u4E00\u7801";
+/** 物料批号、唯一码至少有一个非空 */
+export declare function hasProductionIdentificationScanKey(parsed: IRuleParseData): boolean;
+/** 条码解析结果 → 扫码接口入参 */
+export declare function buildProductionIdentificationScanBody(parsed: IRuleParseData): Record<string, unknown>;
+/** 调用生产标识扫码匹配接口，返回 0/1/N 条候选 */
+export declare function matchProductionIdentificationScanRecords(parsed: IRuleParseData): Promise<Record<string, unknown>[]>;

package/dist/src/nocode-base/src/core/sub-table/utils/scan/scan-helpers.d.ts

@@ -0,0 +1,38 @@
+import { IRuleParseData } from '../../../../hooks/label-parse-rule';
+/**
+ * 当前行是不是「空壳占位行」，有没有真正的业务内容。
+ * 对齐 Word hasSubtableBusinessData：忽略 front_row_key_ / group_ / deleted_ / _* 元数据。
+ * ignoreValues：行默认值（如仓库上下文）不算用户填报。
+ */
+export declare function hasSubtableBusinessData(row: Record<string, unknown> | null | undefined, ignoreValues?: Record<string, unknown>): boolean;
+/**
+ * 扫码入行：优先回填首个空壳占位行，否则在可见区末尾新增。
+ * 避免版面默认空行时直接 append 导致「第一行空、第二行有数据」。
+ */
+export declare function appendOrFillScanRow(visibleRows: Record<string, unknown>[], row: Record<string, unknown>, ignoreValues?: Record<string, unknown>): Record<string, unknown>[];
+/** 扫码数量调整方向（盘点加减实盘） */
+export type ScanAdjustType = 'add' | 'minus';
+/** 扫码弹窗回传 */
+export type ScanModalInput = {
+    str?: string;
+    parsedValue?: unknown;
+    transformedData?: unknown;
+    barcode?: string;
+    type?: ScanAdjustType | string;
+    [key: string]: unknown;
+};
+/** 取扫码弹窗 parsedValue */
+export declare function resolveScanParsedValue<T extends Record<string, unknown> = IRuleParseData>(input: ScanModalInput): T | undefined;
+/** 取扫码弹窗 transformedData（字段映射结果） */
+export declare function resolveScanFillData(input: ScanModalInput): Record<string, unknown>;
+/** 取扫码数量调整方向，默认 add */
+export declare function resolveScanAdjustType(input: ScanModalInput): ScanAdjustType;
+/** 解析扫码数量，缺省为 1 */
+export declare function resolveScanQty(parsedQty: unknown, recordQty?: unknown, fallback?: number): number;
+/** 有效期格式化为 YYYY-MM-DD */
+export declare function toDateOnly(value: unknown): string | undefined;
+/** 多选弹框行展示字段 */
+export declare function mapScanRecordsForPicker(records: Record<string, unknown>[]): {
+    productId: unknown;
+    materialNo: unknown;
+}[];

package/dist/src/nocode-base/src/core/sub-table/utils/stocktake/stocktake-calc.d.ts

@@ -7,68 +7,15 @@ export declare function buildStocktakeDerived(stocktakeNum?: number | null, stoc
     status: StocktakeStatusKey;
     statusLabel: string;
 };
-/** 盘点状态 key 对应展示文案 */
-export declare function getStocktakeStatusLabel(key: StocktakeStatusKey): string;
-/** 计算差异数量 */
-export declare function calcDiffNum(stocktakeNum?: number | null, stockNum?: number | null): number | undefined;
-/** 根据实盘数量与库存数量计算盘点状态 key */
-export declare function calcStocktakeStatus(stocktakeNum?: number | null, stockNum?: number | null): StocktakeStatusKey;
-/** 按批次+物料+仓库将接口明细拆成多组（扫码可能一次返回多种物料） */
-export declare function groupRecordsByInventoryIdentity(records: Record<string, unknown>[]): Record<string, unknown>[][];
-/**
- * 扫码记录处理结果
- * @property kind='accumulate'                 - 匹配到已有盘点行，执行数量累加
- * @property kind='skip-location-not-selected' - 因未选择仓位而跳过处理
- * @property kind='unprocessed'                - 未匹配到已有盘点行，等待后续新增行处理
- */
-export type ScanRecordDisposition = {
-    kind: 'accumulate';
-    index: number;
-} | {
-    kind: 'skip-location-not-selected';
-} | {
-    kind: 'unprocessed';
-};
-/**
- * 判断单条扫码明细如何处理：
- * - 已有相同行且库位已选（或无库位字段）→ 累加条码 qty 到实盘数
- * - 已有相同物料行但库位未选 → 跳过
- * - 否则 → 待新建行
- */
-export declare function dispositionScanRecord(record: Record<string, unknown>, visibleRows: IWarehouseInventoryRow[], groupByWarehouse: boolean): ScanRecordDisposition;
-/**
- * 待新建明细：先按批次+物料+仓库分组，取第一组再组装 resolve 入参
- * - 页面无库位：该组全部明细 groupBy 累加
- * - 页面有库位 + 组内多条：整组走多库位候选（不自动填库位）
- * - 页面有库位 + 组内单条：自动填库位
- */
-export declare function pickRecordsForNewScanRow(unprocessed: Record<string, unknown>[], groupByWarehouse: boolean): {
-    records: Record<string, unknown>[];
-    productGroupCount: number;
-};
-/** 按条码 qty 与调整方向更新盘点数量；原值为空时视为 1 */
-export declare function applyScanQtyToStocktake(current: unknown, scanQty: unknown, type: 'add'): unknown;
-/** 扫码命中已有行：按 add/minus 调整 stocktake_num_ */
-export declare function accumulateScanQtyOnRow(visibleRows: IWarehouseInventoryRow[], rowIndex: number, scanQty: unknown, type: 'add'): {
-    rows: IWarehouseInventoryRow[];
-    mergedIndex: number;
-    shouldWarning?: boolean;
-};
-/** 未处理明细新建行 */
-export declare function appendScanRowFromResolve(visibleRows: IWarehouseInventoryRow[], rowData: Record<string, unknown>): {
-    rows: IWarehouseInventoryRow[];
-    mergedIndex: number;
-};
+/** 按条码 qty 与调整方向更新盘点数量；原值为空时视为 0 */
+export declare function applyScanQtyToStocktake(current: unknown, scanQty: unknown, type?: 'add' | 'minus'): unknown;
+/** 盘点数量下限 */
+export declare const MIN_STOCKTAKE_NUM = 0;
+/** 扣减导致实盘数量小于 0 时的拦截原因；add 或无需校验时返回 undefined */
+export declare function getScanQtyDeductionBlockReason(current: unknown, scanQty: unknown, type?: 'add' | 'minus'): string | undefined;
 /**
  * 将明细转为盘点行
  * - 页面有库位字段：不 groupBy，一条明细一行
  * - 页面无库位字段：按 批次 + 物料 + 仓库 groupBy，stock_num_ 累加
  */
 export declare function groupInventoryToStocktakeRows(records: Record<string, unknown>[], groupByWarehouse: boolean): IWarehouseInventoryRow[];
-export declare function shouldAssignScanQty(options: {
-    assignScanQty: boolean;
-    scanQty: unknown;
-    rowIndex: number;
-    qtyAssignedRowIndexes: ReadonlySet<number>;
-}): boolean;
-export declare function resolveScanRecords(groupByWarehouse: boolean, records: any): any;

package/dist/src/nocode-base/src/core/sub-table/warehouse-in-table-core.d.ts

@@ -0,0 +1,11 @@
+import { ProfileDrivenSubTableCore } from './profile-driven-sub-table-core';
+import { SubTableCore } from './sub-table-core';
+import { ScanModalInput } from './utils/scan';
+/**
+ * 入库明细表 Core
+ * - 扫码：生产标识匹配，连续扫码每次新增一行
+ */
+export declare class WarehouseInTableCore extends ProfileDrivenSubTableCore {
+    calcSubTableActionMenu: SubTableCore['calcSubTableActionMenu'];
+    protected onScan(input: ScanModalInput): Promise<void>;
+}

package/dist/src/nocode-base/src/core/sub-table/warehouse-out-table-core.d.ts

@@ -0,0 +1,21 @@
+import { ProfileDrivenSubTableCore } from './profile-driven-sub-table-core';
+import { SubTableCore } from './sub-table-core';
+import { ScanModalInput } from './utils/scan';
+/**
+ * 出库明细表 Core
+ * - 物料走库存选择（allocateProduct）
+ * - 扫码：库存匹配；同物料+批次累加数量，否则新增行
+ */
+export declare class WarehouseOutTableCore extends ProfileDrivenSubTableCore {
+    get warehouseId(): any;
+    handleFieldTd: SubTableCore['handleFieldTd'];
+    calcFieldQuery: SubTableCore['calcFieldQuery'];
+    calcSubTableActionMenu: SubTableCore['calcSubTableActionMenu'];
+    handleChange(params: {
+        rowData: any;
+        field: string;
+        value: any;
+        option?: any;
+    }): void;
+    protected onScan(input: ScanModalInput): Promise<void>;
+}

package/dist/src/nocode-base/src/hooks/index.d.ts

@@ -13,7 +13,7 @@ export * from './device-link';
 export * from './form-model';
 export * from './form-tmpl-config';
 export * from './material-consume';
+export * from './material-consume-object';
 export * from './label-parse-rule';
 export * from './material-balance';
 export * from './app-info';
-export * from './material-stocktake';

package/dist/src/nocode-base/src/hooks/label-parse-rule/type.d.ts

@@ -24,6 +24,12 @@ export interface IRuleParseData {
     qty?: number;
     /** 有效期 */
     expiration?: string;
+    /** 唯一码 */
+    uniqueCode?: string;
+    /** 工单编号 */
+    mfgOrderCode?: string;
+    /** 灭菌批次号 */
+    sterilizationLot?: string;
     /** 其他字段 */
     [k: string]: any;
 }

package/dist/src/nocode-base/src/hooks/material-consume/bom-validator.d.ts

@@ -1,4 +1,10 @@
 import { IBomEntry, IMaterialConsumeData } from './types';
+/** 行级校验错误：提交时挂到对应单元格，扫码/切组仍可读 message */
+export declare class McRowValidateError extends Error {
+    readonly targetFieldId: 'product_id_' | 'material_no_' | 'qty_' | 'expiration_date_';
+    readonly row: IMaterialConsumeData;
+    constructor(message: string, targetFieldId: 'product_id_' | 'material_no_' | 'qty_' | 'expiration_date_', row: IMaterialConsumeData);
+}
 /** 扫码校验通过后抛给填充层的完整计划（下标相对入参 arr） */
 export interface ScanFillPlan {
     target: BomEntryValidator;
@@ -83,17 +89,6 @@ export declare class BomEntryValidator {
     validateSpecifiedMaterialNo(row: IMaterialConsumeData): void;
     /** 整组指定批次校验：组内每一行有批次值的都检查 */
     validateSpecifiedMaterialNoForGroup(arr: IMaterialConsumeData[]): void;
-    /**
-     * 校验数量
-     * @param arr
-     * @return {*}
-     */
-    validateNum(arr: IMaterialConsumeData[]): Promise<void>;
-    /**
-     * 校验库存
-     * @param row 当前行数据
-     */
-    validateStock(row: IMaterialConsumeData): Promise<void>;
     /**
      * 计算已经消耗的数量之和
      * @param arr
@@ -115,12 +110,6 @@ export declare class BomEntryValidator {
      * @param sequential 是否按顺序上料；eq 规则在非顺序模式下允许少上
      */
     validateGroupQty(arr: IMaterialConsumeData[], sequential?: boolean, groupNo?: number): Promise<void>;
-    /**
-     * 按顺序投料用
-     * 检查数据中的当前明细的填报是否已经完成
-     * @param arr
-     */
-    validateHasCompleted(arr: IMaterialConsumeData[]): Promise<void>;
 }
 export declare class BomEntriesValidator {
     entries: IBomEntry[];
@@ -146,8 +135,6 @@ export declare class BomEntriesValidator {
     mainMaterialNo: string, 
     /** 物料消耗模式 */
     noBomMode: boolean);
-    /** 当前批次/生产数量 */
-    get materialNoNum(): number;
     /**
      * 翻译物料的code
      * @param productId
@@ -168,8 +155,6 @@ export declare class BomEntriesValidator {
      * @returns 有编辑行且只落在一组 → true；无编辑行 → false；跨多组编辑 → 抛错
      */
     hasEditingGroup(arr: IMaterialConsumeData[]): boolean;
-    /** 取当前唯一编辑组的 BOM 明细 id；没有则 undefined */
-    getEditingGroupId(arr: IMaterialConsumeData[]): string | undefined;
     /**
      * 行 → BOM 明细在 bomEntryValidators 中的下标，找不到返回 -1
      */
@@ -188,13 +173,6 @@ export declare class BomEntriesValidator {
      * 编辑行无物料时，用前后组夹出范围，取 (prev, next) 开区间起点。
      */
     findSequenceBomEntry(arr: IMaterialConsumeData[]): BomEntryValidator | undefined;
-    /**
-     * 检验是否符合顺序投料的顺序要求
-     * @param row 当前编辑的行
-     * @param arr 所有的数据
-     * @return {*}
-     */
-    validateSequenceLoading(row: IMaterialConsumeData, arr: IMaterialConsumeData[]): Promise<void>;
     /** 表中是否已有该 BOM 组（有物料行或带 bom_entry_id_ 的空行） */
     private groupExistsInTable;
     /**
@@ -224,70 +202,33 @@ export declare class BomEntriesValidator {
      * 切组前校验当前编辑组：BOM 内 + 必填、有效期、替代料、混批、数量校验
      */
     validateCurrentGroupForSwitch(arr: IMaterialConsumeData[], current: BomEntryValidator): Promise<void>;
+    /**
+     * 行级错误（提交收集全部打标；切组/扫码抛第一条）
+     */
+    getRowFieldErrors(row: IMaterialConsumeData): McRowValidateError[];
     /**
      * 校验物料是否在bom里被使用
      * @param row 单行的数据
      */
     validateInBom(row: IMaterialConsumeData): void;
     /**
-     * 检查数据是否完整
-     * @param arr
+     * 检查数据是否完整（切组/扫码：遇错即抛）
      */
     validateDataCompleted(row: IMaterialConsumeData): void;
-    /**
-     * 校验替代料校验
-     * @param arr
-     */
-    validateSubstitute(arr: IMaterialConsumeData[]): void;
-    /**
-     * 校验混批校验
-     * @param arr
-     */
-    validateLotMixing(arr: IMaterialConsumeData[]): void;
-    /**
-     * 通用校验 3（扫码/写入前）：用 row + 表内同行组数据对比混批次数，不改动原 validateLotMixing
-     */
-    validateLotMixingWithRow(row: IMaterialConsumeData, arr: IMaterialConsumeData[]): void;
-    /**
-     * 校验数量
-     * @param arr
-     */
-    validateNum(arr: IMaterialConsumeData[]): Promise<void>;
-    /**
-     * 校验库存消耗
-     * @param row
-     */
-    validateStock(row: IMaterialConsumeData): Promise<void>;
-    /**
-     * 检验整个数组是否符合bom配置的要求
-     * @param arr
-     */
-    validate(arr: IMaterialConsumeData[]): Promise<void>;
+    /** 提交：收集全表行级错误，不中断。无物料且无组归属的占位行跳过 */
+    collectRowErrors(arr: IMaterialConsumeData[]): McRowValidateError[];
     /**
      * 检查扫描数据是否可以插入，通过后返回填充计划（记录模式无 plan）
      */
     validateScanCanInsert(row: IMaterialConsumeData, arr: IMaterialConsumeData[]): Promise<ScanFillPlan | undefined>;
-    /**
-     * 校验当前编辑行的数据
-     * @param arr
-     * @returns
-     */
-    validateEditRow(arr: IMaterialConsumeData[]): Promise<void>;
     /**
      * 顺序上料提交：表中最后一组之前，必须上料组不能缺失（仅结构/顺序，不校验数量）
      */
     private assertSubmitSequenceOrder;
     /**
-     * 提交整表校验：必须上料组须存在；顺序上料校验组序；表中存在的组走整组校验（不含库存）
-     */
-    validateAllRows(arr: IMaterialConsumeData[]): Promise<void>;
-    /**
-     * 把扫描数据按情况插入到数组的位置，返回新数组
-     * @param row
-     * @param arr
-     * @return {*}
+     * 提交组级校验：必须上料 / 顺序 / 替代料 / 混批 / 组数量。遇错即抛，不含行级必填。
      */
-    mergeRowInArr(row: IMaterialConsumeData, arr: IMaterialConsumeData[]): IMaterialConsumeData[];
+    assertGroupRules(arr: IMaterialConsumeData[]): Promise<void>;
     /**
      * 获取BOM里面所有的主料，替换料的id集合
      */