@gct-paas/excel 0.1.39-beta.47 → 0.1.39-beta.48

package/dist/{BaseComponent-B4z-0IvX.js → BaseComponent-CkMnlfWd.js}

@@ -1,4 +1,4 @@
-import { h as normalizeFieldWidth } from "./dynamic-table-action-ZAmTIvcp.js";
+import { h as normalizeFieldWidth } from "./dynamic-table-action-BP2qzgdK.js";
 import { get, pick } from "lodash-es";
 import { F as FIELD_TYPE } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
 import { f as fontStyleAttrs } from "./config.enum-B8UZQTON.js";

package/dist/{barcode-design-CkIF3AdC.js → barcode-design-BNIpxEzc.js}

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, watch, openBlock, createElementBlock, normalizeStyle, normalizeClass, createElementVNode, toDisplayString, createCommentVNode } from "vue";
 import { pick } from "lodash-es";
-import { u as useSpreadSheet, h as useModelFields, l as loadBwip } from "./index-DHtjlchw.js";
+import { u as useSpreadSheet, h as useModelFields, l as loadBwip } from "./index-CbuzkPgj.js";
 import { Q as PaperWidgeValueType, a7 as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
 import "dayjs";
 import "ant-design-vue";

package/dist/base/index.es.js

@@ -1,12 +1,12 @@
 import { E as api, _ as PlatformEnum, F as FIELD_TYPE, bc as getRowId, bd as findRuntimeTableRow, b5 as RenderModeEnum, C as ComponentTypeEnum, aF as Dependency_ENUM, aE as ASSIGNMENTSTRATEGY_ENUM, bn as fetchHistoryConsume, bo as isBomGranted, aT as renderUtils, bm as uuid2, bp as parseFrontConfig, aI as CheckDsTypeEnum, aC as transformUtils, bq as baseDataUtils, X as FormTypeEnum, br as normalizeToArray, bs as safeParseArray, bt as BpmnNodeTypeEnum, bu as mergeByMultiKey, a7 as _export_sfc, bv as evaluateInspectionDecisionRule, bw as useNocodeEmitter, bx as commonUtils, aG as EntityModelCategoryEnum } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
 import { aL, aN, a_, a0, by, bz, B, bA, y, af, bB, bC, bD, bb, bE, aQ, av, aM, aJ, aK, bF, ag, ak, bG, bH, aD, a2, ae, aw, aO, $, ai, L, bI, bJ, bK, O, p, P, a9, o, Q, A, bL, bM, au, at, a5, a1, a3, a4, a6, f, bN, aj, an, ah, bO, bP, bQ, bR, ba, bS, bT, bU, bV, bW, bX, bY, bZ, b_, b$, be, c0, c1, aW, c2, a$, b0, c3, c4, c5, c6, c7, c8, c9, ca, cb, cc, aV, cd, b1, b8, ce, cf, al, t, aP, cg, ch, bf, aX } from "../dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
-import { a2 as getRuntimeDataFieldId, O as parseRuntimeFieldPath, a3 as buildRuntimeFieldPath, a4 as resolveRuntimeFieldProps, a5 as resolveRuntimeFieldState, a6 as assembleRules, a7 as isAttachFieldActive, P as calculateFormula, a8 as getRuntimeDependencyOutputKey, a9 as isRowAddedInCurrentFormChange, c as getParseFormulaVarInfos, w as MaterialConsumptionPatternEnum, aa as MaterialConsumeTableController, ab as setFormulaParamsConfig, ac as normalizeRuntime, V as createRuntimeInstanceContext, ad as initializeSealFields, U as RuntimeFormStateStore, ae as RuntimeSheetService, g as getBusinessFieldKey, af as validateObjectBomQtyOnSubmit, ag as areValidationCommentsEqual, ah as closeValidatorPopovers, ai as enrichFormChangeRowDetails, N as NCB_PROVIDE, W as RuntimeInstanceRegistry, aj as useMaterialBalance, ak as collectFormChangeFieldLocations, al as nextFormChangeRowViewHistoryId } from "../dynamic-table-action-ZAmTIvcp.js";
-import { B as B2, am, k, a1 as a12, an as an2, $ as $2, ao, a0 as a02, F, ap, aq, ar, as, at as at2, M, a, au as au2, b, av as av2, aw as aw2, ax, ay, az, aA, aB, aC, C, aD as aD2, t as t2, aE, d, aF, aG, aH, aI, r, E, aJ as aJ2, aK as aK2, aL as aL2, aM as aM2, l, G, j, aN as aN2, aO as aO2, aP as aP2, aQ as aQ2, aR, aS, aT, y as y2, v, aU, z, p as p2, aV as aV2, s, aW as aW2, R, S, u, A as A2, T, o as o2, q, Q as Q2, m, x } from "../dynamic-table-action-ZAmTIvcp.js";
+import { a2 as getRuntimeDataFieldId, O as parseRuntimeFieldPath, a3 as buildRuntimeFieldPath, a4 as resolveRuntimeFieldProps, a5 as resolveRuntimeFieldState, a6 as assembleRules, a7 as isAttachFieldActive, P as calculateFormula, a8 as getRuntimeDependencyOutputKey, a9 as isRowAddedInCurrentFormChange, c as getParseFormulaVarInfos, w as MaterialConsumptionPatternEnum, aa as MaterialConsumeTableController, ab as setFormulaParamsConfig, ac as normalizeRuntime, V as createRuntimeInstanceContext, ad as initializeSealFields, U as RuntimeFormStateStore, ae as RuntimeSheetService, g as getBusinessFieldKey, af as validateObjectBomQtyOnSubmit, ag as areValidationCommentsEqual, ah as closeValidatorPopovers, ai as enrichFormChangeRowDetails, N as NCB_PROVIDE, W as RuntimeInstanceRegistry, aj as useMaterialBalance, ak as collectFormChangeFieldLocations, al as nextFormChangeRowViewHistoryId } from "../dynamic-table-action-BP2qzgdK.js";
+import { B as B2, am, k, a1 as a12, an as an2, $ as $2, ao, a0 as a02, F, ap, aq, ar, as, at as at2, M, a, au as au2, b, av as av2, aw as aw2, ax, ay, az, aA, aB, aC, C, aD as aD2, t as t2, aE, d, aF, aG, aH, aI, r, E, aJ as aJ2, aK as aK2, aL as aL2, aM as aM2, l, G, j, aN as aN2, aO as aO2, aP as aP2, aQ as aQ2, aR, aS, aT, y as y2, v, aU, z, p as p2, aV as aV2, s, aW as aW2, R, S, u, A as A2, T, o as o2, q, Q as Q2, m, x } from "../dynamic-table-action-BP2qzgdK.js";
 import { toRaw, watch, toRef, computed, defineComponent, openBlock, createElementBlock, createElementVNode, toDisplayString, ref, provide, onUnmounted, markRaw, reactive, onBeforeUnmount } from "vue";
 import { cloneDeep, defaults, isEmpty, merge } from "lodash-es";
 import "dayjs";
-import { S as SubTableCoreFactory, R as RuntimeInstanceController } from "../sub-table-factory-9_e9NXAk.js";
-import { A as A3, D, M as M2, a as a7, P as P2, b as b2, c, d as d2, e, W, f as f2, g, h } from "../sub-table-factory-9_e9NXAk.js";
+import { S as SubTableCoreFactory, R as RuntimeInstanceController } from "../sub-table-factory-yVCjr6FI.js";
+import { A as A3, D, M as M2, a as a7, P as P2, b as b2, c, d as d2, e, W, f as f2, g, h } from "../sub-table-factory-yVCjr6FI.js";
 import { B as B3, F as F2, M as M3, a as a8, u as u2 } from "../mb-render-C7bYBZNr.js";
 const InstanceStatusValues = {
   /** 作废状态 */

package/dist/{diagonal-design-CBGnh101.js → diagonal-design-6V7cgcn8.js}

@@ -1,5 +1,5 @@
 import { defineComponent, computed, openBlock, createBlock } from "vue";
-import { h as useModelFields, D as Diagonal } from "./index-DHtjlchw.js";
+import { h as useModelFields, D as Diagonal } from "./index-CbuzkPgj.js";
 import { al as resolveDiagonalVertex, a7 as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
 import "lodash-es";
 import "dayjs";

package/dist/{dynamic-table-action-ZAmTIvcp.js → dynamic-table-action-BP2qzgdK.js}

@@ -6030,6 +6030,7 @@ class MaterialConsumeTableController {
       return this.actualBomEntries.map((i) => {
         return {
           product_id_: i.product_id_,
+          qty_required_uom_id_: i.uom_id_ || void 0,
           ...materialNoNum === void 0 ? {} : { qty_required_: Number(i.qty_required_) * Number(materialNoNum) },
           bom_entry_id_: i.id_
         };
@@ -6214,6 +6215,9 @@ class MaterialConsumeTableController {
     this.setDefaultValue(row);
     try {
       const plan = await this.bomEntriesValidator.validateScanCanInsert(row, this.actualTableData);
+      if (plan) {
+        row.qty_required_uom_id_ = plan.target.bomEntry.uom_id_ || void 0;
+      }
       const existingRequiredQty = this.isCustomRequiredQty && plan ? this.actualTableData.find(
         (item) => plan.target.isRowInGroup(item) && item.qty_required_ != null
       )?.qty_required_ : void 0;
@@ -6587,11 +6591,22 @@ class MaterialConsumeTableController {
     this.updateRowConsumed();
     this.updateGroupQtyConsumedTotal();
   }
+  /** 同步 BOM 主物料的需求数量单位，未关联 BOM 的行保留原单位。 */
+  syncRequiredUomFromBom(row) {
+    const validator = this.bomEntriesValidator;
+    const productId = row.product_id_;
+    const bound = row.bom_entry_id_ ? validator.bomEntryValidators.find((item) => item.bomEntry.id_ === row.bom_entry_id_) : void 0;
+    const matched = productId ? bound?.productIds.includes(productId) ? bound : validator.findUtilByProductId(productId) : void 0;
+    if (matched || bound) {
+      row.qty_required_uom_id_ = matched?.bomEntry.uom_id_ || void 0;
+    }
+  }
   /**
-   * 设置默认值，如工序，需求数量/已消耗数量
+   * 设置默认值，如工序，需求数量/需求数量单位/已消耗数量
    * @param row
    */
   setDefaultValue(row) {
+    this.syncRequiredUomFromBom(row);
     if (!row.routing_operation_id_) {
       row.routing_operation_id_ = this.tmplBomController.operationId;
     }

package/dist/excel.css

@@ -3332,7 +3332,7 @@ img[data-v-57e657ee] {
 .data-group__index--row[data-v-d28554d6] {
   left: 6px;
 }
-.num-input[data-v-10739a10] {
+.num-input[data-v-e327dc6f] {
   margin-left: 25px;
   width: 50px !important;
 }
@@ -4184,7 +4184,7 @@ img[data-v-57e657ee] {
 .gct-sheet-status__label[data-v-1db7a3a4] {
   font-weight: bold;
   margin-right: 8px;
-}.ant-spin-spinning[data-v-467f6f1b] {
+}.ant-spin-spinning[data-v-39141cf4] {
   height: 100%;
   width: 100%;
   position: absolute;

package/dist/{exceljs.min-BdYR3omv.js → exceljs.min-U1z8AVud.js}

@@ -1,5 +1,5 @@
 import { M as commonjsGlobal, N as getDefaultExportFromCjs } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
-import { c as commonjsRequire } from "./index-DHtjlchw.js";
+import { c as commonjsRequire } from "./index-CbuzkPgj.js";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/{font-editor-C40nR0g-.js → font-editor-CSzJYS59.js}

@@ -1,7 +1,7 @@
 import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, unref, normalizeClass, withCtx, normalizeStyle } from "vue";
 import { A as AlignEditor } from "./align-editor-CRjMBiv1.js";
 import { pick } from "lodash-es";
-import { z as _sfc_main$1, C as ColorPicker } from "./index-DHtjlchw.js";
+import { z as _sfc_main$1, C as ColorPicker } from "./index-CbuzkPgj.js";
 import { a7 as _export_sfc } from "./dynamic-table-action.vue_vue_type_style_index_0_scoped_53d7e66c_lang-DTkBFPUl.js";
 const _hoisted_1 = { class: "ks-row-middle mb-6px" };
 const _sfc_main = /* @__PURE__ */ defineComponent({

package/dist/{index-BhwTs4qO.js → index-B3YLauBl.js}

@@ -3,7 +3,7 @@ import { C as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_styl
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-B4z-0IvX.js";
+import { B as BaseComponent } from "./BaseComponent-CkMnlfWd.js";
 class Department extends BaseComponent {
   component = ComponentTypeEnum.Department;
   wrapperCmpConfig({ data }) {

package/dist/{index-9bqJP9tH.js → index-BB53z_-a.js}

@@ -3,7 +3,7 @@ import "vue";
 import { pick, has, isEmpty, cloneDeep, get } from "lodash-es";
 import "dayjs";
 import "ant-design-vue";
-import { A as AsyncGctOnlineComponents } from "./index-DHtjlchw.js";
+import { A as AsyncGctOnlineComponents } from "./index-CbuzkPgj.js";
 class Tr {
   component = "tr";
   wrapperCmpConfig({ data, parent }) {

package/dist/{index-DxBNlXoA.js → index-BJJhezsz.js}

@@ -3,7 +3,7 @@ import { C as ComponentTypeEnum, av as DecimalDisplayMode, au as RangeCompareOp,
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-B4z-0IvX.js";
+import { B as BaseComponent } from "./BaseComponent-CkMnlfWd.js";
 class InputDouble extends BaseComponent {
   component = ComponentTypeEnum.InputDouble;
   wrapperCmpConfig({ data }) {

package/dist/{index-CJNVJa0j.js → index-BcC37bc7.js}

@@ -3,7 +3,7 @@ import { C as ComponentTypeEnum, F as FIELD_TYPE, au as RangeCompareOp, at as Ra
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-B4z-0IvX.js";
+import { B as BaseComponent } from "./BaseComponent-CkMnlfWd.js";
 class DateTimepicker extends BaseComponent {
   component = ComponentTypeEnum.DateTimepicker;
   wrapperCmpConfig({ data }) {

package/dist/{index-CSl64wAM.js → index-Bv0fTe8J.js}

@@ -3,8 +3,8 @@ import "vue";
 import "lodash-es";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-B4z-0IvX.js";
-import { g as getTraceLikeSelectProps } from "./trace-like-wrapper-BUq72oS3.js";
+import { B as BaseComponent } from "./BaseComponent-CkMnlfWd.js";
+import { g as getTraceLikeSelectProps } from "./trace-like-wrapper-Buykmr-D.js";
 class RdoSelect extends BaseComponent {
   component = ComponentTypeEnum.RdoSelect;
   wrapperCmpConfig({ data }) {

package/dist/{index-YqLRgg7Y.js → index-CNRHbj9w.js}

@@ -3,7 +3,7 @@ import { C as ComponentTypeEnum } from "./dynamic-table-action.vue_vue_type_styl
 import "vue";
 import "dayjs";
 import "ant-design-vue";
-import { B as BaseComponent } from "./BaseComponent-B4z-0IvX.js";
+import { B as BaseComponent } from "./BaseComponent-CkMnlfWd.js";
 class UploadFile extends BaseComponent {
   component = ComponentTypeEnum.UploadFile;
   wrapperCmpConfig({ data }) {

package/dist/{index-CwFhzKly.js → index-CUGjf_Fd.js}

@@ -4,7 +4,7 @@ import "vue";
 import { pick } from "lodash-es";
 import "dayjs";
 import "ant-design-vue";
-import { n as normalizeSpacerWidth, g as getFieldWidget } from "./index-DHtjlchw.js";
+import { n as normalizeSpacerWidth, g as getFieldWidget } from "./index-CbuzkPgj.js";
 class CombineFields {
   component = ComponentTypeEnum.CombineFields;
   wrapperCmpConfig({ data }) {