feat: 重新开票功能bug修复

曾国涛
1 parent de64c07c
Showing 4 changed files with 496 additions and 9 deletions
src/pages/Invoice/constant.tsx
src/pages/Order/components/ReissueModal.tsx
src/services/definition.ts
src/services/request.ts
@@ -175,14 +175,14 @@ export const BANK_STATEMENT_COLUMNS = [
     width: 100,
   },
   {
-    dataIndex: 'collectionDate',
+    dataIndex: 'collectionDatetime',
     title: '收款时间',
     valueType: 'date',
     width: 100,
     hideInSearch: true,
   },
   {
-    dataIndex: 'collectionDateSearch',
+    dataIndex: 'collectionDatetimeSearch',
     title: '收款时间',
     valueType: 'dateRange',
     width: 100,
@@ -191,8 +191,8 @@ export const BANK_STATEMENT_COLUMNS = [
       transform: (value) => {
         if (value) {
           return {
-            collectionDateBegin: value[0],
-            collectionDateEnd: value[1],
+            collectionDatetimeBegin: value[0],
+            collectionDatetimeEnd: value[1],
           };
         }
       },
@@ -32,7 +32,7 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
       let temInvoiceSelectList = [];
       res.data.forEach((item) => {
         temInvoiceSelectList.push({
-          label: item.id,
+          label: item.invoiceNumber,
           value: item.id,
         });
       });
@@ -500,6 +500,12 @@ export interface ApiQueryOrderStatusCountsRequest {
 }
  
 export interface AuditDto {
+  /**
+   * @description
+   *   主订单id
+   * @format int64
+   */
+  mainOrderId?: number;
   notes?: string;
   /**
    * @description
@@ -854,6 +860,22 @@ export interface InventoryMaterialStockReq {
   materialId?: string;
 }
  
+export interface InvoiceRecordQueryRequest {
+  /** @format date */
+  createTimeGe?: string;
+  /** @format date */
+  createTimeLe?: string;
+  /** @format int32 */
+  pageNumber?: number;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+}
+
 export interface Item {
   billDate?: string;
   billNo?: string;
@@ -867,6 +889,20 @@ export interface ItemSaItem {
   itemValue?: string;
 }
  
+export interface MainOrderqueryRequest {
+  afterInvoicingStatusIsNull?: boolean;
+  orderStatusNotIn?: Array<string>;
+  /** @format int32 */
+  pageNumber?: number;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+}
+
 export interface MaterialListReply {
   count?: string;
   /** @format int32 */
@@ -1413,13 +1449,13 @@ export interface QueryBankStatementDto {
    *   collection_date
    * @format date
    */
-  collectionDateBegin?: string;
+  collectionDatetimeBegin?: string;
   /**
    * @description
    *   collection_date
    * @format date
    */
-  collectionDateEnd?: string;
+  collectionDatetimeEnd?: string;
   /** @format int32 */
   current?: number;
   /** @format int64 */
@@ -1529,8 +1565,6 @@ export interface QueryReportFormsDto {
 export interface ReissueInvoiceDto {
   /** @format int64 */
   invoiceId?: number;
-  invoiceNumber?: string;
-  mainOrderIds?: Array<number>;
   notes?: string;
 }
  
@@ -1984,6 +2018,101 @@ export interface SalesRechargePrepaymentUpdateRequest {
   salesCode?: string;
 }
  
+/**
+ * @description
+ *   开票添加对象
+ */
+export interface StoreOrderInvoiceRequest {
+  /**
+   * @description
+   *   开票备注
+   */
+  comment?: string;
+  /**
+   * @description
+   *   开票内容
+   */
+  content?: string;
+  /**
+   * @description
+   *   创建时间
+   * @format date-time
+   */
+  createTime?: string;
+  /**
+   * @description
+   *   关联订单id
+   */
+  orderIdList?: Array<number>;
+  /**
+   * @description
+   *   买方注册地址
+   */
+  partyAAddress?: string;
+  /**
+   * @description
+   *   买方开户行账号
+   */
+  partyABankAccount?: string;
+  /**
+   * @description
+   *   买方名称
+   */
+  partyAName?: string;
+  /**
+   * @description
+   *   买方开户行
+   */
+  partyAOpenBank?: string;
+  /**
+   * @description
+   *   买方电话号码
+   */
+  partyAPhoneNumber?: string;
+  /**
+   * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
+   *   抬头类型
+   */
+  partyAType?: string;
+  /**
+   * @description
+   *   卖方名称
+   */
+  partyBName?: string;
+  /**
+   * @description
+   *   发票金额
+   * @format double
+   */
+  price?: number;
+  /**
+   * @description
+   *   接收邮箱地址
+   */
+  receiveEmail?: string;
+  /**
+   * @description
+   *   发票类型
+   */
+  type?: string;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+  /**
+   * @description
+   *   更新时间
+   * @format date-time
+   */
+  updateTime?: string;
+}
+
 export interface UploadPaymentReceiptDTO {
   /**
    * @description
@@ -41,6 +41,8 @@ import type {
   DictionaryVO,
   Dto,
   InventoryMaterialStockReq,
+  InvoiceRecordQueryRequest,
+  MainOrderqueryRequest,
   MaterialListReply,
   MaterialMaterialListReq,
   MaterialStockRes,
@@ -79,6 +81,7 @@ import type {
   SaveReply,
   ServerResult,
   ShippingWarehouseChangeDto,
+  StoreOrderInvoiceRequest,
   SysLogQueryVO,
   SystemCustomFieldReq,
   ToProcureAuditDto,
@@ -475,6 +478,148 @@ export const postApiOrderCreateOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postApiOrderInvoicedOrderList */
+export interface PostApiOrderInvoicedOrderListOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: MainOrderqueryRequest;
+  };
+}
+
+/** @description response type for postApiOrderInvoicedOrderList */
+export interface PostApiOrderInvoicedOrderListResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderInvoicedOrderListResponseSuccess =
+  PostApiOrderInvoicedOrderListResponse[200];
+/**
+ * @description
+ *   获取已开票订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderInvoicedOrderList = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/invoicedOrderList';
+  function request(
+    option: PostApiOrderInvoicedOrderListOption,
+  ): Promise<PostApiOrderInvoicedOrderListResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderInvoicedOrderListResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postApiOrderInvoicedRecordList */
+export interface PostApiOrderInvoicedRecordListOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: InvoiceRecordQueryRequest;
+  };
+}
+
+/** @description response type for postApiOrderInvoicedRecordList */
+export interface PostApiOrderInvoicedRecordListResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderInvoicedRecordListResponseSuccess =
+  PostApiOrderInvoicedRecordListResponse[200];
+/**
+ * @description
+ *   获取开票记录
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderInvoicedRecordList = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/invoicedRecordList';
+  function request(
+    option: PostApiOrderInvoicedRecordListOption,
+  ): Promise<PostApiOrderInvoicedRecordListResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderInvoicedRecordListResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postApiOrderQueryOrderDetail */
 export interface PostApiOrderQueryOrderDetailOption {
   /**
@@ -688,6 +833,148 @@ export const postApiOrderQueryServiceOrder = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postApiOrderStoreApplyInvoice */
+export interface PostApiOrderStoreApplyInvoiceOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: StoreOrderInvoiceRequest;
+  };
+}
+
+/** @description response type for postApiOrderStoreApplyInvoice */
+export interface PostApiOrderStoreApplyInvoiceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderStoreApplyInvoiceResponseSuccess =
+  PostApiOrderStoreApplyInvoiceResponse[200];
+/**
+ * @description
+ *   商城申请开票
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderStoreApplyInvoice = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/storeApplyInvoice';
+  function request(
+    option: PostApiOrderStoreApplyInvoiceOption,
+  ): Promise<PostApiOrderStoreApplyInvoiceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderStoreApplyInvoiceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postApiOrderWaitInvoiceOrderList */
+export interface PostApiOrderWaitInvoiceOrderListOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: MainOrderqueryRequest;
+  };
+}
+
+/** @description response type for postApiOrderWaitInvoiceOrderList */
+export interface PostApiOrderWaitInvoiceOrderListResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostApiOrderWaitInvoiceOrderListResponseSuccess =
+  PostApiOrderWaitInvoiceOrderListResponse[200];
+/**
+ * @description
+ *   获取可开票订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postApiOrderWaitInvoiceOrderList = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/api/order/waitInvoiceOrderList';
+  function request(
+    option: PostApiOrderWaitInvoiceOrderListOption,
+  ): Promise<PostApiOrderWaitInvoiceOrderListResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostApiOrderWaitInvoiceOrderListResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postCanrdApiUserDetail */
 export interface PostCanrdApiUserDetailOption {
   /**
@@ -6415,6 +6702,77 @@ export const postOrderErpUsersUpdatePass = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
  
+/** @description request parameter type for postOrderImportImportWeightAndVolume */
+export interface PostOrderImportImportWeightAndVolumeOption {
+  /**
+   * @description
+   *   file
+   */
+  formData: {
+    /**
+        @description
+          file */
+    file: File;
+  };
+}
+
+/** @description response type for postOrderImportImportWeightAndVolume */
+export interface PostOrderImportImportWeightAndVolumeResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostOrderImportImportWeightAndVolumeResponseSuccess =
+  PostOrderImportImportWeightAndVolumeResponse[200];
+/**
+ * @description
+ *   导入重量和体积
+ * @tags 导入
+ * @produces *
+ * @consumes multipart/form-data
+ */
+export const postOrderImportImportWeightAndVolume = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/order/import/importWeightAndVolume';
+  function request(
+    option: PostOrderImportImportWeightAndVolumeOption,
+  ): Promise<PostOrderImportImportWeightAndVolumeResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostOrderImportImportWeightAndVolumeResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postPrepaidAudit */
 export interface PostPrepaidAuditOption {
   /**