@etsoo/smarterp-core 1.1.65 → 1.1.67

package/lib/mjs/rq/report/OrderDailyReportQueryRQ.d.ts

@@ -0,0 +1,22 @@
+import { AppActionData, QueryRQ } from "@etsoo/appscript";
+/**
+ * Order daily report query request
+ * 订单日报表查询请求
+ */
+export type OrderDailyReportQueryRQ = QueryRQ & {
+    /**
+     * Action signed data
+     * 操作签名数据
+     */
+    action: AppActionData;
+    /**
+     * Start date
+     * 开始日期
+     */
+    startDate?: string;
+    /**
+     * End date
+     * 结束日期
+     */
+    endDate?: string;
+};

package/lib/mjs/rq/report/OrderDailyReportQueryRQ.js

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

package/lib/mjs/rq/report/OrderDailyReportRQ.d.ts

@@ -0,0 +1,22 @@
+import { AppActionData } from "@etsoo/appscript";
+/**
+ * Order daily report request data
+ * 订单日报表请求数据
+ */
+export type OrderDailyReportRQ = {
+    /**
+     * Action signed data
+     * 操作签名数据
+     */
+    action: AppActionData;
+    /**
+     * Start date
+     * 开始日期
+     */
+    startDate?: string;
+    /**
+     * Days to cover
+     * 覆盖的天数
+     */
+    days?: number;
+};

package/lib/mjs/rq/report/OrderDailyReportRQ.js

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

package/lib/mjs/rq/report/OrderMonthlyReportQueryRQ.d.ts

@@ -0,0 +1,22 @@
+import { AppActionData, QueryRQ } from "@etsoo/appscript";
+/**
+ * Order monthly report query request data
+ * 订单月报表查询请求数据
+ */
+export type OrderMonthlyReportQueryRQ = QueryRQ & {
+    /**
+     * Action signed data
+     * 操作签名数据
+     */
+    action: AppActionData;
+    /**
+     * Start date
+     * 开始日期
+     */
+    startDate?: string;
+    /**
+     * End date
+     * 结束日期
+     */
+    endDate?: string;
+};

package/lib/mjs/rq/report/OrderMonthlyReportQueryRQ.js

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

package/lib/mjs/rq/report/OrderMonthlyReportRQ.d.ts

@@ -0,0 +1,22 @@
+import { AppActionData } from "@etsoo/appscript";
+/**
+ * Order monthly report request data
+ * 订单月报表请求数据
+ */
+export type OrderMonthlyReportRQ = {
+    /**
+     * Action signed data
+     * 操作签名数据
+     */
+    action: AppActionData;
+    /**
+     * Year
+     * 年
+     */
+    year?: number;
+    /**
+     * Whether to include last year data
+     * 是否包含去年数据
+     */
+    hasLastYear?: boolean;
+};

package/lib/mjs/rq/report/OrderMonthlyReportRQ.js

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/smarterp-core",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "TypeScript APIs for SmartERP Core",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -61,7 +61,7 @@
     "@etsoo/react": "^1.8.91",
     "@etsoo/shared": "^1.2.86",
     "@etsoo/toolpad": "^1.0.50",
-    "@mui/material": "^9.1.1",
+    "@mui/material": "^9.1.2",
     "ajv": "^8.20.0",
     "ajv-formats": "^3.0.1",
     "react": "^19.2.7",

package/src/CoreApp.ts

@@ -17,7 +17,8 @@ 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";
+import { ReportApi } from "./ReportApi";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
 
 type AppData = { id: number; appId?: number; name: string; localName?: string };
 
@@ -61,6 +62,11 @@ export interface ICoreApp {
    */
   readonly publicApi: PublicApi;
 
+  /**
+   * Report API
+   */
+  readonly reportApi: ReportApi;
+
   /**
    * User API
    */
@@ -159,7 +165,7 @@ export interface ICoreApp {
    * @param year Year to calculate
    * @returns Result
    */
-  getReportData(data: OrgReportData[], year: number): number[];
+  getReportData(data: PeriodReportData[], year: number): number[];
 
   /**
    * Transform report data for chart
@@ -170,7 +176,7 @@ export interface ICoreApp {
    * @returns Transformed report data
    */
   transformReportData(
-    data: OrgReportData[],
+    data: PeriodReportData[],
     hasLastYear?: boolean,
     year?: number
   ): {
@@ -248,6 +254,15 @@ export class CoreApp implements ICoreApp {
     return (this._publicApi ??= new PublicApi(this.app, this.api));
   }
 
+  private _reportApi?: ReportApi;
+  /**
+   * Report API
+   * 报告接口
+   */
+  get reportApi() {
+    return (this._reportApi ??= new ReportApi(this.app, this.api));
+  }
+
   private _userApi?: UserApi;
   /**
    * User API
@@ -420,13 +435,13 @@ export class CoreApp implements ICoreApp {
    * @param year Year to calculate
    * @returns Result
    */
-  getReportData(data: OrgReportData[], year: number) {
+  getReportData(data: PeriodReportData[], 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);
+      items.push(item?.value ?? 0);
     }
 
     return items;
@@ -441,7 +456,7 @@ export class CoreApp implements ICoreApp {
    * @returns Transformed report data
    */
   transformReportData(
-    data: OrgReportData[],
+    data: PeriodReportData[],
     hasLastYear?: boolean,
     year?: number
   ) {

package/src/OrgApi.ts

@@ -36,8 +36,6 @@ 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
@@ -414,14 +412,4 @@ 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/ReportApi.ts

@@ -0,0 +1,92 @@
+import { BaseApi, IApi, IApiPayload, IApp } from "@etsoo/appscript";
+import { OrgUsageReportRQ } from "./rq/report/OrgUsageReportRQ";
+import { PeriodReportData } from "./dto/report/PeriodReportData";
+import { OrderDailyReportData } from "./dto/report/OrderDailyReportData";
+import { OrderDailyReportRQ } from "./rq/report/OrderDailyReportRQ";
+import { OrderMonthlyReportRQ } from "./rq/report/OrderMonthlyReportRQ";
+import { OrderMonthlyReportData } from "./dto/report/OrderMonthlyReportData";
+import { OrderDailyReportQueryRQ } from "./rq/report/OrderDailyReportQueryRQ";
+import { OrderDailyReportQueryData } from "./dto/report/OrderDailyReportQueryData";
+import { OrderMonthlyReportQueryData } from "./dto/report/OrderMonthlyReportQueryData";
+import { OrderMonthlyReportQueryRQ } from "./rq/report/OrderMonthlyReportQueryRQ";
+
+/**
+ * Report API
+ */
+export class ReportApi extends BaseApi {
+  /**
+   * Constructor
+   * @param app Application
+   * @param api API
+   */
+  constructor(app: IApp, api: IApi = app.api) {
+    super(app, api);
+  }
+
+  /**
+   * Order daily report
+   * 订单日报表
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  orderDailyReport(
+    rq: OrderDailyReportRQ,
+    payload?: IApiPayload<OrderDailyReportData[]>
+  ) {
+    return this.api.post("Report/OrderDailyReport", rq, payload);
+  }
+
+  /**
+   * Order daily report query
+   * 订单日报表查询
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  orderDailyReportQuery(
+    rq: OrderDailyReportQueryRQ,
+    payload?: IApiPayload<OrderDailyReportQueryData[]>
+  ) {
+    return this.api.post("Report/OrderDailyReportQuery", rq, payload);
+  }
+
+  /**
+   * Order monthly report
+   * 订单月报表
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  orderMonthlyReport(
+    rq: OrderMonthlyReportRQ,
+    payload?: IApiPayload<OrderMonthlyReportData[]>
+  ) {
+    return this.api.post("Report/OrderMonthlyReport", rq, payload);
+  }
+
+  /**
+   * Order monthly report query
+   * 订单月报表查询
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  orderMonthlyReportQuery(
+    rq: OrderMonthlyReportQueryRQ,
+    payload?: IApiPayload<OrderMonthlyReportQueryData[]>
+  ) {
+    return this.api.post("Report/OrderMonthlyReportQuery", rq, payload);
+  }
+
+  /**
+   * Get usage report
+   * 获取使用报告
+   * @param rq Request data
+   * @param payload Payload
+   * @returns Result
+   */
+  usageReport(rq: OrgUsageReportRQ, payload?: IApiPayload<PeriodReportData[]>) {
+    return this.api.post("Report/UsageReport", rq, payload);
+  }
+}

package/src/dto/report/OrderDailyReportData.ts

@@ -0,0 +1,29 @@
+/**
+ * Order daily report data
+ * 订单日报表数据
+ */
+export type OrderDailyReportData = {
+  /**
+   * Period
+   * 区间
+   */
+  period: string;
+
+  /**
+   * Order Items
+   * 订单数
+   */
+  items: number;
+
+  /**
+   * Amount
+   * 金额
+   */
+  amount: number;
+
+  /**
+   * Customers
+   * 客户数
+   */
+  customers: number;
+};

package/src/dto/report/OrderDailyReportQueryData.ts

@@ -0,0 +1,65 @@
+/**
+ * Order daily report query data
+ * 订单日报表查询数据
+ */
+export type OrderDailyReportQueryData = {
+  /**
+   * Id
+   * 编号
+   */
+  id: number;
+
+  /**
+   * Period
+   * 区间
+   */
+  period: string;
+
+  /**
+   * Order Items
+   * 订单数
+   */
+  items: number;
+
+  /**
+   * Amount
+   * 金额
+   */
+  amount: number;
+
+  /**
+   * Paid amount
+   * 已付款金额
+   */
+  paidAmount: number;
+
+  /**
+   * Discount
+   * 折扣
+   */
+  discount: number;
+
+  /**
+   * Line discount
+   * 行折扣
+   */
+  lineDiscount: number;
+
+  /**
+   * Approved discount
+   * 授权折扣
+   */
+  approvedDiscount: number;
+
+  /**
+   * Qty
+   * 数量
+   */
+  qty: number;
+
+  /**
+   * Customers
+   * 客户数
+   */
+  customers: number;
+};

package/src/dto/report/OrderMonthlyReportData.ts

@@ -0,0 +1,29 @@
+/**
+ * Order monthly report data
+ * 订单月报表数据
+ */
+export type OrderMonthlyReportData = {
+  /**
+   * Period
+   * 区间
+   */
+  period: number;
+
+  /**
+   * Order Items
+   * 订单数
+   */
+  items: number;
+
+  /**
+   * Amount
+   * 金额
+   */
+  amount: number;
+
+  /**
+   * Customers
+   * 客户数
+   */
+  customers: number;
+};

package/src/dto/report/OrderMonthlyReportQueryData.ts

@@ -0,0 +1,65 @@
+/**
+ * Order monthly report query data
+ * 订单月报表查询数据
+ */
+export type OrderMonthlyReportQueryData = {
+  /**
+   * Id
+   * 编号
+   */
+  id: number;
+
+  /**
+   * Period
+   * 区间
+   */
+  period: number;
+
+  /**
+   * Order Items
+   * 订单数
+   */
+  items: number;
+
+  /**
+   * Amount
+   * 金额
+   */
+  amount: number;
+
+  /**
+   * Paid amount
+   * 已付款金额
+   */
+  paidAmount: number;
+
+  /**
+   * Discount
+   * 折扣
+   */
+  discount: number;
+
+  /**
+   * Line discount
+   * 行折扣
+   */
+  lineDiscount: number;
+
+  /**
+   * Approved discount
+   * 授权折扣
+   */
+  approvedDiscount: number;
+
+  /**
+   * Qty
+   * 数量
+   */
+  qty: number;
+
+  /**
+   * Customers
+   * 客户数
+   */
+  customers: number;
+};

package/src/dto/report/PeriodReportData.ts

@@ -0,0 +1,17 @@
+/**
+ * Period report data
+ * 周期报表数据
+ */
+export type PeriodReportData = {
+  /**
+   * Period
+   * 周期
+   */
+  period: number;
+
+  /**
+   * Value
+   * 值
+   */
+  value: number;
+};

package/src/dto/report/TitleReportData.ts

@@ -0,0 +1,17 @@
+/**
+ * Title report data
+ * 标题报表数据
+ */
+export type TitleReportData = {
+  /**
+   * Title
+   * 标题
+   */
+  title: string;
+
+  /**
+   * Value
+   * 值
+   */
+  value: number;
+};

package/src/index.ts

@@ -19,6 +19,7 @@ export * from "./dto/member/MemberQueryDto";
 export * from "./dto/member/MemberReadDto";
 export * from "./dto/member/MemberUpdateReadDto";
 
+// Org
 export * from "./dto/org/CoreApiService";
 export * from "./dto/org/OrgDownloadKind";
 export * from "./dto/org/OrgGetMyData";
@@ -27,12 +28,12 @@ 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";
 export * from "./dto/org/OrgUpdateResourceReadData";
 
+// Public
 export * from "./dto/public/AvatarState";
 export * from "./dto/public/ChinaPinData";
 export * from "./dto/public/CurrencyItem";
@@ -47,6 +48,14 @@ export * from "./dto/user/DeviceListDto";
 export * from "./dto/user/UserIdentifierData";
 export * from "./dto/user/UserUpdateReadDto";
 
+// Report
+export * from "./dto/report/OrderDailyReportData";
+export * from "./dto/report/OrderDailyReportQueryData";
+export * from "./dto/report/OrderMonthlyReportData";
+export * from "./dto/report/OrderMonthlyReportQueryData";
+export * from "./dto/report/PeriodReportData";
+export * from "./dto/report/TitleReportData";
+
 // i18n
 export * from "./i18n/CoreCulture";
 
@@ -76,6 +85,7 @@ export * from "./rq/member/MemberListRQ";
 export * from "./rq/member/MemberQueryRQ";
 export * from "./rq/member/MemberUpdateRQ";
 
+// Org
 export * from "./rq/org/OrgCreateApiRQ";
 export * from "./rq/org/OrgCreateResourceRQ";
 export * from "./rq/org/OrgCreateRQ";
@@ -86,12 +96,12 @@ 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";
 export * from "./rq/org/SendSMSMessage";
 
+// Public
 export * from "./rq/public/AcceptInvitationRQ";
 export * from "./rq/public/CreateBarcodeRQ";
 export * from "./rq/public/ParseNameRQ";
@@ -102,6 +112,13 @@ export * from "./rq/public/TimeZoneRQ";
 export * from "./rq/user/AuditHistoryRQ";
 export * from "./rq/user/UserUpdateRQ";
 
+// Report
+export * from "./rq/report/OrderDailyReportQueryRQ";
+export * from "./rq/report/OrderDailyReportRQ";
+export * from "./rq/report/OrderMonthlyReportQueryRQ";
+export * from "./rq/report/OrderMonthlyReportRQ";
+export * from "./rq/report/OrgUsageReportRQ";
+
 // APIs
 export * from "./AppApi";
 export * from "./AuthCodeApi";

package/src/rq/report/OrderDailyReportQueryRQ.ts

@@ -0,0 +1,25 @@
+import { AppActionData, QueryRQ } from "@etsoo/appscript";
+
+/**
+ * Order daily report query request
+ * 订单日报表查询请求
+ */
+export type OrderDailyReportQueryRQ = QueryRQ & {
+  /**
+   * Action signed data
+   * 操作签名数据
+   */
+  action: AppActionData;
+
+  /**
+   * Start date
+   * 开始日期
+   */
+  startDate?: string;
+
+  /**
+   * End date
+   * 结束日期
+   */
+  endDate?: string;
+};

package/src/rq/report/OrderDailyReportRQ.ts

@@ -0,0 +1,25 @@
+import { AppActionData } from "@etsoo/appscript";
+
+/**
+ * Order daily report request data
+ * 订单日报表请求数据
+ */
+export type OrderDailyReportRQ = {
+  /**
+   * Action signed data
+   * 操作签名数据
+   */
+  action: AppActionData;
+
+  /**
+   * Start date
+   * 开始日期
+   */
+  startDate?: string; // DateOnly maps to string (ISO format: YYYY-MM-DD)
+
+  /**
+   * Days to cover
+   * 覆盖的天数
+   */
+  days?: number;
+};