@gct-paas/word 0.1.63-beta.9 → 0.1.64

package/dist/index.es.js

@@ -108232,7 +108232,6 @@ class BomEntryValidator {
       if (idSet.size > 1) {
         throw new Error(
           "整批替代不允许混用主料或者替代料"
-          /*$t('sys.edhr.mcTable.notAllowMixSubstituteMaterial')*/
         );
       }
     }
@@ -108279,7 +108278,6 @@ class BomEntryValidator {
     if (["eq", "lte"].includes(this.bomEntry.qty_validation_rule_) && consumeNum > this.remainingNum) {
       throw new Error(
         "当前物料上料总消耗不能大于需求数量"
-        /*$t('sys.edhr.mcTable.overMaterialConsumeError')*/
       );
     }
     if (this.bomEntry.qty_validation_rule_ === "bounds") {
@@ -109016,7 +109014,7 @@ class MaterialConsumeTableController {
     if (data.expiration) {
       row.expiration_date_ = toDateOnly(data.expiration);
     }
-    this.setDefaultValue(row);
+    this.setDefaultValue(row, option.doc);
     try {
       const newArr = this.bomEntriesValidator.mergeRowInArr(row, this.actualTableData);
       await this.bomEntriesValidator.validateScanCanInsert(newArr);
@@ -109258,7 +109256,7 @@ class MaterialConsumeTableController {
    * 设置默认值，如工序，需求数量/已消耗数量
    * @param row
    */
-  setDefaultValue(row) {
+  setDefaultValue(row, doc) {
     if (!row.routing_operation_id_) {
       row.routing_operation_id_ = this.tmplBomController.operationId;
     }
@@ -109270,6 +109268,7 @@ class MaterialConsumeTableController {
         row.bom_entry_id_ = util.bomEntry.id_;
       }
     }
+    this.updateRowConsumed(doc);
   }
   getDefaultValue(row) {
     const value = {};
@@ -109489,53 +109488,57 @@ const syncMaterialConsumeTableBomInfo = async (templateId, docModel) => {
 };
 const initMaterialConsumeTableConfig = (doc, subConfig, tmplBomC) => {
   if (!tmplBomC?.formInstBom?.formTmplBomList) return;
-  const useBomMode = tmplBomC.defaultMCPattern === MaterialConsumptionPatternEnum.BOM;
-  tmplBomC.formInstBom.formTmplBomList.forEach(({
-    personal_bom_enabled_,
-    entries_,
-    table_key_
-  }) => {
-    if (useBomMode) {
-      const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
-      const includedIds = [];
-      (entries || []).forEach((e) => {
-        includedIds.push(e.product_id_.split(":").pop());
-        (e.substitute_material_entries_ || []).forEach((_e) => {
-          includedIds.push(_e.product_id_.split(":").pop());
-        });
-      });
-      subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
-    }
-    const subFieldKey = table_key_.replace("$.", "");
-    const rows = doc.dataManager.getRawData()[subFieldKey] || [];
-    const rowCount = rows.length;
-    repeat(rowCount || 1, (index2) => {
-      MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
-    });
-    rows.forEach((row, rowIndex) => {
-      const rowPath = `${table_key_}[${rowIndex}]`;
+  tmplBomC.formInstBom.formTmplBomList.forEach(
+    ({ personal_bom_enabled_, entries_, table_key_ }) => {
       const tableController = tmplBomC?.findTableControllerByField(table_key_);
-      if (row.product_id_) {
-        const versionId = row.product_id_.split(":").pop();
-        if (versionId) {
-          subConfig[`${rowPath}.material_no_`] = {
-            "product_id_.versionIn": [versionId]
-          };
-        }
+      const useBomMode = tableController?.mcPattern === MaterialConsumptionPatternEnum.BOM;
+      if (useBomMode) {
+        const entries = personal_bom_enabled_ ? entries_ : tmplBomC.bomEntries;
+        const includedIds = [];
+        (entries || []).forEach((e) => {
+          includedIds.push(e.product_id_.split(":").pop());
+          (e.substitute_material_entries_ || []).forEach((_e) => {
+            includedIds.push(_e.product_id_.split(":").pop());
+          });
+        });
+        subConfig[`${table_key_}[n].product_id_`] = { "id_.in": includedIds };
       }
-      MCDataUtil.updateViewFieldsDisablement({
-        dataManager: doc.dataManager,
-        rowPath,
-        disabled: !!tableController?.getMaterialTypeIsView(row.product_id_)
+      const subFieldKey = table_key_.replace("$.", "");
+      const rows = doc.dataManager.getRawData()[subFieldKey] || [];
+      const rowCount = rows.length;
+      repeat(rowCount || 1, (index2) => {
+        MCDataUtil.disableQtyFields(doc.dataManager, `${table_key_}[${index2}]`);
       });
-      if (row.is_confirmed_) {
-        MCDataUtil.updateConfirmableFieldsDisablement({
+      rows.forEach((row, rowIndex) => {
+        const rowPath = `${table_key_}[${rowIndex}]`;
+        if (row.product_id_) {
+          const versionId = row.product_id_.split(":").pop();
+          if (versionId) {
+            subConfig[`${rowPath}.material_no_`] = {
+              "product_id_.versionIn": [versionId]
+            };
+          }
+        }
+        MCDataUtil.updateViewFieldsDisablement({
           dataManager: doc.dataManager,
           rowPath,
-          disabled: true
+          disabled: !!tableController?.getMaterialTypeIsView(row.product_id_)
         });
-      }
-    });
+        if (row.is_confirmed_) {
+          MCDataUtil.updateConfirmableFieldsDisablement({
+            dataManager: doc.dataManager,
+            rowPath,
+            disabled: true
+          });
+        }
+      });
+    }
+  );
+};
+const handleAllMCTablesMounted = (doc, tmplBomC) => {
+  tmplBomC.formInstBom?.formTmplBomList?.forEach(({ table_key_ }) => {
+    const tableController = tmplBomC.findTableControllerByField(table_key_);
+    tableController?.updateRowConsumed(doc);
   });
 };
 class DocRequestStrategy {
@@ -110829,10 +110832,14 @@ function useDocumentFactory(props, payload) {
         try {
           const response = await runFetchDocument(newRequestId);
           if (!response) return;
-          if (response.tmplBomC) {
-            tmplBomCRef.value = response.tmplBomC;
-          }
           await mountDocument(response);
+          const { tmplBomC } = response;
+          if (tmplBomC) {
+            tmplBomCRef.value = tmplBomC;
+            if (docIns.value) {
+              handleAllMCTablesMounted(docIns.value, tmplBomC);
+            }
+          }
         } catch (err) {
           console.error(err);
         }
@@ -129165,7 +129172,7 @@ const _sfc_main$1G = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1G, [["__scopeId", "data-v-0b5a3b4b"]]);
+const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1G, [["__scopeId", "data-v-0e3048f6"]]);
 const schema$a = createTablePanelSchema("material-consume-table.basic", MaterialConsumeTablePanel);
 const schema$9 = createTablePanelSchema("fixed-table.basic", BoundedSubTablePanel);
 const _sfc_main$1F = /* @__PURE__ */ defineComponent({

package/dist/runtime/canvas/table/render/material-consume/material-consume-table-controller.d.ts

@@ -237,7 +237,7 @@ export declare class MaterialConsumeTableController {
      * 设置默认值，如工序，需求数量/已消耗数量
      * @param row
      */
-    setDefaultValue(row: IMaterialConsumeData): void;
+    setDefaultValue(row: IMaterialConsumeData, doc: Doc): void;
     getDefaultValue(row: IMaterialConsumeData): any;
     /**
      * 处理[物料消耗表]下拉字段变更

package/dist/runtime/canvas/table/render/material-consume/material-consume.util.d.ts

@@ -2,10 +2,15 @@ import { Doc } from '../../../../../core';
 import { DocModel } from '../../../../../core/model';
 import { FormTmplBomController } from './tmpl-bom-controller';
 /**
- * 同步[物料消耗表] formTmplBomList 信息
+ * 同步[物料消耗表] formTmplBomList 信息到 widgetProps 上
+ * 因为 formTmplBomList 有独立存取接口
  */
 export declare const syncMaterialConsumeTableBomInfo: (templateId: string, docModel: DocModel) => Promise<void>;
 /**
  * 处理表单实例上的[物料消耗表]相关配置
  */
 export declare const initMaterialConsumeTableConfig: (doc: Doc, subConfig: Record<string, any>, tmplBomC?: FormTmplBomController) => void;
+/**
+ * 文档加载完毕后，处理所有[物料消耗表]已消耗数量累加计算
+ */
+export declare const handleAllMCTablesMounted: (doc: Doc, tmplBomC: FormTmplBomController) => void;

package/dist/word.css

@@ -10774,22 +10774,22 @@ svg.portrait-icon[data-v-8bdb451e] {
 .bom-entry-item .iconfont.btn-item[data-v-cabb46fe] {
   margin-right: 8px;
 }
-.panel-material-consume-table[data-v-0b5a3b4b] {
+.panel-material-consume-table[data-v-0e3048f6] {
   position: relative;
 }
-.panel-material-consume-table .container[data-v-0b5a3b4b] {
+.panel-material-consume-table .container[data-v-0e3048f6] {
   padding: 16px;
 }
-.panel-material-consume-table .form-custom-label[data-v-0b5a3b4b] {
+.panel-material-consume-table .form-custom-label[data-v-0e3048f6] {
   display: inline-flex;
   align-items: center;
   gap: 4px;
 }
-.panel-material-consume-table .form-custom-label .icon[data-v-0b5a3b4b] {
+.panel-material-consume-table .form-custom-label .icon[data-v-0e3048f6] {
   cursor: pointer;
   vertical-align: text-top;
 }
-.panel-material-consume-table .content[data-v-0b5a3b4b] {
+.panel-material-consume-table .content[data-v-0e3048f6] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
@@ -10797,7 +10797,7 @@ svg.portrait-icon[data-v-8bdb451e] {
   line-height: 22px;
   width: 100%;
 }
-.panel-material-consume-table .entries-container[data-v-0b5a3b4b] {
+.panel-material-consume-table .entries-container[data-v-0e3048f6] {
   padding: 6px 0;
 }
 .add-ds-btn[data-v-e5dff26f] {

package/package.json

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