@gct-paas/word 0.1.56 → 0.1.57

package/dist/index.es.js

@@ -105944,6 +105944,11 @@ function deduplicateFields(data) {
   });
   return [...map.values()];
 }
+var MaterialConsumptionPatternEnum = /* @__PURE__ */ ((MaterialConsumptionPatternEnum2) => {
+  MaterialConsumptionPatternEnum2["RECORD"] = "record";
+  MaterialConsumptionPatternEnum2["BOM"] = "bom";
+  return MaterialConsumptionPatternEnum2;
+})(MaterialConsumptionPatternEnum || {});
 const postApi = api.apaas.modelComprehensive.postBizServiceModelCategoryModelKeyBsKey;
 async function materialCheck(params) {
   const res = await postApi(
@@ -106013,6 +106018,18 @@ async function judgeUnique(opts) {
   );
   return res;
 }
+async function queryIsBomGranted() {
+  try {
+    const res = await api.apaas.modelComprehensive.getBizServiceModelCategoryModelKeyBsKey({
+      modelKey: "em_product_bom",
+      bsKey: "biz_bom_granted",
+      modelCategory: "entity"
+    }, {});
+    return res ?? false;
+  } catch (error) {
+    return false;
+  }
+}
 function findLastIndex(array4, predicate) {
   if (!Array.isArray(array4)) {
     throw new TypeError("Expected an array");
@@ -106028,12 +106045,13 @@ function findLastIndex(array4, predicate) {
   return -1;
 }
 class BomEntryValidator {
-  constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo) {
+  constructor(bomEntry, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
     this.bomEntry = bomEntry;
     this.enableSequenceLoading = enableSequenceLoading;
     this.materialNoNum = materialNoNum;
     this.historyData = historyData;
     this.mainMaterialNo = mainMaterialNo;
+    this.mcPattern = mcPattern;
     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_) {
@@ -106243,14 +106261,22 @@ class BomEntryValidator {
   }
 }
 class BomEntriesValidator {
-  constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo) {
+  constructor(entries, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo, mcPattern) {
     this.entries = entries;
     this.enableSequenceLoading = enableSequenceLoading;
     this.materialNoNum = materialNoNum;
     this.historyData = historyData;
     this.mainMaterialNo = mainMaterialNo;
+    this.mcPattern = mcPattern;
     this.bomEntryValidators = entries.map(
-      (i) => new BomEntryValidator(i, enableSequenceLoading, materialNoNum, historyData, mainMaterialNo)
+      (i) => new BomEntryValidator(
+        i,
+        enableSequenceLoading,
+        materialNoNum,
+        historyData,
+        mainMaterialNo,
+        mcPattern
+      )
     );
   }
   bomEntryValidators;
@@ -106413,6 +106439,9 @@ class BomEntriesValidator {
         /*$t('sys.edhr.mcTable.noEditingRow')*/
       );
     }
+    if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
+      return;
+    }
     this.validateInBom(editRow);
     await this.validateSequenceLoading(editRow, arr);
     this.validateSubstitute(arr);
@@ -106425,7 +106454,9 @@ class BomEntriesValidator {
    * @return {*}
    */
   mergeRowInArr(row, arr) {
-    this.validateInBom(row);
+    if (this.mcPattern !== MaterialConsumptionPatternEnum.RECORD) {
+      this.validateInBom(row);
+    }
     const newArr = cloneDeep(arr).filter((i) => i.product_id_);
     const util = this.findUtilByProductId(row.product_id_);
     const sameIndex = findLastIndex(newArr, (i) => {
@@ -106558,7 +106589,8 @@ class MaterialConsumeTableController {
       this.enableSequenceLoading,
       this.materialNoNum,
       this.tmplBomController.historyData,
-      this.tmplBomController.materialNo
+      this.tmplBomController.materialNo,
+      this.mcPattern
     );
   }
   /**
@@ -106580,6 +106612,10 @@ class MaterialConsumeTableController {
   get materialNoNum() {
     return this.tmplBomController.materialNoNum;
   }
+  /** 物料消耗模式（自身没有配置的话取环境的默认值） */
+  get mcPattern() {
+    return this.tmplBom.material_consumption_pattern_ ?? this.tmplBomController.defaultMCPattern;
+  }
   /**
    * 解析规则数据对象
    */
@@ -106715,6 +106751,7 @@ class MaterialConsumeTableController {
     if (!this.isFirstBlankRow() && this.hasEditingRow()) {
       return;
     }
+    const isRecordPattern = this.mcPattern === MaterialConsumptionPatternEnum.RECORD;
     const data = getParseRuleValue(str, this.scanRules);
     console.log("parseScanStr", data);
     const arr = await materialCheck({
@@ -106722,7 +106759,8 @@ class MaterialConsumeTableController {
       production_identification_name_: data.lot,
       qty_: data.qty,
       validate_: data.expiration,
-      bom_entries_bom: this.actualBomEntries,
+      // 记录模式传null，后台就不校验了
+      bom_entries_bom: isRecordPattern ? null : this.actualBomEntries,
       operation_id_: this.tmplBomController.operationId
     });
     if (!arr) {
@@ -106832,13 +106870,27 @@ class MaterialConsumeTableController {
     this.tableDataRef = opts.tableDataRef;
     this.subTableInfo = opts.subTableInfo;
   }
+  /** 校验有效期 */
+  validateExpiration(row) {
+    if (row.expiration_date_) {
+      if (dayjs(row.expiration_date_).isBefore(dayjs())) {
+        throw new Error("有效期不能早于当前日期");
+      }
+    }
+  }
   /**
    * 校验数据，并退出编辑
-   * @param row
    */
   async confirm(option, subModelKey) {
     try {
-      await this.bomEntriesValidator.validate(this.actualTableData);
+      if (this.mcPattern === MaterialConsumptionPatternEnum.RECORD) {
+        const { dataManager, rowIndex, subFieldKey } = option;
+        const rows = dataManager.getRawData()[subFieldKey] ?? [];
+        const row = rows[rowIndex];
+        this.validateExpiration(row);
+      } else {
+        await this.bomEntriesValidator.validate(this.actualTableData);
+      }
       const isUnique = await judgeUnique({
         modelKey: subModelKey,
         data: this.actualTableData
@@ -107018,6 +107070,8 @@ class FormTmplBomController {
   tableControllers = {};
   /** 字段key和tableKey的映射 */
   field2TableMap = {};
+  /** 默认物料消耗模式 */
+  defaultMCPattern = MaterialConsumptionPatternEnum.RECORD;
   constructor() {
   }
   /**
@@ -107062,7 +107116,6 @@ class FormTmplBomController {
    * @readonly
    */
   get enableSequenceLoading() {
-    console.log("enableSequenceLoading", this.formInstBom?.sequenceEntries);
     return !!this.formInstBom?.sequenceEntries?.[0]?.enabled_;
   }
   /**
@@ -107079,6 +107132,8 @@ class FormTmplBomController {
       production_identification_id_: this.formInstBom.productionIdentificationId,
       routing_operation_id_: this.operationId
     });
+    const isGranted = await queryIsBomGranted();
+    this.defaultMCPattern = isGranted ? MaterialConsumptionPatternEnum.BOM : MaterialConsumptionPatternEnum.RECORD;
     this.tableControllers = {};
     this.tmplBomList.forEach((cur) => {
       const controller = new MaterialConsumeTableController(this, cur);
@@ -126637,6 +126692,10 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
     active: {}
   },
   setup(__props) {
+    const patternOptions = [
+      { label: "BOM 模式", value: MaterialConsumptionPatternEnum.BOM },
+      { label: "记录模式", value: MaterialConsumptionPatternEnum.RECORD }
+    ];
     const props = __props;
     const regionRef = computed(
       () => props.widget.findRegionById(props.active.context.regionId)
@@ -126652,6 +126711,12 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
       active: props.active,
       regionType: "material-consume-table"
     });
+    onMounted(async () => {
+      const isGranted = await queryIsBomGranted();
+      if (isGranted && regionProps.value && !regionProps.value.material_consumption_pattern_) {
+        regionProps.value.material_consumption_pattern_ = MaterialConsumptionPatternEnum.BOM;
+      }
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$1c, [
         createVNode(SubTableBasicInfo, {
@@ -126681,37 +126746,50 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(unref(GctFormItem), null, {
-                label: withCtx(() => [..._cache[4] || (_cache[4] = [
+              createVNode(unref(GctFormItem), {
+                inline: false,
+                label: "物料消耗模式"
+              }, {
+                default: withCtx(() => [
+                  createVNode(unref(GctSelect), {
+                    modelValue: unref(regionProps).material_consumption_pattern_,
+                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(regionProps).material_consumption_pattern_ = $event),
+                    options: patternOptions
+                  }, null, 8, ["modelValue"])
+                ]),
+                _: 1
+              }),
+              unref(regionProps).material_consumption_pattern_ === unref(MaterialConsumptionPatternEnum).BOM ? (openBlock(), createBlock(unref(GctFormItem), { key: 0 }, {
+                label: withCtx(() => [..._cache[5] || (_cache[5] = [
                   createElementVNode("div", { class: "form-custom-label" }, " 人为指定物料 ", -1)
                 ])]),
                 default: withCtx(() => [
                   createElementVNode("div", _hoisted_3$v, [
                     createVNode(unref(GctSwitch), {
                       modelValue: unref(regionProps).personal_bom_enabled_,
-                      "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => unref(regionProps).personal_bom_enabled_ = $event),
+                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(regionProps).personal_bom_enabled_ = $event),
                       size: "small"
                     }, null, 8, ["modelValue"])
                   ])
                 ]),
                 _: 1
-              }),
-              unref(regionProps).personal_bom_enabled_ ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+              })) : createCommentVNode("", true),
+              unref(regionProps).personal_bom_enabled_ ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                 createElementVNode("div", _hoisted_4$o, [
                   createVNode(BomEntryEditor, {
                     list: unref(regionProps).entries_,
-                    "onUpdate:list": _cache[2] || (_cache[2] = ($event) => unref(regionProps).entries_ = $event)
+                    "onUpdate:list": _cache[3] || (_cache[3] = ($event) => unref(regionProps).entries_ = $event)
                   }, null, 8, ["list"])
                 ]),
                 createVNode(unref(GctFormItem), null, {
-                  label: withCtx(() => [..._cache[5] || (_cache[5] = [
+                  label: withCtx(() => [..._cache[6] || (_cache[6] = [
                     createElementVNode("div", { class: "form-custom-label" }, " 按顺序投料 ", -1)
                   ])]),
                   default: withCtx(() => [
                     createElementVNode("div", _hoisted_5$i, [
                       createVNode(unref(GctSwitch), {
                         modelValue: unref(regionProps).sequence_loading_enabled_,
-                        "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => unref(regionProps).sequence_loading_enabled_ = $event),
+                        "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => unref(regionProps).sequence_loading_enabled_ = $event),
                         size: "small"
                       }, null, 8, ["modelValue"])
                     ])
@@ -126727,7 +126805,7 @@ const _sfc_main$1v = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-e57a85ec"]]);
+const MaterialConsumeTablePanel = /* @__PURE__ */ _export_sfc(_sfc_main$1v, [["__scopeId", "data-v-0dd8e3b3"]]);
 const schema$9 = createTablePanelSchema("material-consume-table.basic", MaterialConsumeTablePanel);
 const schema$8 = createTablePanelSchema("fixed-table.basic", BoundedSubTablePanel);
 const _sfc_main$1u = /* @__PURE__ */ defineComponent({

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

@@ -1,4 +1,4 @@
-import { IBomEntry, IMaterialConsumeData } from '../../../../../types/material.type';
+import { IBomEntry, IMaterialConsumeData, MaterialConsumptionPatternEnum } from '../../../../../types/material.type';
 export declare class BomEntryValidator {
     bomEntry: IBomEntry;
     /** 是否启用顺序投料 */
@@ -9,6 +9,8 @@ export declare class BomEntryValidator {
     historyData: IMaterialConsumeData[];
     /** 表单实例的批次号 */
     mainMaterialNo: string;
+    /** 物料消耗模式 */
+    mcPattern: MaterialConsumptionPatternEnum;
     /** 该明细使用到的产品的id集合 */
     productIds: string[];
     /** 物料和code的映射 */
@@ -27,7 +29,9 @@ export declare class BomEntryValidator {
     /** 历史填报数据 */
     historyData: IMaterialConsumeData[], 
     /** 表单实例的批次号 */
-    mainMaterialNo: string);
+    mainMaterialNo: string, 
+    /** 物料消耗模式 */
+    mcPattern: MaterialConsumptionPatternEnum);
     /**
      * 翻译物料的code
      * @param productId
@@ -85,6 +89,8 @@ export declare class BomEntriesValidator {
     historyData: IMaterialConsumeData[];
     /** 表单实例的批次号 */
     mainMaterialNo: string;
+    /** 物料消耗模式 */
+    mcPattern: MaterialConsumptionPatternEnum;
     bomEntryValidators: BomEntryValidator[];
     constructor(entries: IBomEntry[], 
     /** 是否启用顺序投料 */
@@ -94,7 +100,9 @@ export declare class BomEntriesValidator {
     /** 历史填报数据 */
     historyData: IMaterialConsumeData[], 
     /** 表单实例的批次号 */
-    mainMaterialNo: string);
+    mainMaterialNo: string, 
+    /** 物料消耗模式 */
+    mcPattern: MaterialConsumptionPatternEnum);
     /**
      * 翻译物料的code
      * @param productId

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

@@ -1,4 +1,4 @@
-import { IFormTmplBom, IMaterialConsumeData, ParseRuleProps } from '../../../../../types/material.type';
+import { MaterialConsumptionPatternEnum, IFormTmplBom, IMaterialConsumeData, ParseRuleProps } from '../../../../../types/material.type';
 import { FormTmplBomController } from './tmpl-bom-controller';
 import { Ref } from 'vue';
 import { BomEntriesValidator } from './bom-validator';
@@ -85,6 +85,8 @@ export declare class MaterialConsumeTableController {
     /** 表单模型控制器 */
     /** 批次数量 */
     get materialNoNum(): number;
+    /** 物料消耗模式（自身没有配置的话取环境的默认值） */
+    get mcPattern(): MaterialConsumptionPatternEnum;
     /**
      * 解析规则数据对象
      */
@@ -191,9 +193,10 @@ export declare class MaterialConsumeTableController {
         tableDataRef: Ref<any>;
         subTableInfo: ISubTableInfo;
     }): Promise<void>;
+    /** 校验有效期 */
+    validateExpiration(row: IMaterialConsumeData): void;
     /**
      * 校验数据，并退出编辑
-     * @param row
      */
     confirm(option: UpdateRowOption, subModelKey: string): Promise<void>;
     /**

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

@@ -60,3 +60,5 @@ export declare function judgeUnique(opts: {
     /** 前端数据集合 */
     data: any[];
 }): Promise<boolean>;
+/** 是否有BOM授权 */
+export declare function queryIsBomGranted(): Promise<any>;

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

@@ -1,5 +1,5 @@
 import { MaterialConsumeTableController } from './material-consume-table-controller';
-import { IBomEntry, IFormTmplBom, IMaterialConsumeData } from '../../../../../types/material.type';
+import { IBomEntry, IFormTmplBom, IMaterialConsumeData, MaterialConsumptionPatternEnum } from '../../../../../types/material.type';
 interface FormInstBomResponse {
     bomEntries?: any[];
     formTmplBomList?: IFormTmplBom[];
@@ -25,6 +25,8 @@ export declare class FormTmplBomController {
     tableControllers: Record<string, MaterialConsumeTableController>;
     /** 字段key和tableKey的映射 */
     field2TableMap: Record<string, string>;
+    /** 默认物料消耗模式 */
+    defaultMCPattern: MaterialConsumptionPatternEnum;
     constructor();
     /**
      * 判断使用场景，不符合的报错提示

package/dist/types/material.type.d.ts

@@ -78,6 +78,8 @@ export interface IFormTmplBom {
     entries_: IBomEntry[];
     /** 删除标记 */
     deleted_?: boolean;
+    /** 物料消耗模式, record：记录模式,bom： BOM模式 */
+    material_consumption_pattern_?: MaterialConsumptionPatternEnum;
 }
 /**
  * 物料消耗表子模型的数据结构
@@ -130,3 +132,10 @@ export interface ParseRuleProps {
         formFields?: string[];
     }>;
 }
+/** 物料消耗模式 */
+export declare enum MaterialConsumptionPatternEnum {
+    /** 记录模式 */
+    RECORD = "record",
+    /** bom模式 */
+    BOM = "bom"
+}

package/dist/word.css

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.56",
+  "version": "0.1.57",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",