@gct-paas/word 0.1.74-beta.52 → 0.1.74-beta.54

package/dist/core/data/submit/form-state.d.ts

@@ -26,4 +26,4 @@ export declare function conversionFormState(payload: {
 /** 从模型子表元信息解析二维/检验表交叉区 key；无元信息时回退为 formData 中含 `:` 的 key */
 export declare function resolveSubmitCrossKeys(formData: Record<string, any>, subTableInfoList?: SubTableInfo[]): string[];
 /** 数据转成真实提交数据 */
-export declare function getSubmitFormData(formData: any, subTableInfoList?: SubTableInfo[]): any;
+export declare function getSubmitFormData(formData: any, subTableInfoList?: SubTableInfo[], fieldList?: FieldMeta[]): any;

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.52 */
+/*! @gct-paas/word v0.1.74-beta.54 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, getCurrentInstance, getCurrentScope, guardReactiveProps, h, inject, isRef, isVNode, markRaw, mergeModels, mergeProps, nextTick, normalizeClass, normalizeProps, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, onScopeDispose, onUnmounted, openBlock, provide, reactive, readonly, ref, render, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toHandlers, toRaw, toRef, toValue, unref, useAttrs, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import Rt, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -97707,8 +97707,26 @@ function resolveSubmitCrossKeys(formData, subTableInfoList) {
 	}
 	return Object.keys(formData).filter((k) => k.includes(":"));
 }
+function normalizeSubmitFieldValues(data, fieldList) {
+	const fieldMap = new Map(fieldList.map((field) => [field.key, field]));
+	const normalizeRecord = (record) => {
+		Object.entries(record).forEach(([key, value]) => {
+			if (Array.isArray(value)) {
+				value.forEach((row) => row && typeof row === "object" && normalizeRecord(row));
+				return;
+			}
+			if (typeof value !== "string" || value === "") return;
+			const field = fieldMap.get(key);
+			if (!field) return;
+			if (!NUMBER_FIELD_TYPES.has(resolveFieldManifestType(field))) return;
+			const normalized = Number(value);
+			if (Number.isFinite(normalized)) record[key] = normalized;
+		});
+	};
+	normalizeRecord(data);
+}
 /** 数据转成真实提交数据 */
-function getSubmitFormData(formData, subTableInfoList) {
+function getSubmitFormData(formData, subTableInfoList, fieldList = []) {
 	const _formData = { ...formData };
 	const checkTableFieldList = (subTableInfoList || []).filter((o) => o.subType === "check-table-2d").map((o) => o.field);
 	resolveSubmitCrossKeys(_formData, subTableInfoList).forEach((crossKey) => {
@@ -97745,19 +97763,22 @@ function getSubmitFormData(formData, subTableInfoList) {
 		return reducedData;
 	}, {});
 	console.log("数据转成真实提交数据", realFormData);
+	normalizeSubmitFieldValues(realFormData, fieldList);
 	return stripHrefDerivedData(omitSubmitExcludedTopLevel(realFormData));
 }
-var handleSyncCheckValue;
+var handleSyncCheckValue, NUMBER_FIELD_TYPES;
 var init_form_state = __esmMin((() => {
 	init_field_paths();
 	init_fields$14();
 	init_check_table();
+	init_field_type();
 	handleSyncCheckValue = (row) => {
 		const { type_, value_ } = row;
 		const valueFieldKey = CHECK_TABLE_TYPE_TO_VALUE_FIELD[type_];
 		if (!valueFieldKey) return;
 		row[valueFieldKey] = value_;
 	};
+	NUMBER_FIELD_TYPES = /* @__PURE__ */ new Set([FIELD_TYPE.QTY]);
 }));
 //#endregion
 //#region src/runtime/interface/fetchers.ts
@@ -128059,7 +128080,10 @@ function getGroupProductIds(entry) {
 */
 function findEntryByProductId(entries, productId) {
 	const versionId = parseFormTmplRefId(productId).id || productId;
-	return entries.find((entry) => getGroupProductIds(entry).includes(versionId));
+	return entries.find((entry) => getGroupProductIds(entry).some((candidate) => {
+		const candidateVersionId = parseFormTmplRefId(candidate).id || candidate;
+		return candidate === productId || candidateVersionId === versionId;
+	}));
 }
 var init_scan_validator = __esmMin((() => {
 	init_core$1();
@@ -128274,6 +128298,23 @@ var init_bom_validator = __esmMin((() => {
 }));
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/material-consume-object/linkage.ts
+/** 提交前按当前产品值补齐所有物料消耗对象的 BOM 明细 ID。 */
+function buildConsumeObjectBomSubmitUpdates(doc, formInstBom) {
+	if (!formInstBom) return {};
+	return (doc.fieldModelQuery.getFieldList(doc.mainModelKey) ?? []).filter((field) => !field.belongingObject && resolveFieldManifestType(field) === FIELD_TYPE.MATERIAL_CONSUME).map((field) => field.key).reduce((updates, belongingObject) => {
+		const { productPath, bomEntryIdPath } = collectConsumeObjectPaths(doc, belongingObject);
+		if (!productPath || !bomEntryIdPath) return updates;
+		const productId = doc.dataManager.get(productPath);
+		if (isBlank$1(productId)) return updates;
+		const entry = resolveObjectBomEntry({
+			formInstBom,
+			belongingObject,
+			productId: String(productId)
+		});
+		if (entry === null || entry === void 0 ? void 0 : entry.id_) updates[bomEntryIdPath] = entry.id_;
+		return updates;
+	}, {});
+}
 function widgetFieldKey$1(field) {
 	return (field.fieldLink ? getLastSegment$1(field.fieldLink) : field.key) || void 0;
 }
@@ -128286,17 +128327,26 @@ function isMaterialConsumeObject(doc, belongingObject) {
 function collectConsumeObjectPaths(doc, belongingObject) {
 	var _doc$model, _doc$model$getWidgetI;
 	const paths = {};
+	const assignPath = (field) => {
+		const key = widgetFieldKey$1(field);
+		const path = key ? generateValuePath(key, "") : void 0;
+		if (!path) return;
+		const fieldType = field.fieldType ?? resolveFieldManifestType(field);
+		if (fieldType === FIELD_TYPE.PRODUCT) paths.productPath = path;
+		if (fieldType === FIELD_TYPE.MATERIAL_NO) paths.materialNoPath = path;
+		if (fieldType === FIELD_TYPE.BOM_ENTRY_ID) paths.bomEntryIdPath = path;
+	};
 	const widgets = ((_doc$model = doc.model) === null || _doc$model === void 0 || (_doc$model$getWidgetI = _doc$model.getWidgetInstances) === null || _doc$model$getWidgetI === void 0 ? void 0 : _doc$model$getWidgetI.call(_doc$model)) ?? [];
 	for (const widget of widgets) {
 		var _widget$widgetMeta;
 		const field = (_widget$widgetMeta = widget.widgetMeta) === null || _widget$widgetMeta === void 0 ? void 0 : _widget$widgetMeta.field;
 		if (!field || field.belongingObject !== belongingObject) continue;
-		const key = widgetFieldKey$1(field);
-		const path = key ? generateValuePath(key, "") : void 0;
-		if (!path) continue;
-		if (field.fieldType === FIELD_TYPE.PRODUCT) paths.productPath = path;
-		if (field.fieldType === FIELD_TYPE.MATERIAL_NO) paths.materialNoPath = path;
-		if (field.fieldType === FIELD_TYPE.BOM_ENTRY_ID) paths.bomEntryIdPath = path;
+		assignPath(field);
+	}
+	const modelFields = doc.fieldModelQuery.getFieldList(doc.mainModelKey) ?? [];
+	for (const field of modelFields) {
+		if (field.belongingObject !== belongingObject) continue;
+		assignPath(field);
 	}
 	return paths;
 }
@@ -128352,10 +128402,11 @@ async function buildConsumeObjectSelectUpdates(opts) {
 		if (bomEntryIdPath) {
 			updates[bomEntryIdPath] = null;
 			if (formInstBom && selectedOption) {
+				const pendingProduct = productPath ? pending[productPath] : void 0;
 				const entry = resolveObjectBomEntry({
 					formInstBom,
 					belongingObject,
-					productId: selectedOption.id_ ? String(selectedOption.id_) : void 0
+					productId: !isBlank$1(pendingProduct) ? String(pendingProduct) : selectedOption.id_ ? String(selectedOption.id_) : void 0
 				});
 				if (entry) updates[bomEntryIdPath] = entry.id_;
 			}
@@ -137089,6 +137140,7 @@ function useDocumentFactory(props, payload) {
 		docInteraction,
 		hasData,
 		loading: computed(() => fetchLoading.value || loading.value),
+		tmplBomCRef,
 		isRefreshingData,
 		ctx: payload.ctx,
 		reload() {
@@ -140976,17 +141028,24 @@ function useTableDropdown(props, searchFilters) {
 		const tableType = subFieldKey ? (_TableRuntimeContext$2 = TableRuntimeContext.find(docInst.value, subFieldKey)) === null || _TableRuntimeContext$2 === void 0 ? void 0 : _TableRuntimeContext$2.profile.type : void 0;
 		return showDisplayAndSearchConfig(fieldInfo.value, tableType);
 	});
+	const isMaterialConsumeObjectProduct = computed(() => {
+		var _fieldMeta$value8, _fieldMeta$value9;
+		const belongingObject = (_fieldMeta$value8 = fieldMeta.value) === null || _fieldMeta$value8 === void 0 ? void 0 : _fieldMeta$value8.belongingObject;
+		if (((_fieldMeta$value9 = fieldMeta.value) === null || _fieldMeta$value9 === void 0 ? void 0 : _fieldMeta$value9.fieldType) !== FIELD_TYPE.PRODUCT || !belongingObject) return false;
+		const objectField = fieldList.value.find((item) => item.key === belongingObject);
+		return !!objectField && resolveFieldManifestType(objectField) === FIELD_TYPE.MATERIAL_CONSUME;
+	});
 	/**
 	* 搜索字段以设计端配置为准。
 	* 工序历史模板未写入搜索字段时，回退为按名称搜索；有值才显示搜索框。
 	*/
 	const quickSearchFields = computed(() => {
-		var _fieldMeta$value8;
+		var _fieldMeta$value10;
 		if (isSubtableMfgOrder.value) return SEARCHABLE_FIELD_DEFAULT_FIELDS_MAP.subtableMfgOrder;
 		if (isInventoryProductField.value) return INVENTORY_QUICK_SEARCH_FIELDS;
 		const configured = widgetProps.value.searchField;
 		if (Array.isArray(configured) && configured.length) return configured;
-		const fieldType = (_fieldMeta$value8 = fieldMeta.value) === null || _fieldMeta$value8 === void 0 ? void 0 : _fieldMeta$value8.fieldType;
+		const fieldType = (_fieldMeta$value10 = fieldMeta.value) === null || _fieldMeta$value10 === void 0 ? void 0 : _fieldMeta$value10.fieldType;
 		if (fieldType === FIELD_TYPE.MFG_ORDER) return SEARCHABLE_FIELD_DEFAULT_FIELDS_MAP.mfgOrder;
 		if (fieldType === FIELD_TYPE.OPERATION || fieldType === FIELD_TYPE.ROUTING_OPERATION) return ["name_.iLike"];
 		if (fieldType === FIELD_TYPE.PRODUCT || fieldType === FIELD_TYPE.SCRAP_MATERIAL) return SEARCHABLE_FIELD_DEFAULT_FIELDS_MAP.material;
@@ -140994,23 +141053,25 @@ function useTableDropdown(props, searchFilters) {
 	});
 	/** 不开放快速搜索配置，但业务上仍需提供固定搜索能力的字段。 */
 	const basicSearchEnabled = computed(() => {
-		var _fieldMeta$value9;
-		if (showFieldConfig.value || !fieldInfo.value) return false;
-		return fieldInfo.value.key === "part_id_" || BASIC_SEARCH_FIELD_TYPES.has(((_fieldMeta$value9 = fieldMeta.value) === null || _fieldMeta$value9 === void 0 ? void 0 : _fieldMeta$value9.fieldType) ?? fieldInfo.value.type);
+		var _fieldMeta$value11;
+		if (!fieldInfo.value) return false;
+		if (isMaterialConsumeObjectProduct.value) return true;
+		if (showFieldConfig.value) return false;
+		return fieldInfo.value.key === "part_id_" || BASIC_SEARCH_FIELD_TYPES.has(((_fieldMeta$value11 = fieldMeta.value) === null || _fieldMeta$value11 === void 0 ? void 0 : _fieldMeta$value11.fieldType) ?? fieldInfo.value.type);
 	});
 	const querySearchFields = computed(() => {
-		var _fieldMeta$value10, _fieldInfo$value2;
+		var _fieldMeta$value12, _fieldInfo$value2;
 		if (quickSearchFields.value.length) return quickSearchFields.value;
-		const fieldType = ((_fieldMeta$value10 = fieldMeta.value) === null || _fieldMeta$value10 === void 0 ? void 0 : _fieldMeta$value10.fieldType) ?? ((_fieldInfo$value2 = fieldInfo.value) === null || _fieldInfo$value2 === void 0 ? void 0 : _fieldInfo$value2.type);
+		const fieldType = ((_fieldMeta$value12 = fieldMeta.value) === null || _fieldMeta$value12 === void 0 ? void 0 : _fieldMeta$value12.fieldType) ?? ((_fieldInfo$value2 = fieldInfo.value) === null || _fieldInfo$value2 === void 0 ? void 0 : _fieldInfo$value2.type);
 		return fieldType && BASIC_SEARCH_FIELDS[fieldType] || [];
 	});
 	const columns = computed(() => {
-		var _props$widget, _fieldMeta$value11;
+		var _props$widget, _fieldMeta$value13;
 		const displayFields = isSubtableMfgOrder.value ? [{
 			key: "code_",
 			name: "工单编号"
 		}] : showFieldConfig.value ? ((_props$widget = props.widget) === null || _props$widget === void 0 || (_props$widget = _props$widget.widgetMeta) === null || _props$widget === void 0 || (_props$widget = _props$widget.props) === null || _props$widget === void 0 ? void 0 : _props$widget.displayFields) || [] : [];
-		const effectiveDisplayFields = ((_fieldMeta$value11 = fieldMeta.value) === null || _fieldMeta$value11 === void 0 ? void 0 : _fieldMeta$value11.fieldType) === FIELD_TYPE.MFG_ORDER && !displayFields.length ? [{
+		const effectiveDisplayFields = ((_fieldMeta$value13 = fieldMeta.value) === null || _fieldMeta$value13 === void 0 ? void 0 : _fieldMeta$value13.fieldType) === FIELD_TYPE.MFG_ORDER && !displayFields.length ? [{
 			key: "code_",
 			name: "工单编号"
 		}] : displayFields;
@@ -141041,17 +141102,17 @@ function useTableDropdown(props, searchFilters) {
 	});
 	/** 是否需要数据联动 */
 	const businessLinkage = computed(() => {
-		var _fieldMeta$value12, _fieldMeta$value13;
+		var _fieldMeta$value14, _fieldMeta$value15;
 		return new TableRuntime(docInst.value).resolveSelectLinkage({
-			subFieldKey: (_fieldMeta$value12 = fieldMeta.value) === null || _fieldMeta$value12 === void 0 ? void 0 : _fieldMeta$value12.subFieldKey,
-			fieldKey: (_fieldMeta$value13 = fieldMeta.value) === null || _fieldMeta$value13 === void 0 ? void 0 : _fieldMeta$value13.fieldLink,
+			subFieldKey: (_fieldMeta$value14 = fieldMeta.value) === null || _fieldMeta$value14 === void 0 ? void 0 : _fieldMeta$value14.subFieldKey,
+			fieldKey: (_fieldMeta$value15 = fieldMeta.value) === null || _fieldMeta$value15 === void 0 ? void 0 : _fieldMeta$value15.fieldLink,
 			runtimeValuePath: runtimeValuePath.value
 		});
 	});
 	const enableLinkage = computed(() => {
-		var _businessLinkage$valu, _fieldMeta$value14, _fieldMeta$value15, _fieldMeta$value16;
+		var _businessLinkage$valu, _fieldMeta$value16, _fieldMeta$value17, _fieldMeta$value18;
 		if ((_businessLinkage$valu = businessLinkage.value) === null || _businessLinkage$valu === void 0 ? void 0 : _businessLinkage$valu.enabled) return true;
-		return shouldEnableLinkage(docInst.value, (_fieldMeta$value14 = fieldMeta.value) === null || _fieldMeta$value14 === void 0 ? void 0 : _fieldMeta$value14.fieldType, ((_fieldMeta$value15 = fieldMeta.value) === null || _fieldMeta$value15 === void 0 ? void 0 : _fieldMeta$value15.subFieldKey) || ((_fieldMeta$value16 = fieldMeta.value) === null || _fieldMeta$value16 === void 0 ? void 0 : _fieldMeta$value16.modelLink));
+		return shouldEnableLinkage(docInst.value, (_fieldMeta$value16 = fieldMeta.value) === null || _fieldMeta$value16 === void 0 ? void 0 : _fieldMeta$value16.fieldType, ((_fieldMeta$value17 = fieldMeta.value) === null || _fieldMeta$value17 === void 0 ? void 0 : _fieldMeta$value17.subFieldKey) || ((_fieldMeta$value18 = fieldMeta.value) === null || _fieldMeta$value18 === void 0 ? void 0 : _fieldMeta$value18.modelLink));
 	});
 	/** 严格级联：上游无值时阻断；可选过滤（requireLinkValue: false）不阻断 */
 	const linkageRequiresUpstreamValue = computed(() => {
@@ -141063,8 +141124,8 @@ function useTableDropdown(props, searchFilters) {
 		var _businessLinkage$valu3;
 		if ((_businessLinkage$valu3 = businessLinkage.value) === null || _businessLinkage$valu3 === void 0 ? void 0 : _businessLinkage$valu3.enabled) return businessLinkage.value.linkValue;
 		if (enableLinkage.value) {
-			var _fieldMeta$value17;
-			const linkValuePath = generateValuePath(strategy.value.linkFieldId, (_fieldMeta$value17 = fieldMeta.value) === null || _fieldMeta$value17 === void 0 ? void 0 : _fieldMeta$value17.subFieldKey);
+			var _fieldMeta$value19;
+			const linkValuePath = generateValuePath(strategy.value.linkFieldId, (_fieldMeta$value19 = fieldMeta.value) === null || _fieldMeta$value19 === void 0 ? void 0 : _fieldMeta$value19.subFieldKey);
 			const realLinkValuePath = replacePathIndexPlaceholders({
 				refPath: runtimeValuePath.value,
 				templatePath: linkValuePath
@@ -141074,8 +141135,8 @@ function useTableDropdown(props, searchFilters) {
 	});
 	const clearValuePath = computed(() => {
 		if (strategy.value.clearFieldId) {
-			var _fieldMeta$value18;
-			const valuePath = generateValuePath(strategy.value.clearFieldId, (_fieldMeta$value18 = fieldMeta.value) === null || _fieldMeta$value18 === void 0 ? void 0 : _fieldMeta$value18.subFieldKey);
+			var _fieldMeta$value20;
+			const valuePath = generateValuePath(strategy.value.clearFieldId, (_fieldMeta$value20 = fieldMeta.value) === null || _fieldMeta$value20 === void 0 ? void 0 : _fieldMeta$value20.subFieldKey);
 			return replacePathIndexPlaceholders({
 				refPath: runtimeValuePath.value,
 				templatePath: valuePath
@@ -141094,7 +141155,7 @@ function useTableDropdown(props, searchFilters) {
 	/** 非联动场景、可选过滤、或联动已选择关联值时，才展示搜索栏 */
 	const showSearch = computed(() => !enableLinkage.value || !linkageRequiresUpstreamValue.value || !!linkDataValue.value);
 	const fetcher = async ({ keyword = "", pageNo, pageSize, deviceTypeId }) => {
-		var _fieldMeta$value19, _fieldMeta$value20, _window$TMPL_BOM_CONT, _fieldMeta$value21, _fieldMeta$value22, _parsedValuePath$segm, _docInst$value$params;
+		var _fieldMeta$value21, _fieldMeta$value22, _window$TMPL_BOM_CONT, _fieldMeta$value23, _fieldMeta$value24, _parsedValuePath$segm, _docInst$value$params;
 		if (!fieldInfo.value) return {
 			data: [],
 			totalPage: 0,
@@ -141110,19 +141171,19 @@ function useTableDropdown(props, searchFilters) {
 		const { buildQuery, fetcher, transform, optionMapping, api, flatRequestBody } = strategy.value;
 		const isLinkQuery = enableLinkage.value;
 		const filters = unref(searchFilters);
-		const valuePath = (_fieldMeta$value19 = fieldMeta.value) === null || _fieldMeta$value19 === void 0 ? void 0 : _fieldMeta$value19.valuePath;
+		const valuePath = (_fieldMeta$value21 = fieldMeta.value) === null || _fieldMeta$value21 === void 0 ? void 0 : _fieldMeta$value21.valuePath;
 		const subFieldConfig = getSubFieldConfig(docInst.value.paramsConfig);
 		const assocFilterParams = await buildAssocFilterExtraParams(docInst.value, widgetProps.value, runtimeValuePath.value);
-		const belongingObject = (_fieldMeta$value20 = fieldMeta.value) === null || _fieldMeta$value20 === void 0 ? void 0 : _fieldMeta$value20.belongingObject;
+		const belongingObject = (_fieldMeta$value22 = fieldMeta.value) === null || _fieldMeta$value22 === void 0 ? void 0 : _fieldMeta$value22.belongingObject;
 		const formTmplBomController = (_window$TMPL_BOM_CONT = window[TMPL_BOM_CONTROLLER]) === null || _window$TMPL_BOM_CONT === void 0 ? void 0 : _window$TMPL_BOM_CONT.value;
-		const objectBomParams = getObjectBomDropdownQuery((_fieldMeta$value21 = fieldMeta.value) === null || _fieldMeta$value21 === void 0 ? void 0 : _fieldMeta$value21.fieldType, {
+		const objectBomParams = getObjectBomDropdownQuery((_fieldMeta$value23 = fieldMeta.value) === null || _fieldMeta$value23 === void 0 ? void 0 : _fieldMeta$value23.fieldType, {
 			formInstBom: formTmplBomController === null || formTmplBomController === void 0 ? void 0 : formTmplBomController.formInstBom,
 			belongingObject
 		});
 		const lotProductParams = getConsumeObjectLotProductQuery({
 			doc: docInst.value,
 			belongingObject,
-			fieldType: (_fieldMeta$value22 = fieldMeta.value) === null || _fieldMeta$value22 === void 0 ? void 0 : _fieldMeta$value22.fieldType
+			fieldType: (_fieldMeta$value24 = fieldMeta.value) === null || _fieldMeta$value24 === void 0 ? void 0 : _fieldMeta$value24.fieldType
 		});
 		const parsedValuePath = parseValuePath(runtimeValuePath.value);
 		const rowIndexMatch = (_parsedValuePath$segm = parsedValuePath.segments[0]) === null || _parsedValuePath$segm === void 0 ? void 0 : _parsedValuePath$segm.match(/\[(\d+)\]/);
@@ -141131,9 +141192,9 @@ function useTableDropdown(props, searchFilters) {
 		const materialConsumeRow = rowIndex != null ? materialConsumeTableController === null || materialConsumeTableController === void 0 ? void 0 : materialConsumeTableController.actualTableData[rowIndex] : void 0;
 		let materialConsumeRowParams;
 		if (materialConsumeTableController && materialConsumeRow) {
-			var _fieldMeta$value23, _fieldMeta$value24;
-			if (((_fieldMeta$value23 = fieldMeta.value) === null || _fieldMeta$value23 === void 0 ? void 0 : _fieldMeta$value23.fieldType) === FIELD_TYPE.PRODUCT) materialConsumeRowParams = materialConsumeTableController.getProductQueryForRow(materialConsumeRow, rowIndex);
-			else if (((_fieldMeta$value24 = fieldMeta.value) === null || _fieldMeta$value24 === void 0 ? void 0 : _fieldMeta$value24.fieldType) === FIELD_TYPE.MATERIAL_NO) materialConsumeRowParams = materialConsumeTableController.getMaterialNoQueryForRow(materialConsumeRow, rowIndex);
+			var _fieldMeta$value25, _fieldMeta$value26;
+			if (((_fieldMeta$value25 = fieldMeta.value) === null || _fieldMeta$value25 === void 0 ? void 0 : _fieldMeta$value25.fieldType) === FIELD_TYPE.PRODUCT) materialConsumeRowParams = materialConsumeTableController.getProductQueryForRow(materialConsumeRow, rowIndex);
+			else if (((_fieldMeta$value26 = fieldMeta.value) === null || _fieldMeta$value26 === void 0 ? void 0 : _fieldMeta$value26.fieldType) === FIELD_TYPE.MATERIAL_NO) materialConsumeRowParams = materialConsumeTableController.getMaterialNoQueryForRow(materialConsumeRow, rowIndex);
 		}
 		const extraParams = {
 			...subFieldConfig.get(valuePath),
@@ -142455,17 +142516,17 @@ var init_base_upload_image_vue_vue_type_script_setup_true_name_base_upload_image
 	});
 }));
 //#endregion
-//#region src/runtime/renderer/dialogs/upload-image/base-upload-image.vue?vue&type=style&index=0&scoped=1a458c43&lang.less
-var init_base_upload_image_vue_vue_type_style_index_0_scoped_1a458c43_lang = __esmMin((() => {}));
+//#region src/runtime/renderer/dialogs/upload-image/base-upload-image.vue?vue&type=style&index=0&scoped=c88c950f&lang.less
+var init_base_upload_image_vue_vue_type_style_index_0_scoped_c88c950f_lang = __esmMin((() => {}));
 //#endregion
 //#region src/runtime/renderer/dialogs/upload-image/base-upload-image.vue
 var base_upload_image_default;
 var init_base_upload_image = __esmMin((() => {
 	init_base_upload_image_vue_vue_type_script_setup_true_name_base_upload_image_lang();
 	init_base_upload_image_vue_vue_type_script_setup_true_name_base_upload_image_lang();
-	init_base_upload_image_vue_vue_type_style_index_0_scoped_1a458c43_lang();
+	init_base_upload_image_vue_vue_type_style_index_0_scoped_c88c950f_lang();
 	init__plugin_vue_export_helper();
-	base_upload_image_default = /*#__PURE__*/ _plugin_vue_export_helper_default(base_upload_image_vue_vue_type_script_setup_true_name_base_upload_image_lang_default, [["__scopeId", "data-v-1a458c43"]]);
+	base_upload_image_default = /*#__PURE__*/ _plugin_vue_export_helper_default(base_upload_image_vue_vue_type_script_setup_true_name_base_upload_image_lang_default, [["__scopeId", "data-v-c88c950f"]]);
 }));
 //#endregion
 //#region src/runtime/renderer/dialogs/upload-image/upload-image-dialog.vue?vue&type=script&setup=true&lang.ts
@@ -142540,8 +142601,8 @@ var init_upload_image_dialog_vue_vue_type_script_setup_true_lang = __esmMin((()
 	});
 }));
 //#endregion
-//#region src/runtime/renderer/dialogs/upload-image/upload-image-dialog.vue?vue&type=style&index=0&scoped=75035e38&lang.less
-var init_upload_image_dialog_vue_vue_type_style_index_0_scoped_75035e38_lang = __esmMin((() => {}));
+//#region src/runtime/renderer/dialogs/upload-image/upload-image-dialog.vue?vue&type=style&index=0&scoped=44846541&lang.less
+var init_upload_image_dialog_vue_vue_type_style_index_0_scoped_44846541_lang = __esmMin((() => {}));
 //#endregion
 //#region src/runtime/renderer/dialogs/upload-image/upload-image-dialog.vue
 var upload_image_dialog_exports = /* @__PURE__ */ __exportAll({ default: () => upload_image_dialog_default });
@@ -142549,9 +142610,9 @@ var upload_image_dialog_default;
 var init_upload_image_dialog = __esmMin((() => {
 	init_upload_image_dialog_vue_vue_type_script_setup_true_lang();
 	init_upload_image_dialog_vue_vue_type_script_setup_true_lang();
-	init_upload_image_dialog_vue_vue_type_style_index_0_scoped_75035e38_lang();
+	init_upload_image_dialog_vue_vue_type_style_index_0_scoped_44846541_lang();
 	init__plugin_vue_export_helper();
-	upload_image_dialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default(upload_image_dialog_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-75035e38"]]);
+	upload_image_dialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default(upload_image_dialog_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-44846541"]]);
 }));
 //#endregion
 //#region src/base/utils/image-size-util.ts
@@ -144318,6 +144379,7 @@ var init_overlay_render_vue_vue_type_script_setup_true_lang = __esmMin((() => {
 			const props = __props;
 			const isTargetReady = ref(false);
 			const isMenuShown = ref(false);
+			let isMaterialObjectScanOpen = false;
 			const pickerTriggerRef = ref(null);
 			const dropdownPlacement = ref("bottom-start");
 			const dropdownAvailableHeight = ref(390);
@@ -144584,91 +144646,115 @@ var init_overlay_render_vue_vue_type_script_setup_true_lang = __esmMin((() => {
 					isMenuShown.value = false;
 				}
 			});
-			async function openMaterialObjectScan() {
-				var _fieldMeta$value3, _tmplBomCRef$value;
-				const belongingObject = (_fieldMeta$value3 = fieldMeta.value) === null || _fieldMeta$value3 === void 0 ? void 0 : _fieldMeta$value3.belongingObject;
-				const objectBom = tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value = tmplBomCRef.value) === null || _tmplBomCRef$value === void 0 || (_tmplBomCRef$value = _tmplBomCRef$value.formInstBom) === null || _tmplBomCRef$value === void 0 || (_tmplBomCRef$value = _tmplBomCRef$value.formTmplObjectBomList) === null || _tmplBomCRef$value === void 0 ? void 0 : _tmplBomCRef$value.find((item) => item.object_key_ === belongingObject);
-				let objectParseRules;
-				if (!(objectBom === null || objectBom === void 0 ? void 0 : objectBom.disable_barcode_parsing_) && (objectBom === null || objectBom === void 0 ? void 0 : objectBom.barcode_parsing_rules_id_)) try {
-					objectParseRules = JSON.parse(objectBom.barcode_parsing_rules_id_);
+			/** 解析规则配置字符串转成对象（与物料消耗表一致） */
+			function toParseRuleConfig(value) {
+				if (!value) return void 0;
+				try {
+					return JSON.parse(value);
 				} catch {
-					objectParseRules = { parsingRuleId: objectBom.barcode_parsing_rules_id_ };
-				}
-				const objectFields = fieldList.value.filter((item) => item.belongingObject === belongingObject);
-				await Jr("COMMON_SCAN", {
-					title: "扫码录入",
-					ruleTip: "扫码解析后按字段映射写入表单",
-					scanRules: objectParseRules,
-					scanParam: (objectParseRules === null || objectParseRules === void 0 ? void 0 : objectParseRules.parsingRuleId) ? void 0 : "lot",
-					formFieldsLabel: "对象字段",
-					formFieldOptions: objectFields.map((item) => ({
-						...item,
-						label: `${item.name}`,
-						value: `${item.modelKey}.${item.key}`
-					})),
-					onScan: async ({ str, parsedValue = {}, transformedData = {} }) => {
-						var _tmplBomCRef$value2, _tmplBomCRef$value3, _tmplBomCRef$value4;
-						if (!str) return;
-						if (parsedValue.expiration && dayjs(parsedValue.expiration).endOf("day").isBefore(dayjs())) throw new Error("物料批次已过期");
-						const rows = await materialCheck({
-							material_no_: parsedValue.materialCode,
-							production_identification_name_: parsedValue.lot,
-							qty_: parsedValue.qty,
-							validate_: parsedValue.expiration,
-							bom_entries_: (objectBom === null || objectBom === void 0 ? void 0 : objectBom.material_consumption_pattern_) === MaterialConsumptionPatternEnum.RECORD ? null : tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value2 = tmplBomCRef.value) === null || _tmplBomCRef$value2 === void 0 || (_tmplBomCRef$value2 = _tmplBomCRef$value2.formInstBom) === null || _tmplBomCRef$value2 === void 0 ? void 0 : _tmplBomCRef$value2.bomEntries,
-							operation_id_: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value3 = tmplBomCRef.value) === null || _tmplBomCRef$value3 === void 0 ? void 0 : _tmplBomCRef$value3.operationId,
-							unique_code_: parsedValue.uniqueCode,
-							bar_code_enabled_: !(objectBom === null || objectBom === void 0 ? void 0 : objectBom.disable_barcode_parsing_)
-						}) ?? [];
-						if (!rows.length) throw new Error("匹配不到对应物料，请按规则上料或新增物料");
-						let material = rows[0];
-						if (rows.length > 1) {
-							const selected = await Jr("SCAN_MULTI_ROWS_MODAL", { rows });
-							if (!selected.success) return;
-							material = selected.result;
-						} else if (material.productionIdentificationIsLocked) throw new Error(await getLotLockedReason(material.productionIdentificationId));
-						validateObjectBomForScan({
-							formInstBom: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value4 = tmplBomCRef.value) === null || _tmplBomCRef$value4 === void 0 ? void 0 : _tmplBomCRef$value4.formInstBom,
-							belongingObject,
-							productId: material.materialId
-						});
-						await assertReinspectionDate({
-							product_id_: material.materialId,
-							material_no_: material.productionIdentificationName,
-							material_no_id_: material.productionIdentificationId
-						});
-						const productUpdates = await buildConsumeObjectScanProductUpdate({
-							doc: props.doc,
-							belongingObject,
-							material
-						});
-						const byBiz = (bizType) => objectFields.find((item) => (item.bizType || item.type) === bizType);
-						const qtyField = byBiz(FIELD_TYPE.QTY);
-						const expirationField = objectFields.find((item) => {
-							var _item$key;
-							return (_item$key = item.key) === null || _item$key === void 0 ? void 0 : _item$key.startsWith("expiration_date_");
-						});
-						const bomEntryIdField = byBiz(FIELD_TYPE.BOM_ENTRY_ID);
-						const rootPath = (key) => key.startsWith("$") ? key : `$.${key}`;
-						const updates = Object.fromEntries(Object.entries(transformedData).map(([key, value]) => [rootPath(key), value]));
-						updates[runtimeValuePath.value] = material.productionIdentificationName;
-						updates[getIdPath(runtimeValuePath.value)] = material.productionIdentificationId;
-						Object.assign(updates, productUpdates);
-						if (qtyField && parsedValue.qty !== void 0) updates[rootPath(qtyField.key)] = parsedValue.qty;
-						if (expirationField && parsedValue.expiration !== void 0) updates[rootPath(expirationField.key)] = parsedValue.expiration;
-						if (bomEntryIdField) {
-							var _tmplBomCRef$value5;
-							const bomEntry = resolveObjectBomEntry({
-								formInstBom: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value5 = tmplBomCRef.value) === null || _tmplBomCRef$value5 === void 0 ? void 0 : _tmplBomCRef$value5.formInstBom,
-								belongingObject,
-								productId: material.materialId
-							});
-							if (bomEntry) updates[rootPath(bomEntryIdField.key)] = bomEntry.id_;
+					return { parsingRuleId: value };
+				}
+			}
+			async function openMaterialObjectScan() {
+				if (isMaterialObjectScanOpen) return;
+				isMaterialObjectScanOpen = true;
+				try {
+					var _fieldMeta$value3, _tmplBomCRef$value, _objectBom$value, _objectBom$value2;
+					const belongingObject = (_fieldMeta$value3 = fieldMeta.value) === null || _fieldMeta$value3 === void 0 ? void 0 : _fieldMeta$value3.belongingObject;
+					const objectBom = tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value = tmplBomCRef.value) === null || _tmplBomCRef$value === void 0 || (_tmplBomCRef$value = _tmplBomCRef$value.formInstBom) === null || _tmplBomCRef$value === void 0 || (_tmplBomCRef$value = _tmplBomCRef$value.formTmplObjectBomList) === null || _tmplBomCRef$value === void 0 ? void 0 : _tmplBomCRef$value.find((item) => item.object_key_ === belongingObject);
+					const scanRules = !!((_objectBom$value = objectBom.value) === null || _objectBom$value === void 0 ? void 0 : _objectBom$value.disable_barcode_parsing_) ? void 0 : toParseRuleConfig((_objectBom$value2 = objectBom.value) === null || _objectBom$value2 === void 0 ? void 0 : _objectBom$value2.barcode_parsing_rules_id_);
+					const objectFields = fieldList.value.filter((item) => item.belongingObject === belongingObject);
+					await Jr("COMMON_SCAN", {
+						title: "扫码录入",
+						ruleTip: "扫码解析后按字段映射写入表单",
+						scanRules,
+						scanParam: (objectBom === null || objectBom === void 0 ? void 0 : objectBom.disable_barcode_parsing_) ? objectBom.scan_param_type_ : void 0,
+						formFieldsLabel: "对象字段",
+						formFieldOptions: objectFields.map((item) => ({
+							...item,
+							label: `${item.name}`,
+							value: `${item.modelKey}.${item.key}`
+						})),
+						onScan: async ({ str, parsedValue, transformedData }) => {
+							if (!str || !parsedValue || !Object.keys(parsedValue).length) return;
+							try {
+								var _tmplBomCRef$value2, _tmplBomCRef$value3, _tmplBomCRef$value4;
+								if (parsedValue.expiration && dayjs(parsedValue.expiration).endOf("day").isBefore(dayjs())) throw new Error("物料批次已过期");
+								const rows = await materialCheck({
+									material_no_: parsedValue.materialCode,
+									production_identification_name_: parsedValue.lot,
+									qty_: parsedValue.qty,
+									validate_: parsedValue.expiration,
+									bom_entries_: (objectBom === null || objectBom === void 0 ? void 0 : objectBom.material_consumption_pattern_) === MaterialConsumptionPatternEnum.RECORD ? null : tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value2 = tmplBomCRef.value) === null || _tmplBomCRef$value2 === void 0 || (_tmplBomCRef$value2 = _tmplBomCRef$value2.formInstBom) === null || _tmplBomCRef$value2 === void 0 ? void 0 : _tmplBomCRef$value2.bomEntries,
+									operation_id_: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value3 = tmplBomCRef.value) === null || _tmplBomCRef$value3 === void 0 ? void 0 : _tmplBomCRef$value3.operationId,
+									unique_code_: parsedValue.uniqueCode,
+									bar_code_enabled_: !(objectBom === null || objectBom === void 0 ? void 0 : objectBom.disable_barcode_parsing_)
+								}) ?? [];
+								if (!rows.length) throw new Error("匹配不到对应物料，请按规则上料或新增物料");
+								let material = rows[0];
+								if (rows.length > 1) {
+									const selected = await Jr("SCAN_MULTI_ROWS_MODAL", { rows: rows.map((e) => {
+										return {
+											...e,
+											productId: e.materialName
+										};
+									}) });
+									if (!selected.success || !selected.result) return;
+									material = selected.result;
+								} else if (material.productionIdentificationIsLocked) throw new Error(await getLotLockedReason(material.productionIdentificationId));
+								validateObjectBomForScan({
+									formInstBom: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value4 = tmplBomCRef.value) === null || _tmplBomCRef$value4 === void 0 ? void 0 : _tmplBomCRef$value4.formInstBom,
+									belongingObject,
+									productId: material.materialId
+								});
+								await assertReinspectionDate({
+									product_id_: material.materialId,
+									material_no_: material.productionIdentificationName,
+									material_no_id_: material.productionIdentificationId
+								});
+								const productUpdates = await buildConsumeObjectScanProductUpdate({
+									doc: props.doc,
+									belongingObject,
+									material
+								});
+								const byBiz = (bizType) => objectFields.find((item) => (item.bizType || item.type) === bizType);
+								const qtyField = byBiz(FIELD_TYPE.QTY);
+								const expirationField = objectFields.find((item) => {
+									var _item$key;
+									return (_item$key = item.key) === null || _item$key === void 0 ? void 0 : _item$key.startsWith("expiration_date_");
+								});
+								const bomEntryIdField = byBiz(FIELD_TYPE.BOM_ENTRY_ID);
+								const rootPath = (key) => key.startsWith("$") ? key : `$.${key}`;
+								const updates = {};
+								updates[runtimeValuePath.value] = material.productionIdentificationName;
+								updates[getIdPath(runtimeValuePath.value)] = material.productionIdentificationId;
+								Object.assign(updates, productUpdates);
+								if (qtyField && parsedValue.qty != null) updates[rootPath(qtyField.key)] = parsedValue.qty;
+								if (expirationField && parsedValue.expiration !== void 0) updates[rootPath(expirationField.key)] = parsedValue.expiration;
+								if (bomEntryIdField) {
+									var _tmplBomCRef$value5;
+									const bomEntry = resolveObjectBomEntry({
+										formInstBom: tmplBomCRef === null || tmplBomCRef === void 0 || (_tmplBomCRef$value5 = tmplBomCRef.value) === null || _tmplBomCRef$value5 === void 0 ? void 0 : _tmplBomCRef$value5.formInstBom,
+										belongingObject,
+										productId: material.materialId
+									});
+									if (bomEntry) updates[rootPath(bomEntryIdField.key)] = bomEntry.id_;
+								}
+								if (transformedData && typeof transformedData === "object") Object.assign(updates, Object.fromEntries(Object.entries(transformedData).map(([key, value]) => [rootPath(key), value])));
+								if (updates[runtimeValuePath.value] !== material.productionIdentificationName) updates[getIdPath(runtimeValuePath.value)] = null;
+								props.doc.dataManager.setMultiple(updates, "user");
+								await props.doc.dataManager.whenEmitSettled();
+								return true;
+							} catch (e) {
+								GctMessage.error((e === null || e === void 0 ? void 0 : e.message) || String(e));
+							}
 						}
-						props.doc.dataManager.setMultiple(updates, "user");
-						await props.doc.dataManager.whenEmitSettled();
-					}
-				});
+					});
+				} catch (e) {
+					GctMessage.error((e === null || e === void 0 ? void 0 : e.message) || String(e));
+				} finally {
+					isMaterialObjectScanOpen = false;
+				}
 			}
 			function openDialog(options) {
 				var _fieldInfo$value;
@@ -144927,8 +145013,8 @@ var init_overlay_render_vue_vue_type_script_setup_true_lang = __esmMin((() => {
 //#region src/runtime/canvas/__common__/widget-container/overlay-render.vue?vue&type=style&index=0&lang.less
 var init_overlay_render_vue_vue_type_style_index_0_lang = __esmMin((() => {}));
 //#endregion
-//#region src/runtime/canvas/__common__/widget-container/overlay-render.vue?vue&type=style&index=1&scoped=e7d4f550&lang.less
-var init_overlay_render_vue_vue_type_style_index_1_scoped_e7d4f550_lang = __esmMin((() => {}));
+//#region src/runtime/canvas/__common__/widget-container/overlay-render.vue?vue&type=style&index=1&scoped=7b8fc726&lang.less
+var init_overlay_render_vue_vue_type_style_index_1_scoped_7b8fc726_lang = __esmMin((() => {}));
 //#endregion
 //#region src/runtime/canvas/__common__/widget-container/overlay-render.vue
 var overlay_render_default;
@@ -144936,9 +145022,9 @@ var init_overlay_render = __esmMin((() => {
 	init_overlay_render_vue_vue_type_script_setup_true_lang();
 	init_overlay_render_vue_vue_type_script_setup_true_lang();
 	init_overlay_render_vue_vue_type_style_index_0_lang();
-	init_overlay_render_vue_vue_type_style_index_1_scoped_e7d4f550_lang();
+	init_overlay_render_vue_vue_type_style_index_1_scoped_7b8fc726_lang();
 	init__plugin_vue_export_helper();
-	overlay_render_default = /*#__PURE__*/ _plugin_vue_export_helper_default(overlay_render_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-e7d4f550"]]);
+	overlay_render_default = /*#__PURE__*/ _plugin_vue_export_helper_default(overlay_render_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-7b8fc726"]]);
 }));
 //#endregion
 //#region src/utils/composables/useHoverDelay.ts
@@ -149832,6 +149918,7 @@ function useDocOperations(docRef) {
 //#region src/sdk/doc-runtime/composables/useDocController.ts
 init_form_state();
 init_form_change_row();
+init_material_consume_object();
 /**
 * 将加载层（factory）与操作层（ops）组合为受控文档句柄 DocController
 *
@@ -149890,11 +149977,14 @@ function useDocController(factory, ops) {
 				return readDocRawData(doc, options);
 			},
 			async getSubmitFormData() {
-				var _doc$model;
+				var _factory$tmplBomCRef$, _doc$model;
 				ops.clearFormChangeRowPreview();
+				const bomUpdates = buildConsumeObjectBomSubmitUpdates(doc, (_factory$tmplBomCRef$ = factory.tmplBomCRef.value) === null || _factory$tmplBomCRef$ === void 0 ? void 0 : _factory$tmplBomCRef$.formInstBom);
+				if (Object.keys(bomUpdates).length) doc.dataManager.setMultiple(bomUpdates, "hydrate");
 				await doc.dataManager.prepareForSubmit();
 				const subTableInfoList = ((_doc$model = doc.model) === null || _doc$model === void 0 ? void 0 : _doc$model.getSubTableInfoList()) ?? [];
-				return getSubmitFormData(doc.dataManager.getRawData(), subTableInfoList);
+				const fieldList = doc.fieldModelQuery.getFieldList(doc.mainModelKey) ?? [];
+				return getSubmitFormData(doc.dataManager.getRawData(), subTableInfoList, fieldList);
 			},
 			async setRawData(data, defaultDataMap) {
 				ops.clearFormChangeRowPreview();
@@ -166380,6 +166470,8 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 						"parseRuleProps"
 					]),
 					barcode_parsing_rules_id_: Object.keys(parseRuleProps).length ? JSON.stringify(parseRuleProps) : "",
+					disable_barcode_parsing_: result.disableBarcodeParsing,
+					scan_param_type_: result.scanParamType,
 					object_key_: result.objectField,
 					entries_: result.personal_bom_enabled_ ? [bomEntry] : []
 				}
@@ -166459,7 +166551,7 @@ var object_init_vue_vue_type_script_setup_true_lang_default = /*@__PURE__*/ defi
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/object-init/object-init.vue
 init__plugin_vue_export_helper();
-var object_init_default = /*#__PURE__*/ _plugin_vue_export_helper_default(object_init_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-4482ca5e"]]);
+var object_init_default = /*#__PURE__*/ _plugin_vue_export_helper_default(object_init_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-d8f43bdd"]]);
 //#endregion
 //#region src/suites/edhr/panel-schema/data-init/DataInitPanel.vue?vue&type=script&setup=true&name=panel-data-init&lang.ts
 init_core$1();
@@ -174931,7 +175023,7 @@ var assoc_filter_editor_vue_vue_type_script_setup_true_name_assoc_filter_editor_
 //#endregion
 //#region src/suites/shared/panel/config/editor/assoc-filter-editor/assoc-filter-editor.vue
 init__plugin_vue_export_helper();
-var assoc_filter_editor_default = /*#__PURE__*/ _plugin_vue_export_helper_default(assoc_filter_editor_vue_vue_type_script_setup_true_name_assoc_filter_editor_lang_default, [["__scopeId", "data-v-eb6928ec"]]);
+var assoc_filter_editor_default = /*#__PURE__*/ _plugin_vue_export_helper_default(assoc_filter_editor_vue_vue_type_script_setup_true_name_assoc_filter_editor_lang_default, [["__scopeId", "data-v-81133a7f"]]);
 //#endregion
 //#region src/suites/edhr/panel-config/field/trace/device-group-select.vue?vue&type=script&setup=true&lang.ts
 init_base$2();

package/dist/sdk/doc-runtime/factories/useDocumentFactory.d.ts

@@ -58,6 +58,8 @@ export interface DocumentFactory {
     hasData: ComputedRef<boolean>;
     /** 是否正在加载 */
     loading: ComputedRef<boolean>;
+    /** 当前实例 BOM 控制器。 */
+    tmplBomCRef: Ref<FormTmplBomController | null>;
     /**
      * refreshData() 执行期间为 true。
      * 供 useDocLooperAutoSaveNotify 读取以抑制通知，防止循环触发。

package/dist/suites/edhr/panel-schema/data-init/material-consume-object/linkage.d.ts

@@ -25,6 +25,8 @@ export interface ConsumeObjectSelectUpdatesOpts {
     /** 表单实例 BOM 信息，用于 BOM 模式下写入 bom_entry_id_ */
     formInstBom?: FormInstBomResponse | null;
 }
+/** 提交前按当前产品值补齐所有物料消耗对象的 BOM 明细 ID。 */
+export declare function buildConsumeObjectBomSubmitUpdates(doc: ConsumeObjectDoc, formInstBom?: FormInstBomResponse | null): Record<string, unknown>;
 /**
  * 消耗对象批次下拉：同组物料有值时按该物料版本过滤，替换 BOM versionIn。
  */

package/dist/word.css

@@ -9353,59 +9353,61 @@ textarea[data-v-a7d89044]::placeholder {
   width: 100%;
   height: 100%;
 }
-.word-base-upload-modal[data-v-1a458c43] {
+.word-base-upload-modal[data-v-c88c950f] {
   position: relative;
   width: 100%;
 }
-.word-base-upload-modal .upload-dragger[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger[data-v-c88c950f] {
   position: relative;
 }
-.word-base-upload-modal .upload-dragger .upload[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload[data-v-c88c950f] {
+  position: relative;
+  transition: border-color 0.3s;
   border: 1px dashed #d9d9d9;
-  background: #f7f8fa;
   border-radius: 2px;
-  cursor: pointer;
-  height: 100%;
-  position: relative;
+  background: #f7f8fa;
   text-align: center;
-  transition: border-color 0.3s;
+  cursor: pointer;
 }
-.word-base-upload-modal .upload-dragger .upload[data-v-1a458c43]:hover {
+.word-base-upload-modal .upload-dragger .upload[data-v-c88c950f]:hover {
   border-color: #026ac8;
 }
-.word-base-upload-modal .upload-dragger .upload.dragover[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload.dragover[data-v-c88c950f] {
   border-color: #026ac8;
   background: #eef6ff;
 }
-.word-base-upload-modal .upload-dragger .upload .input[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload .input[data-v-c88c950f] {
   display: none;
 }
-.word-base-upload-modal .upload-dragger .upload .upload-content[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload .upload-content[data-v-c88c950f] {
+  display: flex;
   position: relative;
+  flex-direction: column;
+  align-items: center;
   padding: 24px;
 }
-.word-base-upload-modal .upload-dragger .upload .upload-content .icon[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload .upload-content .icon[data-v-c88c950f] {
   display: flex;
-  justify-content: center;
   align-items: center;
+  justify-content: center;
 }
-.word-base-upload-modal .upload-dragger .upload .upload-content .text[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload .upload-content .text[data-v-c88c950f] {
   margin-top: 4px;
   font-size: 14px;
   line-height: 24px;
 }
-.word-base-upload-modal .upload-dragger .upload.is-disabled[data-v-1a458c43] {
-  cursor: not-allowed;
-  background: #fafafa;
+.word-base-upload-modal .upload-dragger .upload.is-disabled[data-v-c88c950f] {
   border-color: #e5e6eb;
+  background: #fafafa;
+  cursor: not-allowed;
 }
-.word-base-upload-modal .upload-dragger .upload.is-disabled[data-v-1a458c43]:hover {
+.word-base-upload-modal .upload-dragger .upload.is-disabled[data-v-c88c950f]:hover {
   border-color: #e5e6eb;
 }
-.word-base-upload-modal .upload-dragger .upload.is-disabled .upload-content[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .upload.is-disabled .upload-content[data-v-c88c950f] {
   opacity: 0.4;
 }
-.word-base-upload-modal .upload-dragger .img-box[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .img-box[data-v-c88c950f] {
   display: flex;
   gap: 12px;
   flex-wrap: wrap;
@@ -9413,38 +9415,38 @@ textarea[data-v-a7d89044]::placeholder {
   padding-top: 8px;
   padding-bottom: 8px;
 }
-.word-base-upload-modal .upload-dragger .scrollbar[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .scrollbar[data-v-c88c950f] {
   position: relative;
   margin-top: 8px;
 }
-.word-base-upload-modal .upload-dragger .img-item[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .img-item[data-v-c88c950f] {
+  position: relative;
   width: 80px;
   height: 80px;
-  position: relative;
 }
-.word-base-upload-modal .upload-dragger .img[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .img[data-v-c88c950f] {
   display: block;
   width: 100%;
   height: 100%;
-  object-fit: cover;
   border-radius: 4px;
-  cursor: pointer;
   background-color: #f7f8fa;
+  cursor: pointer;
+  object-fit: cover;
 }
-.word-base-upload-modal .upload-dragger .delete[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .delete[data-v-c88c950f] {
+  display: flex;
   position: absolute;
   top: -6px;
   right: -6px;
+  align-items: center;
+  justify-content: center;
   width: 18px;
   height: 18px;
-  background: #000;
   border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
+  background: #000;
   cursor: pointer;
 }
-.word-base-upload-modal .upload-dragger .progress[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .progress[data-v-c88c950f] {
   position: absolute;
   bottom: 0;
   left: 0;
@@ -9452,31 +9454,30 @@ textarea[data-v-a7d89044]::placeholder {
   height: 2px;
   background: rgba(0, 0, 0, 0.06);
 }
-.word-base-upload-modal .upload-dragger .progress-inner[data-v-1a458c43] {
-  height: 100%;
-  background: #026ac8;
+.word-base-upload-modal .upload-dragger .progress-inner[data-v-c88c950f] {
   position: relative;
-  border-radius: 100px;
+  height: 100%;
   transition: all 0.3s cubic-bezier(0.78, 0.14, 0.15, 0.86);
+  border-radius: 100px;
+  background: #026ac8;
 }
-.word-base-upload-modal .upload-dragger .preview-mask[data-v-1a458c43] {
-  position: fixed;
-  inset: 0;
-  background: rgba(0, 0, 0, 0.4);
+.word-base-upload-modal .upload-dragger .preview-mask[data-v-c88c950f] {
   display: flex;
+  position: fixed;
+  z-index: 9999;
   align-items: center;
   justify-content: center;
-  z-index: 9999;
+  background: rgba(0, 0, 0, 0.4);
+  inset: 0;
 }
-.word-base-upload-modal .upload-dragger .preview-mask img[data-v-1a458c43] {
+.word-base-upload-modal .upload-dragger .preview-mask img[data-v-c88c950f] {
   max-width: 80%;
   max-height: 80%;
 }
-.word-upload-image-dialog[data-v-75035e38] {
+.word-upload-image-dialog[data-v-44846541] {
   position: relative;
-  overflow: hidden;
   width: 100%;
-  height: 100%;
+  overflow: hidden;
 }
 
 .card-signer[data-v-72001702] {
@@ -9734,7 +9735,7 @@ textarea[data-v-a7d89044]::placeholder {
 /**
  * 字段态配色 —— DOM 控件子集（input / select / overlay）
  */
-.widget-container-action[data-v-e7d4f550] {
+.widget-container-action[data-v-7b8fc726] {
   position: absolute;
   inset: 0;
   z-index: 999;
@@ -9742,7 +9743,7 @@ textarea[data-v-a7d89044]::placeholder {
   height: 0;
   pointer-events: all;
 }
-.picker-trigger[data-v-e7d4f550] {
+.picker-trigger[data-v-7b8fc726] {
   display: flex;
   box-sizing: border-box;
   align-items: center;
@@ -9754,19 +9755,19 @@ textarea[data-v-a7d89044]::placeholder {
   outline: none;
   background-color: #fff;
 }
-.picker-trigger.disabled[data-v-e7d4f550] {
+.picker-trigger.disabled[data-v-7b8fc726] {
   border: 1px solid rgba(13, 13, 13, 0.12);
   cursor: not-allowed;
 }
-.picker-trigger.disabled .gct-icon[data-v-e7d4f550] {
+.picker-trigger.disabled .gct-icon[data-v-7b8fc726] {
   color: rgba(0, 0, 0, 0.25);
 }
-.picker-trigger.readonly[data-v-e7d4f550] {
+.picker-trigger.readonly[data-v-7b8fc726] {
   border-color: #d9d9d9;
   background-color: #f5f6f8;
   cursor: default;
 }
-.picker-trigger.readonly .gct-icon[data-v-e7d4f550] {
+.picker-trigger.readonly .gct-icon[data-v-7b8fc726] {
   color: rgba(0, 0, 0, 0.65);
 }
 .resize-box[data-v-788ab62c] {
@@ -12619,35 +12620,35 @@ svg.portrait-icon[data-v-8bdb451e] {
   cursor: pointer;
   color: #797a7d;
 }
-.object-item[data-v-4482ca5e] {
+.object-item[data-v-d8f43bdd] {
   margin-bottom: 16px;
   padding: 12px;
   border: 1px dashed #e4e4e4;
   border-radius: 8px;
   background: #f6f8fa;
 }
-.object-item.is-filled[data-v-4482ca5e] {
+.object-item.is-filled[data-v-d8f43bdd] {
   border-color: #a7cae6;
   background: #ecf3fc;
 }
-.object-item .item-info[data-v-4482ca5e] {
+.object-item .item-info[data-v-d8f43bdd] {
   display: flex;
 }
-.object-item .item-info .info-text[data-v-4482ca5e] {
+.object-item .item-info .info-text[data-v-d8f43bdd] {
   flex-grow: 1;
   margin-right: 8px;
   overflow: hidden;
 }
-.object-item .item-info .info-text .text-row[data-v-4482ca5e] {
+.object-item .item-info .info-text .text-row[data-v-d8f43bdd] {
   margin-bottom: 4px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-.object-item .item-info .info-text .text-row .row-label[data-v-4482ca5e] {
+.object-item .item-info .info-text .text-row .row-label[data-v-d8f43bdd] {
   color: #76777e;
 }
-.object-item .item-info .info-button[data-v-4482ca5e] {
+.object-item .item-info .info-button[data-v-d8f43bdd] {
   display: flex;
   flex-shrink: 0;
   align-items: center;
@@ -12657,16 +12658,16 @@ svg.portrait-icon[data-v-8bdb451e] {
   border-radius: 4px;
   cursor: pointer;
 }
-.object-item .item-info .info-button[data-v-4482ca5e]:hover {
+.object-item .item-info .info-button[data-v-d8f43bdd]:hover {
   background: #fff;
 }
-.object-item .item-info .info-button:hover .gct-icon[data-v-4482ca5e] {
+.object-item .item-info .info-button:hover .gct-icon[data-v-d8f43bdd] {
   color: #1c1e20;
 }
-.object-item .item-info .info-button .gct-icon[data-v-4482ca5e] {
+.object-item .item-info .info-button .gct-icon[data-v-d8f43bdd] {
   color: #a4aaaf;
 }
-.object-item .item-button[data-v-4482ca5e] {
+.object-item .item-button[data-v-d8f43bdd] {
   margin-top: 8px;
 }
 .panel-data-init[data-v-d6dda95c] {
@@ -14329,24 +14330,24 @@ svg.portrait-icon[data-v-8bdb451e] {
 .panel-field-text-config[data-v-af8de84d] {
   padding: 16px;
 }
-.form-item.default.assoc-filter-editor.is-content-hidden[data-v-eb6928ec] .form-item__label {
+.form-item.default.assoc-filter-editor.is-content-hidden[data-v-81133a7f] .form-item__label {
   margin-bottom: 0 !important;
 }
-.assoc-filter-editor__extra[data-v-eb6928ec] {
+.assoc-filter-editor__extra[data-v-81133a7f] {
   display: inline-flex;
   align-items: center;
 }
-.assoc-filter-editor__source[data-v-eb6928ec] {
+.assoc-filter-editor__source[data-v-81133a7f] {
   display: flex;
   flex-direction: column;
   gap: 8px;
 }
-.assoc-filter-editor__source-label[data-v-eb6928ec] {
+.assoc-filter-editor__source-label[data-v-81133a7f] {
   color: rgba(0, 0, 0, 0.85);
-  font-size: 14px;
+  font-size: 12px;
   line-height: 22px;
 }
-.assoc-filter-editor__tip[data-v-eb6928ec] {
+.assoc-filter-editor__tip[data-v-81133a7f] {
   margin-top: 8px;
   color: #8c8c8c;
   font-size: 12px;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.74-beta.52",
+  "version": "0.1.74-beta.54",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",