@etsoo/smarterp-core 1.1.59 → 1.1.60

package/__tests__/OrgApi.ts

@@ -3,11 +3,56 @@ import { isLocalTest, TestApp } from "./app/TestApp";
 import { EntityStatus } from "@etsoo/appscript";
 import { OrgApi } from "../src/OrgApi";
 import { OrgCreateRQ } from "../src/rq/org/OrgCreateRQ";
+import { CoreApp } from "../src";
+
+const app = new TestApp();
+await app.changeCulture(app.settings.cultures[0]);
+
+test("Test SysResourceKeyPrefix", () => {
+  const source = [
+    {
+      period: 202601,
+      qty: 236
+    },
+    {
+      period: 202602,
+      qty: 99
+    },
+    {
+      period: 202603,
+      qty: 120
+    },
+    {
+      period: 202604,
+      qty: 199
+    },
+    {
+      period: 202605,
+      qty: 230
+    },
+    {
+      period: 202606,
+      qty: 3
+    },
+    {
+      period: 202505,
+      qty: 215
+    }
+  ];
+
+  const core = new CoreApp(app, app.api);
+  const result = core.transformReportData(source, true, 2026);
+
+  expect(result.labels.length).toBe(12);
+  expect(result.currentYearData[5]).toBe(3);
+  expect(result.lastYearData[4]).toBe(215);
+});
+
+test("Test SysResourceKeyPrefix", () => {
+  expect(OrgApi.SysResourceKeyPrefix).toBe("etsoo");
+});
 
 if (isLocalTest) {
-  const app = new TestApp();
-  await app.changeCulture(app.settings.cultures[0]);
-
   // Simulate logined
   app.authorize(
     "eyJhbGciOiJodHRwOi8vd3d3LnczLm9yZy8yMDAxLzA0L3htbGVuYyNrdy1hZXMyNTYiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIiwidHlwIjoiSldUIiwiY3R5IjoiSldUIn0.dtsirpxAaX-pHgFrSRp9bTEvkFkphcihoOC9Mj-hgNEY9fvgSrb4-NkaQxiw1KIIXdct_2wXeHe4-vcWOrkpABANtf6LHdJo.vk9wrjb6DIw0f9xLAj-3AQ.CwEV20n7LhwalIx3a3WDQkJjMAHW1Bn6VJGMjfckNVBZv0G_xcWZbo5Gg2CF4vdUjH6pqAH5IhuMmRqlkeCYwuF5d_rQVI_kLtmvgpAJoqYhU3-J_XqPrLpdWXPQ-V84lzngTAJlIX4On6JP_ZRTWLZDGxiiC1Tg_6GlWU3EUX2kcMBb03NWGczHaPS5-ivp4L9CntqaEOOK35cWQx6oZyp0KmwM6KjoY3ard5SLUofF10DqBwto6KqNAeZnLjBnJV_j9dX-si5FalrGrTV09KtjSMeXd7Rp3VfC5BRge5zSx5CecEzk_yt50GdYjvDRYj31whyVx0bVLKH9Pyz1OsHLDfolVpSRRIk-1UuaZz-5WfKcUrE6EWB-Mykn5Mxiyo7CxlhHOnEkUAJ5wdYGiRdVkk04HA8YdOxBRHUZzB44nrUVIWEYtWu8KddQTkWhYOCNc4OdCBweuiO_TEt2haxEsUmyuRZ0PgoVg-B8ZUXz0ot79GNQcd8ZYoaaap8WYhvMod8lw-e-HH7fABlCoAsIx8xt4aMGOD1iVgXFTnJ4qD9x5suZczHqj4BoeoKkgg1Lil_jG_3cADxIRPmReWqeOrrA6f54PjBd5kdSNNv72axxW3AfbZaOYQ-n7zzQjWUgKZnMnu4N2NXCkis8JvHCfVi3jgUO3jeGp6vVlPoaCbFXXMiKKL1bkhRXZT47uglPi4zD2tRqKOEzGMPpB4d0X_tZVt_lPRvbLFjUNUVikQGA3nD_9c5B5QfI4olFjA6H4eUN7b74R4HcVIr6hNBvDKGXeTJBmoopu4fGMAysCJ_ybUcJxWXldoy6nFTZjJ2QllbLLqdYuCvxYlTo3Z4nODna6NW18QcSXIIHj3U6H6VIDkXBnjArkvsgj_0uvqW_zyZNj_JIONAuwZYfDC6gsjbzV7llp53d3o3-xFhOBvxUibFTPvY39E-X_-crww6flp_tDyndlzBoVYMhybhnRLQy-PpO4dZQhzr2sdHpsF57Fj7SecXwbAtcQdKp.C6VZunr9ohscx6vVMVmRQnG37pWumGCHMLO0jJmLQXo"
@@ -58,10 +103,6 @@ if (isLocalTest) {
   });
   */
 
-  test("Test SysResourceKeyPrefix", () => {
-    expect(OrgApi.SysResourceKeyPrefix).toBe("etsoo");
-  });
-
   test("Test for query zero return", async () => {
     const result = await api.query({
       keyword: "亿速",

package/__tests__/tsconfig.json

@@ -6,7 +6,7 @@
     "moduleResolution": "bundler",
     "allowJs": false,
     "isolatedModules": true,
-    "outDir": "./lib",
+    "rootDir": "..",
     "noEmit": false,
     "declaration": true,
     "strict": true,

package/lib/cjs/CoreApp.d.ts

@@ -10,6 +10,7 @@ import { ListType, ListType1 } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
+import { OrgReportData } from "./dto/org/OrgReportData";
 type AppData = {
     id: number;
     appId?: number;
@@ -123,6 +124,27 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data: OrgReportData[], year: number): number[];
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
 }
 /**
  * Core application
@@ -256,5 +278,26 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data: OrgReportData[], year: number): number[];
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
 }
 export {};

package/lib/cjs/CoreApp.js

@@ -220,5 +220,39 @@ class CoreApp {
                 return id;
         });
     }
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data, year) {
+        const [start, end] = shared_1.NumberUtils.getMonthPeriodRange(year);
+        const items = [];
+        for (let i = start; i <= end; i++) {
+            const item = data.find((d) => d.period === i);
+            items.push(item ? ("qty" in item ? item.qty : item.amount) : 0);
+        }
+        return items;
+    }
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data, hasLastYear, year) {
+        year ??= new Date().getFullYear();
+        const months = appscript_1.BusinessUtils.getMonths(this.app.get("months") ?? []);
+        const labels = months.map((m) => m.label);
+        const currentYearData = this.getReportData(data, year);
+        const lastYearData = hasLastYear == null || hasLastYear
+            ? this.getReportData(data, year - 1)
+            : [];
+        return { labels, currentYearData, lastYearData };
+    }
 }
 exports.CoreApp = CoreApp;

package/lib/cjs/OrgApi.d.ts

@@ -26,6 +26,8 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
+import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
+import { OrgReportData } from "./dto/org/OrgReportData";
 /**
  * Organization API
  * 机构接口
@@ -247,4 +249,11 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     updateResourceRead(id: number, payload?: IApiPayload<OrgUpdateResourceReadData>): Promise<OrgUpdateResourceReadData | undefined>;
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>): Promise<OrgReportData[] | undefined>;
 }

package/lib/cjs/OrgApi.js

@@ -305,5 +305,14 @@ class OrgApi extends appscript_1.EntityApi {
     updateResourceRead(id, payload) {
         return this.api.get(`${this.flag}/UpdateResourceRead/${id}`, undefined, payload);
     }
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq, payload) {
+        return this.api.post(`${this.flag}/UsageReport`, rq, payload);
+    }
 }
 exports.OrgApi = OrgApi;

package/lib/cjs/dto/org/OrgReportData.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Organization usage report data
+ * 机构使用报告数据
+ */
+type OrgUsageReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Qty.
+     * 数量
+     */
+    qty: number;
+};
+/**
+ * Organization amount report data
+ * 机构金额报告数据
+ */
+type OrgAmountReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Amount
+     * 金额
+     */
+    amount: number;
+};
+/**
+ * Organization report data
+ * 机构报告数据
+ */
+export type OrgReportData = OrgUsageReportData | OrgAmountReportData;
+export {};

package/lib/cjs/dto/org/OrgReportData.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/i18n/en.json

@@ -106,6 +106,7 @@
     "roleOperator": "Operator",
     "rolePartner": "Channel Partner",
     "roleUser": "User",
+    "samePeriodLastYear": "Same period last year",
     "slogan": "Slogan",
     "smarterp": "SmartERP Cloud",
     "signin": "Sign in",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "Alipay",
     "uiTypeGoogle": "Google",
     "uiTypeMicrosoft": "Microsoft",
-    "updatedAt": "Updated at"
+    "updatedAt": "Updated at",
+    "usage": "Usage",
+    "usageReport": "Usage report"
 }

package/lib/cjs/i18n/zh-Hans.json

@@ -106,6 +106,7 @@
     "roleOperator": "操作员",
     "rolePartner": "渠道伙伴",
     "roleUser": "用户",
+    "samePeriodLastYear": "去年同期",
     "slogan": "标语",
     "smarterp": "司友®云ERP",
     "signin": "登录",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "支付宝",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微软",
-    "updatedAt": "更新时间"
+    "updatedAt": "更新时间",
+    "usage": "使用量",
+    "usageReport": "使用情况报告"
 }

package/lib/cjs/i18n/zh-Hant.json

@@ -106,6 +106,7 @@
     "roleOperator": "操作員",
     "rolePartner": "渠道夥伴",
     "roleUser": "用戶",
+    "samePeriodLastYear": "去年同期",
     "signin": "登入",
     "signout": "登出",
     "slogan": "標語",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "支付寶",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微軟",
-    "updatedAt": "更新時間"
+    "updatedAt": "更新時間",
+    "usage": "使用量",
+    "usageReport": "使用情況報告"
 }

package/lib/cjs/index.d.ts

@@ -22,6 +22,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -68,6 +69,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";

package/lib/cjs/index.js

@@ -39,6 +39,7 @@ __exportStar(require("./dto/org/OrgQueryApiData"), exports);
 __exportStar(require("./dto/org/OrgQueryDto"), exports);
 __exportStar(require("./dto/org/OrgQueryResourceData"), exports);
 __exportStar(require("./dto/org/OrgReadDto"), exports);
+__exportStar(require("./dto/org/OrgReportData"), exports);
 __exportStar(require("./dto/org/OrgResourceItem"), exports);
 __exportStar(require("./dto/org/OrgUpdateApiReadDto"), exports);
 __exportStar(require("./dto/org/OrgUpdateReadDto"), exports);
@@ -87,6 +88,7 @@ __exportStar(require("./rq/org/OrgQueryApiRQ"), exports);
 __exportStar(require("./rq/org/OrgQueryResourceRQ"), exports);
 __exportStar(require("./rq/org/OrgQueryRQ"), exports);
 __exportStar(require("./rq/org/OrgUpdateApiRQ"), exports);
+__exportStar(require("./rq/org/OrgUsageReportRQ"), exports);
 __exportStar(require("./rq/org/OrgUpdateRQ"), exports);
 __exportStar(require("./rq/org/SendEmailMessage"), exports);
 __exportStar(require("./rq/org/SendProfileEmailRQ"), exports);

package/lib/cjs/rq/org/OrgUsageReportRQ.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Organization usage report request data
+ * 机构使用报告请求数据
+ */
+export type OrgUsageReportRQ = {
+    /**
+     * Organization id
+     * 机构编号
+     */
+    orgId?: number;
+    /**
+     * Year
+     * 年
+     */
+    year?: number;
+    /**
+     * Whether to include last year data
+     * 是否包含去年数据
+     */
+    hasLastYear?: boolean;
+};

package/lib/cjs/rq/org/OrgUsageReportRQ.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/mjs/CoreApp.d.ts

@@ -10,6 +10,7 @@ import { ListType, ListType1 } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
+import { OrgReportData } from "./dto/org/OrgReportData";
 type AppData = {
     id: number;
     appId?: number;
@@ -123,6 +124,27 @@ export interface ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data: OrgReportData[], year: number): number[];
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
 }
 /**
  * Core application
@@ -256,5 +278,26 @@ export declare class CoreApp implements ICoreApp {
      * @returns List
      */
     getIdentityFlags(identity?: number | true): ListType[];
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data: OrgReportData[], year: number): number[];
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data: OrgReportData[], hasLastYear?: boolean, year?: number): {
+        labels: string[];
+        currentYearData: number[];
+        lastYearData: number[];
+    };
 }
 export {};

package/lib/mjs/CoreApp.js

@@ -3,9 +3,9 @@ import { OrgApi } from "./OrgApi";
 import { AppApi } from "./AppApi";
 import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
-import { AuthApi, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
+import { AuthApi, BusinessUtils, IdentityType, IdentityTypeFlags, UserIdentifierType } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { DataTypes } from "@etsoo/shared";
+import { DataTypes, NumberUtils } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
@@ -217,4 +217,38 @@ export class CoreApp {
                 return id;
         });
     }
+    /**
+     * Get report data
+     * 获取报告数据
+     * @param data Input data
+     * @param year Year to calculate
+     * @returns Result
+     */
+    getReportData(data, year) {
+        const [start, end] = NumberUtils.getMonthPeriodRange(year);
+        const items = [];
+        for (let i = start; i <= end; i++) {
+            const item = data.find((d) => d.period === i);
+            items.push(item ? ("qty" in item ? item.qty : item.amount) : 0);
+        }
+        return items;
+    }
+    /**
+     * Transform report data for chart
+     * 转换报告数据用于图表
+     * @param data Input data
+     * @param hasLastYear Has last year data
+     * @param year Year to calculate, default is current year
+     * @returns Transformed report data
+     */
+    transformReportData(data, hasLastYear, year) {
+        year ??= new Date().getFullYear();
+        const months = BusinessUtils.getMonths(this.app.get("months") ?? []);
+        const labels = months.map((m) => m.label);
+        const currentYearData = this.getReportData(data, year);
+        const lastYearData = hasLastYear == null || hasLastYear
+            ? this.getReportData(data, year - 1)
+            : [];
+        return { labels, currentYearData, lastYearData };
+    }
 }

package/lib/mjs/OrgApi.d.ts

@@ -26,6 +26,8 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
+import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
+import { OrgReportData } from "./dto/org/OrgReportData";
 /**
  * Organization API
  * 机构接口
@@ -247,4 +249,11 @@ export declare class OrgApi extends EntityApi {
      * @returns Result
      */
     updateResourceRead(id: number, payload?: IApiPayload<OrgUpdateResourceReadData>): Promise<OrgUpdateResourceReadData | undefined>;
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>): Promise<OrgReportData[] | undefined>;
 }

package/lib/mjs/OrgApi.js

@@ -302,4 +302,13 @@ export class OrgApi extends EntityApi {
     updateResourceRead(id, payload) {
         return this.api.get(`${this.flag}/UpdateResourceRead/${id}`, undefined, payload);
     }
+    /**
+     * Get usage report
+     * @param rq Request data
+     * @param payload Payload
+     * @returns Result
+     */
+    usageReport(rq, payload) {
+        return this.api.post(`${this.flag}/UsageReport`, rq, payload);
+    }
 }

package/lib/mjs/dto/org/OrgReportData.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Organization usage report data
+ * 机构使用报告数据
+ */
+type OrgUsageReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Qty.
+     * 数量
+     */
+    qty: number;
+};
+/**
+ * Organization amount report data
+ * 机构金额报告数据
+ */
+type OrgAmountReportData = {
+    /**
+     * Period
+     * 周期
+     */
+    period: number;
+    /**
+     * Amount
+     * 金额
+     */
+    amount: number;
+};
+/**
+ * Organization report data
+ * 机构报告数据
+ */
+export type OrgReportData = OrgUsageReportData | OrgAmountReportData;
+export {};

package/lib/mjs/dto/org/OrgReportData.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/i18n/en.json

@@ -106,6 +106,7 @@
     "roleOperator": "Operator",
     "rolePartner": "Channel Partner",
     "roleUser": "User",
+    "samePeriodLastYear": "Same period last year",
     "slogan": "Slogan",
     "smarterp": "SmartERP Cloud",
     "signin": "Sign in",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "Alipay",
     "uiTypeGoogle": "Google",
     "uiTypeMicrosoft": "Microsoft",
-    "updatedAt": "Updated at"
+    "updatedAt": "Updated at",
+    "usage": "Usage",
+    "usageReport": "Usage report"
 }

package/lib/mjs/i18n/zh-Hans.json

@@ -106,6 +106,7 @@
     "roleOperator": "操作员",
     "rolePartner": "渠道伙伴",
     "roleUser": "用户",
+    "samePeriodLastYear": "去年同期",
     "slogan": "标语",
     "smarterp": "司友®云ERP",
     "signin": "登录",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "支付宝",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微软",
-    "updatedAt": "更新时间"
+    "updatedAt": "更新时间",
+    "usage": "使用量",
+    "usageReport": "使用情况报告"
 }

package/lib/mjs/i18n/zh-Hant.json

@@ -106,6 +106,7 @@
     "roleOperator": "操作員",
     "rolePartner": "渠道夥伴",
     "roleUser": "用戶",
+    "samePeriodLastYear": "去年同期",
     "signin": "登入",
     "signout": "登出",
     "slogan": "標語",
@@ -139,5 +140,7 @@
     "uiTypeAlipay": "支付寶",
     "uiTypeGoogle": "谷歌",
     "uiTypeMicrosoft": "微軟",
-    "updatedAt": "更新時間"
+    "updatedAt": "更新時間",
+    "usage": "使用量",
+    "usageReport": "使用情況報告"
 }

package/lib/mjs/index.d.ts

@@ -22,6 +22,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -68,6 +69,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";

package/lib/mjs/index.js

@@ -23,6 +23,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -71,6 +72,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";

package/lib/mjs/rq/org/OrgUsageReportRQ.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Organization usage report request data
+ * 机构使用报告请求数据
+ */
+export type OrgUsageReportRQ = {
+    /**
+     * Organization id
+     * 机构编号
+     */
+    orgId?: number;
+    /**
+     * Year
+     * 年
+     */
+    year?: number;
+    /**
+     * Whether to include last year data
+     * 是否包含去年数据
+     */
+    hasLastYear?: boolean;
+};

package/lib/mjs/rq/org/OrgUsageReportRQ.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.59",
+  "version": "1.1.60",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -49,7 +49,7 @@
     "@vitejs/plugin-react": "^6.0.2",
     "jsdom": "^29.1.1",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.8"
+    "vitest": "^4.1.9"
   },
   "overrides": {
     "react": "$react",
@@ -57,9 +57,9 @@
   },
   "dependencies": {
     "@etsoo/appscript": "^1.6.66",
-    "@etsoo/materialui": "^1.6.70",
+    "@etsoo/materialui": "^1.6.71",
     "@etsoo/react": "^1.8.91",
-    "@etsoo/shared": "^1.2.84",
+    "@etsoo/shared": "^1.2.86",
     "@etsoo/toolpad": "^1.0.50",
     "@mui/material": "^9.1.1",
     "ajv": "^8.20.0",

package/src/CoreApp.ts

@@ -6,16 +6,18 @@ import { PublicApi } from "./PublicApi";
 import { UserApi } from "./UserApi";
 import {
   AuthApi,
+  BusinessUtils,
   IApp,
   IdentityType,
   IdentityTypeFlags,
   UserIdentifierType
 } from "@etsoo/appscript";
 import { AuthCodeApi } from "./AuthCodeApi";
-import { DataTypes, ListType, ListType1 } from "@etsoo/shared";
+import { DataTypes, ListType, ListType1, NumberUtils } from "@etsoo/shared";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { DocumentApi } from "./DocumentApi";
 import { DocumentKind } from "./dto/document/DocumentKind";
+import { OrgReportData } from "./dto/org/OrgReportData";
 
 type AppData = { id: number; appId?: number; name: string; localName?: string };
 
@@ -149,6 +151,33 @@ export interface ICoreApp {
    * @returns List
    */
   getIdentityFlags(identity?: number | true): ListType[];
+
+  /**
+   * Get report data
+   * 获取报告数据
+   * @param data Input data
+   * @param year Year to calculate
+   * @returns Result
+   */
+  getReportData(data: OrgReportData[], year: number): number[];
+
+  /**
+   * Transform report data for chart
+   * 转换报告数据用于图表
+   * @param data Input data
+   * @param hasLastYear Has last year data
+   * @param year Year to calculate, default is current year
+   * @returns Transformed report data
+   */
+  transformReportData(
+    data: OrgReportData[],
+    hasLastYear?: boolean,
+    year?: number
+  ): {
+    labels: string[];
+    currentYearData: number[];
+    lastYearData: number[];
+  };
 }
 
 /**
@@ -383,4 +412,52 @@ export class CoreApp implements ICoreApp {
       if (id === 0 || (id & identity) > 0) return id;
     });
   }
+
+  /**
+   * Get report data
+   * 获取报告数据
+   * @param data Input data
+   * @param year Year to calculate
+   * @returns Result
+   */
+  getReportData(data: OrgReportData[], year: number) {
+    const [start, end] = NumberUtils.getMonthPeriodRange(year);
+    const items: number[] = [];
+
+    for (let i = start; i <= end; i++) {
+      const item = data.find((d) => d.period === i);
+      items.push(item ? ("qty" in item ? item.qty : item.amount) : 0);
+    }
+
+    return items;
+  }
+
+  /**
+   * Transform report data for chart
+   * 转换报告数据用于图表
+   * @param data Input data
+   * @param hasLastYear Has last year data
+   * @param year Year to calculate, default is current year
+   * @returns Transformed report data
+   */
+  transformReportData(
+    data: OrgReportData[],
+    hasLastYear?: boolean,
+    year?: number
+  ) {
+    year ??= new Date().getFullYear();
+
+    const months = BusinessUtils.getMonths(
+      this.app.get<string[]>("months") ?? []
+    );
+    const labels = months.map((m) => m.label);
+
+    const currentYearData = this.getReportData(data, year);
+    const lastYearData =
+      hasLastYear == null || hasLastYear
+        ? this.getReportData(data, year - 1)
+        : [];
+
+    return { labels, currentYearData, lastYearData };
+  }
 }

package/src/OrgApi.ts

@@ -36,6 +36,8 @@ import { OrgQueryApiData } from "./dto/org/OrgQueryApiData";
 import { CoreApiService } from "./dto/org/CoreApiService";
 import { UploadFilesResult } from "./dto/org/UploadFilesResult";
 import { OrgOwnsRQ } from "./rq/org/OrgOwnsRQ";
+import { OrgUsageReportRQ } from "./rq/org/OrgUsageReportRQ";
+import { OrgReportData } from "./dto/org/OrgReportData";
 
 /**
  * Organization API
@@ -412,4 +414,14 @@ export class OrgApi extends EntityApi {
       payload
     );
   }
+
+  /**
+   * Get usage report
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<OrgReportData[]>) {
+    return this.api.post(`${this.flag}/UsageReport`, rq, payload);
+  }
 }

package/src/dto/org/OrgReportData.ts

@@ -0,0 +1,41 @@
+/**
+ * Organization usage report data
+ * 机构使用报告数据
+ */
+type OrgUsageReportData = {
+  /**
+   * Period
+   * 周期
+   */
+  period: number;
+
+  /**
+   * Qty.
+   * 数量
+   */
+  qty: number;
+};
+
+/**
+ * Organization amount report data
+ * 机构金额报告数据
+ */
+type OrgAmountReportData = {
+  /**
+   * Period
+   * 周期
+   */
+  period: number;
+
+  /**
+   * Amount
+   * 金额
+   */
+  amount: number;
+};
+
+/**
+ * Organization report data
+ * 机构报告数据
+ */
+export type OrgReportData = OrgUsageReportData | OrgAmountReportData;

package/src/i18n/en.json

@@ -106,6 +106,7 @@
   "roleOperator": "Operator",
   "rolePartner": "Channel Partner",
   "roleUser": "User",
+  "samePeriodLastYear": "Same period last year",
   "slogan": "Slogan",
   "smarterp": "SmartERP Cloud",
   "signin": "Sign in",
@@ -139,5 +140,7 @@
   "uiTypeAlipay": "Alipay",
   "uiTypeGoogle": "Google",
   "uiTypeMicrosoft": "Microsoft",
-  "updatedAt": "Updated at"
+  "updatedAt": "Updated at",
+  "usage": "Usage",
+  "usageReport": "Usage report"
 }

package/src/i18n/zh-Hans.json

@@ -106,6 +106,7 @@
   "roleOperator": "操作员",
   "rolePartner": "渠道伙伴",
   "roleUser": "用户",
+  "samePeriodLastYear": "去年同期",
   "slogan": "标语",
   "smarterp": "司友®云ERP",
   "signin": "登录",
@@ -139,5 +140,7 @@
   "uiTypeAlipay": "支付宝",
   "uiTypeGoogle": "谷歌",
   "uiTypeMicrosoft": "微软",
-  "updatedAt": "更新时间"
+  "updatedAt": "更新时间",
+  "usage": "使用量",
+  "usageReport": "使用情况报告"
 }

package/src/i18n/zh-Hant.json

@@ -106,6 +106,7 @@
   "roleOperator": "操作員",
   "rolePartner": "渠道夥伴",
   "roleUser": "用戶",
+  "samePeriodLastYear": "去年同期",
   "signin": "登入",
   "signout": "登出",
   "slogan": "標語",
@@ -139,5 +140,7 @@
   "uiTypeAlipay": "支付寶",
   "uiTypeGoogle": "谷歌",
   "uiTypeMicrosoft": "微軟",
-  "updatedAt": "更新時間"
+  "updatedAt": "更新時間",
+  "usage": "使用量",
+  "usageReport": "使用情況報告"
 }

package/src/index.ts

@@ -27,6 +27,7 @@ export * from "./dto/org/OrgQueryApiData";
 export * from "./dto/org/OrgQueryDto";
 export * from "./dto/org/OrgQueryResourceData";
 export * from "./dto/org/OrgReadDto";
+export * from "./dto/org/OrgReportData";
 export * from "./dto/org/OrgResourceItem";
 export * from "./dto/org/OrgUpdateApiReadDto";
 export * from "./dto/org/OrgUpdateReadDto";
@@ -83,6 +84,7 @@ export * from "./rq/org/OrgQueryApiRQ";
 export * from "./rq/org/OrgQueryResourceRQ";
 export * from "./rq/org/OrgQueryRQ";
 export * from "./rq/org/OrgUpdateApiRQ";
+export * from "./rq/org/OrgUsageReportRQ";
 export * from "./rq/org/OrgUpdateRQ";
 export * from "./rq/org/SendEmailMessage";
 export * from "./rq/org/SendProfileEmailRQ";

package/src/rq/org/OrgUsageReportRQ.ts

@@ -0,0 +1,23 @@
+/**
+ * Organization usage report request data
+ * 机构使用报告请求数据
+ */
+export type OrgUsageReportRQ = {
+  /**
+   * Organization id
+   * 机构编号
+   */
+  orgId?: number;
+
+  /**
+   * Year
+   * 年
+   */
+  year?: number;
+
+  /**
+   * Whether to include last year data
+   * 是否包含去年数据
+   */
+  hasLastYear?: boolean;
+};