fix: 修改预警数量

boyang
1 parent a39ecdce
Showing 4 changed files with 122 additions and 19 deletions
src/pages/Order/OrderWarning/index.tsx
src/services/definition.ts
src/services/request.ts
src/tsg.config.ts
@@ -4181,8 +4181,22 @@ const OrderPage = () =&gt; {
   const [invoiceRefundWarningNum, setInvoiceRefundWarningNum] = useState(0);
   const [waitConfirmPayment, setWaitConfirmPayment] = useState(0);
   const [waitFeedback, setWaitFeedback] = useState(0);
+  const [staticSalesCode, setStaticSalesCode] = useState(userInfo.userName);
+  //修改预警数请求salesCode
+  const changeSalesCode = () => {
+    if (salesCodeSelect === undefined) {
+      setStaticSalesCode(userInfo.userName);
+    } else {
+      setStaticSalesCode(salesCodeSelect);
+    }
+  };
   async function getInvoiceWarningNum() {
-    const res = await postServiceOrderWarningOrderStatistics();
+    changeSalesCode();
+    const res = await postServiceOrderWarningOrderStatistics({
+      data: {
+        salesCode: staticSalesCode,
+      },
+    });
     setInvoiceWarningNum(res.data.waitConfirmInvoice);
     setInvoiceRefundWarningNum(res.data.waitConfirmReceipt);
     setWaitConfirmPayment(res.data.waitConfirmPayment);
@@ -4191,7 +4205,7 @@ const OrderPage = () =&gt; {
   useEffect(() => {
     //预警订单数
     getInvoiceWarningNum();
-  }, []);
+  }, [salesCodeSelect]);
   //biaojiup
   // 监听 calDate 变化，触发请求
   useEffect(() => {
@@ -4324,14 +4338,21 @@ const OrderPage = () =&gt; {
             width="200px"
             actionRef={mainTableRef}
             formRef={mainTableFormRef}
-            initialValue={userInfo.nickName}
+            initialValue={userInfo.userName}
             showSearch
             label="销售代表"
             placeholder="请输入销售代表"
             options={salesCodeOptions}
             onChange={(_, option) => {
-              console.log(option, '5656option');
-              selectSalesCode(option.value);
+              if (option === undefined) {
+                selectSalesCode(userInfo.userName);
+              }
+              // if (option.value !== undefined) {
+              //   selectSalesCode(option.value);
+              // }
+              if (option && option.value !== undefined) {
+                selectSalesCode(option.value);
+              }
               mainTableRef.current?.reload();
             }}
             request={async () => {
@@ -4414,7 +4435,7 @@ const OrderPage = () =&gt; {
               });
             }
           }
-          params.salesCode = userInfo.nickName;
+          params.salesCode = userInfo.userName;
           params.condition = filterCondifion;
           //排序
           params.sorted = sorted;
@@ -4439,7 +4460,7 @@ const OrderPage = () =&gt; {
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
             params.orderStatus = 'SHIPPED'; // 发票确认预警
             params.isDeleteQueryOrder = false; // 强制查询非作废订单
-            params.salesCode = userInfo.nickName;
+            params.salesCode = userInfo.userName;
             if (salesCodeSelect !== undefined) {
               params.salesCode = salesCodeSelect;
             }
@@ -4456,7 +4477,7 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.nickName;
+            params.salesCode = userInfo.userName;
             if (salesCodeSelect !== undefined) {
               params.salesCode = salesCodeSelect;
             }
@@ -4475,7 +4496,7 @@ const OrderPage = () =&gt; {
             //   params.applyTimeLe = calDate;
             // }
             // params.applyTimeIsNotNull = true; // 要求申请时间非空
-            params.salesCode = userInfo.nickName;
+            params.salesCode = userInfo.userName;
             if (salesCodeSelect !== undefined) {
               params.salesCode = salesCodeSelect;
             }
@@ -4493,7 +4514,7 @@ const OrderPage = () =&gt; {
             } else {
               params.applyTimeLe = calDate;
             }
-            params.salesCode = userInfo.nickName;
+            params.salesCode = userInfo.userName;
             if (salesCodeSelect !== undefined) {
               params.salesCode = salesCodeSelect;
             }
@@ -4534,7 +4555,8 @@ const OrderPage = () =&gt; {
             });
             mainOrderIdSubOrderIdRelationsMap.set(mianOrderId, subOrderIds);
           }
-
+          // 请求完成后触发 getInvoiceWarningNum
+          getInvoiceWarningNum();
           return {
             data: data?.data || [],
             total: data?.total || 0,
@@ -765,6 +765,7 @@ export interface ApplyInvoiceDTO {
    * @format int64
    */
   id?: number;
+  invoice?: Invoice;
   /**
    * @description
    *   发票地址
@@ -778,8 +779,9 @@ export interface ApplyInvoiceDTO {
   /**
    * @description
    *   关联发票id
+   * @format int64
    */
-  invoiceId?: string;
+  invoiceId?: number;
   /**
    * @description
    *   发票号码
@@ -1420,6 +1422,42 @@ export interface InventoryMaterialStockReq {
   materialId?: string;
 }
+export interface Invoice {
+  /** @format date-time */
+  collectionTime?: string;
+  contacts?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  ext?: string;
+  /** @format int64 */
+  id?: number;
+  invoiceConfirmStatus?: string;
+  /** @format date-time */
+  invoiceConfirmStatusDatetime?: string;
+  invoiceNumber?: string;
+  /** @format int64 */
+  invoiceRecordId?: number;
+  invoiceStatus?: string;
+  /** @format date-time */
+  invoicingTime?: string;
+  invoicingType?: string;
+  logicDelete?: boolean;
+  /** @format int64 */
+  money?: number;
+  moneyAsBigDecimal?: number;
+  notes?: string;
+  payee?: string;
+  purchaser?: string;
+  sale?: string;
+  status?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+  /** @format int64 */
+  writeOffId?: number;
+}
+
 export interface InvoiceBatchDownloadDto {
   invoiceRecordIds?: Array<number>;
 }
@@ -1457,6 +1495,9 @@ export interface InvoiceDto {
    * @format int64
    */
   id?: number;
+  invoiceConfirmStatus?: string;
+  /** @format date-time */
+  invoiceConfirmStatusDatetime?: string;
   /**
    * @description
    *   发票号码
@@ -1587,6 +1628,7 @@ export interface InvoiceRecordDTO {
    * @format int64
    */
   id?: number;
+  invoice?: Invoice;
   /**
    * @description
    *   发票地址
@@ -1600,8 +1642,9 @@ export interface InvoiceRecordDTO {
   /**
    * @description
    *   关联发票id
+   * @format int64
    */
-  invoiceId?: string;
+  invoiceId?: number;
   /**
    * @description
    *   发票号码
@@ -2850,6 +2893,7 @@ export interface QueryClientDto {
   companyAddressLike?: string;
   companyIds?: Array<number>;
   companyNameLike?: string;
+  contacts?: string;
   createByName?: string;
   createByUserIdIn?: Array<number>;
   /** @format date-time */
@@ -2886,13 +2930,13 @@ export interface QueryCommunicationInfoDto {
   content?: string;
   createByName?: string;
   createByNameIn?: Array<string>;
-  /** @format date-time */
-  createTimeGe?: string;
-  /** @format date-time */
-  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format date-time */
+  dateTimeGe?: string;
+  /** @format date-time */
+  dateTimeLe?: string;
+  /** @format date-time */
   datetime?: string;
   /** @format int32 */
   end?: number;
@@ -2905,6 +2949,7 @@ export interface QueryCommunicationInfoDto {
   /** @format int32 */
   total?: number;
   tradeStatusLike?: string;
+  updateByName?: string;
   way?: string;
 }
@@ -3240,6 +3285,21 @@ export interface QueryUseOldInvoicingDto {
   total?: number;
 }
+export interface QueryWarningOrderStatistics {
+  excludeWhiteList?: boolean;
+  salesCode?: string;
+  /** @format date-time */
+  waitConfirmInvoiceStatusDateTimeLe?: string;
+  /** @format date-time */
+  waitConfirmPaymentOrderCreatedDateTimeGe?: string;
+  /** @format date-time */
+  waitConfirmPaymentStatusDateTimeLe?: string;
+  /** @format date-time */
+  waitConfirmReiceptStatusDateTimeLe?: string;
+  /** @format date-time */
+  waitFeedbackStatusDateTimeLe?: string;
+}
+
 export interface QueryWarningOrderWhiteListDto {
   createByName?: string;
   /** @format date-time */
@@ -3722,6 +3782,8 @@ export interface SubOrder {
   /** @format date-time */
   collectMoneyTime?: string;
   confirmDeliverNotes?: string;
+  /** @format date-time */
+  confirmReceiptDatetime?: string;
   confirmReissueNotes?: string;
   createByName?: string;
   /** @format date-time */
@@ -105,6 +105,7 @@ import type {
   QueryProcureReturnBillDto,
   QueryReportFormsDto,
   QueryUseOldInvoicingDto,
+  QueryWarningOrderStatistics,
   QueryWarningOrderWhiteListDto,
   QueryWarningUserWhiteListDto,
   QueryWriteOffRecordDto,
@@ -21707,6 +21708,20 @@ export const postServiceOrderViewImages = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderWarningOrderStatistics */
+export interface PostServiceOrderWarningOrderStatisticsOption {
+  /**
+   * @description
+   *   query
+   */
+  body: {
+    /**
+        @description
+          query */
+    query: QueryWarningOrderStatistics;
+  };
+}
+
 /** @description response type for postServiceOrderWarningOrderStatistics */
 export interface PostServiceOrderWarningOrderStatisticsResponse {
   /**
@@ -21748,9 +21763,12 @@ export type PostServiceOrderWarningOrderStatisticsResponseSuccess =
 export const postServiceOrderWarningOrderStatistics = /* #__PURE__ */ (() => {
   const method = 'post';
   const url = '/service/order/warningOrderStatistics';
-  function request(): Promise<PostServiceOrderWarningOrderStatisticsResponseSuccess> {
+  function request(
+    option: PostServiceOrderWarningOrderStatisticsOption,
+  ): Promise<PostServiceOrderWarningOrderStatisticsResponseSuccess> {
     return requester(request.url, {
       method: request.method,
+      ...option,
     }) as unknown as Promise<PostServiceOrderWarningOrderStatisticsResponseSuccess>;
   }
@@ -33,7 +33,8 @@ const projects: Project[] = [
      * openapi 文档地址，可以是远程的json文件，也可以是本地的json文件
      * 如果使用本地文件，相对路径以当前'tsg.config.ts'为基准
      * */
-    source: 'http://localhost:8085/v2/api-docs',
+    // source: 'http://localhost:8085/v2/api-docs',
+    source: 'http://39.108.227.113:8085/v2/api-docs',
     // source: 'https://petstore3.swagger.io/api/v3/openapi.json',
     // source: './fixture/pet.json',