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

package/dist/base/index.es.js

@@ -1,11 +1,11 @@
-import { aW as fetchHistoryConsume, aX as isBomGranted, F as FIELD_TYPE, w as api, c as getProfileByTableType, b as isBusinessSubTableProfile, aY as runRowHandler, aZ as F$1, a_ as FILL_FROM_INVENTORY_OPTION, a$ as F$2, b0 as INVENTORY_BASE_FIELDS, b1 as WAREHOUSE_IDENTITY_GROUP_KEYS, b2 as SCAN_MERGE_GROUP_KEYS, b3 as AUTO_LOAD_READONLY_SELECT_FIELDS, aH as getParseRuleInfo, b4 as FILL_FROM_INVENTORY_OPTION$1, aI as getParseRuleValue, b5 as F$3, b6 as FILL_FROM_INVENTORY_OPTION$2, b7 as calcFillData, b8 as extractKeywordFromQueryData, b9 as F$4, ba as isProductManuallyEditable, bb as applyFillFromMfgOrderOption, bc as applyFillFromOption$1, bd as applyFillFromProductOption, be as CLEAR_ON_MATERIAL_CONTAINER_SELECT, M as FormTypeEnum, bf as transformUtils, d as SubTableType, aE as NCB_PROVIDE, bg as settleAndValidateDisplay, bh as unregisterValidationContext, bi as clearFormRules, bj as registerValidationContext, m as ComponentTypeEnum, aM as RenderModeEnum, bk as requestFullValidation, bl as requestDisplayValidation, bm as closeValidatorPopovers, bn as baseDataUtils, bo as getRawFormRuleMeta, bp as enrichFormChangeRowDetails, bq as settleAfterModeSwitch, br as calcUtils, an as CheckDsTypeEnum, aB as renderUtils, Y as PlatformEnum, bs as uuid2, bt as normalizeToArray, bu as safeParseArray, bv as BpmnNodeTypeEnum, bw as mergeByMultiKey, aV as useNocodeEmitter, bx as commonUtils, am as EntityModelCategoryEnum, by as getRowId, bz as collectFormChangeFieldLocations, bA as nextFormChangeRowViewHistoryId } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-SAa6KGYz.js";
-import { aq, as, aC, R, bB, bC, B, bD, t, a0, bE, bF, bG, aA, aD, ar, ao, ap, a1, a5, bH, aO, ae, bI, ak, au, Q, a3, L, bJ, bK, O, j, P, al, h, G, at, bL, bM, aL, W, T, V, X, bN, a4, a8, a2, bO, bP, bQ, bR, bS, bT, bU, bV, bW, bX, bY, bZ, b_, aK, b$, c0, c1, c2, c3, c4, c5, c6, c7, c8, c9, ca, cb, cc, cd, aF, ce, cf, cg, aG, ch, ci, cj, ck, a6, cl, cm, ay, cn, ax, av, co, H, aJ, aN, az, cp, u, aw } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-SAa6KGYz.js";
-import { M as MaterialConsumptionPatternEnum, e as MaterialConsumeTableController, f as SubTableCore, g as SubTableActionMenuTypeEnum, h as getMenuByAction, i as SubTableActionEnum, j as getCopySubMenu, k as getInsertSubMenu, l as useMaterialBalance, v as validate } from "../dynamic-table-action-CT_aYOca.js";
-import { B as B2, m, D, _, n, c, o, d, F, p, I, q, O as O2, u as u2, a, b } from "../dynamic-table-action-CT_aYOca.js";
+import { a$ as fetchHistoryConsume, b0 as isBomGranted, F as FIELD_TYPE, w as api, b1 as F$1, b2 as F$2, b3 as runRowHandler, c as getProfileByTableType, b as isBusinessSubTableProfile, b4 as F$3, b5 as FILL_FROM_INVENTORY_OPTION, b6 as FILL_FROM_INVENTORY_OPTION$1, b7 as TABLE_TYPE, b8 as FILL_FROM_INVENTORY_OPTION$2, b9 as F$4, ba as INVENTORY_BASE_FIELDS, bb as WAREHOUSE_IDENTITY_GROUP_KEYS, bc as AUTO_LOAD_READONLY_SELECT_FIELDS, aL as getParseRuleInfo, bd as FILL_FROM_INVENTORY_OPTION$3, be as calcFillData, aM as getParseRuleValue, bf as F$5, bg as FILL_FROM_INVENTORY_OPTION$4, bh as extractKeywordFromQueryData, aJ as LOT_CONTAINER_ROLE, an as resolveLotDisplayLabel, bi as F$6, bj as isProductManuallyEditable, bk as applyFillFromMfgOrderOption, bl as applyFillFromOption$1, bm as applyFillFromProductOption, bn as MATERIAL_CONTAINER_ID, bo as F$7, bp as F$8, bq as FILL_FROM_INVENTORY_OPTION$5, M as FormTypeEnum, br as transformUtils, d as SubTableType, aF as NCB_PROVIDE, bs as settleAndValidateDisplay, bt as unregisterValidationContext, bu as clearFormRules, bv as registerValidationContext, m as ComponentTypeEnum, aS as RenderModeEnum, bw as requestFullValidation, bx as requestDisplayValidation, by as closeValidatorPopovers, bz as baseDataUtils, bA as getRawFormRuleMeta, bB as enrichFormChangeRowDetails, bC as settleAfterModeSwitch, bD as calcUtils, ao as CheckDsTypeEnum, aC as renderUtils, Q as PlatformEnum, bE as uuid2, bF as normalizeToArray, bG as safeParseArray, bH as BpmnNodeTypeEnum, bI as mergeByMultiKey, a_ as useNocodeEmitter, bJ as commonUtils, am as EntityModelCategoryEnum, bK as getRowId, bL as collectFormChangeFieldLocations, bM as nextFormChangeRowViewHistoryId } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D4i-Gvff.js";
+import { ar, at, aD, T, bN, bO, B, bP, t, a1, bQ, bR, bS, aB, aE, as, ap, aq, bT, a2, a6, bU, bV, af, bW, al, av, R, a4, L, bX, bY, O, j, P, Z, h, G, au, bZ, b_, aR, X, V, W, Y, b$, a5, a9, a3, c0, c1, c2, aQ, c3, c4, c5, c6, c7, c8, c9, ca, cb, cc, cd, aP, ce, cf, cg, ch, ci, cj, ck, cl, cm, cn, co, cp, cq, aO, cr, aG, cs, ct, cu, aI, cv, cw, cx, cy, a7, cz, cA, az, cB, ay, aw, cC, H, aN, aT, aA, cD, u, ax } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-D4i-Gvff.js";
+import { M as MaterialConsumptionPatternEnum, f as MaterialConsumeTableController, h as SubTableCore, i as SubTableActionMenuTypeEnum, j as getMenuByAction, k as SubTableActionEnum, r as resolveScanAdjustType, l as resolveScanQty, t as toDateOnly, m as getCopySubMenu, n as getInsertSubMenu, o as resolveScanParsedValue, p as resolveScanFillData, q as useMaterialBalance, s as validate, w as validateObjectBomQtyOnSubmit } from "../dynamic-table-action-DMqtzls4.js";
+import { B as B2, x, D, _, y, d, z, e, F, A, I, C, O as O2, g, u as u2, b, a, c, v } from "../dynamic-table-action-DMqtzls4.js";
 import { ref, provide, watch, computed, onBeforeMount } from "vue";
 import { defaults, has, merge, isEmpty, cloneDeep, debounce } from "lodash-es";
-import dayjs from "dayjs";
-import { B as B3, F as F2, M, a as a7, u as u3 } from "../mb-render-DiWQ5hOn.js";
+import "dayjs";
+import { B as B3, F as F2, M, a as a8, u as u3 } from "../mb-render-QRW5YlWX.js";
 var MaterialStatusEnum = /* @__PURE__ */ ((MaterialStatusEnum2) => {
   MaterialStatusEnum2["LOT"] = "LOT";
   MaterialStatusEnum2["SN"] = "SN";
@@ -56,6 +56,8 @@ class FormTmplBomController {
   operationId;
   /** 批次/sn */
   materialNo;
+  /** 接收数量 */
+  productQty;
   /** 历史填报数据 */
   historyData = [];
   /** 表单控制器(key是tableKey) */
@@ -96,7 +98,7 @@ class FormTmplBomController {
    * @readonly
    */
   get materialNoNum() {
-    return this.formInstBom?.qty ?? 1;
+    return this.productQty ?? this.formInstBom?.qty ?? 1;
   }
   /**
    * bom模块配置关联过来的bom明细集合
@@ -126,6 +128,7 @@ class FormTmplBomController {
     this.operationId = data.operationId;
     this.materialNo = data.materialNo;
     this.formInstBom = data.formInstBom;
+    this.productQty = data.productQty ?? 0;
     this.historyData = await fetchHistoryConsume({
       production_identification_id_: this.formInstBom.productionIdentificationId,
       routing_operation_id_: this.operationId
@@ -188,23 +191,18 @@ class FormTmplBomController {
     });
   }
   async submitValidate() {
-    const results = await Promise.allSettled(
+    const results = await Promise.all(
       Object.values(this.tableControllers).map((c10) => c10.submitValidate())
     );
-    const successful = results.filter((result) => result.status === "fulfilled").map((result) => result.value);
-    const fieldArr = successful.filter(Boolean);
-    if (fieldArr.length) {
-      const fields = fieldArr.reduce((acc, cur) => {
-        acc[cur.field] = [cur];
-        return acc;
-      }, {});
-      return {
-        isValid: false,
-        fields
-      };
-    }
+    const fields = {};
+    let isValid = true;
+    results.forEach((res) => {
+      if (!res?.isValid) isValid = false;
+      Object.assign(fields, res?.fields ?? {});
+    });
     return {
-      isValid: true
+      isValid,
+      fields: Object.keys(fields).length ? fields : void 0
     };
   }
 }
@@ -242,7 +240,86 @@ async function getModelQueries(opts) {
   console.log("getModelQueries", res);
   return res;
 }
-function isBlank$2(value) {
+const SCAN_NOT_FOUND_MSG$2 = "扫描的物料不存在";
+const SCAN_LOT_OR_UNIQUE_REQUIRED_MSG = "条码中未解析到物料批号或唯一码";
+function hasLotOrUniqueCode(parsed) {
+  return Boolean(String(parsed.lot ?? "").trim() || String(parsed.uniqueCode ?? "").trim());
+}
+function buildInventoryScanRequestBody(parsed, warehouseId) {
+  const body = {};
+  if (parsed.materialCode) body.product_code_ = parsed.materialCode;
+  if (parsed.lot) body.material_no_ = parsed.lot;
+  if (parsed.uniqueCode) body.unique_code_ = parsed.uniqueCode;
+  if (parsed.mfgOrderCode) body.mfg_order_code_ = parsed.mfgOrderCode;
+  if (warehouseId) body.warehouse_id_ = warehouseId;
+  return body;
+}
+function unwrapBizServiceList$1(result) {
+  if (!result) return [];
+  if (Array.isArray(result)) return result;
+  const data = result.data;
+  if (Array.isArray(data)) return data;
+  if (data && typeof data === "object") return [data];
+  return [];
+}
+async function matchInventoryScanRecords(parsed, warehouseId) {
+  const body = buildInventoryScanRequestBody(parsed, warehouseId);
+  if (!body.material_no_ && !body.unique_code_) return [];
+  const result = await api.apaas.modelComprehensive.postBizServiceGeneralModelCategoryModelKeyBsKey(
+    {
+      modelCategory: "entity",
+      modelKey: "em_inventory",
+      bsKey: "biz_inventory_production_identification_scan"
+    },
+    {},
+    body
+  );
+  return unwrapBizServiceList$1(result);
+}
+const PRODUCTION_IDENTIFICATION_SCAN_NOT_FOUND_MSG = "扫描的物料不存在";
+const PRODUCTION_IDENTIFICATION_SCAN_LOT_OR_UNIQUE_REQUIRED_MSG = "条码中未解析到物料批号或唯一码";
+function hasProductionIdentificationScanKey(parsed) {
+  return Boolean(String(parsed.lot ?? "").trim() || String(parsed.uniqueCode ?? "").trim());
+}
+function buildProductionIdentificationScanBody(parsed) {
+  const body = {};
+  if (parsed.materialCode) body.product_code_ = parsed.materialCode;
+  if (parsed.lot) body.material_no_ = parsed.lot;
+  if (parsed.qty != null) body.qty_ = parsed.qty;
+  if (parsed.expiration) body.vaildate_ = parsed.expiration;
+  if (parsed.deviceCode) body.device_code_ = parsed.deviceCode;
+  if (parsed.uniqueCode) body.unique_code = parsed.uniqueCode;
+  if (parsed.mfgOrderCode) body.mfg_order_code_ = parsed.mfgOrderCode;
+  if (parsed.sterilizationLot) body.sterilization_code_ = parsed.sterilizationLot;
+  const productionContainerName = parsed.productionContainerName ?? parsed.production_container_name_ ?? parsed.productionLot;
+  if (productionContainerName) {
+    body.production_container_name_ = productionContainerName;
+  }
+  return body;
+}
+function unwrapBizServiceList(result) {
+  if (!result) return [];
+  if (Array.isArray(result)) return result;
+  const data = result.data;
+  if (Array.isArray(data)) return data;
+  if (data && typeof data === "object") return [data];
+  return [];
+}
+async function matchProductionIdentificationScanRecords(parsed) {
+  const body = buildProductionIdentificationScanBody(parsed);
+  if (!body.material_no_ && !body.unique_code) return [];
+  const result = await api.apaas.modelComprehensive.postBizServiceGeneralModelCategoryModelKeyBsKey(
+    {
+      modelCategory: "entity",
+      modelKey: "em_production_identification",
+      bsKey: "biz_production_identification_scan"
+    },
+    {},
+    body
+  );
+  return unwrapBizServiceList(result);
+}
+function isBlank$3(value) {
   return value === void 0 || value === null || value === "";
 }
 function matchFieldKey(match, fieldKey) {
@@ -261,7 +338,7 @@ function buildDefaultMapFromProfile(profile, paramsConfig) {
   );
   for (const assignment of assignments) {
     const value = paramsConfig?.[assignment.paramKey];
-    if (isBlank$2(value)) continue;
+    if (isBlank$3(value)) continue;
     result[assignment.fieldKey] = value;
   }
   return result;
@@ -332,54 +409,49 @@ class ProfileDrivenSubTableCore extends SubTableCore {
     super.handleChange(params);
   }
 }
-class WarehouseInTableCore extends ProfileDrivenSubTableCore {
+function isBlank$2(value) {
+  return value === void 0 || value === null || value === "";
 }
-class WarehouseInboundTableCore extends ProfileDrivenSubTableCore {
+function isPartInventoryOption(option) {
+  if (!option) return false;
+  return option.part_id_ != null || option.part_id_name_ != null || option.warehouse_id_ != null || option.stock_num_ != null;
 }
-class WarehouseOutTableCore extends ProfileDrivenSubTableCore {
-  get warehouseId() {
-    return this.factory.ctx.paramsConfig?.warehouseId;
-  }
-  handleFieldTd = (params) => {
-    const { field, tdHandler } = params;
-    if (field === F$1.product) {
-      tdHandler.mergeTd({
-        cellWidget: {
-          props: {
-            customRenderTag: "allocateProduct",
-            newSpecificConfig: {
-              newOptions: []
-            }
-          }
-        }
-      });
-    }
-    super.handleFieldTd(params);
-  };
-  calcFieldQuery = (params) => {
-    const { field } = params;
-    if (field === F$1.product) {
-      return {
-        warehouse_id_: this.warehouseId
-      };
-    }
-  };
-  handleChange(params) {
-    super.handleChange(params);
-    const { field, value, option, rowData } = params;
-    if (field !== F$1.product || !option || value === void 0 || value === null || value === "") {
-      return;
-    }
-    for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION) {
+function applyInventoryFill(rowData, option, mappings) {
+  for (const { optionField, toField } of mappings) {
+    if (option[optionField] !== void 0) {
       rowData[toField] = option[optionField];
     }
   }
 }
+class WarehouseInboundTableCore extends ProfileDrivenSubTableCore {
+}
 class WarehouseOutboundTableCore extends ProfileDrivenSubTableCore {
+  handleChange(params) {
+    super.handleChange(params);
+    const { field, value, option, rowData } = params;
+    if (field !== F$3.part || isBlank$2(value) || !isPartInventoryOption(option)) return;
+    applyInventoryFill(rowData, option, FILL_FROM_INVENTORY_OPTION$1);
+  }
 }
 class PartStocktakeTableCore extends ProfileDrivenSubTableCore {
+  handleChange(params) {
+    super.handleChange(params);
+    const { field, value, option, rowData } = params;
+    if (field !== F$2.part || isBlank$2(value) || !isPartInventoryOption(option)) return;
+    applyInventoryFill(rowData, option, FILL_FROM_INVENTORY_OPTION);
+    runRowHandler(TABLE_TYPE, "stocktake-derived", {
+      rowData,
+      changedField: field
+    });
+  }
 }
 class DevicePartConsumeTableCore extends ProfileDrivenSubTableCore {
+  handleChange(params) {
+    super.handleChange(params);
+    const { field, value, option, rowData } = params;
+    if (field !== F$1.part || isBlank$2(value) || !isPartInventoryOption(option)) return;
+    applyInventoryFill(rowData, option, FILL_FROM_INVENTORY_OPTION$2);
+  }
 }
 class MaterialRequisitionTableCore extends ProfileDrivenSubTableCore {
 }
@@ -413,23 +485,20 @@ function pickInventoryBase(record) {
 function mapInventoryRecordToRow(record) {
   return {
     ...pickInventoryBase(record),
-    [F$2.location]: record[F$2.location],
-    [F$2.stock]: toNumber(record[F$2.stock])
+    [F$4.location]: record[F$4.location],
+    [F$4.stock]: toNumber(record[F$4.stock])
   };
 }
 function mergeInventoryByWarehouse(items) {
   const [first] = items;
   return {
     ...pickInventoryBase(first),
-    [F$2.stock]: items.reduce((sum, item) => sum + toNumber(item[F$2.stock]), 0)
+    [F$4.stock]: items.reduce((sum, item) => sum + toNumber(item[F$4.stock]), 0)
   };
 }
 function buildWarehouseGroupKey(record) {
   return buildRowGroupKey(record, WAREHOUSE_IDENTITY_GROUP_KEYS);
 }
-function buildScanMergeKey(record) {
-  return buildRowGroupKey(record, SCAN_MERGE_GROUP_KEYS);
-}
 function groupByWarehouseIdentity(records) {
   const groups = /* @__PURE__ */ new Map();
   for (const record of records) {
@@ -471,53 +540,7 @@ function buildStocktakeDerived(stocktakeNum, stockNum) {
     statusLabel: STOCKTAKE_STATUS[status]
   };
 }
-function groupRecordsByInventoryIdentity(records) {
-  return Array.from(groupByWarehouseIdentity(records).values());
-}
-function dispositionScanRecord(record, visibleRows, groupByWarehouse) {
-  if (groupByWarehouse) {
-    const key = buildWarehouseGroupKey(record);
-    const index = visibleRows.findIndex((row) => buildWarehouseGroupKey(row) === key);
-    return index >= 0 ? { kind: "accumulate", index } : { kind: "unprocessed" };
-  }
-  const scanKey = buildScanMergeKey(record);
-  const warehouseKey = buildWarehouseGroupKey(record);
-  let hasWaitingRow = false;
-  for (let i = 0; i < visibleRows.length; i++) {
-    const row = visibleRows[i];
-    if (buildScanMergeKey(row) === scanKey) {
-      if (isBlank$1(row[F$2.location])) {
-        return { kind: "skip-location-not-selected" };
-      }
-      return { kind: "accumulate", index: i };
-    }
-    if (!hasWaitingRow && buildWarehouseGroupKey(row) === warehouseKey && isBlank$1(row[F$2.location])) {
-      hasWaitingRow = true;
-    }
-  }
-  return hasWaitingRow ? { kind: "skip-location-not-selected" } : { kind: "unprocessed" };
-}
-function pickRecordsForNewScanRow(unprocessed, groupByWarehouse) {
-  if (!unprocessed.length) {
-    return {
-      records: [],
-      productGroupCount: 0
-    };
-  }
-  const productGroups = groupRecordsByInventoryIdentity(unprocessed);
-  const productRecords = productGroups[0] ?? [];
-  if (!productRecords.length) {
-    return {
-      records: [],
-      productGroupCount: productGroups.length
-    };
-  }
-  return {
-    records: groupByWarehouse || productRecords.length > 1 ? productRecords : [productRecords[0]],
-    productGroupCount: productGroups.length
-  };
-}
-function applyScanQtyToStocktake(current, scanQty, type) {
+function applyScanQtyToStocktake(current, scanQty, type = "add") {
   if (isBlank$1(scanQty)) {
     return current;
   }
@@ -528,32 +551,20 @@ function applyScanQtyToStocktake(current, scanQty, type) {
   const base = isBlank$1(current) ? 0 : toNumber(current);
   return base + (type === "minus" ? -qtyNum : qtyNum);
 }
-function accumulateScanQtyOnRow(visibleRows, rowIndex, scanQty, type) {
-  const nextRows = [...visibleRows];
-  const caculateNum = applyScanQtyToStocktake(nextRows[rowIndex][F$2.stocktake], scanQty, type);
-  if (toNumber(caculateNum) >= 0) {
-    nextRows[rowIndex] = {
-      ...nextRows[rowIndex],
-      [F$2.stocktake]: caculateNum
-    };
+const MIN_STOCKTAKE_NUM = 0;
+function getScanQtyDeductionBlockReason(current, scanQty, type = "add") {
+  if (type !== "minus" || isBlank$1(scanQty)) {
+    return void 0;
   }
-  return {
-    rows: nextRows,
-    mergedIndex: rowIndex,
-    shouldWarning: toNumber(caculateNum) < 0
-  };
-}
-function appendScanRowFromResolve(visibleRows, rowData) {
-  return {
-    rows: [
-      ...visibleRows,
-      {
-        ...rowData,
-        [F$2.rowSource]: "scan"
-      }
-    ],
-    mergedIndex: visibleRows.length
-  };
+  const qtyNum = Number(scanQty);
+  if (Number.isNaN(qtyNum) || qtyNum <= 0) {
+    return void 0;
+  }
+  const base = isBlank$1(current) ? 0 : toNumber(current);
+  if (base - qtyNum >= MIN_STOCKTAKE_NUM) {
+    return void 0;
+  }
+  return "当前实盘数量小于本次条码扫码数量，无法扣减";
 }
 function groupInventoryToStocktakeRows(records, groupByWarehouse) {
   if (!groupByWarehouse) {
@@ -561,24 +572,6 @@ function groupInventoryToStocktakeRows(records, groupByWarehouse) {
   }
   return Array.from(groupByWarehouseIdentity(records).values()).map(mergeInventoryByWarehouse);
 }
-function shouldAssignScanQty(options) {
-  const { assignScanQty, scanQty, rowIndex, qtyAssignedRowIndexes } = options;
-  if (!assignScanQty || scanQty == null || scanQty === "") {
-    return false;
-  }
-  return !qtyAssignedRowIndexes.has(rowIndex);
-}
-function resolveScanRecords(groupByWarehouse, records) {
-  const row = { ...records[0] };
-  if (!groupByWarehouse) {
-    const allLocationIds = records.map((e) => e[F$2.location]);
-    row[F$2.location] = allLocationIds.length > 1 ? void 0 : allLocationIds[0];
-    row[F$2.inventoryLocationIds] = allLocationIds;
-  } else {
-    row[F$2.stock] = records.reduce((acc, cur) => acc + toNumber(cur[F$2.stock]), 0);
-  }
-  return row;
-}
 async function getStockData({
   warehouse_id_,
   material_no_,
@@ -603,6 +596,57 @@ async function getStockData({
   );
   return res || [];
 }
+function isSameStocktakeIdentity(row, record, groupByWarehouse) {
+  if (row[F$4.product] !== record.product_id_) return false;
+  const rowBatch = row[F$4.batch];
+  const recordBatch = record.production_identification_id_;
+  if (rowBatch && recordBatch && rowBatch !== recordBatch) return false;
+  if (!rowBatch || !recordBatch) {
+    const rowNo = row[F$4.matno];
+    const recordNo = record.material_no_ ?? record.name_;
+    if (!(rowNo && recordNo && rowNo === recordNo)) return false;
+  }
+  if ((row[F$4.warehouse] ?? "") !== (record.warehouse_id_ ?? "")) return false;
+  if (!groupByWarehouse) {
+    if ((row[F$4.location] ?? "") !== (record.location_id_ ?? "")) return false;
+  }
+  return true;
+}
+function buildInventoryScanRow(record, parsed, fillData, stocktakeQty) {
+  const row = {
+    [F$4.inventory]: record.id_,
+    [F$4.batch]: record.production_identification_id_,
+    [F$4.product]: record.product_id_,
+    [F$4.productName]: record.product_id_name_,
+    [F$4.productCode]: record.product_id_code_ ?? record.product_code_,
+    [F$4.productSpec]: record.product_id_spec_,
+    [F$4.warehouse]: record.warehouse_id_,
+    [F$4.location]: record.location_id_,
+    [F$4.stock]: record.stock_num_,
+    [F$4.matno]: record.material_no_ ?? record.name_,
+    [F$4.reInspectionDate]: record.re_inspection_date_,
+    [F$4.stocktake]: stocktakeQty,
+    [F$4.rowSource]: "scan",
+    ...fillData
+  };
+  const validityFromRecord = record.validate_ ?? record.validity_;
+  if (parsed.expiration) {
+    row[F$4.validity] = toDateOnly(parsed.expiration);
+  } else if (validityFromRecord != null) {
+    row[F$4.validity] = toDateOnly(validityFromRecord);
+  }
+  return row;
+}
+function calcRowData(rowData, stocktakeNum) {
+  const { stock_num_, stocktake_num_ } = rowData;
+  const { diff, status, statusLabel } = buildStocktakeDerived(
+    stocktake_num_,
+    stock_num_
+  );
+  rowData.diff_num_ = diff;
+  rowData.stocktake_status_ = status;
+  rowData.stocktake_status__lb_ = $t(statusLabel);
+}
 class StocktakeTableCore extends ProfileDrivenSubTableCore {
   initData = [];
   get isGroupByWarehouse() {
@@ -626,10 +670,10 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
     const result = super.calcFieldStatus(params);
     const { field, rowData } = params;
     const { row_source_: source } = rowData;
-    if (field === F$2.stocktake) return result;
-    if (!Object.values(F$2).includes(field)) return result;
+    if (field === F$4.stocktake) return result;
+    if (!Object.values(F$4).includes(field)) return result;
     if (source === WarehouseInventoryRowSource.SCAN) {
-      result.disabled = F$2.location !== field;
+      result.disabled = F$4.location !== field;
     } else if (source === WarehouseInventoryRowSource.AUTO) {
       result.disabled = true;
     } else if (!source || source === WarehouseInventoryRowSource.MANUAL) {
@@ -641,12 +685,12 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
   }
   calcFieldQuery = (params) => {
     const { field, rowData } = params;
-    if (field === F$2.location && rowData[F$2.inventoryLocationIds]) {
+    if (field === F$4.location && rowData[F$4.inventoryLocationIds]) {
       return {
-        "id_.in": rowData[F$2.inventoryLocationIds]
+        "id_.in": rowData[F$4.inventoryLocationIds]
       };
     }
-    if (field === F$2.product) {
+    if (field === F$4.product) {
       return {
         warehouse_id_: this.paramsWarehouseId
       };
@@ -654,7 +698,7 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
   };
   handleFieldTd = (params) => {
     const { field, tdHandler } = params;
-    if (field === F$2.product) {
+    if (field === F$4.product) {
       tdHandler.mergeTd({
         cellWidget: {
           props: {
@@ -675,7 +719,6 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
         label: $t("sys.edhr.bizOperation")
       },
       getMenuByAction(SubTableActionEnum.SCAN),
-      getMenuByAction(SubTableActionEnum.CHANGE_PARSE_RULE),
       {
         type: SubTableActionMenuTypeEnum.DIVIDER
       },
@@ -694,17 +737,18 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
     return menus;
   };
   async init() {
-    const { autoLoadStock, barcodeParsingRules } = this.bizTableConfig || {};
+    const config = this.bizTableConfig || {};
+    const { autoLoadStock, barcodeParsingRules } = config;
     if (barcodeParsingRules) {
-      this.scanRuleProps = this.bizTableConfig.barcodeParsingRules;
+      this.scanRuleProps = barcodeParsingRules;
       this.scanRuleInfo = await getParseRuleInfo({ id: this.scanRuleProps.parsingRuleId });
     }
     if (this.isDataProcessed || !autoLoadStock || !this.paramsWarehouseId) return;
     const res = await getStockData({ warehouse_id_: this.paramsWarehouseId });
-    this.initData = groupInventoryToStocktakeRows(res, this.isGroupByWarehouse).map((e) => {
-      calcRowData(e);
-      e.row_source_ = "auto";
-      return e;
+    this.initData = groupInventoryToStocktakeRows(res, this.isGroupByWarehouse).map((e2) => {
+      calcRowData(e2);
+      e2.row_source_ = "auto";
+      return e2;
     });
   }
   handleInitializeFormState(_params) {
@@ -713,203 +757,96 @@ class StocktakeTableCore extends ProfileDrivenSubTableCore {
   handleChange(params) {
     super.handleChange(params);
     const { field, value, option, rowData } = params;
-    if (field === F$2.product && option && value !== void 0 && value !== null && value !== "") {
-      for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION$1) {
+    if (field === F$4.product && option && value !== void 0 && value !== null && value !== "") {
+      for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION$3) {
         rowData[toField] = option[optionField];
       }
       calcRowData(rowData);
     }
   }
-  async onScan({ barcode, type }) {
-    const { lot, materialCode, qty = 0 } = getParseRuleValue(barcode, this.scanRuleInfo.rules_);
-    if (!lot) {
-      this.warning({ content: "条码中未解析到批次号" });
+  /**
+   * 盘点扫码弹窗回传 { barcode, type }；在此解析并走库存扫码接口
+   */
+  async onScan(input) {
+    const parsed = resolveScanParsedFromInput(input, this.scanRuleInfo?.rules_);
+    if (!parsed || !hasLotOrUniqueCode(parsed)) {
+      this.error({ content: SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
       return;
     }
-    const res = await getStockData({
-      material_no_: lot,
-      product_code_: materialCode,
-      warehouse_id_: this.paramsWarehouseId
-    });
-    if (res?.length) {
-      const materialGroups = groupRecordsByInventoryIdentity(res);
-      const assignScanQty = materialGroups.length === 1;
-      const mergedIndexes = [];
-      let totalSkippedForLocation = 0;
-      const visibleRows = this.tableData.filter((e) => !e.deleted_);
-      const deletedRows = this.tableData.filter((e) => e.deleted_);
-      const warningList = [];
-      for (let i = 0; i < materialGroups.length; i += 1) {
-        const groupRecords = materialGroups[i];
-        const result = processScanRecordGroup({
-          groupRecords,
-          visibleRows,
-          groupByWarehouse: this.isGroupByWarehouse,
-          scanQty: qty || 1,
-          scanAdjustType: type,
-          assignScanQty
-        });
-        this.tableData = [...result.rows, ...deletedRows];
-        mergedIndexes.push(...result.mergedIndexes);
-        totalSkippedForLocation += result.skippedForLocation;
-        warningList.push(...result.messageList);
-      }
-      if (totalSkippedForLocation > 0) {
-        this.warning({
-          content: totalSkippedForLocation === 1 ? "相同物料行尚未选择库位，已忽略 1 条扫码数据" : `相同物料行尚未选择库位，已忽略 ${totalSkippedForLocation} 条扫码数据`
-        });
-      }
-      if (warningList.length) {
-        warningList.forEach((e) => {
-          this.warning({ content: e });
-        });
-      }
-      if (!mergedIndexes.length) {
-        if (totalSkippedForLocation === 0) {
-          this.error({ content: "扫描结果解析失败" });
-        }
-        return;
-      }
+    const records = await matchInventoryScanRecords(parsed, this.paramsWarehouseId);
+    if (!records.length) {
+      this.error({ content: SCAN_NOT_FOUND_MSG$2 });
+      return;
     }
-  }
-}
-function calcRowData(rowData, stocktakeNum) {
-  const { stock_num_, stocktake_num_ } = rowData;
-  const { diff, status, statusLabel } = buildStocktakeDerived(
-    stocktake_num_,
-    stock_num_
-  );
-  rowData.diff_num_ = diff;
-  rowData.stocktake_status_ = status;
-  rowData.stocktake_status__lb_ = $t(statusLabel);
-}
-function processScanRecordGroup(options) {
-  const { groupRecords, groupByWarehouse, scanQty, scanAdjustType, assignScanQty } = options;
-  let visibleRows = options.visibleRows;
-  const mergedIndexes = [];
-  const unprocessed = [];
-  let skippedForLocation = 0;
-  let accumulated = 0;
-  const qtyAssignedRowIndexes = /* @__PURE__ */ new Set();
-  const messageList = [];
-  for (const record of groupRecords) {
-    const disposition = dispositionScanRecord(record, visibleRows, groupByWarehouse);
-    if (disposition.kind === "accumulate") {
-      accumulated += 1;
-      const qtyCheck = {
-        assignScanQty,
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const scanAdjustType = resolveScanAdjustType(input);
+    const scanQty = resolveScanQty(parsed.qty, selected.qty_);
+    const fillData = this.scanRuleProps?.fillMapArr?.length && parsed ? calcFillData(parsed, this.scanRuleProps.fillMapArr) : {};
+    const visibleRows = this.showTableData;
+    const deletedRows = this.tableData.filter((e2) => e2.deleted_);
+    const existIndex = visibleRows.findIndex(
+      (row2) => isSameStocktakeIdentity(row2, selected, this.isGroupByWarehouse)
+    );
+    if (existIndex >= 0) {
+      const existRow = visibleRows[existIndex];
+      const blockReason = getScanQtyDeductionBlockReason(
+        existRow[F$4.stocktake],
         scanQty,
-        rowIndex: disposition.index,
-        qtyAssignedRowIndexes
-      };
-      const shouldAddQty = shouldAssignScanQty(qtyCheck);
-      const result = accumulateScanQtyOnRow(
-        visibleRows,
-        disposition.index,
-        shouldAddQty ? scanQty : void 0,
         scanAdjustType
       );
-      if (result.shouldWarning) {
-        messageList.push($t("sys.edhr.stocktakeScanWarning"));
-      }
-      if (shouldAddQty) {
-        qtyAssignedRowIndexes.add(disposition.index);
-      }
-      calcRowData(result.rows[disposition.index]);
-      visibleRows = result.rows;
-      if (!mergedIndexes.includes(result.mergedIndex)) {
-        mergedIndexes.push(result.mergedIndex);
+      if (blockReason) {
+        this.error({ content: blockReason });
+        return;
       }
-      continue;
-    }
-    if (disposition.kind === "skip-location-not-selected") {
-      skippedForLocation += 1;
-      continue;
-    }
-    unprocessed.push(record);
-  }
-  const appended = appendUnresolvedScanRecords({
-    unprocessed,
-    visibleRows,
-    groupByWarehouse,
-    scanQty,
-    scanAdjustType,
-    assignScanQty: assignScanQty && mergedIndexes.length === 0
-  });
-  visibleRows = appended.rows;
-  const appendedCount = appended.mergedIndex != null ? 1 : 0;
-  if (appended.mergedIndex != null) {
-    mergedIndexes.push(appended.mergedIndex);
-  }
-  const stats = {
-    total: groupRecords.length,
-    accumulated,
-    skipped: skippedForLocation,
-    unprocessed: unprocessed.length,
-    appended: appendedCount
-  };
-  return { rows: visibleRows, mergedIndexes, skippedForLocation, stats, messageList };
-}
-function appendUnresolvedScanRecords(options) {
-  const { unprocessed, visibleRows, groupByWarehouse, scanQty, scanAdjustType, assignScanQty } = options;
-  if (!unprocessed.length) return { rows: visibleRows };
-  const { records: recordsForNewRow, productGroupCount } = pickRecordsForNewScanRow(
-    unprocessed,
-    groupByWarehouse
-  );
-  if (!recordsForNewRow.length) return { rows: visibleRows };
-  const rowData = buildRowFromResolve(
-    resolveScanRecords(groupByWarehouse, recordsForNewRow),
-    scanQty,
-    assignScanQty,
-    scanAdjustType
-  );
-  calcRowData(rowData);
-  const appended = appendScanRowFromResolve(visibleRows, rowData);
-  return {
-    rows: appended.rows,
-    mergedIndex: appended.mergedIndex,
-    appendMeta: {
-      unprocessedCount: unprocessed.length,
-      productGroupCount,
-      usedForNewRow: recordsForNewRow.length,
-      multiLocationPending: !groupByWarehouse && recordsForNewRow.length > 1
+      existRow[F$4.stocktake] = applyScanQtyToStocktake(
+        existRow[F$4.stocktake],
+        scanQty,
+        scanAdjustType
+      );
+      calcRowData(existRow);
+      this.tableData = [...visibleRows, ...deletedRows];
+      return;
     }
+    const stocktakeQty = applyScanQtyToStocktake(void 0, scanQty, scanAdjustType);
+    const row = buildInventoryScanRow(selected, parsed, fillData, stocktakeQty);
+    calcRowData(row);
+    this.tableData = [...visibleRows, row, ...deletedRows];
+  }
+}
+function resolveScanParsedFromInput(input, rules) {
+  if (input.parsedValue && typeof input.parsedValue === "object") {
+    return input.parsedValue;
+  }
+  const raw = input.barcode ?? input.str;
+  if (!raw || !rules) return void 0;
+  return getParseRuleValue(raw, rules);
+}
+function buildAllocateScanRow(record, parsed, fillData) {
+  const row = {
+    [F$5.inventory]: record.id_,
+    [F$5.product]: record.product_id_,
+    [F$5.productName]: record.product_id_name_,
+    [F$5.productCode]: record.product_id_code_,
+    [F$5.productSpec]: record.product_id_spec_,
+    [F$5.batch]: record.production_identification_id_,
+    [F$5.originLocation]: record.location_id_,
+    [F$5.originWarehouse]: record.warehouse_id_,
+    [F$5.stock]: record.stock_num_,
+    [F$5.mfgOrder]: record.mfg_order_id_,
+    [F$5.lotSn]: record.lot_sn_id_,
+    [F$5.uniqueCode]: record.unique_code_,
+    [F$5.reInspectionDate]: record.re_inspection_date_,
+    [F$5.allocateNum]: resolveScanQty(parsed.qty, record.qty_),
+    ...fillData
   };
-}
-function buildRowFromResolve(row, scanQty, assignScanQty = false, scanAdjustType = "add") {
-  const rowData = {
-    ...row,
-    [F$2.rowSource]: "scan"
-  };
-  if (assignScanQty && scanQty != null && scanQty !== "") {
-    rowData[F$2.stocktake] = applyScanQtyToStocktake(void 0, scanQty, scanAdjustType);
+  const validityFromRecord = record.validate_ ?? record.validity_;
+  if (parsed.expiration) {
+    row[F$5.validity] = toDateOnly(parsed.expiration);
+  } else if (validityFromRecord != null) {
+    row[F$5.validity] = toDateOnly(validityFromRecord);
   }
-  return rowData;
-}
-async function fetchInventoryInfo({
-  warehouse_id_,
-  material_no_,
-  location_id_,
-  product_code_,
-  production_identification_id_
-}) {
-  const res = await api.apaas.modelComprehensive.postBizServiceGeneralModelCategoryModelKeyBsKey(
-    {
-      modelCategory: "entity",
-      bsKey: "biz_get_inventory_info",
-      modelKey: "em_inventory"
-    },
-    {},
-    {
-      warehouse_id_,
-      material_no_,
-      location_id_,
-      product_code_,
-      production_identification_id_
-    }
-  );
-  return res || [];
+  return row;
 }
 class AllocateTableCore extends ProfileDrivenSubTableCore {
   /** 绘制UI相关工具 */
@@ -926,7 +863,7 @@ class AllocateTableCore extends ProfileDrivenSubTableCore {
   }
   handleFieldTd = (params) => {
     const { field, tdHandler } = params;
-    if (field === F$3.product) {
+    if (field === F$5.product) {
       tdHandler.mergeTd({
         cellWidget: {
           props: {
@@ -942,17 +879,17 @@ class AllocateTableCore extends ProfileDrivenSubTableCore {
   };
   calcFieldQuery = (params) => {
     const { field, rowData } = params;
-    if (field === F$3.location) {
+    if (field === F$5.location) {
       return {
-        "warehouse_id_.eq": rowData[F$3.warehouse]
+        "warehouse_id_.eq": rowData[F$5.warehouse]
       };
     }
-    if (field === F$3.originLocation) {
+    if (field === F$5.originLocation) {
       return {
-        "warehouse_id_.eq": rowData[F$3.originWarehouse]
+        "warehouse_id_.eq": rowData[F$5.originWarehouse]
       };
     }
-    if (field === F$3.product) {
+    if (field === F$5.product) {
       return {
         warehouse_id_: this.warehouseId
       };
@@ -960,7 +897,19 @@ class AllocateTableCore extends ProfileDrivenSubTableCore {
   };
   calcSubTableActionMenu = (params) => {
     const { showDelBtn } = params;
-    const menus = [
+    return [
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.bizOperation")
+      },
+      getMenuByAction(SubTableActionEnum.SCAN),
+      {
+        type: SubTableActionMenuTypeEnum.DIVIDER
+      },
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.editRow")
+      },
       getMenuByAction(SubTableActionEnum.Insert1RowAfter),
       getCopySubMenu(),
       getInsertSubMenu(),
@@ -971,55 +920,32 @@ class AllocateTableCore extends ProfileDrivenSubTableCore {
         getMenuByAction(SubTableActionEnum.DeleteRowCurrent)
       ] : []
     ].filter(Boolean);
-    return menus;
   };
   handleChange(params) {
     super.handleChange(params);
     const { field, value, option, rowData } = params;
-    if (field !== F$3.product || !option || value === void 0 || value === null || value === "") {
+    if (field !== F$5.product || !option || value === void 0 || value === null || value === "") {
       return;
     }
-    for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION$2) {
+    for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION$4) {
       rowData[toField] = option[optionField];
     }
   }
-  async onScan({ str }) {
-    const data = getParseRuleValue(str, this.scanRuleInfo.rules_);
-    console.log("parseScanStr", data);
-    const arr = await fetchInventoryInfo({
-      warehouse_id_: this.warehouseId,
-      product_code_: data.materialCode
-    });
-    if (!arr?.length) {
-      this.error({ content: "扫描的物料不存在" });
+  async onScan(input) {
+    const parsed = resolveScanParsedValue(input);
+    if (!parsed || !hasLotOrUniqueCode(parsed)) {
+      this.error({ content: SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
       return;
     }
-    const info = arr[0];
-    const row = {
-      product_id_: info.product_id_,
-      product_id_name_: info.product_id_name_,
-      product_id_code_: info.product_id_code_,
-      product_id_spec_: info.product_id_spec_,
-      production_identification_id_: info.production_identification_id_,
-      origin_location_id_: info.location_id_,
-      origin_warehouse_id_: info.warehouse_id_,
-      stock_num_: info.stock_num_,
-      inventory_id_: info.id_,
-      mfg_order_id_: info.mfg_order_id_,
-      lot_sn_id_: info.lot_sn_id_,
-      re_inspection_date_: info.re_inspection_date_
-    };
-    if (data.expiration) {
-      row.validity_ = dayjs(data.expiration).format("YYYY-MM-DD");
-    } else if (info.validate_) {
-      row.validity_ = info.validate_;
-    }
-    if (this.scanRuleProps?.fillMapArr?.length) {
-      const fillData = calcFillData(data, this.scanRuleProps.fillMapArr);
-      console.log("fillData", fillData);
-      Object.assign(row, fillData);
+    const records = await matchInventoryScanRecords(parsed, this.warehouseId);
+    if (!records.length) {
+      this.error({ content: SCAN_NOT_FOUND_MSG$2 });
+      return;
     }
-    this.tableData = [...this.tableData, row];
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const row = buildAllocateScanRow(selected, parsed, resolveScanFillData(input));
+    this.tableData = [...this.showTableData, row];
   }
   beforeBtnClick = async (params) => {
     const { btn } = params;
@@ -1119,49 +1045,40 @@ const fillFromOption = [
     toField: F3.qty
   }
 ];
-function applyFillFromOption(A, B4) {
-  const writableA = A;
+function applyFillFromOption(A2, B4) {
+  const writableA = A2;
   fillFromOption.forEach(({ optionField, toField }) => {
     if (has(B4, optionField)) {
       writableA[toField] = B4[optionField];
     }
   });
-  return A;
+  return A2;
 }
 function mapContainerRowsToOptions(data = []) {
   return data.map((item) => ({
-    label: item.__LABEL__ ?? item.name_ ?? String(item.id_ ?? item.id ?? ""),
+    label: resolveLotDisplayLabel(item, item.name_),
     value: item.id_ || item.id,
     disabled: !!item.deleted_,
     _item: item
   }));
 }
-async function fetchProductionContainerByName$1(name_) {
-  const res = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
-    {
-      modelCategory: "entity",
-      modelKey: "em_production_identification",
-      bsKey: "biz_get_production_identification"
-    },
-    {},
-    {
-      query: { "production_identification_type_.in": ["LOT", "SN"], name_ },
-      exp: "AND(production_identification_type_.in,name_)"
-    }
-  );
-  return normalizeContainerResult$1(res);
-}
-function normalizeContainerResult$1(res) {
-  if (!res) return void 0;
-  const data = res?.data ?? res;
-  if (Array.isArray(data)) return data[0];
-  if (typeof data === "object") return data;
-  return void 0;
+const SCAN_NOT_FOUND_MSG$1 = "扫描的物料批次不存在";
+function buildEntrustScanRow(record, parsed, fillData) {
+  return {
+    [F3.productionContainer]: record.lot_sn_id_ ?? record.production_container_id_,
+    [F3.product]: record.product_id_,
+    [F3.productName]: record.product_id_name_,
+    [F3.productCode]: record.product_id_code_,
+    [F3.productSpec]: record.product_id_spec_,
+    [F3.mfgOrderCode]: record.mfg_order_code_,
+    [F3.mfgOrder]: record.mfg_order_id_,
+    [F3.qty]: parsed.qty ?? record.qty_,
+    [F3.productionDate]: toDateOnly(record.production_date_),
+    ...fillData
+  };
 }
 class SterilizeBatchTableCore extends SubTableCore {
-  /** 触发扫码时的目标行 */
-  scanTargetRow;
-  /** 绘制UI相关工具，一期复用调拨表扫码弹窗 */
+  /** 绘制UI相关工具，复用调拨表扫码弹窗 */
   get render() {
     return window.NocodeAdapter.allocateRender;
   }
@@ -1179,16 +1096,14 @@ class SterilizeBatchTableCore extends SubTableCore {
   calcSubTableActionMenu = (params) => {
     const { showDelBtn } = params;
     return [
-      // 一期暂不支持扫码
-      // {
-      //   type: SubTableActionMenuTypeEnum.SUBTITLE,
-      //   label: $t('sys.edhr.bizOperation'),
-      // },
-      // getMenuByAction(SubTableActionEnum.SCAN),
-      // getMenuByAction(SubTableActionEnum.CHANGE_PARSE_RULE),
-      // {
-      //   type: SubTableActionMenuTypeEnum.DIVIDER,
-      // },
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.bizOperation")
+      },
+      getMenuByAction(SubTableActionEnum.SCAN),
+      {
+        type: SubTableActionMenuTypeEnum.DIVIDER
+      },
       {
         type: SubTableActionMenuTypeEnum.SUBTITLE,
         label: $t("sys.edhr.editRow")
@@ -1203,17 +1118,6 @@ class SterilizeBatchTableCore extends SubTableCore {
       ] : []
     ].filter(Boolean);
   };
-  handleMenuClick(params) {
-    const { actionKey, rowData } = params;
-    if (actionKey === SubTableActionEnum.SCAN) {
-      this.scanTargetRow = rowData;
-      this.openScanModal();
-      return;
-    }
-    if (actionKey === SubTableActionEnum.CHANGE_PARSE_RULE) {
-      this.changeScanRule();
-    }
-  }
   handleFieldTd = (params) => {
     const { field, tdHandler } = params;
     if (field === F3.productionContainer) {
@@ -1222,7 +1126,6 @@ class SterilizeBatchTableCore extends SubTableCore {
           props: {
             newSpecificConfig: {
               newOptions: []
-              // 禁用初始选项,数据源完全由 customLoader 提供
             }
           }
         }
@@ -1241,18 +1144,28 @@ class SterilizeBatchTableCore extends SubTableCore {
     const { field } = params;
     if (field !== F3.productionContainer) return;
     const loader = async (loaderParams) => {
-      const { mode, queryData = {}, pageNo = 1, pageSize = 100, ids = [] } = loaderParams;
+      const { mode, queryData = {}, exp, pageNo = 1, pageSize = 100, ids = [] } = loaderParams;
+      let resolvedExp = exp;
       const query = {
         ...queryData,
         is_rework_: 0,
-        "production_identification_type_.in": ["LOT", "SN"]
+        "production_identification_type_.in": ["LOT", "SN"],
+        "container_role_.ne": LOT_CONTAINER_ROLE.RELATED_PARENT
       };
       if (mode === "byIds" && ids.length) {
         query["id_.in"] = ids;
       } else {
         const keyword = extractKeywordFromQueryData(queryData);
-        if (keyword && !query["name_.like"] && !query["name_.iLike"]) {
-          query["name_.like"] = keyword;
+        if (keyword) {
+          if (!query["name_.like"] && !query["name_.iLike"]) {
+            query["name_.like"] = keyword;
+          }
+          if (!query["related_parent_name_.like"] && !query["related_parent_name_.iLike"]) {
+            query["related_parent_name_.like"] = keyword;
+          }
+          if (!resolvedExp && (query["name_.like"] || query["name_.iLike"]) && (query["related_parent_name_.like"] || query["related_parent_name_.iLike"])) {
+            resolvedExp = "OR(name_.like,related_parent_name_.like)";
+          }
         }
       }
       const res = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
@@ -1263,6 +1176,7 @@ class SterilizeBatchTableCore extends SubTableCore {
         },
         {},
         {
+          exp: resolvedExp,
           query,
           pageNo,
           pageSize,
@@ -1270,11 +1184,14 @@ class SterilizeBatchTableCore extends SubTableCore {
         }
       );
       const data = res?.data || [];
+      const dict = res?.dict;
       const totalCount = Number(res?.totalCount ?? data.length);
       const totalPage = Number(res?.totalPage ?? Math.max(1, Math.ceil(totalCount / pageSize)));
       const options = mapContainerRowsToOptions(data);
       if (mode === "byIds") {
         return {
+          data,
+          dict,
           options,
           finished: true,
           totalCount
@@ -1282,6 +1199,7 @@ class SterilizeBatchTableCore extends SubTableCore {
       }
       return {
         data,
+        dict,
         options,
         finished: pageNo >= totalPage,
         totalCount,
@@ -1294,7 +1212,6 @@ class SterilizeBatchTableCore extends SubTableCore {
     const { field, option, value, rowData } = params;
     if (field !== F3.productionContainer) return;
     if (option) {
-      console.log(option);
       applyFillFromOption(rowData, option);
       return;
     }
@@ -1304,36 +1221,26 @@ class SterilizeBatchTableCore extends SubTableCore {
       });
     }
   };
-  async onScan({ str }) {
-    if (!this.scanRuleInfo) {
-      this.error({ content: $t("sys.edhr.mcTable.scanRuleNotFound") });
+  async onScan(input) {
+    const parsed = resolveScanParsedValue(input);
+    if (!parsed || !hasProductionIdentificationScanKey(parsed)) {
+      this.error({ content: PRODUCTION_IDENTIFICATION_SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
       return;
     }
-    const data = getParseRuleValue(str, this.scanRuleInfo.rules_);
-    const name = data.lot;
-    if (!name) {
-      this.warning({ content: "条码中未解析到批次号/SN" });
-      return;
-    }
-    let containerInfo;
-    try {
-      containerInfo = await fetchProductionContainerByName$1(name);
-      console.log(this.scanTargetRo);
-    } catch {
-      this.error({ content: "查询生产批次失败" });
+    const records = await matchProductionIdentificationScanRecords(parsed);
+    if (!records.length) {
+      this.error({ content: SCAN_NOT_FOUND_MSG$1 });
       return;
     }
-    if (!containerInfo) {
-      this.error({ content: "未查询到匹配的生产批次" });
-      return;
-    }
-    const merged = { ...data, ...containerInfo };
-    this.tableData = [...this.showTableData, applyFillFromOption({}, merged)];
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const row = buildEntrustScanRow(selected, parsed, resolveScanFillData(input));
+    this.tableData = [...this.showTableData, row];
   }
 }
-function mapRefRowsToOptions(data = [], labelKey = "name_") {
+function mapRefRowsToOptions(data = [], labelKey = "name_", displayRelatedParent = false) {
   return data.map((item) => ({
-    label: item.__LABEL__ ?? item[labelKey] ?? String(item.id_ ?? item.id ?? ""),
+    label: displayRelatedParent ? resolveLotDisplayLabel(item, item[labelKey]) : item.__LABEL__ ?? item[labelKey] ?? String(item.id_ ?? item.id ?? ""),
     value: item.id_ || item.id,
     disabled: !!item.deleted_,
     _item: item
@@ -1341,18 +1248,28 @@ function mapRefRowsToOptions(data = [], labelKey = "name_") {
 }
 function createProductionContainerLoader() {
   return async (loaderParams) => {
-    const { mode, queryData = {}, pageNo = 1, pageSize = 100, ids = [] } = loaderParams;
+    const { mode, queryData = {}, exp, pageNo = 1, pageSize = 100, ids = [] } = loaderParams;
+    let resolvedExp = exp;
     const query = {
       ...queryData,
       is_rework_: 0,
-      "production_identification_type_.in": ["LOT", "SN"]
+      "production_identification_type_.in": ["LOT", "SN"],
+      "container_role_.ne": LOT_CONTAINER_ROLE.RELATED_PARENT
     };
     if (mode === "byIds" && ids.length) {
       query["id_.in"] = ids;
     } else {
       const keyword = extractKeywordFromQueryData(queryData);
-      if (keyword && !query["name_.like"] && !query["name_.iLike"]) {
-        query["name_.like"] = keyword;
+      if (keyword) {
+        if (!query["name_.like"] && !query["name_.iLike"]) {
+          query["name_.like"] = keyword;
+        }
+        if (!query["related_parent_name_.like"] && !query["related_parent_name_.iLike"]) {
+          query["related_parent_name_.like"] = keyword;
+        }
+        if (!resolvedExp && (query["name_.like"] || query["name_.iLike"]) && (query["related_parent_name_.like"] || query["related_parent_name_.iLike"])) {
+          resolvedExp = "OR(name_.like,related_parent_name_.like)";
+        }
       }
     }
     const res = await api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey(
@@ -1363,6 +1280,7 @@ function createProductionContainerLoader() {
       },
       {},
       {
+        exp: resolvedExp,
         query,
         pageNo,
         pageSize,
@@ -1370,11 +1288,14 @@ function createProductionContainerLoader() {
       }
     );
     const data = res?.data || [];
+    const dict = res?.dict;
     const totalCount = Number(res?.totalCount ?? data.length);
     const totalPage = Number(res?.totalPage ?? Math.max(1, Math.ceil(totalCount / pageSize)));
-    const options = mapRefRowsToOptions(data);
+    const options = mapRefRowsToOptions(data, "name_", true);
     if (mode === "byIds") {
       return {
+        data,
+        dict,
         options,
         finished: true,
         totalCount
@@ -1382,6 +1303,7 @@ function createProductionContainerLoader() {
     }
     return {
       data,
+      dict,
       options,
       finished: pageNo >= totalPage,
       totalCount,
@@ -1488,35 +1410,47 @@ function createMaterialContainerLoader() {
     };
   };
 }
-async function fetchProductionContainerByName(name_) {
-  const res = await api.apaas.modelComprehensive.postBizServiceGeneralModelCategoryModelKeyBsKey(
-    {
-      modelCategory: "entity",
-      modelKey: "em_production_identification",
-      bsKey: "biz_get_production_identification"
-    },
-    {},
-    {
-      query: { "production_identification_type_.in": ["LOT", "SN"], name_ },
-      exp: "AND(production_identification_type_.in,name_)"
-    }
-  );
-  return normalizeContainerResult(res);
-}
-function normalizeContainerResult(res) {
-  if (!res) return void 0;
-  const data = res?.data ?? res;
-  if (Array.isArray(data)) return data[0];
-  if (typeof data === "object") return data;
-  return void 0;
-}
 function isBlank(value) {
   return value === void 0 || value === null || value === "";
 }
+const SCAN_NOT_FOUND_MSG = "扫描的批次/物料不存在";
+function isProductionLotOrSn(record) {
+  const type = record.production_identification_type_;
+  return type === "LOT" || type === "SN";
+}
+function buildProductionContainerRow(record, parsed, fillData) {
+  return {
+    [F$6.productionContainer]: record.lot_sn_id_ ?? record.production_container_id_,
+    [F$6.product]: record.product_id_,
+    [F$6.productName]: record.product_id_name_,
+    [F$6.productCode]: record.product_id_code_,
+    [F$6.productSpec]: record.product_id_spec_,
+    [F$6.mfgOrderCode]: record.mfg_order_code_,
+    [F$6.qty]: parsed.qty ?? record.qty_,
+    [F$6.productionDate]: toDateOnly(record.production_date_),
+    [F$6.materialContainerNo]: void 0,
+    [MATERIAL_CONTAINER_ID]: void 0,
+    [F$6.mfgOrder]: void 0,
+    ...fillData
+  };
+}
+function buildMaterialContainerRow(record, parsed, fillData) {
+  return {
+    [F$6.materialContainerNo]: record.material_no_,
+    [MATERIAL_CONTAINER_ID]: record.production_identification_id_,
+    [F$6.product]: record.product_id_,
+    [F$6.productName]: record.product_id_name_,
+    [F$6.productCode]: record.product_id_code_,
+    [F$6.productSpec]: record.product_id_spec_,
+    [F$6.mfgOrderCode]: record.mfg_order_code_,
+    [F$6.mfgOrder]: record.mfg_order_id_,
+    [F$6.qty]: parsed.qty ?? record.qty_,
+    [F$6.productionContainer]: void 0,
+    ...fillData
+  };
+}
 class PretreatmentListTableCore extends ProfileDrivenSubTableCore {
-  /** 触发扫码时的目标行 */
-  scanTargetRow;
-  /** 绘制UI相关工具，一期复用调拨表扫码弹窗 */
+  /** 绘制UI相关工具，复用调拨表扫码弹窗 */
   get render() {
     return window.NocodeAdapter.allocateRender;
   }
@@ -1534,6 +1468,14 @@ class PretreatmentListTableCore extends ProfileDrivenSubTableCore {
   calcSubTableActionMenu = (params) => {
     const { showDelBtn } = params;
     return [
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.bizOperation")
+      },
+      getMenuByAction(SubTableActionEnum.SCAN),
+      {
+        type: SubTableActionMenuTypeEnum.DIVIDER
+      },
       {
         type: SubTableActionMenuTypeEnum.SUBTITLE,
         label: $t("sys.edhr.editRow")
@@ -1548,79 +1490,246 @@ class PretreatmentListTableCore extends ProfileDrivenSubTableCore {
       ] : []
     ].filter(Boolean);
   };
-  handleMenuClick(params) {
-    const { actionKey, rowData } = params;
-    if (actionKey === SubTableActionEnum.SCAN) {
-      this.scanTargetRow = rowData;
-      this.openScanModal();
-      return;
-    }
-    if (actionKey === SubTableActionEnum.CHANGE_PARSE_RULE) {
-      this.changeScanRule();
-    }
-  }
   calcFieldStatus(params) {
     const result = super.calcFieldStatus(params);
     const { field, rowData } = params;
-    if (field === F$4.product) {
+    if (field === F$6.product) {
       result.disabled = !isProductManuallyEditable(rowData);
     }
     return result;
   }
   calcFieldDataSource = (params) => {
     const { field } = params;
-    if (field === F$4.productionContainer) return createProductionContainerLoader();
-    if (field === F$4.mfgOrder) return createMfgOrderLoader();
-    if (field === F$4.materialContainerNo) return createMaterialContainerLoader();
+    if (field === F$6.productionContainer) return createProductionContainerLoader();
+    if (field === F$6.mfgOrder) return createMfgOrderLoader();
+    if (field === F$6.materialContainerNo) return createMaterialContainerLoader();
   };
   handleChange(params) {
     super.handleChange(params);
     const { field, option, value, rowData } = params;
     if (!option || isBlank(value)) return;
     const source = option._item ?? option;
-    if (field === F$4.mfgOrder) {
+    if (field === F$6.mfgOrder) {
       applyFillFromMfgOrderOption(rowData, source);
       return;
     }
-    if (field === F$4.productionContainer || field === F$4.materialContainerNo) {
+    if (field === F$6.productionContainer || field === F$6.materialContainerNo) {
       applyFillFromOption$1(rowData, source);
       return;
     }
-    if (field === F$4.product) {
+    if (field === F$6.product) {
       applyFillFromProductOption(rowData, source);
     }
   }
-  async onScan({ str }) {
-    if (!this.scanRuleInfo) {
-      this.error({ content: $t("sys.edhr.mcTable.scanRuleNotFound") });
+  async onScan(input) {
+    const parsed = resolveScanParsedValue(input);
+    if (!parsed || !hasProductionIdentificationScanKey(parsed)) {
+      this.error({ content: PRODUCTION_IDENTIFICATION_SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
       return;
     }
-    const data = getParseRuleValue(str, this.scanRuleInfo.rules_);
-    const name = data.lot;
-    if (!name) {
-      this.warning({ content: "条码中未解析到批次号/SN" });
+    const records = await matchProductionIdentificationScanRecords(parsed);
+    if (!records.length) {
+      this.error({ content: SCAN_NOT_FOUND_MSG });
       return;
     }
-    let containerInfo;
-    try {
-      containerInfo = await fetchProductionContainerByName(name);
-    } catch {
-      this.error({ content: "查询生产批次失败" });
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const fillData = resolveScanFillData(input);
+    const row = isProductionLotOrSn(selected) ? buildProductionContainerRow(selected, parsed, fillData) : buildMaterialContainerRow(selected, parsed, fillData);
+    this.tableData = [...this.showTableData, row];
+  }
+}
+function buildWarehouseInScanRow(record, parsed, fillData) {
+  const row = {
+    [F$7.product]: record.product_id_,
+    [F$7.productName]: record.product_id_name_,
+    [F$7.productCode]: record.product_id_code_,
+    [F$7.productSpec]: record.product_id_spec_,
+    [F$7.materialNo]: record.material_no_,
+    [F$7.materialNoId]: record.production_identification_id_,
+    [F$7.mfgOrder]: record.mfg_order_id_,
+    [F$7.lotSn]: record.lot_sn_id_,
+    [F$7.uniqueCode]: record.unique_code_,
+    [F$7.reInspectionDate]: record.re_inspection_date_,
+    [F$7.qty]: resolveScanQty(parsed.qty, record.qty_),
+    ...fillData
+  };
+  const validityFromRecord = record.validity_;
+  if (parsed.expiration && row[F$7.validity] == null) {
+    row[F$7.validity] = toDateOnly(parsed.expiration);
+  } else if (validityFromRecord != null && row[F$7.validity] == null) {
+    row[F$7.validity] = toDateOnly(validityFromRecord);
+  }
+  return row;
+}
+class WarehouseInTableCore extends ProfileDrivenSubTableCore {
+  calcSubTableActionMenu = (params) => {
+    const { showDelBtn } = params;
+    return [
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.bizOperation")
+      },
+      getMenuByAction(SubTableActionEnum.SCAN),
+      {
+        type: SubTableActionMenuTypeEnum.DIVIDER
+      },
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.editRow")
+      },
+      getMenuByAction(SubTableActionEnum.Insert1RowAfter),
+      getCopySubMenu(),
+      getInsertSubMenu(),
+      ...showDelBtn ? [
+        {
+          type: SubTableActionMenuTypeEnum.DIVIDER
+        },
+        getMenuByAction(SubTableActionEnum.DeleteRowCurrent)
+      ] : []
+    ].filter(Boolean);
+  };
+  async onScan(input) {
+    const parsed = resolveScanParsedValue(input);
+    if (!parsed || !hasProductionIdentificationScanKey(parsed)) {
+      this.error({ content: PRODUCTION_IDENTIFICATION_SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
       return;
     }
-    if (!containerInfo) {
-      this.error({ content: "未查询到匹配的生产批次" });
+    const records = await matchProductionIdentificationScanRecords(parsed);
+    if (!records.length) {
+      this.error({ content: PRODUCTION_IDENTIFICATION_SCAN_NOT_FOUND_MSG });
       return;
     }
-    const merged = { ...data, ...containerInfo };
-    const applyScanFill = (row) => {
-      applyFillFromOption$1(row, merged);
-      CLEAR_ON_MATERIAL_CONTAINER_SELECT.forEach((key) => {
-        row[key] = void 0;
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const row = buildWarehouseInScanRow(selected, parsed, resolveScanFillData(input));
+    this.tableData = [...this.showTableData, row];
+  }
+}
+function isSameMaterialBatch(row, record) {
+  if (row[F$8.product] !== record.product_id_) return false;
+  const rowBatchId = row[F$8.materialNoId];
+  const recordBatchId = record.production_identification_id_;
+  if (rowBatchId && recordBatchId) return rowBatchId === recordBatchId;
+  const rowBatchNo = row[F$8.materialNo];
+  const recordBatchNo = record.material_no_ ?? record.name_;
+  return Boolean(rowBatchNo && recordBatchNo && rowBatchNo === recordBatchNo);
+}
+function buildWarehouseOutScanRow(record, parsed, fillData, qty) {
+  const row = {
+    [F$8.inventory]: record.id_,
+    [F$8.product]: record.product_id_,
+    [F$8.productName]: record.product_id_name_,
+    [F$8.productCode]: record.product_id_code_,
+    [F$8.productSpec]: record.product_id_spec_,
+    [F$8.materialNo]: record.material_no_,
+    [F$8.materialNoId]: record.production_identification_id_,
+    [F$8.warehouse]: record.warehouse_id_,
+    [F$8.location]: record.location_id_,
+    [F$8.mfgOrder]: record.mfg_order_id_,
+    [F$8.lotSn]: record.lot_sn_id_,
+    [F$8.uniqueCode]: record.unique_code_,
+    [F$8.reInspectionDate]: record.re_inspection_date_,
+    [F$8.qty]: qty,
+    ...fillData
+  };
+  const validityFromRecord = record.validate_ ?? record.validity_;
+  if (parsed.expiration) {
+    row[F$8.validity] = toDateOnly(parsed.expiration);
+  } else if (validityFromRecord != null) {
+    row[F$8.validity] = toDateOnly(validityFromRecord);
+  }
+  return row;
+}
+class WarehouseOutTableCore extends ProfileDrivenSubTableCore {
+  get warehouseId() {
+    return this.factory.ctx.paramsConfig?.warehouseId;
+  }
+  handleFieldTd = (params) => {
+    const { field, tdHandler } = params;
+    if (field === F$8.product) {
+      tdHandler.mergeTd({
+        cellWidget: {
+          props: {
+            customRenderTag: "allocateProduct",
+            newSpecificConfig: {
+              newOptions: []
+            }
+          }
+        }
       });
-      return row;
-    };
-    this.tableData = [...this.showTableData, applyScanFill({})];
+    }
+    super.handleFieldTd(params);
+  };
+  calcFieldQuery = (params) => {
+    const { field } = params;
+    if (field === F$8.product) {
+      return {
+        warehouse_id_: this.warehouseId
+      };
+    }
+  };
+  calcSubTableActionMenu = (params) => {
+    const { showDelBtn } = params;
+    return [
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.bizOperation")
+      },
+      getMenuByAction(SubTableActionEnum.SCAN),
+      {
+        type: SubTableActionMenuTypeEnum.DIVIDER
+      },
+      {
+        type: SubTableActionMenuTypeEnum.SUBTITLE,
+        label: $t("sys.edhr.editRow")
+      },
+      getMenuByAction(SubTableActionEnum.Insert1RowAfter),
+      getCopySubMenu(),
+      getInsertSubMenu(),
+      ...showDelBtn ? [
+        {
+          type: SubTableActionMenuTypeEnum.DIVIDER
+        },
+        getMenuByAction(SubTableActionEnum.DeleteRowCurrent)
+      ] : []
+    ].filter(Boolean);
+  };
+  handleChange(params) {
+    super.handleChange(params);
+    const { field, value, option, rowData } = params;
+    if (field !== F$8.product || !option || value === void 0 || value === null || value === "") {
+      return;
+    }
+    for (const { optionField, toField } of FILL_FROM_INVENTORY_OPTION$5) {
+      rowData[toField] = option[optionField];
+    }
+  }
+  async onScan(input) {
+    const parsed = resolveScanParsedValue(input);
+    if (!parsed || !hasLotOrUniqueCode(parsed)) {
+      this.error({ content: SCAN_LOT_OR_UNIQUE_REQUIRED_MSG });
+      return;
+    }
+    const records = await matchInventoryScanRecords(parsed, this.warehouseId);
+    if (!records.length) {
+      this.error({ content: SCAN_NOT_FOUND_MSG$2 });
+      return;
+    }
+    const selected = await this.pickScanRecord(records);
+    if (!selected) return;
+    const scanQty = resolveScanQty(parsed.qty, selected.qty_);
+    const fillData = resolveScanFillData(input);
+    const visibleRows = this.showTableData;
+    const existIndex = visibleRows.findIndex((row2) => isSameMaterialBatch(row2, selected));
+    if (existIndex >= 0) {
+      const existRow = visibleRows[existIndex];
+      existRow[F$8.qty] = Number(existRow[F$8.qty] ?? 0) + scanQty;
+      this.tableData = [...visibleRows];
+      return;
+    }
+    const row = buildWarehouseOutScanRow(selected, parsed, fillData, scanQty);
+    this.tableData = [...visibleRows, row];
   }
 }
 function getClassByType(type) {
@@ -2107,7 +2216,9 @@ function useRenderPageFactory(props, payload) {
     await tmplBomC.init({
       formInstBom: selfInfo.formInstBom,
       operationId: paramsConfig?.routingOperationId,
-      materialNo
+      materialNo,
+      productQty: paramsConfig?.productQty
+      // 接收数量
       // relatedLotNo: paramsConfig?.relatedLotNo,
     });
     const materialConsumeData = tmplBomC.calcFormState(paper);
@@ -2227,8 +2338,8 @@ function useRenderPageFactory(props, payload) {
             paramsConfig,
             instanceId: id,
             subTableInfo
-          }).catch((e) => {
-            console.error("Error in requestCustomSourceData:", e);
+          }).catch((e2) => {
+            console.error("Error in requestCustomSourceData:", e2);
             return null;
           }),
           transformUtils.getEventInitDataLoad({
@@ -2243,8 +2354,8 @@ function useRenderPageFactory(props, payload) {
               findBasicInsInfo,
               findFormInsInfo
             }
-          }).catch((e) => {
-            console.error("Error in getEventInitDataLoad:", e);
+          }).catch((e2) => {
+            console.error("Error in getEventInitDataLoad:", e2);
             return null;
           })
         ]);
@@ -2324,6 +2435,8 @@ function useRenderPageFactory(props, payload) {
         annRowDetails: [],
         validatorLocationList: [],
         validatorMessageMap: {},
+        mcValidatorLocationList: [],
+        mcValidatorMessageMap: {},
         mobileTdIdGroups: fieldInfoMap.tdIdGroups,
         mobileSelectTdId: void 0,
         contentHighlight: paramsConfig?._gct_nocode_of_instance_id_ === props.selfId ? {
@@ -2342,6 +2455,7 @@ function useRenderPageFactory(props, payload) {
           foreignFields: fieldInfoMap.foreignFields,
           subModelFields: fieldInfoMap.subModelFields,
           appendixFields: fieldInfoMap.useAppendixFields,
+          signatureFields: fieldInfoMap.useSignatureFields,
           subTableInfo
         }
       }
@@ -2374,9 +2488,9 @@ function useRenderPageFactory(props, payload) {
       const prevMap = info.validatorMessageMap ?? {};
       const sameLocations = prevLocations.length === nextLocations.length && nextLocations.every((k, i) => k === prevLocations[i]);
       const sameMessages = sameLocations && nextLocations.every((k) => {
-        const a9 = prevMap[k];
+        const a10 = prevMap[k];
         const b2 = map[k];
-        return JSON.stringify(a9) === JSON.stringify(b2);
+        return JSON.stringify(a10) === JSON.stringify(b2);
       });
       if (sameMessages) return;
       closeValidatorPopovers();
@@ -2384,9 +2498,29 @@ function useRenderPageFactory(props, payload) {
       info.validatorMessageMap = map;
     });
   }
+  function applyMcValidatorComments(uniqueId, comments) {
+    const map = comments && Object.keys(comments).length ? comments : {};
+    const nextLocations = Object.keys(map);
+    basicInfoList.value.forEach((info) => {
+      if (info.uniqueId !== uniqueId) return;
+      const prevLocations = info.mcValidatorLocationList ?? [];
+      const prevMap = info.mcValidatorMessageMap ?? {};
+      const sameLocations = prevLocations.length === nextLocations.length && nextLocations.every((k, i) => k === prevLocations[i]);
+      const sameMessages = sameLocations && nextLocations.every((k) => {
+        const a10 = prevMap[k];
+        const b2 = map[k];
+        return JSON.stringify(a10) === JSON.stringify(b2);
+      });
+      if (sameMessages) return;
+      closeValidatorPopovers();
+      info.mcValidatorLocationList = nextLocations;
+      info.mcValidatorMessageMap = map;
+    });
+  }
   function registerFormValidationContext(uniqueId) {
     registerValidationContext({
       uniqueId,
+      platformType: payload.platformType,
       getFormData: () => formStateMap.value?.[uniqueId] ?? {},
       getPaper: () => dataCenterMap.value?.[uniqueId]?.[ComponentTypeEnum.PAPER],
       getKeepExceptionHighlight: () => {
@@ -2441,12 +2575,27 @@ function useRenderPageFactory(props, payload) {
     const res = await validate(formState, dataCenter[ComponentTypeEnum.PAPER], uniqueId);
     if (bomC) {
       const bomRes = await bomC.submitValidate();
+      applyMcValidatorComments(uniqueId, bomRes.fields ?? null);
       if (!bomRes.isValid) {
         merge(res, bomRes);
+        return res;
+      }
+      const paper = dataCenter?.[ComponentTypeEnum.PAPER];
+      const objErr = await validateObjectBomQtyOnSubmit({
+        formState,
+        objectFieldList: paper?.props?.objectFieldList,
+        formInstBom: bomC.formInstBom
+      });
+      if (objErr) {
+        const objectBomRes = {
+          isValid: false,
+          fields: { [objErr.field]: [objErr] }
+        };
+        merge(res, objectBomRes);
         const info = basicInfoList.value.find((item) => item.uniqueId === uniqueId);
         const current = {
           ...info?.validatorMessageMap ?? {},
-          ...bomRes.fields ?? {}
+          ...objectBomRes.fields ?? {}
         };
         applyValidatorComments(uniqueId, Object.keys(current).length ? current : null);
         return res;
@@ -2493,6 +2642,8 @@ function useRenderPageFactory(props, payload) {
         if (status) {
           info.validatorLocationList = [];
           info.validatorMessageMap = {};
+          info.mcValidatorLocationList = [];
+          info.mcValidatorMessageMap = {};
           closeValidatorPopovers();
         }
       }
@@ -2566,7 +2717,10 @@ function useRenderPageFactory(props, payload) {
       viewMode: RenderModeEnum.ViewMode,
       dataStatus: selfInfo.dataStatus
     });
-    const idsFormState = transformUtils.getFormDataIdsMap(newFormState);
+    const signatureKeys = (currentSelfInfo.newBackupInfo.signatureFields || []).map(
+      (item) => item.fieldId
+    );
+    const idsFormState = transformUtils.getFormDataIdsMap(newFormState, signatureKeys);
     merge(formStateMap.value?.[uniqueId], idsFormState);
     if (payload.afterProcessData && typeof payload.afterProcessData === "function") {
       payload.afterProcessData(formStateMap.value?.[uniqueId]);
@@ -3122,27 +3276,27 @@ function useFormulaExpWatcher(options) {
   let calcReqId = 0;
   async function computeMinMaxOnce() {
     const myId = ++calcReqId;
-    const getValue = (v) => {
+    const getValue = (v2) => {
       if (returnType === "number") {
-        const parsed = v == null ? null : parseFloat(String(v));
+        const parsed = v2 == null ? null : parseFloat(String(v2));
         return Number.isFinite(parsed) ? parsed : null;
       }
-      return v;
+      return v2;
     };
     if (needMinValidateCalc) {
       try {
-        const v = await onCalculateFormula("min");
+        const v2 = await onCalculateFormula("min");
         if (myId !== calcReqId) return;
-        onMinComputed?.(getValue(v));
-      } catch (e) {
+        onMinComputed?.(getValue(v2));
+      } catch (e2) {
       }
     }
     if (needMaxValidateCalc) {
       try {
-        const v = await onCalculateFormula("max");
+        const v2 = await onCalculateFormula("max");
         if (myId !== calcReqId) return;
-        onMaxComputed?.(getValue(v));
-      } catch (e) {
+        onMaxComputed?.(getValue(v2));
+      } catch (e2) {
       }
     }
   }
@@ -3154,14 +3308,14 @@ function useFormulaExpWatcher(options) {
       const s = topStops.shift();
       try {
         s && s();
-      } catch (e) {
+      } catch (e2) {
       }
     }
     for (const [, rowMap] of hashRowStops) {
       for (const stop2 of rowMap.values()) {
         try {
           stop2 && stop2();
-        } catch (e) {
+        } catch (e2) {
         }
       }
     }
@@ -3175,8 +3329,8 @@ function useFormulaExpWatcher(options) {
       debouncedCompute();
       return;
     }
-    for (const p2 of parseInfos) {
-      const { type, processed, hashValue } = p2;
+    for (const p of parseInfos) {
+      const { type, processed, hashValue } = p;
       if (type === "plain") {
         const stop2 = watch(
           () => currentPageFormState.value?.[processed],
@@ -3355,9 +3509,9 @@ class FormAnnotationController {
       const items = this.normalizeAllResponse(res);
       this.applyAnnotationItems(items, () => true);
       return items;
-    } catch (e) {
-      console.error("加载所有批注信息 error", e);
-      throw e;
+    } catch (e2) {
+      console.error("加载所有批注信息 error", e2);
+      throw e2;
     }
   };
   handleOpenAnnotation = async () => {
@@ -3403,219 +3557,195 @@ function filterAnnotationItemsUpToCurrent(items) {
     return ts <= currentTs;
   });
 }
-function useMaterialStocktake() {
-  async function getStockDataByWarehouse({ cloneRuntimeJson, warehouseId, locationId }) {
-    const stocktakeTables = cloneRuntimeJson?.paper?.props?.materialStocktakeList;
-    if (!stocktakeTables?.length || !warehouseId) return {};
-    const res = await api.apaas.modelComprehensive.getBizServiceModelCategoryModelKeyBsKey(
-      {
-        modelCategory: "entity",
-        bsKey: "listAll",
-        modelKey: "em_inventory"
-      },
-      {
-        query: {
-          "warehouse_id_.eq": warehouseId,
-          "location_id_.eq": locationId
-        }
-      }
-    );
-    return stocktakeTables.reduce((obj, e) => {
-      obj[e.masterSubField] = res?.data;
-      return obj;
-    }, {});
-  }
-  async function openScanModal() {
-    console.log("materialStocktake openScanModal");
-  }
-  return {
-    getStockDataByWarehouse,
-    openScanModal
-  };
-}
 export {
-  aq as AITooltips,
+  ar as AITooltips,
   AllocateTableCore,
   B3 as BaseFormModelFetcher,
-  as as BinarizeMethodOptions,
-  aC as BindCmpStyleEnum,
-  R as BooleanShowMode,
+  at as BinarizeMethodOptions,
+  aD as BindCmpStyleEnum,
+  T as BooleanShowMode,
   B2 as BorderTD,
   BpmnNodeTypeEnum,
-  bB as BpmnSignatureTypeEnum,
-  bC as ButtonTypeEnum,
+  bN as BpmnSignatureTypeEnum,
+  bO as ButtonTypeEnum,
   B as BwipCodeType,
-  bD as CHECK_TABLE_MEDPRO_PROTOCOL_KEY,
+  bP as CHECK_TABLE_MEDPRO_PROTOCOL_KEY,
   t as CellType,
-  a0 as CellWidgetViewState,
+  a1 as CellWidgetViewState,
   CheckDsTypeEnum,
-  bE as CodeRunner,
+  bQ as CodeRunner,
   ComponentTypeEnum,
-  bF as Config_Fields,
-  bG as ControlStatusEnum,
-  aA as DateFormat,
-  aD as DecimalDisplayMode,
-  ar as DenoiseMethodOptions,
-  m as DeviceConnector,
-  ao as DeviceLink,
+  bR as Config_Fields,
+  bS as ControlStatusEnum,
+  aB as DateFormat,
+  aE as DecimalDisplayMode,
+  as as DenoiseMethodOptions,
+  x as DeviceConnector,
+  ap as DeviceLink,
   D as DeviceLinkTmplUtil,
-  ap as DeviceParamsTypeTitle,
+  aq as DeviceParamsTypeTitle,
   DevicePartConsumeTableCore,
-  a1 as DiagonalDirection,
-  a5 as DiagonalVertex,
+  bT as DeviceStatus,
+  a2 as DiagonalDirection,
+  a6 as DiagonalVertex,
   _ as DocumentLayout,
-  n as DocumentLoading,
-  c as DocumentPaper,
-  o as DynamicQuickFillModal,
-  d as DynamicTableAction,
-  bH as EBR_PROVIDE_ENUM,
-  aO as EFieldBizTypeEnum,
-  ae as EmptySymbol,
-  bI as FieldSysVarDefaultValueEnum,
+  y as DocumentLoading,
+  d as DocumentPaper,
+  z as DynamicQuickFillModal,
+  e as DynamicTableAction,
+  bU as EBR_PROVIDE_ENUM,
+  bV as EFieldBizTypeEnum,
+  af as EmptySymbol,
+  bW as FieldSysVarDefaultValueEnum,
   FillingTypeEnum,
   F as FixedQuickFillModal,
   FormAnnotationController,
   F2 as FormModelController,
   FormTmplBomController,
-  p as FormTmplConfigController,
+  A as FormTmplConfigController,
   FormTypeEnum,
-  ak as ImageDisplayModeEnum,
+  al as ImageDisplayModeEnum,
   I as InstanceStatusValues,
-  au as JoinModelTypeEum,
-  Q as LabelPosition,
-  a3 as LineDirection,
+  av as JoinModelTypeEum,
+  R as LabelPosition,
+  a4 as LineDirection,
   L as LineType,
   M as MBRender,
-  q as MCDataUtil,
-  a7 as MCRender,
+  C as MCDataUtil,
+  a8 as MCRender,
   MaterialConsumeTableController,
   MaterialConsumptionPatternEnum,
   MaterialRequisitionTableCore,
   MaterialStatusEnum,
-  bJ as MobileFillTypeEnum,
+  bX as MobileFillTypeEnum,
   NCB_PROVIDE,
   O2 as OCR_MODEL_PRECISION_ENUM_KEY,
-  bK as OfficeTypeEnum,
+  bY as OfficeTypeEnum,
   O as Orientation,
   j as PageSizeEnum,
   P as PaginationFormat,
-  al as PaperSizeMap,
+  Z as PaperSizeMap,
   h as PaperWidgeType,
   G as PaperWidgeValueType,
-  at as ParamModelTypeEnum,
+  au as ParamModelTypeEnum,
   PartStocktakeTableCore,
   PlatformEnum,
-  bL as PosEnum,
+  bZ as PosEnum,
   PretreatmentListTableCore,
   ProfileDrivenSubTableCore,
-  bM as RangeCompareOp,
-  aL as RangeValidateMode,
+  b_ as RangeCompareOp,
+  aR as RangeValidateMode,
   RenderModeEnum,
-  W as SignShowTypeEnum,
-  T as SignatureNumberTypeEnum,
-  V as SignatureTimeTypeEnum,
-  X as SignatureTypeEnum,
+  X as SignShowTypeEnum,
+  V as SignatureNumberTypeEnum,
+  W as SignatureTimeTypeEnum,
+  Y as SignatureTypeEnum,
   SterilizeBatchTableCore,
   StocktakeTableCore,
   SubTableCore,
   SubTableCoreFactory,
   SubTableType,
-  bN as SummaryApproveHisTypeEnum,
-  a4 as TimeDiffFormat,
-  a8 as ViewTypeEnum,
+  b$ as SummaryApproveHisTypeEnum,
+  a5 as TimeDiffFormat,
+  a9 as ViewTypeEnum,
   WarehouseInTableCore,
   WarehouseInboundTableCore,
   WarehouseOutTableCore,
   WarehouseOutboundTableCore,
-  a2 as WidgetImageSizeMode,
-  bO as applyCheckDsDataToRuntime,
-  bP as applyMedProCheckDsDataToRuntime,
+  a3 as WidgetImageSizeMode,
+  c0 as applyCheckDsDataToRuntime,
+  c1 as applyMedProCheckDsDataToRuntime,
   baseDataUtils,
-  bQ as buildFormChangeDisplayRows,
-  bR as buildStableFieldLocation,
+  c2 as buildDeviceBaseQuery,
+  aQ as buildDeviceFilterQuery,
+  c3 as buildFormChangeDisplayRows,
+  c4 as buildStableFieldLocation,
   calcFillData,
   calcUtils,
   clearFormRules,
   collectAnnotationItemsByLocation,
   collectFormChangeFieldLocations,
   commonUtils,
-  bS as deleteSubtableRow,
-  bT as detailsHaveFormChangeRowOps,
+  c5 as deleteSubtableRow,
+  c6 as detailsHaveFormChangeRowOps,
   enrichFormChangeRowDetails,
-  bU as extractFormChangeRowDetails,
+  c7 as extractFormChangeRowDetails,
   extractKeywordFromQueryData,
-  bV as fetchCheckDsDataForTable,
-  bW as fetchCustomCheckDsData,
+  c8 as fetchCheckDsDataForTable,
+  c9 as fetchCustomCheckDsData,
   fetchHistoryConsume,
-  bX as fetchMedProCheckDsData,
+  ca as fetchMedProCheckDsData,
   filterAnnotationItemsUpToCurrent,
   getAppInfo,
-  bY as getCheckTableSnapshotKey,
-  bZ as getFormChangeRowKey,
-  b_ as getFormChangeRowOp,
-  aK as getLotLockedReason,
-  b$ as getParseRuleConfig,
+  cb as getCheckTableSnapshotKey,
+  cc as getFormChangeRowKey,
+  cd as getFormChangeRowOp,
+  aP as getLotLockedReason,
+  g as getObjectBomMaterialLotQuery,
+  ce as getParseRuleConfig,
   getParseRuleInfo,
   getParseRuleValue,
-  c0 as getSubTableQuickFillInfo,
+  cf as getSubTableQuickFillInfo,
   getSuiteKey,
-  c1 as handleOldConfig,
-  c2 as hasAnyCheckTableSnapshot,
-  c3 as hasByTableCheckTableSnapshot,
-  c4 as hasSharedCheckTableSnapshot,
-  c5 as insertSubtableRows,
-  c6 as isAnnLocationSelected,
+  cg as handleOldConfig,
+  ch as hasAnyCheckTableSnapshot,
+  ci as hasByTableCheckTableSnapshot,
+  cj as hasSharedCheckTableSnapshot,
+  ck as insertSubtableRows,
+  cl as isAnnLocationSelected,
   isBomGranted,
   isEdhrSuite,
   isEqmSuite,
-  c7 as isFormChangeGhostRow,
-  c8 as isMedProSuite,
-  c9 as isRowAddedInCurrentFormChange,
-  ca as jsonSchemaUtils,
-  cb as judgeUnique,
-  cc as materialCheck,
-  cd as migrateDiagonalDirectionToVertex,
+  cm as isFormChangeGhostRow,
+  cn as isMedProSuite,
+  co as isRowAddedInCurrentFormChange,
+  cp as jsonSchemaUtils,
+  cq as judgeUnique,
+  aO as materialCheck,
+  cr as migrateDiagonalDirectionToVertex,
   nextFormChangeRowViewHistoryId,
-  aF as normalizeRefLoaderResult,
-  ce as parseFrontConfig,
-  cf as recordSubtableRowAdd,
-  cg as recordSubtableRowDelete,
-  aG as refUtils,
+  aG as normalizeRefLoaderResult,
+  cs as parseFrontConfig,
+  ct as recordSubtableRowAdd,
+  cu as recordSubtableRowDelete,
+  aI as refUtils,
   registerValidationContext,
-  ch as relocateDeletedRowsToEnd,
+  cv as relocateDeletedRowsToEnd,
   renderUtils,
   requestDisplayValidation,
   requestFullValidation,
-  ci as requestMedProCheckDsData,
-  cj as requestNonMedProCheckDsData,
-  ck as resolveAnnotationFieldLocation,
-  a6 as resolveDiagonalVertex,
-  cl as resolveFormChangeRowUi,
-  cm as resolveRowFormChangeMark,
-  ay as setSelectAnnotationId,
-  cn as setSelectMobileTdId,
-  ax as setSelectValidatorId,
+  cw as requestMedProCheckDsData,
+  cx as requestNonMedProCheckDsData,
+  cy as resolveAnnotationFieldLocation,
+  a7 as resolveDiagonalVertex,
+  cz as resolveFormChangeRowUi,
+  cA as resolveRowFormChangeMark,
+  az as setSelectAnnotationId,
+  cB as setSelectMobileTdId,
+  ay as setSelectValidatorId,
   settleAndValidateDisplay,
-  av as sqlUtils,
-  co as stockCheck,
+  aw as sqlUtils,
+  cC as stockCheck,
   transformUtils,
   unregisterValidationContext,
   H as useCalculateFormula,
-  aJ as useCurrentPageFormState,
-  aN as useDependency,
+  aN as useCurrentPageFormState,
+  aT as useDependency,
   useEbrWikiFactoryV2,
   u3 as useFormModel,
   u2 as useFormTmplConfig,
   useFormulaExpWatcher,
   useMaterialBalance,
-  useMaterialStocktake,
   useNocodeEmitter,
-  az as useNocodeFormWidget,
-  cp as useOnlineFormActionButton,
+  aA as useNocodeFormWidget,
+  cD as useOnlineFormActionButton,
   u as useOnlineFormTransformField2Component,
   useRenderPageFactory,
-  a as useStyles,
-  b as useValidator,
-  aw as useWidgetStaticAttrs,
-  validate
+  b as useStyles,
+  a as useTmplBom,
+  c as useValidator,
+  ax as useWidgetStaticAttrs,
+  validate,
+  v as validateObjectBomForScan,
+  validateObjectBomQtyOnSubmit
 };