@gct-paas/excel 0.1.28-beta.9 → 0.1.28

package/dist/{dynamic-table-action-C1o2TjqX.js → dynamic-table-action-DmQ4nVdA.js}

@@ -1,10 +1,10 @@
-import { computed, watch, toRaw, onUnmounted, markRaw, ref, inject, unref, provide, reactive, defineComponent, openBlock, createElementBlock, mergeProps, createElementVNode, normalizeClass, renderSlot, createCommentVNode, createVNode, toDisplayString, toRef, isVNode, h, onBeforeMount, resolveComponent, createBlock, withCtx, Fragment, renderList, createTextVNode, onMounted } from "vue";
+import { computed, watch, toRaw, onUnmounted, markRaw, ref, inject, unref, provide, nextTick, reactive, defineComponent, openBlock, createElementBlock, mergeProps, createElementVNode, normalizeClass, renderSlot, createCommentVNode, createVNode, toDisplayString, toRef, isVNode, h, onMounted, onBeforeMount, resolveComponent, createBlock, withCtx, Fragment, renderList, createTextVNode } from "vue";
+import { C as ComponentTypeEnum, aP as useWidgetStaticAttrs, Z as PlatformEnum, d9 as assembleRules, da as deleteFormRule, db as setFormRule, c2 as requestDisplayValidation, dc as isReferenceOptionActive, dd as validateAllFields, de as runValidation, df as ensureFrontRowKey, dg as FRONT_ROW_KEY, cf as getRowId, b1 as getParseRuleInfo, bb as transformUtils, aY as materialCheck, aZ as getLotLockedReason, a_ as validateReinspectionDate, bh as FormulaRuleFieldKeyEnum, aW as NCB_PROVIDE, F as FIELD_TYPE, dh as buildError, z as api, l as SubTableType, b2 as getParseRuleValue, c9 as uuid2, aH as DeviceLink, a4 as _export_sfc, cz as buildFormChangeDisplayRows, d5 as resolveRowFormChangeMark, d4 as resolveFormChangeRowUi, cS as isAnnLocationSelected, d6 as setSelectMobileTdId, cT as isFormChangeGhostRow, x as CellType, aR as setSelectAnnotationId, c$ as recordSubtableRowDelete, cB as deleteSubtableRow, d0 as relocateDeletedRowsToEnd, cR as insertSubtableRows, c_ as recordSubtableRowAdd, G as useModal, di as q, dj as groupFixedTableRows, dk as QUICK_FILL_ALLOWED_FIELDS, dl as processQuickFillRows, dm as getIsGroupEmpty, bf as RenderModeEnum, cM as getSubTableQuickFillInfo } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-BviS9x-o.js";
 import { isNil, cloneDeep, merge, pickBy, mergeWith, omit, last, pick } from "lodash-es";
-import { ax as useWidgetStaticAttrs, Q as PlatformEnum, m as ComponentTypeEnum, cu as assembleRules, cv as deleteFormRule, cw as setFormRule, bp as requestDisplayValidation, cx as isReferenceOptionActive, cy as validateAllFields, cz as runValidation, cA as ensureFrontRowKey, cB as FRONT_ROW_KEY, bC as getRowId, aL as getParseRuleInfo, bj as transformUtils, aO as materialCheck, aP as getLotLockedReason, aT as FormulaRuleFieldKeyEnum, aF as NCB_PROVIDE, F as FIELD_TYPE, w as api, d as SubTableType, aM as getParseRuleValue, bw as uuid2, ap as DeviceLink, _ as _export_sfc, bV as buildFormChangeDisplayRows, cq as resolveRowFormChangeMark, cp as resolveFormChangeRowUi, cb as isAnnLocationSelected, cr as setSelectMobileTdId, cc as isFormChangeGhostRow, t as CellType, az as setSelectAnnotationId, ck as recordSubtableRowDelete, bX as deleteSubtableRow, cl as relocateDeletedRowsToEnd, ca as insertSubtableRows, cj as recordSubtableRowAdd, aN as useCurrentPageFormState, aC as renderUtils, y as useModal, cC as q, cD as groupFixedTableRows, cE as QUICK_FILL_ALLOWED_FIELDS, cF as processQuickFillRows, cG as getIsGroupEmpty, aR as RenderModeEnum, c5 as getSubTableQuickFillInfo } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D8HQKSsX.js";
 import dayjs from "dayjs";
 import { u as useNamespace } from "./use-namespace-BxkK4ofX.js";
 import { Modal, message } from "ant-design-vue";
-import { u as useFormModel } from "./mb-render-DNA0sAdk.js";
+import { u as useFormModel } from "./mb-render-BBRR_byl.js";
 const InstanceStatusValues = {
   /** 作废状态 */
   ABANDON: "ABANDON",
@@ -38,12 +38,19 @@ var MaterialConsumptionPatternEnum = /* @__PURE__ */ ((MaterialConsumptionPatter
   MaterialConsumptionPatternEnum2["BOM"] = "bom";
   return MaterialConsumptionPatternEnum2;
 })(MaterialConsumptionPatternEnum || {});
-function useStyles(widget, isArea = false) {
+function isDroppedFieldWidget(widget, isDroppedField) {
+  if (typeof isDroppedField === "boolean") return isDroppedField;
+  return widget?.component !== ComponentTypeEnum.RO && widget?.component !== ComponentTypeEnum.DynRo;
+}
+function useStyles(widget, isArea = false, isDroppedField) {
   const otherClass = computed(() => {
+    const dropped = isDroppedFieldWidget(widget, isDroppedField);
+    const cls = [];
     if (!widget.style) {
-      return;
+      cls.push(dropped ? "m-justify-center" : "m-justify-start");
+      cls.push(isArea ? "m-content-center" : "m-items-center");
+      return cls;
     }
-    const cls = [];
     if (widget.style["textAlign"]) {
       if (widget.style["textAlign"] === "center") {
         cls.push("m-justify-center");
@@ -55,7 +62,7 @@ function useStyles(widget, isArea = false) {
         cls.push("m-justify-end");
       }
     } else {
-      cls.push("m-justify-center");
+      cls.push(dropped ? "m-justify-center" : "m-justify-start");
     }
     if (widget.style["verticalAlign"]) {
       if (widget.style["verticalAlign"] === "middle") {
@@ -74,16 +81,33 @@ function useStyles(widget, isArea = false) {
   });
   return { otherClass };
 }
-const constantRequiredStyles = {
-  "--required-border-color": "#ffb0ae",
-  "--required-border-hover-color": "rgb(255, 31, 31, 0.86)",
-  "--required-background-color": "#fff7f7"
-};
-const resetRequiredStyles = {
-  "--required-border-color": "#e0e3eb",
-  "--required-border-hover-color": "var(--ant-primary-color)",
-  "--required-background-color": "transparent"
-};
+const DEFAULT_FIELD_WIDTH = 75;
+function normalizeFieldWidth(value) {
+  if (value == null || value === "") return DEFAULT_FIELD_WIDTH;
+  const width = Number(value);
+  return Number.isFinite(width) && width >= 0 ? width : DEFAULT_FIELD_WIDTH;
+}
+function fieldChromeStyles(state) {
+  const required = state === "required";
+  const disabled = state === "disabled";
+  const border = required ? "#ffb0ae" : "#e0e3eb";
+  const hover = required ? "#ff7875" : "var(--ant-primary-color)";
+  const background = disabled ? "#f2f3f5" : required ? "#fff7f7" : "#fff";
+  const text = disabled ? "#bfbfbf" : "#1a1d23";
+  return {
+    "--cell-field-border-color": border,
+    "--cell-field-border-hover-color": hover,
+    "--cell-field-background-color": background,
+    "--cell-field-placeholder-color": "#bfbfbf",
+    "--cell-field-text-color": text
+  };
+}
+function resolveChromeState(isDp, blocked, required) {
+  if (isDp) return "default";
+  if (blocked) return "disabled";
+  if (required) return "required";
+  return "default";
+}
 const reliableVerticalTextStyles = {
   "writing-mode": "horizontal-tb",
   display: "inline-block",
@@ -115,11 +139,11 @@ function useValidator(props) {
   const isDpPlatform = computed(
     () => dataRelationShip?.platformType === PlatformEnum.INTEGRATION_PAAS_DP
   );
-  const sizeStyles = {
-    "--size": `${widget.props.size ?? 12}px`,
-    "--cmp-width": isNil(widget.props.cmpWidth) ? "100%" : `${widget.props.cmpWidth}px`,
+  const sizeStyles = computed(() => ({
+    "--size": typeof widget.style?.fontSize === "number" ? `${widget.style.fontSize}px` : widget.style?.fontSize || `${widget.props.size ?? 12}px`,
+    "--cmp-width": `${normalizeFieldWidth(widget.props.cmpWidth)}px`,
     "--cmp-height": `${widget.props.cmpHeight ?? 0}px`
-  };
+  }));
   const skipFormItem = computed(() => {
     if (widget.component === ComponentTypeEnum.DynValue) {
       return true;
@@ -292,13 +316,16 @@ function useValidator(props) {
   );
   const widgetStyles = computed(() => {
     if (widget.component === ComponentTypeEnum.DynValue) {
-      return isDpPlatform.value ? resetRequiredStyles : {};
+      return isDpPlatform.value ? fieldChromeStyles("default") : {};
     }
-    const requiredActive = !isDpPlatform.value && showRequired.value && !blocked.value && referenceActive.value;
-    const isAttachField = !!props.referenceInfo?.belongFieldId;
+    const chrome = resolveChromeState(
+      isDpPlatform.value,
+      blocked.value,
+      !!showRequired.value && referenceActive.value
+    );
     return {
-      ...sizeStyles,
-      ...isDpPlatform.value ? resetRequiredStyles : requiredActive ? constantRequiredStyles : isAttachField ? resetRequiredStyles : {},
+      ...sizeStyles.value,
+      ...fieldChromeStyles(chrome),
       ...isVerticalLrText(widget.style) ? reliableVerticalTextStyles : {}
     };
   });
@@ -327,6 +354,16 @@ const validate = async (formData, paper, uniqueId) => {
     uiApplied: false
   };
 };
+class McRowValidateError extends Error {
+  constructor(message2, targetFieldId, row) {
+    super(message2);
+    this.targetFieldId = targetFieldId;
+    this.row = row;
+    this.name = "McRowValidateError";
+  }
+  targetFieldId;
+  row;
+}
 class BomEntryValidator {
   constructor(bomEntry, enableSequenceLoading, getMaterialNoNum, historyData, mainMaterialNo, noBomMode) {
     this.bomEntry = bomEntry;
@@ -499,7 +536,7 @@ class BomEntryValidator {
     }
     const allowed = (this.bomEntry.specified_material_entries_ ?? []).map((e) => e.name_).filter(Boolean);
     if (!allowed.includes(lot)) {
-      throw new Error(`${lot}，不在指定物料批次范围内`);
+      throw new McRowValidateError(`${lot}，不在指定物料批次范围内`, "material_no_", row);
     }
   }
   /** 整组指定批次校验：组内每一行有批次值的都检查 */
@@ -523,6 +560,11 @@ class BomEntryValidator {
     const groupData = this.filterGroupData(arr);
     return groupData.reduce((acc, cur) => acc + (cur.qty_ ?? 0), 0);
   }
+  /** 上下限校验统一按需求单位口径取转换数量，历史数据未转换时兼容原数量。 */
+  calcQtyForBounds(arr) {
+    const groupData = this.filterGroupData(arr);
+    return groupData.reduce((acc, cur) => acc + (cur.qty_transfer_ ?? cur.qty_ ?? 0), 0);
+  }
   /**
    * 计算自定义的数量校验的最大值和最小值
    * @param data
@@ -585,7 +627,7 @@ class BomEntryValidator {
         break;
       case "bounds": {
         const groupData = this.filterGroupData(arr);
-        const consumeSum = loaded + this.hasConsumed;
+        const consumeSum = this.calcQtyForBounds(arr) + this.calcQtyForBounds(this.historyData);
         const { min, max } = await this.calcCustomNumberLimit(groupData[0]);
         if (min !== void 0 && consumeSum < min || max !== void 0 && consumeSum > max) {
           fail($t("sys.qtyValidationRule.bounds", { min, max }));
@@ -654,12 +696,14 @@ class BomEntriesValidator {
   }
   /**
    * 是否有正在编辑的组。
-   * 一组可多行同时 !is_confirmed_；正常应只有一组。
-   * @returns 有编辑行且只落在一组 → true；无编辑行 → false；跨多组编辑 → 抛错
+   * 未开顺序上料：只回答有无未确认行，不限制组数。
+   * 顺序上料：一组可多行同时 !is_confirmed_；正常应只有一组。
+   * @returns 有编辑行且只落在一组 → true；无编辑行 → false；顺序上料且跨多组编辑 → 抛错
    */
   hasEditingGroup(arr) {
     const editRows = arr.filter((i) => !i.is_confirmed_ && !i.deleted_);
     if (!editRows.length) return false;
+    if (!this.enableSequenceLoading) return true;
     const groupIds = /* @__PURE__ */ new Set();
     for (const row of editRows) {
       const id = this.getRowGroupId(row);
@@ -878,15 +922,9 @@ class BomEntriesValidator {
     if (!rows.length) throw new Error($t("sys.edhr.mcTable.materialEmptyError"));
     rows.forEach((row) => {
       this.validateDataCompleted(row);
-      if (row.expiration_date_ && dayjs(row.expiration_date_).endOf("day").isBefore(dayjs())) {
-        throw new Error(
-          $t("sys.expirationDateError", { product: row.product_id__lb_, lot: row.material_no_ })
-        );
-      }
     });
     util.validateSubstitute(arr);
     util.validateLotMixing(arr);
-    util.validateSpecifiedMaterialNoForGroup(arr);
     const orderIndex = this.resolveGroupOrderIndexByUtil(util, arr);
     const groupNo = orderIndex >= 0 ? orderIndex + 1 : void 0;
     await util.validateGroupQty(arr, this.enableSequenceLoading, groupNo);
@@ -898,46 +936,98 @@ class BomEntriesValidator {
     await this.validateGroup(arr, current);
   }
   /**
-   * 校验物料是否在bom里被使用
-   * @param row 单行的数据
+   * 行级错误（提交收集全部打标；切组/扫码抛第一条）
    */
-  validateInBom(row) {
+  getRowFieldErrors(row) {
     if (this.noBomMode) {
-      return;
+      return [];
     }
+    const errors = [];
     if (!row.product_id_) {
-      throw new Error($t("sys.edhr.mcTable.materialEmptyError"));
+      errors.push(
+        new McRowValidateError($t("sys.edhr.mcTable.materialEmptyError"), "product_id_", row)
+      );
+      return errors;
     }
     const util = this.findUtilByProductId(row.product_id_);
     if (!util) {
-      throw new Error($t("匹配不到对应物料，请按规则上料或新增物料"));
+      errors.push(
+        new McRowValidateError($t("匹配不到对应物料，请按规则上料或新增物料"), "product_id_", row)
+      );
+      return errors;
     }
-  }
-  /**
-   * 检查数据是否完整
-   * @param arr
-   */
-  validateDataCompleted(row) {
-    this.validateInBom(row);
-    const util = this.findUtilByProductId(row.product_id_);
     const { type_ } = util.bomEntry;
     if (type_ === "view") {
-      return;
+      return errors;
     }
     if (type_ === "by_lot" && !row.material_no_) {
-      throw new Error(
-        $t("sys.edhr.mcTable.materialNoEmptyError", {
-          product: this.translateProductCode(row.product_id_)
-        })
+      errors.push(
+        new McRowValidateError(
+          $t("sys.edhr.mcTable.materialNoEmptyError", {
+            product: this.translateProductCode(row.product_id_)
+          }),
+          "material_no_",
+          row
+        )
       );
     }
     if (!row.qty_) {
-      throw new Error(
-        $t("sys.edhr.mcTable.materialNumEmptyError", {
-          product: this.translateProductCode(row.product_id_)
-        })
+      errors.push(
+        new McRowValidateError(
+          $t("sys.edhr.mcTable.materialNumEmptyError", {
+            product: this.translateProductCode(row.product_id_)
+          }),
+          "qty_",
+          row
+        )
       );
     }
+    if (row.expiration_date_ && dayjs(row.expiration_date_).endOf("day").isBefore(dayjs())) {
+      errors.push(
+        new McRowValidateError(
+          $t("sys.expirationDateError", {
+            product: row.product_id__lb_,
+            lot: row.material_no_
+          }),
+          "expiration_date_",
+          row
+        )
+      );
+    }
+    try {
+      util.validateSpecifiedMaterialNo(row);
+    } catch (e) {
+      if (e instanceof McRowValidateError) {
+        errors.push(e);
+      } else if (e?.message) {
+        errors.push(new McRowValidateError(e.message, "material_no_", row));
+      }
+    }
+    return errors;
+  }
+  /**
+   * 校验物料是否在bom里被使用
+   * @param row 单行的数据
+   */
+  validateInBom(row) {
+    const first = this.getRowFieldErrors(row).find((e) => e.targetFieldId === "product_id_");
+    if (first) throw first;
+  }
+  /**
+   * 检查数据是否完整（切组/扫码：遇错即抛）
+   */
+  validateDataCompleted(row) {
+    const first = this.getRowFieldErrors(row)[0];
+    if (first) throw first;
+  }
+  /** 提交：收集全表行级错误，不中断。无物料且无组归属的占位行跳过 */
+  collectRowErrors(arr) {
+    const errors = [];
+    arr.forEach((row) => {
+      if (row.deleted_ || !row.product_id_ && !row.bom_entry_id_) return;
+      errors.push(...this.getRowFieldErrors(row));
+    });
+    return errors;
   }
   /**
    * 检查扫描数据是否可以插入，通过后返回填充计划（记录模式无 plan）
@@ -971,9 +1061,9 @@ class BomEntriesValidator {
     }
   }
   /**
-   * 提交整表校验：必须上料组须存在；顺序上料校验组序；表中存在的组走整组校验（不含库存）
+   * 提交组级校验：必须上料 / 顺序 / 替代料 / 混批 / 组数量。遇错即抛，不含行级必填。
    */
-  async validateAllRows(arr) {
+  async assertGroupRules(arr) {
     if (this.noBomMode) {
       return;
     }
@@ -986,9 +1076,16 @@ class BomEntriesValidator {
       this.assertSubmitSequenceOrder(arr);
     }
     for (const util of this.bomEntryValidators) {
-      if (this.groupExistsInTable(arr, util)) {
-        await this.validateGroup(arr, util);
-      }
+      if (!this.groupExistsInTable(arr, util)) continue;
+      const rows = arr.filter(
+        (r) => !r.deleted_ && r.product_id_ && (util.productIds.includes(r.product_id_) || r.bom_entry_id_ === util.bomEntry.id_)
+      );
+      if (!rows.length) continue;
+      util.validateSubstitute(arr);
+      util.validateLotMixing(arr);
+      const orderIndex = this.resolveGroupOrderIndexByUtil(util, arr);
+      const groupNo = orderIndex >= 0 ? orderIndex + 1 : void 0;
+      await util.validateGroupQty(arr, this.enableSequenceLoading, groupNo);
     }
   }
   /**
@@ -1384,7 +1481,7 @@ class MaterialConsumeTableController {
     this.tmplBomController = tmplBomController;
     this.tmplBom = tmplBom;
     this.initScanRule(this.tmplBom.barcode_parsing_rules_id_);
-    this.scanParamType = this.tmplBom.barcodeParamType;
+    this.scanParamType = this.tmplBom.scan_param_type_;
     markRaw(this);
     this.bomEntriesValidator = new BomEntriesValidator(
       this.actualBomEntries,
@@ -1418,10 +1515,12 @@ class MaterialConsumeTableController {
   formModelController;
   /** 当前 paper 上配置的单位转化规则（由组件 setup 注入） */
   unitConversionRules = [];
-  /** 主表 formState（由组件 setup 注入），用于读取主表字段值 */
+  /** 主表 formState（由 factory bindRuntime 注入），用于读取主表字段值 */
   mainFormState = ref({});
-  /** 表单数据状态（由组件 setup 注入）：未填报 / STASH / SUBMIT */
+  /** 表单数据状态（由 factory bindRuntime 注入）：未填报 / STASH / SUBMIT */
   dataStatus;
+  /** factory 是否已绑定过运行时（避免重复 initTableData） */
+  runtimeBound = false;
   /** 表单是否已暂存或提交（已处理过则不再跑初始化） */
   get isDataProcessed() {
     return ["STASH", "SUBMIT"].includes(this.dataStatus ?? "");
@@ -1632,7 +1731,8 @@ class MaterialConsumeTableController {
   }
   /**
    * 是否有正在编辑的组。
-   * 一组可多行同时为编辑态；同时只能有一组处于编辑态。
+   * 顺序上料：一组可多行同时为编辑态，同时只能有一组处于编辑态。
+   * 未开顺序上料：不限制组数。
    */
   hasEditingGroup(showMessage = true) {
     try {
@@ -1654,7 +1754,9 @@ class MaterialConsumeTableController {
    * @param str
    */
   async parseScanStr(data, transformedData) {
-    await this.bomEntriesValidator.hasEditingGroup(this.actualTableData);
+    if (this.enableSequenceLoading) {
+      this.bomEntriesValidator.hasEditingGroup(this.actualTableData);
+    }
     const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_;
     console.log("parseScanStr", data);
     const arr = await materialCheck({
@@ -1687,6 +1789,16 @@ class MaterialConsumeTableController {
       this.error(msg);
       return;
     }
+    try {
+      await validateReinspectionDate({
+        product_id_: materialData.materialId,
+        material_no_: materialData.productionIdentificationName,
+        material_no_id_: materialData.productionIdentificationId
+      });
+    } catch (e) {
+      this.error(e.message);
+      return;
+    }
     const row = {
       product_id_: materialData.materialId,
       material_no_: materialData.productionIdentificationName,
@@ -1763,16 +1875,15 @@ class MaterialConsumeTableController {
     });
   }
   /**
-   * 消耗表组件setup时调用
-   * @param opts
+   * 表单加载时由 factory 调用：绑定稳定数据源并初始化行数据。
+   * 不在分页组件 setup 中调用，避免跨页挂载重复 init。
    */
-  async setup(opts) {
+  bindRuntime(opts) {
     this.tableDataRef = opts.tableDataRef;
-    this.widget = opts.widget;
-    this.formModelController = opts.formModelController;
-    this.unitConversionRules = opts.unitConversionRules ?? [];
     this.mainFormState = opts.mainFormState ?? ref({});
     this.dataStatus = opts.dataStatus;
+    if (this.runtimeBound) return;
+    this.runtimeBound = true;
     this.initTableData(opts.defaultRowData);
     if (this.actualTableData.length === 1) {
       const firstRow = this.actualTableData[0];
@@ -1780,14 +1891,14 @@ class MaterialConsumeTableController {
         MCDataUtil.setRowEditing(firstRow, true);
       }
     }
-    watch(
-      () => this.materialNoNum,
-      () => this.syncQtyRequiredFromBom(),
-      { immediate: true }
-    );
-    onUnmounted(() => {
-      MaterialConsumeTableController.render.destroyAllModals();
-    });
+  }
+  /**
+   * 消耗表组件挂载时调用：只同步视图依赖，不初始化数据、不注册 watch。
+   */
+  bindView(opts) {
+    this.widget = opts.widget;
+    this.formModelController = opts.formModelController;
+    this.unitConversionRules = opts.unitConversionRules ?? [];
   }
   /**
    * 按当前 materialNoNum 回写各行 qty_required_（校验侧 total 已通过 getter 实时读取）
@@ -1891,23 +2002,42 @@ class MaterialConsumeTableController {
   //   }
   // }
   /**
-   * 生成校验清单格式的报错
-   * @param message
-   * @return {*}
+   * 生成校验清单格式的报错（仅行级，挂对应单元格）
    */
-  calcErrorObj(message2) {
+  calcErrorObj(err) {
+    const targetFieldId = err.targetFieldId;
+    const rowIndex = Math.max(this.actualTableData.indexOf(err.row), 0);
+    const modelKey = this.widget.props.modelKey;
+    const showFieldName = this.formModelController?.findField(modelKey, targetFieldId)?.name || targetFieldId;
     return {
-      field: this.widget.props.field + "_0_product_id_",
+      field: `${this.widget.props.field}_${rowIndex}_${targetFieldId}`,
       message: JSON.stringify({
-        message: message2,
-        showFieldName: $t("sys.model.product"),
-        showModelKey: this.widget.props.modelKey,
+        message: err.message,
+        showFieldName,
+        showModelKey: modelKey,
         showModelName: this.widget.props.tableTitle,
         subFieldKey: this.widget.props.field,
-        targetFieldId: "product_id_"
+        targetFieldId
       })
     };
   }
+  /**
+   * 当前行 BOM 行级批注：待删除的 key + 重算后的错误
+   * 改物料/批次会清批次数量有效期，四个字段一起替换；改数量/有效期只动自身
+   */
+  getRowCommentPatch(row, field) {
+    const rowIndex = Math.max(this.actualTableData.indexOf(row), 0);
+    const fieldKeys = field === "qty_" || field === "expiration_date_" ? [field] : ["product_id_", "material_no_", "qty_", "expiration_date_"];
+    const keys = fieldKeys.map((f) => `${this.widget.props.field}_${rowIndex}_${f}`);
+    const keySet = new Set(keys);
+    const add = {};
+    this.bomEntriesValidator.getRowFieldErrors(row).forEach((e) => {
+      const obj = this.calcErrorObj(e);
+      if (!keySet.has(obj.field)) return;
+      (add[obj.field] ??= []).push(obj);
+    });
+    return { keys, add };
+  }
   /**
    * 是否是单独一行空数据
    */
@@ -1921,23 +2051,36 @@ class MaterialConsumeTableController {
     return false;
   }
   /**
-   * 提交的时候的校验
+   * 提交校验：先行级打标，全部通过后再组级 fail-fast toast
    */
   async submitValidate() {
     if (this.isOnlyEmptyRow()) {
-      return;
+      return { isValid: true };
+    }
+    for (const row of this.actualTableData) {
+      await this.applyUnitConversionRules(row);
+    }
+    if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_) {
+      return { isValid: true };
+    }
+    const rowErrors = this.bomEntriesValidator.collectRowErrors(this.actualTableData);
+    if (rowErrors.length) {
+      const fields = {};
+      rowErrors.forEach((e) => {
+        const obj = this.calcErrorObj(e);
+        (fields[obj.field] ??= []).push(obj);
+      });
+      return { isValid: false, fields };
     }
-    let errorObj;
     try {
-      if (this.mcPattern !== MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_) {
-        await this.bomEntriesValidator.validateAllRows(this.actualTableData);
-      }
+      await this.bomEntriesValidator.assertGroupRules(this.actualTableData);
     } catch (e) {
       if (e?.message) {
-        errorObj = this.calcErrorObj(e.message);
+        this.error(e.message);
       }
+      return { isValid: false };
     }
-    return errorObj;
+    return { isValid: true };
   }
   /**
    * 是否有正在编辑的行
@@ -2047,27 +2190,56 @@ class MaterialConsumeTableController {
     console.log("handleChange", opts);
     if (field === "product_id_") {
       if (row._scanFallback) {
+        try {
+          await validateReinspectionDate({
+            product_id_: row.product_id_,
+            material_no_: row.material_no_,
+            material_no_id_: row.material_no__id_
+          });
+        } catch (e) {
+          row.product_id_ = void 0;
+          this.error(e.message);
+        }
         return;
       }
       row.material_no_ = void 0;
-      row.qty_ = void 0;
+      row.material_no__id_ = void 0;
+      row.material_no__lb_ = void 0;
       row.qty_consumed_ = void 0;
       row.qty_required_ = void 0;
+      row.expiration_date_ = void 0;
       this.setDefaultValue(row);
+      this.updateDerivedQtyFields();
     } else if (field === "material_no_") {
       if (option?.is_locked_) {
         row.material_no_ = void 0;
         row.material_no__id_ = void 0;
+        row.material_no__lb_ = void 0;
         const msg = await getLotLockedReason(option.id_);
         this.error(msg);
         return;
       }
+      if (!value) return;
+      try {
+        await validateReinspectionDate({
+          product_id_: option.product_id_ ?? row.product_id_,
+          material_no_: row.material_no_ ?? value,
+          material_no_id_: option.id_
+        });
+      } catch (e) {
+        row.material_no_ = void 0;
+        row.material_no__id_ = void 0;
+        row.material_no__lb_ = void 0;
+        this.error(e.message);
+        return;
+      }
       row.product_id_ = option.product_id_;
       row.expiration_date_ = option.validate_;
       this.setDefaultValue(row);
     } else if (field === "qty_") {
       this.updateDerivedQtyFields();
     }
+    await this.applyUnitConversionRules(row);
   }
 }
 const FormTmplBomControllerKey = "GctFormTmplBomController";
@@ -2122,31 +2294,74 @@ function findObjectBom(formInstBom, belongingObject) {
   const objectBomList = formInstBom.formTmplObjectBomList;
   return objectBomList?.find((item) => item.object_key_ === belongingObject);
 }
-function normalizeSubFields(subFields) {
+function shouldSkipObjectBomConstraint(objectBom) {
+  if (!objectBom) return true;
+  if (objectBom.personal_bom_enabled_) return true;
+  return objectBom.material_consumption_pattern_ === MaterialConsumptionPatternEnum.RECORD;
+}
+function collectObjectBomProductVersionIds(formInstBom, belongingObject) {
+  const objectBom = findObjectBom(formInstBom, belongingObject);
+  if (shouldSkipObjectBomConstraint(objectBom)) return null;
+  const versionIds = /* @__PURE__ */ new Set();
+  (formInstBom.bomEntries ?? []).forEach((entry) => {
+    getGroupProductIds(entry).forEach((id) => {
+      const versionId = id?.split(":").pop();
+      if (versionId) versionIds.add(versionId);
+    });
+  });
+  return versionIds.size ? Array.from(versionIds) : [EMPTY_PRODUCT_VERSION_ID];
+}
+function getObjectBomProductQuery(opts) {
+  const ids = collectObjectBomProductVersionIds(opts.formInstBom, opts.belongingObject);
+  return ids ? { "id_.in": ids } : null;
+}
+function normalizeSubFields(subFields, options) {
   if (!subFields) return [];
-  return (Array.isArray(subFields) ? subFields : Object.values(subFields)).filter(
-    (f) => Boolean(f?.used && f?.key)
-  );
+  const list = Array.isArray(subFields) ? subFields : Object.values(subFields);
+  const requireUsed = options?.requireUsed !== false;
+  return list.filter((f) => Boolean(f?.key && (!requireUsed || f.used)));
 }
 function matchFieldBiz(f, bizType) {
   return (f.bizType || f.type) === bizType;
 }
-function pickObjectFieldKeys(subFields, belongingObject) {
-  const list = normalizeSubFields(subFields).filter(
+function pickObjectFieldKeys(subFields, belongingObject, options) {
+  const list = normalizeSubFields(subFields, options).filter(
     (f) => !belongingObject || !f.belongingObject || f.belongingObject === belongingObject
   );
   const byBiz = (bizType) => list.find((f) => matchFieldBiz(f, bizType));
   const qtyField = byBiz(FIELD_TYPE.QTY);
+  const productField = byBiz(FIELD_TYPE.PRODUCT);
+  const materialNoField = byBiz(FIELD_TYPE.MATERIAL_NO);
   return {
-    productKey: byBiz(FIELD_TYPE.PRODUCT)?.key,
+    productKey: productField?.key,
+    productFieldName: productField?.name,
+    materialNoKey: materialNoField?.key,
+    materialNoFieldName: materialNoField?.name,
     qtyKey: qtyField?.key,
     qtyRequiredKey: byBiz(FIELD_TYPE.QTY_REQUIRED)?.key,
-    qtyFieldName: qtyField?.name
+    qtyFieldName: qtyField?.name,
+    bomEntryIdKey: byBiz(FIELD_TYPE.BOM_ENTRY_ID)?.key
   };
 }
 function hasRequiredQtyValue(value) {
   return value !== null && value !== void 0 && value !== "";
 }
+function toObjectSubmitError(opts) {
+  const { field, message: message2, showFieldName, showModelName, showModelKey, subFieldKey } = opts;
+  return {
+    field,
+    message: buildError(
+      {
+        showModelName: showModelName ?? "",
+        showModelKey: showModelKey ?? "",
+        showFieldName: showFieldName || field,
+        subFieldKey,
+        targetFieldId: field
+      },
+      message2
+    )
+  };
+}
 function resolveObjectBomEntry(opts) {
   const { formInstBom, belongingObject, productId } = opts;
   const objectBom = findObjectBom(formInstBom, belongingObject);
@@ -2211,10 +2426,7 @@ function validateObjectBomForScan(opts) {
     return;
   }
   const objectBom = findObjectBom(formInstBom, belongingObject);
-  if (!objectBom) {
-    return;
-  }
-  if (objectBom.personal_bom_enabled_) {
+  if (shouldSkipObjectBomConstraint(objectBom)) {
     return;
   }
   const bomEntries = formInstBom.bomEntries ?? [];
@@ -2223,39 +2435,49 @@ function validateObjectBomForScan(opts) {
   }
 }
 function getObjectBomMaterialLotQuery(opts) {
-  const { formInstBom, belongingObject } = opts;
-  const objectBom = findObjectBom(formInstBom, belongingObject);
-  if (!objectBom || objectBom.personal_bom_enabled_) {
-    return null;
-  }
-  const bomEntries = formInstBom.bomEntries ?? [];
-  const versionIds = /* @__PURE__ */ new Set();
-  bomEntries.forEach((entry) => {
-    getGroupProductIds(entry).forEach((id) => {
-      const versionId = id?.split(":").pop();
-      if (versionId) versionIds.add(versionId);
-    });
-  });
-  return {
-    "product_id_.versionIn": versionIds.size ? Array.from(versionIds) : [EMPTY_PRODUCT_VERSION_ID]
-  };
+  const ids = collectObjectBomProductVersionIds(opts.formInstBom, opts.belongingObject);
+  return ids ? { "product_id_.versionIn": ids } : null;
 }
 async function validateObjectBomQtyOnSubmit(opts) {
-  const { formState, objectFieldList, formInstBom } = opts;
+  const { formState, objectFieldList, formInstBom, showModelKey } = opts;
   if (!formInstBom || !objectFieldList?.length) {
-    return null;
+    return [];
   }
   const sequential = !!formInstBom.sequenceEntries?.[0]?.enabled_;
+  const errors = [];
   for (const obj of objectFieldList) {
     if (!obj?.objectField) continue;
-    const { productKey, qtyKey, qtyRequiredKey, qtyFieldName } = pickObjectFieldKeys(
-      obj.subFields,
-      obj.objectField
-    );
+    const objectBom = findObjectBom(formInstBom, obj.objectField);
+    if (objectBom?.material_consumption_pattern_ === MaterialConsumptionPatternEnum.RECORD) {
+      continue;
+    }
+    const { productKey, productFieldName, qtyKey, qtyRequiredKey, qtyFieldName } = pickObjectFieldKeys(obj.subFields, obj.objectField);
+    const productId = productKey ? formState[productKey] : void 0;
+    const objectShowModelName = obj.objectFieldName || obj.objectField;
+    if (productKey && productId) {
+      try {
+        validateObjectBomForScan({
+          formInstBom,
+          belongingObject: obj.objectField,
+          productId
+        });
+      } catch (e) {
+        errors.push(
+          toObjectSubmitError({
+            field: productKey,
+            message: e?.message || ERR_MATERIAL_NOT_MATCH,
+            showFieldName: productFieldName,
+            showModelName: objectShowModelName,
+            showModelKey,
+            subFieldKey: obj.objectField
+          })
+        );
+      }
+    }
     if (!qtyKey || !qtyRequiredKey) continue;
+    const qtyRaw = formState[qtyKey];
     const requiredRaw = formState[qtyRequiredKey];
-    if (!hasRequiredQtyValue(requiredRaw)) continue;
-    const productId = productKey ? formState[productKey] : void 0;
+    if (!hasRequiredQtyValue(qtyRaw) || !hasRequiredQtyValue(requiredRaw)) continue;
     const entry = resolveObjectBomEntry({
       formInstBom,
       belongingObject: obj.objectField,
@@ -2263,7 +2485,7 @@ async function validateObjectBomQtyOnSubmit(opts) {
     });
     if (!entry?.qty_validation_enabled_) continue;
     if (entry.type_ === "view") continue;
-    const loaded = Number(formState[qtyKey] ?? 0);
+    const loaded = Number(qtyRaw);
     const required = Number(requiredRaw);
     try {
       await assertObjectQtyValidationRule({
@@ -2273,17 +2495,163 @@ async function validateObjectBomQtyOnSubmit(opts) {
         sequential
       });
     } catch (e) {
-      return {
-        field: qtyKey,
-        message: JSON.stringify({
+      errors.push(
+        toObjectSubmitError({
+          field: qtyKey,
           message: e?.message || String(e),
-          showFieldName: qtyFieldName || qtyKey,
-          targetFieldId: qtyKey
+          showFieldName: qtyFieldName,
+          showModelName: objectShowModelName,
+          showModelKey,
+          subFieldKey: obj.objectField
         })
-      };
+      );
     }
   }
-  return null;
+  return errors;
+}
+function isBlank$1(value) {
+  return value == null || value === "";
+}
+function pickPresent(preferred, fallback) {
+  return isBlank$1(preferred) ? fallback : preferred;
+}
+function resolveObjectFieldKeys(opts) {
+  const obj = opts.objectFieldList?.find((item) => item.objectField === opts.belongingObject);
+  const fromList = obj?.subFields ? pickObjectFieldKeys(obj.subFields, opts.belongingObject) : {};
+  const fromFallback = pickObjectFieldKeys(opts.fallbackFields, opts.belongingObject, {
+    requireUsed: false
+  });
+  return {
+    productKey: pickPresent(fromList.productKey, fromFallback.productKey),
+    productFieldName: fromList.productFieldName ?? fromFallback.productFieldName,
+    materialNoKey: pickPresent(fromList.materialNoKey, fromFallback.materialNoKey),
+    materialNoFieldName: fromList.materialNoFieldName ?? fromFallback.materialNoFieldName,
+    qtyKey: pickPresent(fromList.qtyKey, fromFallback.qtyKey),
+    qtyRequiredKey: pickPresent(fromList.qtyRequiredKey, fromFallback.qtyRequiredKey),
+    qtyFieldName: fromList.qtyFieldName ?? fromFallback.qtyFieldName,
+    bomEntryIdKey: pickPresent(fromList.bomEntryIdKey, fromFallback.bomEntryIdKey)
+  };
+}
+function buildObjectLotExtraQuery(productId) {
+  if (isBlank$1(productId)) return {};
+  const versionId = String(productId).split(":").pop();
+  if (!versionId) return {};
+  return { "product_id_.versionEq": versionId };
+}
+function clearObjectLotFields(formData, materialNoKey) {
+  if (!materialNoKey) return;
+  formData[materialNoKey] = void 0;
+  formData[`${materialNoKey}_id_`] = void 0;
+  formData[`${materialNoKey}_lb_`] = void 0;
+}
+function shouldClearLotOnProductChange(opts) {
+  const { prevProduct, nextProduct, lotValue } = opts;
+  if (isBlank$1(prevProduct) && isBlank$1(nextProduct)) return false;
+  if (prevProduct === nextProduct) return false;
+  if (isBlank$1(prevProduct) && !isBlank$1(nextProduct) && !isBlank$1(lotValue)) {
+    return false;
+  }
+  return true;
+}
+let fillingProduct = false;
+function runWithFillProduct(fn) {
+  fillingProduct = true;
+  try {
+    fn();
+  } finally {
+    nextTick(() => {
+      fillingProduct = false;
+    });
+  }
+}
+function fillProductFromLotOption(opts) {
+  const productId = opts.option?.product_id_ ?? opts.option?._item?.product_id_;
+  if (!opts.productKey || isBlank$1(productId)) return;
+  runWithFillProduct(() => {
+    opts.formData[opts.productKey] = productId;
+  });
+}
+function resolveLotValidateParams(keys, formData, option) {
+  return {
+    product_id_: option?.product_id_ ?? option?._item?.product_id_ ?? (keys.productKey ? formData[keys.productKey] : void 0),
+    material_no_: option?.name_ ?? option?.__VALUE__ ?? (keys.materialNoKey ? formData[keys.materialNoKey] : void 0),
+    material_no_id_: option?.id_ ?? (keys.materialNoKey ? formData[`${keys.materialNoKey}_id_`] : void 0)
+  };
+}
+async function applyConsumeObjectTraceChange(opts) {
+  const { belongingObject, role, formData } = opts;
+  if (!belongingObject || !formData) return {};
+  const keys = resolveObjectFieldKeys({
+    belongingObject,
+    objectFieldList: opts.objectFieldList,
+    fallbackFields: opts.fallbackFields
+  });
+  if (role === FIELD_TYPE.PRODUCT) {
+    if (!("prevProduct" in opts) || fillingProduct) return {};
+    if (shouldClearLotOnProductChange({
+      prevProduct: opts.prevProduct,
+      nextProduct: opts.nextValue,
+      lotValue: keys.materialNoKey ? formData[keys.materialNoKey] : void 0
+    })) {
+      clearObjectLotFields(formData, keys.materialNoKey);
+    }
+    if (keys.bomEntryIdKey) {
+      formData[keys.bomEntryIdKey] = null;
+      if (!isBlank$1(opts.nextValue) && opts.formInstBom) {
+        const entry = resolveObjectBomEntry({
+          formInstBom: opts.formInstBom,
+          belongingObject,
+          productId: String(opts.nextValue)
+        });
+        if (entry) formData[keys.bomEntryIdKey] = entry.id_;
+      }
+    }
+    const lotValue = keys.materialNoKey ? formData[keys.materialNoKey] : void 0;
+    if (!isBlank$1(opts.nextValue) && !isBlank$1(lotValue)) {
+      try {
+        await validateReinspectionDate({
+          product_id_: String(opts.nextValue),
+          material_no_: lotValue,
+          material_no_id_: keys.materialNoKey ? formData[`${keys.materialNoKey}_id_`] : void 0
+        });
+      } catch (e) {
+        return { abortReinspection: e?.message || String(e) };
+      }
+    }
+    return {};
+  }
+  if (role === FIELD_TYPE.MATERIAL_NO) {
+    if (opts.option?.is_locked_) {
+      clearObjectLotFields(formData, keys.materialNoKey);
+      return { abortLocked: opts.option.id_ };
+    }
+    const params = resolveLotValidateParams(keys, formData, opts.option);
+    if (isBlank$1(params.material_no_) && isBlank$1(params.material_no_id_)) return {};
+    try {
+      await validateReinspectionDate(params);
+    } catch (e) {
+      clearObjectLotFields(formData, keys.materialNoKey);
+      return { abortReinspection: e?.message || String(e) };
+    }
+    fillProductFromLotOption({
+      formData,
+      productKey: keys.productKey,
+      option: opts.option
+    });
+    if (keys.bomEntryIdKey && opts.formInstBom) {
+      const productId = opts.option?.product_id_ ?? opts.option?._item?.product_id_;
+      if (!isBlank$1(productId)) {
+        const entry = resolveObjectBomEntry({
+          formInstBom: opts.formInstBom,
+          belongingObject,
+          productId: String(productId)
+        });
+        if (entry) formData[keys.bomEntryIdKey] = entry.id_;
+      }
+    }
+    return {};
+  }
+  return {};
 }
 function useMaterialBalance() {
   async function getConsumeData({ cloneRuntimeJson, operationId, materialNo }) {
@@ -2323,6 +2691,21 @@ function useMaterialBalance() {
     destoryConsumeModal
   };
 }
+function getAppInfo() {
+  return api.apaas.designerCommon.getGetApp();
+}
+async function getSuiteKey() {
+  const appInfo = await getAppInfo();
+  return appInfo?.suiteKey;
+}
+async function isEdhrSuite() {
+  const suiteKey = await getSuiteKey();
+  return suiteKey === "eDHR";
+}
+async function isEqmSuite() {
+  const suiteKey = await getSuiteKey();
+  return suiteKey === "EQM";
+}
 var SubTableActionEnum = /* @__PURE__ */ ((SubTableActionEnum2) => {
   SubTableActionEnum2["QuickFillRowCurrent"] = "quickFillRowCurrent";
   SubTableActionEnum2["InsertRowBefore"] = "insertRowBefore";
@@ -2331,6 +2714,7 @@ var SubTableActionEnum = /* @__PURE__ */ ((SubTableActionEnum2) => {
   SubTableActionEnum2["CopyRowAfter"] = "copyRowAfter";
   SubTableActionEnum2["CopyRow2Last"] = "copyRow2Last";
   SubTableActionEnum2["DeleteRowCurrent"] = "deleteRowCurrent";
+  SubTableActionEnum2["ClearRowCurrent"] = "clearRowCurrent";
   SubTableActionEnum2["CONFIRM"] = "CONFIRM";
   SubTableActionEnum2["SCAN"] = "SCAN";
   SubTableActionEnum2["VIEW_BOM"] = "VIEW_BOM";
@@ -2419,6 +2803,12 @@ function getMenuByAction(type) {
       key: SubTableActionEnum.DeleteRowCurrent,
       label: "删除行",
       icon: "size24 icon-a-shanchubiaoge"
+    },
+    [SubTableActionEnum.ClearRowCurrent]: {
+      type: SubTableActionMenuTypeEnum.ACTION,
+      key: SubTableActionEnum.ClearRowCurrent,
+      label: "清除内容",
+      icon: "size24 icon-a-shanchubiaoge"
     }
   };
   return map[type];
@@ -2542,6 +2932,46 @@ class TdHandler {
     this.mergeTd({ cellWidget: { props: { newSpecificConfig: { customLoader } } } });
   }
 }
+const SCAN_ROW_META_KEYS = /* @__PURE__ */ new Set([FRONT_ROW_KEY, "id_", "id", "group_", "deleted_", "delete_"]);
+function hasRowId(row) {
+  const id = row.id_ ?? row.id;
+  return id !== void 0 && id !== null && String(id).trim() !== "";
+}
+function isEmptyScanValue(value) {
+  if (value == null || value === "") return true;
+  if (typeof value === "object" && !Array.isArray(value) && Object.keys(value).length === 0) {
+    return true;
+  }
+  return false;
+}
+function isProductBatchEmptyRow(row) {
+  return isEmptyScanValue(row.product_id_) && isEmptyScanValue(row.material_no_) && isEmptyScanValue(row.material_no__id_);
+}
+function hasSubtableBusinessData(row, ignoreValues = {}) {
+  if (!row || typeof row !== "object") return false;
+  if (hasRowId(row)) return true;
+  return Object.keys(row).some((key) => {
+    if (SCAN_ROW_META_KEYS.has(key) || key.startsWith("_")) return false;
+    const value = row[key];
+    if (isEmptyScanValue(value)) return false;
+    if (key in ignoreValues && value === ignoreValues[key]) return false;
+    return true;
+  });
+}
+function appendOrFillScanRow(visibleRows, row, ignoreValues = {}, isEmptyRow = (item) => !hasSubtableBusinessData(item, ignoreValues)) {
+  const emptyIndex = visibleRows.findIndex((item) => item && !item.deleted_ && isEmptyRow(item));
+  if (emptyIndex >= 0) {
+    const existing = visibleRows[emptyIndex];
+    const next = { ...existing };
+    for (const [key, value] of Object.entries(row)) {
+      if (SCAN_ROW_META_KEYS.has(key)) continue;
+      next[key] = value;
+    }
+    return visibleRows.map((item, index) => index === emptyIndex ? next : item);
+  }
+  ensureFrontRowKey(row);
+  return [...visibleRows, row];
+}
 function resolveScanParsedValue(input) {
   if (input.parsedValue && typeof input.parsedValue === "object") {
     return input.parsedValue;
@@ -2851,15 +3281,45 @@ class SubTableCore {
       return;
     }
     this.isScanOpen = true;
+    const { disableBarcodeParsing, scanParamType } = this.bizTableConfig || {};
     await this.render.openScanModal({
       title: this.ctx.widget.props.tableTitle,
       subModelKey: this.subModelKey,
       formModelController: this.formModelController,
-      scanRules: this.scanRuleProps,
+      scanRules: disableBarcodeParsing ? void 0 : this.scanRuleProps,
+      scanParam: disableBarcodeParsing ? scanParamType : void 0,
       onScan: this.onScan
     });
     this.isScanOpen = false;
   }
+  /** 解析子表默认值（函数默认值先求值），扫码填空行时忽略这些字段 */
+  resolveScanIgnoreValues() {
+    const defaultMap = this.calcDefaultMap() || {};
+    const ignoreValues = {};
+    for (const [key, value] of Object.entries(defaultMap)) {
+      ignoreValues[key] = typeof value === "function" ? value() : value;
+    }
+    return ignoreValues;
+  }
+  /**
+   * 扫码空行判定。默认走整行业务字段；出入库可覆盖为只看物料/批次。
+   */
+  isEmptyScanRow(row, ignoreValues) {
+    return !hasSubtableBusinessData(row, ignoreValues);
+  }
+  /**
+   * 扫码入行：优先回填首个空壳占位行，否则追加到表尾。
+   * 对齐 Word appendOrFillScanRow，避免仅一行空壳时扫码落到第二行。
+   */
+  appendOrFillScanRow(row) {
+    const ignoreValues = this.resolveScanIgnoreValues();
+    this.tableData = appendOrFillScanRow(
+      this.showTableData,
+      row,
+      ignoreValues,
+      (item) => this.isEmptyScanRow(item, ignoreValues)
+    );
+  }
   /**
    * 扫码多条候选时选择一行（1 条自动选中）
    */
@@ -2951,14 +3411,37 @@ class DeviceLinkTmplUtil {
     };
   }
   /**
-   * 计算完整的提示词
-   * @static
-   * @param tmpl
-   * @return {*}
+   * 推荐模式保存时转成运行提示词：文案保持 ${字段名}，
+   * 按插入时记下的字段补上与普通模式相同的 JSON 回写格式。
    */
+  static buildRecommendedRuntimePrompt(tmpl) {
+    const text = tmpl.recommendedPrompt ?? this.DEFAULT_RECOMMENDED_PROMPT;
+    const params = (tmpl.identifyParams || []).filter(
+      (item) => item.prompt?.trim() && item.formField
+    );
+    const fieldKeys = [];
+    params.forEach((item) => {
+      const token = "${" + item.prompt.trim() + "}";
+      const formField = item.formField;
+      if (!text.includes(token) || !formField) return;
+      const fieldKey = formField.split(".").at(-1);
+      if (fieldKey && !fieldKeys.includes(fieldKey)) {
+        fieldKeys.push(fieldKey);
+      }
+    });
+    if (!fieldKeys.length) return text;
+    const jsonObj = fieldKeys.reduce((acc, fieldKey) => {
+      acc[fieldKey] = { value: null };
+      return acc;
+    }, {});
+    return `${text}
+请识别图片中的读数，以
+${JSON.stringify(jsonObj, null, 2)}
+格式返回`;
+  }
   static calcEntirePrompt(tmpl) {
     if (tmpl.promptMode === "RECOMMENDED") {
-      return tmpl.recommendedPrompt ?? this.DEFAULT_RECOMMENDED_PROMPT;
+      return this.buildRecommendedRuntimePrompt(tmpl);
     }
     const validParams = (tmpl.identifyParams || []).map((item) => ({
       prompt: item.prompt?.trim(),
@@ -3149,7 +3632,7 @@ class FormTmplConfigController {
    * 初始化权限
    */
   async initPermissions() {
-    this.state.IOTPermission = await api.platform.license.getModuleAuth({ module: "IOT" }) || false;
+    this.state.IOTPermission = await api.platform.license.getModuleAuth({ moduleType: "IOT" }) || false;
     this.state.OCRPermission = await api.apaas.onlineFormTmpl.getIsOcrGranted() || false;
   }
   /**
@@ -3162,7 +3645,7 @@ class FormTmplConfigController {
         pageNo: 1,
         pageSize: 100
       });
-      this.state.OCRModelPrecisionOptions = (result?.records || []).filter((item) => item.text && item.value).map((item) => ({ label: item.text, value: item.value }));
+      this.state.OCRModelPrecisionOptions = (result?.data || []).filter((item) => item.text && item.value).map((item) => ({ label: item.text, value: item.value }));
     } catch {
       this.state.OCRModelPrecisionOptions = [];
     }
@@ -3276,6 +3759,47 @@ function useFormTmplConfig() {
     injectController
   };
 }
+const OPERATION_RECEIVE_QTY_API = {
+  modelCategory: "entity",
+  modelKey: "em_routing_operation_number",
+  bsKey: "getOne"
+};
+function isBlank(value) {
+  return value == null || value === "";
+}
+function unwrapBizPayload(res) {
+  if (!res || typeof res !== "object") return null;
+  const withData = res;
+  const payload = withData.data != null && typeof withData.data === "object" ? withData.data : res;
+  if (payload.data != null && typeof payload.data === "object" && !Array.isArray(payload.data)) {
+    return payload.data;
+  }
+  return payload;
+}
+async function fetchOperationReceiveQty(paramsConfig) {
+  const containerId = paramsConfig?.containerId;
+  const routingOperationId = paramsConfig?.routingOperationId;
+  if (isBlank(containerId) || isBlank(routingOperationId)) return void 0;
+  try {
+    const res = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
+      OPERATION_RECEIVE_QTY_API,
+      {},
+      {
+        query: {
+          container_id_: String(containerId),
+          routing_operation_id_: String(routingOperationId)
+        }
+      }
+    );
+    const payload = unwrapBizPayload(res);
+    const raw = payload?.qty_current_;
+    if (raw === void 0 || raw === null || raw === "") return void 0;
+    const num = Number(raw);
+    return Number.isNaN(num) ? void 0 : num;
+  } catch {
+    return void 0;
+  }
+}
 const _hoisted_1$5 = ["data-merge", "data-fill-direction"];
 const _hoisted_2$1 = {
   key: 0,
@@ -3664,6 +4188,9 @@ const DocumentSubTable = /* @__PURE__ */ defineComponent({
                 class: "iconfont icon-jinggao"
               }),
               content,
+              okText: $t("sys.okText"),
+              cancelText: $t("sys.cancel"),
+              zIndex: 1050,
               onOk() {
                 handleDeleteRow(rowData, dataIdx);
               }
@@ -4027,10 +4554,6 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
     const tableController = props.tableController;
     const paperWidget = inject(NCB_PROVIDE.PAGER, null);
     const unitConversionRules = paperWidget?.props?.unitConversionRules ?? [];
-    const {
-      currentPageFormState
-    } = useCurrentPageFormState();
-    const selfInfoList = inject(NCB_PROVIDE.FORM_INST_LIST, []);
     provide(NCB_PROVIDE.MATERIAL_CONSUME_TABLE_CONTROLLER, tableController);
     const {
       field = "",
@@ -4051,21 +4574,13 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         updateCalcCallback?.(dataRelationShip?.uniqueId);
       }
     });
-    const currentSelfInfo = selfInfoList?.find((item) => item?.id === dataRelationShip?.key || item?.uniqueId === dataRelationShip?.uniqueId) ?? selfInfoList?.[0];
     const currentFieldDefaultData = computed(() => {
       return defaultDataMap?.[dataRelationShip?.uniqueId ?? ""] ?? {};
     });
-    tableController.setup({
-      tableDataRef: modelValue,
+    tableController.bindView({
       widget: props.widget,
       formModelController,
-      unitConversionRules,
-      mainFormState: currentPageFormState,
-      dataStatus: currentSelfInfo?.dataStatus,
-      defaultRowData: renderUtils.getDefaultValueInfo({
-        defaultDataMap: currentFieldDefaultData.value,
-        key: field
-      })
+      unitConversionRules
     });
     const dataInfo = computed(() => {
       const visibleToRealIndexMap = {};
@@ -4104,6 +4619,11 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         row.tempDeleted = true;
       }
     };
+    const clearMcValidatorComments = () => {
+      if (!dataRelationShip) return;
+      dataRelationShip.mcValidatorMessageMap = {};
+      dataRelationShip.mcValidatorLocationList = [];
+    };
     const deleteRowAt = (row, index) => {
       recordSubtableRowDelete(dataRelationShip, field, row);
       deleteSubtableRow(field, index);
@@ -4123,6 +4643,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         deleteRowAt(rowData, realIndex);
       }
       modelValue.value = relocateDeletedRowsToEnd(modelValue.value.filter((d) => !d.tempDeleted));
+      clearMcValidatorComments();
     };
     const createDefaultRows = (rowNum, quickFillDatas, patch) => {
       return Array.from({
@@ -4140,6 +4661,23 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         return row;
       });
     };
+    const PRESERVE_ROW_KEYS = ["id_", FRONT_ROW_KEY, "group_"];
+    const handleClearRow = (rowData) => {
+      const defaultRow = omit(createDefaultRows(1)[0], PRESERVE_ROW_KEYS);
+      const preserved = pick(rowData, PRESERVE_ROW_KEYS);
+      Object.keys(rowData).forEach((key) => {
+        if (!PRESERVE_ROW_KEYS.includes(key)) {
+          delete rowData[key];
+        }
+      });
+      Object.assign(rowData, defaultRow, preserved);
+      tableController.setDefaultValue(rowData);
+      rowData.bom_entry_id_ = void 0;
+      rowData.qty_consumed_total_ = void 0;
+      clearMcValidatorComments();
+      tableController.updateDerivedQtyFields();
+      updateCalcCallback?.(dataRelationShip?.uniqueId);
+    };
     const insertRowsAt = (insertIndex, rows) => {
       if (!rows.length) return;
       insertSubtableRows(field, insertIndex, rows.length);
@@ -4147,6 +4685,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       modelValue.value = relocateDeletedRowsToEnd(modelValue.value);
       recordSubtableRowAdd(dataRelationShip, field, rows);
       updateCalcCallback?.(dataRelationShip?.uniqueId);
+      clearMcValidatorComments();
     };
     const resolveRealIndex = (index) => dataInfo.value.visibleToRealIndexMap[props.start + index];
     const handleAddRowForGroup = ({
@@ -4342,18 +4881,37 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
               class: "iconfont icon-jinggao"
             }),
             content: "是否确认删除？",
+            okText: $t("sys.okText"),
+            cancelText: $t("sys.cancel"),
             onOk() {
               handleDeleteRow(rowData, dataIdx);
               tableController.updateDerivedQtyFields();
             }
           });
           break;
+        case "clearRowCurrent":
+          Modal.confirm({
+            width: 316,
+            centered: true,
+            class: "confirm-before-delete-modal",
+            icon: h("i", {
+              class: "iconfont icon-jinggao"
+            }),
+            content: "是否确认清除内容？",
+            okText: $t("sys.okText"),
+            cancelText: $t("sys.cancel"),
+            onOk() {
+              handleClearRow(rowData);
+            }
+          });
+          break;
         default:
           handleAction(key, rowData);
       }
     };
     const renderTr2Td = (trKey, trData, rowData, {
       showDelBtn,
+      showClearBtn = false,
       showActionMenu,
       showScanBtn,
       showEditBtn,
@@ -4361,6 +4919,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       dynHeight,
       showInsert1RowBtn
     }) => {
+      const extraRowAction = showDelBtn ? SubTableActionEnum.DeleteRowCurrent : showClearBtn ? SubTableActionEnum.ClearRowCurrent : void 0;
       const menus = [
         {
           type: SubTableActionMenuTypeEnum.SUBTITLE,
@@ -4382,9 +4941,9 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         showInsert1RowBtn ? getMenuByAction(SubTableActionEnum.Insert1RowAfter) : void 0,
         getMenuByAction(SubTableActionEnum.Insert1GroupAfter),
         // getCopySubMenu(),
-        ...showDelBtn ? [{
+        ...extraRowAction ? [{
           type: SubTableActionMenuTypeEnum.DIVIDER
-        }, getMenuByAction(SubTableActionEnum.DeleteRowCurrent)] : []
+        }, getMenuByAction(extraRowAction)] : []
       ].filter(Boolean);
       const realRowIndex = dataIdx !== -1 ? resolveRealIndex(dataIdx) : void 0;
       return createVNode("tr", {
@@ -4498,14 +5057,16 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
           return dynamicIds.map((rowId, rowIdx) => {
             const isLastDynRow = rowIdx === lastDynRowIdx;
             const showDelBtn = dataInfo.value.hasSubData && isLastDynRow;
-            const showScanBtn = isLastDynRow;
+            const showClearBtn = !dataInfo.value.hasSubData && isLastDynRow;
+            const showScanBtn = !isFormChange.value && isLastDynRow;
             const showActionMenu = isLastDynRow;
             const showEditBtn = !isFormChange.value && data.is_confirmed_;
-            const showInsert1RowBtn = !isFormChange.value && !data.is_confirmed_;
+            const showInsert1RowBtn = isFormChange.value || !isFormChange.value && !data.is_confirmed_;
             const row = props.widgetCenter[rowId];
             const dynHeight = props.subInfo.dynamicRowHeights?.[rowId]?.[dataIdx];
             return renderTr2Td(`${stableRowKey}_${rowIdx}`, row, data, {
               showDelBtn,
+              showClearBtn,
               showActionMenu,
               showScanBtn,
               showEditBtn,
@@ -4534,6 +5095,28 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const props = __props;
     const rows = ref([]);
     const cols = ref([]);
+    const gridContainer = ref(null);
+    const gridWidth = ref(0);
+    const availableWidth = computed(() => Math.max(0, Math.floor(gridWidth.value) - 2));
+    const colSize = computed(
+      () => Math.max(200, Math.floor(availableWidth.value / (cols.value.length || 1)))
+    );
+    const gridCols = computed(
+      () => cols.value.map((col, index) => ({
+        ...col,
+        size: index === cols.value.length - 1 && availableWidth.value >= cols.value.length * 200 ? availableWidth.value - colSize.value * index : colSize.value
+      }))
+    );
+    let resizeObserver;
+    onMounted(() => {
+      if (!gridContainer.value) return;
+      gridWidth.value = gridContainer.value.clientWidth;
+      resizeObserver = new ResizeObserver((entries) => {
+        if (entries[0]) gridWidth.value = entries[0].contentRect.width;
+      });
+      resizeObserver.observe(gridContainer.value);
+    });
+    onUnmounted(() => resizeObserver?.disconnect());
     onBeforeMount(() => {
       const { rowCount, colCount } = props;
       const newRow = () => Array.from({ length: colCount }).reduce((map, v, i) => {
@@ -4592,23 +5175,29 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             createElementVNode("li", null, " 表单中支持快速填报的字段类型：文本、长文本、整数、长整数、小数、精度小数、日期、时间、日期时间、LOT/SN、报废物料批次、枚举单选、枚举多选（选项间以“,”分割） ")
           ])
         ], -1)),
-        createVNode(unref(q), {
-          class: "cell-border",
-          range: "",
-          resize: "",
-          colSize: 200,
-          source: rows.value,
-          columns: cols.value,
-          theme: "material",
-          "hide-attribution": "",
-          "apply-on-close": true,
-          onBeforepaste: handleBeforePaste
-        }, null, 8, ["source", "columns"])
+        createElementVNode("div", {
+          ref_key: "gridContainer",
+          ref: gridContainer,
+          class: "grid-container"
+        }, [
+          createVNode(unref(q), {
+            class: "cell-border",
+            range: "",
+            resize: "",
+            colSize: colSize.value,
+            source: rows.value,
+            columns: gridCols.value,
+            theme: "material",
+            "hide-attribution": "",
+            "apply-on-close": true,
+            onBeforepaste: handleBeforePaste
+          }, null, 8, ["colSize", "source", "columns"])
+        ], 512)
       ]);
     };
   }
 });
-const FixedQuickFillModal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-082f502b"]]);
+const FixedQuickFillModal = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-05f7a433"]]);
 const _hoisted_1$1 = {
   key: 1,
   class: "sub-table-action__subtitle"
@@ -4865,22 +5454,26 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           })
         ]),
         default: withCtx(() => [
-          _cache[3] || (_cache[3] = createElementVNode("div", { class: "more-btn" }, [
-            createElementVNode("i", { class: "iconfont icon-gengduo2" })
+          _cache[3] || (_cache[3] = createElementVNode("div", { class: "sub-more-btn" }, [
+            createElementVNode("div", { class: "sub-more-btn-item" }, [
+              createElementVNode("i", { class: "iconfont icon-gengduo2" })
+            ])
           ], -1))
         ]),
         _: 1
       })) : (openBlock(), createElementBlock("div", {
         key: 1,
-        class: "more-btn",
+        class: "sub-more-btn",
         onClick: _cache[2] || (_cache[2] = ($event) => emit("menuClick", { key: "default" }))
       }, [..._cache[4] || (_cache[4] = [
-        createElementVNode("i", { class: "iconfont icon-gengduo2" }, null, -1)
+        createElementVNode("div", { class: "sub-more-btn-item" }, [
+          createElementVNode("i", { class: "iconfont icon-gengduo2" })
+        ], -1)
       ])]));
     };
   }
 });
-const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-01ca4702"]]);
+const SubTableAction = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-acff8196"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "fixed-table-action",
   props: {
@@ -5267,7 +5860,7 @@ const DocumentPaper = /* @__PURE__ */ defineComponent({
           }, tdAttrs, {
             "isEmpty": true
           }), {
-            default: () => tdInfo.cellValueType !== CellType.Default || tdInfo.cellWidget.props.value || tdInfo.cellWidget.props.inlineContent?.length ? slots.widget?.({
+            default: () => tdInfo.cellValueType !== CellType.Default || tdInfo.cellWidget?.props?.value || tdInfo.cellWidget?.props?.inlineContent?.length ? slots.widget?.({
               tdInfo,
               ...widgetAttrs,
               dynamicConfig
@@ -5449,41 +6042,57 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 });
 const DynamicTableAction = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-53d7e66c"]]);
 export {
-  FormTmplConfigController as A,
+  getCopySubMenu as A,
   BorderTD as B,
-  MCDataUtil as C,
+  resolveScanParsedValue as C,
   DeviceLinkTmplUtil as D,
-  FixedQuickFillModal as F,
+  EMPTY_PRODUCT_VERSION_ID as E,
+  resolveScanFillData as F,
+  isProductBatchEmptyRow as G,
+  useMaterialBalance as H,
   InstanceStatusValues as I,
+  validate as J,
+  validateObjectBomQtyOnSubmit as K,
+  DeviceConnector as L,
   MaterialConsumptionPatternEnum as M,
-  OCR_MODEL_PRECISION_ENUM_KEY as O,
+  DocumentLoading as N,
+  DynamicQuickFillModal as O,
+  FixedQuickFillModal as P,
+  FormTmplConfigController as Q,
   RequiredQtyCalcRule as R,
   ScanParamType as S,
+  MCDataUtil as T,
+  OCR_MODEL_PRECISION_ENUM_KEY as U,
+  getAppInfo as V,
+  getSuiteKey as W,
+  isBlank$1 as X,
+  isEqmSuite as Y,
+  pickObjectFieldKeys as Z,
   _sfc_main$5 as _,
   useTmplBom as a,
-  useStyles as b,
-  useValidator as c,
-  DocumentPaper as d,
-  DynamicTableAction as e,
-  MaterialConsumeTableController as f,
+  buildObjectLotExtraQuery as b,
+  resolveObjectBomEntry as c,
+  runWithFillProduct as d,
+  applyConsumeObjectTraceChange as e,
+  fetchOperationReceiveQty as f,
   getObjectBomMaterialLotQuery as g,
-  SubTableCore as h,
-  SubTableActionMenuTypeEnum as i,
-  getMenuByAction as j,
-  SubTableActionEnum as k,
-  resolveScanQty as l,
-  getCopySubMenu as m,
-  getInsertSubMenu as n,
-  resolveScanParsedValue as o,
-  resolveScanFillData as p,
-  useMaterialBalance as q,
-  resolveScanAdjustType as r,
-  validate as s,
-  toDateOnly as t,
+  getObjectBomProductQuery as h,
+  isEdhrSuite as i,
+  useStyles as j,
+  useValidator as k,
+  DocumentPaper as l,
+  DynamicTableAction as m,
+  normalizeFieldWidth as n,
+  MaterialConsumeTableController as o,
+  SubTableCore as p,
+  SubTableActionMenuTypeEnum as q,
+  resolveObjectFieldKeys as r,
+  getMenuByAction as s,
+  SubTableActionEnum as t,
   useFormTmplConfig as u,
   validateObjectBomForScan as v,
-  validateObjectBomQtyOnSubmit as w,
-  DeviceConnector as x,
-  DocumentLoading as y,
-  DynamicQuickFillModal as z
+  getInsertSubMenu as w,
+  resolveScanAdjustType as x,
+  resolveScanQty as y,
+  toDateOnly as z
 };