@gct-paas/excel 0.1.32 → 0.1.33-beta.0

package/dist/{dynamic-table-action-C06Eolmw.js → dynamic-table-action-Cu1Le9hH.js}

@@ -1,10 +1,10 @@
 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-CeMxIrHD.js";
+import { C as ComponentTypeEnum, aQ as useWidgetStaticAttrs, Z as PlatformEnum, da as assembleRules, db as deleteFormRule, dc as setFormRule, c3 as requestDisplayValidation, dd as isReferenceOptionActive, de as validateAllFields, df as runValidation, dg as ensureFrontRowKey, dh as FRONT_ROW_KEY, cg as getRowId, b2 as getParseRuleInfo, bc as transformUtils, aZ as materialCheck, a_ as getLotLockedReason, a$ as validateReinspectionDate, bi as FormulaRuleFieldKeyEnum, aX as NCB_PROVIDE, F as FIELD_TYPE, di as buildError, z as api, l as SubTableType, b3 as getParseRuleValue, ca as uuid2, aI as DeviceLink, a4 as _export_sfc, cA as buildFormChangeDisplayRows, d6 as resolveRowFormChangeMark, d5 as resolveFormChangeRowUi, cT as isAnnLocationSelected, d7 as setSelectMobileTdId, cU as isFormChangeGhostRow, x as CellType, aS as setSelectAnnotationId, d0 as recordSubtableRowDelete, cC as deleteSubtableRow, d1 as relocateDeletedRowsToEnd, cS as insertSubtableRows, c$ as recordSubtableRowAdd, G as useModal, dj as q, dk as groupFixedTableRows, dl as QUICK_FILL_ALLOWED_FIELDS, dm as processQuickFillRows, dn as getIsGroupEmpty, bg as RenderModeEnum, cN as getSubTableQuickFillInfo } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-b00q9wdA.js";
 import { isNil, cloneDeep, merge, pickBy, mergeWith, omit, last, pick } from "lodash-es";
 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-BVp5fqUK.js";
+import { u as useFormModel } from "./mb-render-DriWft67.js";
 const InstanceStatusValues = {
   /** 作废状态 */
   ABANDON: "ABANDON",
@@ -365,13 +365,14 @@ class McRowValidateError extends Error {
   row;
 }
 class BomEntryValidator {
-  constructor(bomEntry, enableSequenceLoading, getMaterialNoNum, historyData, mainMaterialNo, noBomMode) {
+  constructor(bomEntry, enableSequenceLoading, getMaterialNoNum, historyData, mainMaterialNo, noBomMode, isCustomRequiredQty = false) {
     this.bomEntry = bomEntry;
     this.enableSequenceLoading = enableSequenceLoading;
     this.getMaterialNoNum = getMaterialNoNum;
     this.historyData = historyData;
     this.mainMaterialNo = mainMaterialNo;
     this.noBomMode = noBomMode;
+    this.isCustomRequiredQty = isCustomRequiredQty;
     this.productIds.push(this.bomEntry.product_id_);
     this.productCodes[this.bomEntry.product_id_] = this.bomEntry.product_code_;
     if (this.bomEntry.substitute_material_enabled_ && this.bomEntry.substitute_material_entries_) {
@@ -388,6 +389,7 @@ class BomEntryValidator {
   historyData;
   mainMaterialNo;
   noBomMode;
+  isCustomRequiredQty;
   /** 该明细使用到的产品的id集合 */
   productIds = [];
   /** 物料和code的映射 */
@@ -420,7 +422,7 @@ class BomEntryValidator {
    * @return {*}
    */
   filterGroupData(arr) {
-    return arr.filter((i) => this.productIds.includes(i.product_id_));
+    return arr.filter((i) => this.isRowInGroup(i) && i.product_id_);
   }
   /** 行是否属于本 BOM 组（优先 bom_entry_id_，避免跨组 product_id_ 误判） */
   isRowInGroup(row) {
@@ -603,8 +605,18 @@ class BomEntryValidator {
     if (!entry.qty_validation_enabled_ || entry.type_ === "view") {
       return;
     }
+    const groupData = this.filterGroupData(arr);
     const loaded = this.calcQtyConsumed(arr);
-    const required = this.remainingNum;
+    let required = this.remainingNum;
+    if (this.isCustomRequiredQty) {
+      const currentQty = groupData[0]?.qty_required_;
+      if (typeof currentQty !== "number" || !Number.isFinite(currentQty) || currentQty <= 0) {
+        throw new Error(
+          groupNo != null && groupNo > 0 ? `序号${groupNo}，需求数量必须大于 0` : "需求数量必须大于 0"
+        );
+      }
+      required = currentQty - this.hasConsumed;
+    }
     const diff = loaded - required;
     const rule = entry.qty_validation_rule_;
     const fail = (msg) => {
@@ -626,9 +638,9 @@ class BomEntryValidator {
         if (diff > 0) fail($t("sys.qtyValidationRule.lte"));
         break;
       case "bounds": {
-        const groupData = this.filterGroupData(arr);
+        const groupData2 = this.filterGroupData(arr);
         const consumeSum = this.calcQtyForBounds(arr) + this.calcQtyForBounds(this.historyData);
-        const { min, max } = await this.calcCustomNumberLimit(groupData[0]);
+        const { min, max } = await this.calcCustomNumberLimit(groupData2[0]);
         if (min !== void 0 && consumeSum < min || max !== void 0 && consumeSum > max) {
           fail($t("sys.qtyValidationRule.bounds", { min, max }));
         }
@@ -638,13 +650,14 @@ class BomEntryValidator {
   }
 }
 class BomEntriesValidator {
-  constructor(entries, enableSequenceLoading, getMaterialNoNum, historyData, mainMaterialNo, noBomMode) {
+  constructor(entries, enableSequenceLoading, getMaterialNoNum, historyData, mainMaterialNo, noBomMode, isCustomRequiredQty = false) {
     this.entries = entries;
     this.enableSequenceLoading = enableSequenceLoading;
     this.getMaterialNoNum = getMaterialNoNum;
     this.historyData = historyData;
     this.mainMaterialNo = mainMaterialNo;
     this.noBomMode = noBomMode;
+    this.isCustomRequiredQty = isCustomRequiredQty;
     this.bomEntryValidators = entries.map(
       (i) => new BomEntryValidator(
         i,
@@ -652,7 +665,8 @@ class BomEntriesValidator {
         getMaterialNoNum,
         historyData,
         mainMaterialNo,
-        noBomMode
+        noBomMode,
+        isCustomRequiredQty
       )
     );
   }
@@ -662,6 +676,7 @@ class BomEntriesValidator {
   historyData;
   mainMaterialNo;
   noBomMode;
+  isCustomRequiredQty;
   bomEntryValidators;
   /**
    * 翻译物料的code
@@ -719,11 +734,14 @@ class BomEntriesValidator {
    * 行 → BOM 明细在 bomEntryValidators 中的下标，找不到返回 -1
    */
   resolveEntryIndex(row) {
+    if (row.bom_entry_id_) {
+      return this.bomEntryValidators.findIndex((v) => v.bomEntry.id_ === row.bom_entry_id_);
+    }
     if (row.product_id_) {
       const i = this.bomEntryValidators.findIndex((v) => v.productIds.includes(row.product_id_));
       if (i >= 0) return i;
     }
-    return row.bom_entry_id_ ? this.bomEntryValidators.findIndex((v) => v.bomEntry.id_ === row.bom_entry_id_) : -1;
+    return -1;
   }
   /**
    * 行所属组在序号列中的 groupOrderIndex（0-based；-1 未绑 BOM 组）
@@ -1119,6 +1137,7 @@ var ScanParamType = /* @__PURE__ */ ((ScanParamType2) => {
 var RequiredQtyCalcRule = /* @__PURE__ */ ((RequiredQtyCalcRule2) => {
   RequiredQtyCalcRule2["LotQty"] = "lotQty";
   RequiredQtyCalcRule2["ProductQty"] = "productQty";
+  RequiredQtyCalcRule2["Custom"] = "custom";
   return RequiredQtyCalcRule2;
 })(RequiredQtyCalcRule || {});
 async function applyScanFillPlan(arr, scanRow, plan, options) {
@@ -1489,7 +1508,8 @@ class MaterialConsumeTableController {
       () => this.materialNoNum,
       this.tmplBomController.historyData,
       this.tmplBomController.materialNo,
-      this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_
+      this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_,
+      this.tmplBom.required_qty_calc_rule_ === RequiredQtyCalcRule.Custom
     );
   }
   tmplBomController;
@@ -1528,6 +1548,9 @@ class MaterialConsumeTableController {
   /** 批次数量或生产数量 */
   get materialNoNum() {
     const { required_qty_calc_rule_, product_qty_field_ } = this.tmplBom;
+    if (required_qty_calc_rule_ === RequiredQtyCalcRule.Custom) {
+      return void 0;
+    }
     if (required_qty_calc_rule_ === RequiredQtyCalcRule.ProductQty) {
       return product_qty_field_ ? this.mainFormState.value[product_qty_field_] : 0;
     }
@@ -1575,6 +1598,35 @@ class MaterialConsumeTableController {
     const deletedArr = this.tableDataRef.value.filter((i) => i.deleted_);
     this.tableDataRef.value = [...value, ...deletedArr];
   }
+  get isCustomRequiredQty() {
+    return this.tmplBom.required_qty_calc_rule_ === RequiredQtyCalcRule.Custom;
+  }
+  getBomGroupForRow(row) {
+    const validators = this.bomEntriesValidator.bomEntryValidators;
+    if (row.bom_entry_id_) {
+      return validators.find((util) => util.bomEntry.id_ === row.bom_entry_id_);
+    }
+    return row.product_id_ ? this.bomEntriesValidator.findUtilByProductId(row.product_id_) : void 0;
+  }
+  /** 自定义规则的需求数量在同一 BOM 组内保持一致。 */
+  getCustomGroupRequiredQty(row) {
+    const util = this.getBomGroupForRow(row);
+    if (!util) return row.qty_required_;
+    return this.actualTableData.find(
+      (item) => util.isRowInGroup(item) && item.qty_required_ != null
+    )?.qty_required_;
+  }
+  setCustomGroupRequiredQty(row, qty) {
+    if (!this.isCustomRequiredQty) return;
+    const util = this.getBomGroupForRow(row);
+    if (!util) {
+      row.qty_required_ = qty;
+      return;
+    }
+    this.actualTableData.forEach((item) => {
+      if (util.isRowInGroup(item)) item.qty_required_ = qty;
+    });
+  }
   /** 错误信息 */
   error(message2) {
     MaterialConsumeTableController.render.message({
@@ -1630,10 +1682,11 @@ class MaterialConsumeTableController {
    */
   calcFormState() {
     if (this.tmplBom.bom_init_enabled_) {
+      const materialNoNum = this.materialNoNum;
       return this.actualBomEntries.map((i) => {
         return {
           product_id_: i.product_id_,
-          qty_required_: i.qty_required_ * this.materialNoNum,
+          ...materialNoNum === void 0 ? {} : { qty_required_: i.qty_required_ * materialNoNum },
           bom_entry_id_: i.id_
         };
       });
@@ -1673,7 +1726,7 @@ class MaterialConsumeTableController {
       "sort_num_",
       "qty_consumed_total_"
     ];
-    const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD && !this.tmplBom.personal_bom_enabled_;
+    const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD && (!this.tmplBom.personal_bom_enabled_ || this.tmplBom.required_qty_calc_rule_ === RequiredQtyCalcRule.Custom);
     if (!isRecordPattern) {
       disabledKeys.push("qty_required_");
     }
@@ -1813,9 +1866,19 @@ class MaterialConsumeTableController {
     this.setDefaultValue(row);
     try {
       const plan = await this.bomEntriesValidator.validateScanCanInsert(row, this.actualTableData);
-      this.tableDataRef.value = await applyScanFillPlan(this.actualTableData, row, plan, {
+      const existingRequiredQty = this.isCustomRequiredQty && plan ? this.actualTableData.find(
+        (item) => plan.target.isRowInGroup(item) && item.qty_required_ != null
+      )?.qty_required_ : void 0;
+      const nextTable = await applyScanFillPlan(this.actualTableData, row, plan, {
         validateCurrentGroupForSwitch: (table, current) => this.bomEntriesValidator.validateCurrentGroupForSwitch(table, current)
       });
+      if (this.isCustomRequiredQty && plan) {
+        const requiredQty = existingRequiredQty ?? row.qty_required_;
+        nextTable.forEach((item) => {
+          if (plan.target.isRowInGroup(item)) item.qty_required_ = requiredQty;
+        });
+      }
+      this.tableDataRef.value = nextTable;
       this.updateDerivedQtyFields();
     } catch (e) {
       console.error(e);
@@ -1904,6 +1967,7 @@ class MaterialConsumeTableController {
    * 按当前 materialNoNum 回写各行 qty_required_（校验侧 total 已通过 getter 实时读取）
    */
   syncQtyRequiredFromBom() {
+    if (this.tmplBom.required_qty_calc_rule_ === RequiredQtyCalcRule.Custom) return;
     this.actualTableData.forEach((row) => {
       if (!row.product_id_) return;
       const util = this.bomEntriesValidator.findUtilByProductId(row.product_id_);
@@ -2175,7 +2239,9 @@ class MaterialConsumeTableController {
     if (row.product_id_) {
       const util = this.bomEntriesValidator.findUtilByProductId(row.product_id_);
       if (util) {
-        row.qty_required_ = util.total;
+        if (this.tmplBom.required_qty_calc_rule_ !== RequiredQtyCalcRule.Custom) {
+          row.qty_required_ = util.total;
+        }
         row.qty_consumed_ = util.hasConsumed;
         row.bom_entry_id_ = util.bomEntry.id_;
       }
@@ -2188,7 +2254,10 @@ class MaterialConsumeTableController {
   async handleChange(opts) {
     const { field, row, value, option } = opts;
     console.log("handleChange", opts);
-    if (field === "product_id_") {
+    if (field === "qty_required_" && this.isCustomRequiredQty) {
+      const qty = value == null || value === "" ? void 0 : Number(value);
+      this.setCustomGroupRequiredQty(row, qty);
+    } else if (field === "product_id_") {
       if (row._scanFallback) {
         try {
           await validateReinspectionDate({
@@ -2202,6 +2271,8 @@ class MaterialConsumeTableController {
         }
         return;
       }
+      const oldGroupId = row.bom_entry_id_;
+      const oldRequiredQty = this.isCustomRequiredQty && oldGroupId ? this.getCustomGroupRequiredQty(row) : void 0;
       row.material_no_ = void 0;
       row.material_no__id_ = void 0;
       row.material_no__lb_ = void 0;
@@ -2210,6 +2281,10 @@ class MaterialConsumeTableController {
       row.expiration_date_ = void 0;
       this.setDefaultValue(row);
       this.updateDerivedQtyFields();
+      if (this.isCustomRequiredQty) {
+        const qty = oldGroupId && row.bom_entry_id_ === oldGroupId ? oldRequiredQty : this.getCustomGroupRequiredQty(row);
+        this.setCustomGroupRequiredQty(row, qty);
+      }
     } else if (field === "material_no_") {
       if (option?.is_locked_) {
         row.material_no_ = void 0;
@@ -2233,9 +2308,16 @@ class MaterialConsumeTableController {
         this.error(e.message);
         return;
       }
+      const oldGroupId = row.bom_entry_id_;
+      const oldRequiredQty = this.isCustomRequiredQty && oldGroupId ? this.getCustomGroupRequiredQty(row) : void 0;
       row.product_id_ = option.product_id_;
       row.expiration_date_ = option.validate_;
+      if (this.isCustomRequiredQty) row.qty_required_ = void 0;
       this.setDefaultValue(row);
+      if (this.isCustomRequiredQty) {
+        const qty = oldGroupId && row.bom_entry_id_ === oldGroupId ? oldRequiredQty : this.getCustomGroupRequiredQty(row);
+        this.setCustomGroupRequiredQty(row, qty);
+      }
     } else if (field === "qty_") {
       this.updateDerivedQtyFields();
     }
@@ -4673,6 +4755,7 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       Object.assign(rowData, defaultRow, preserved);
       tableController.setDefaultValue(rowData);
       rowData.bom_entry_id_ = void 0;
+      if (tableController.isCustomRequiredQty) rowData.qty_required_ = void 0;
       rowData.qty_consumed_total_ = void 0;
       clearMcValidatorComments();
       tableController.updateDerivedQtyFields();
@@ -4694,8 +4777,11 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
       rowNum = 1,
       quickFillDatas
     }) => {
+      const bomEntryId = rowData.bom_entry_id_ ?? (rowData.product_id_ ? tableController.bomEntriesValidator.findUtilByProductId(rowData.product_id_)?.bomEntry.id_ : void 0);
+      const requiredQty = tableController.isCustomRequiredQty && bomEntryId ? tableController.getCustomGroupRequiredQty(rowData) : void 0;
       insertRowsAt(resolveRealIndex(index) + 1, createDefaultRows(rowNum, quickFillDatas, (r) => {
-        if (rowData.bom_entry_id_) r.bom_entry_id_ = rowData.bom_entry_id_;
+        if (bomEntryId) r.bom_entry_id_ = bomEntryId;
+        if (tableController.isCustomRequiredQty && bomEntryId) r.qty_required_ = requiredQty;
       }));
     };
     const handleAddGroup = async ({
@@ -4732,7 +4818,11 @@ const MaterialConsumeTable = /* @__PURE__ */ defineComponent({
         });
       }
       if (groupLast < 0) groupLast = resolveRealIndex(index);
-      insertRowsAt(groupLast + 1, createDefaultRows(1, quickFillDatas));
+      insertRowsAt(groupLast + 1, createDefaultRows(1, quickFillDatas, (row) => {
+        if (tableController.isCustomRequiredQty && quickFillDatas?.[0]?.qty_required_ == null) {
+          row.qty_required_ = void 0;
+        }
+      }));
     };
     const handleAction = (action, rowData) => {
       switch (action) {