feat(Order): add urgent invoice auditing and reissue functionality

- Implement new check types for urgent invoice auditing and confirmation of reissue. - Add associated constants and services for the new functionalities. - Modify the InvoicingDrawerForm to include new fields and improve the UI/UX. - Refactor the CheckModal to handle the new check types gracefully. - Remove deprecated research group interfaces and clean up the codebase. BREAKING CHANGE: The addition of new check types and related changes may affect existing clients relying on the previous API structure.

feat(Order): add urgent invoice auditing and reissue functionality
- Implement new check types for urgent invoice auditing and confirmation of reissue. - Add associated constants and services for the new functionalities. - Modify the InvoicingDrawerForm to include new fields and improve the UI/UX. - Refactor the CheckModal to handle the new check types gracefully. - Remove deprecated research group interfaces and clean up the codebase. BREAKING CHANGE: The addition of new check types and related changes may affect existing clients relying on the previous API structure.
曾国涛
1 parent 0371e839
Showing 8 changed files with 724 additions and 371 deletions
.idea/.name
src/pages/Order/components/CheckModal.tsx
src/pages/Order/components/InvoicingDrawerForm.tsx
src/pages/Order/components/ReissueModal_old.tsx
src/pages/Order/constant.ts
src/pages/Order/index.tsx
src/services/definition.ts
src/services/request.ts
-front_project
@@ -410,6 +410,12 @@ export default ({
     if (checkType(CHECK_TYPE.CREDIT_AUDIT)) {
       type = 'credit_audit';
     }
+    if (checkType(CHECK_TYPE.URGENT_INVOICE_AUDITING_OLD)) {
+      type = 'urgent_invoice_audit_old';
+    }
+    if (checkType(CHECK_TYPE.CONFIRM_REISSUE_OLD)) {
+      type = 'confirm_reissue_old';
+    }
     return type;
   }
@@ -6,6 +6,7 @@ import {
   postServiceConstInvoicingType,
   postServiceConstListInvoiceDetailNames,
   postServiceInvoiceApplyInvoice,
+  postServiceInvoiceQueryCompanyInfo,
 } from '@/services';
 import { enumToSelect } from '@/utils';
 import {
@@ -19,7 +20,7 @@ import {
   ProFormText,
   ProFormTextArea,
 } from '@ant-design/pro-components';
-import { Button, Form } from 'antd';
+import { Button, Divider, Form, Tag } from 'antd';
 import { useEffect } from 'react';
 export default ({ dataList, mainOrder, setVisible, onClose }) => {
@@ -99,6 +100,66 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
         initialValue={mainOrder.institution}
         placeholder="请输入名称"
       />
+      <ProFormSelect
+        key="key"
+        label="购方名称"
+        width="lg"
+        showSearch
+        name="partyAName"
+        placeholder="请搜索购方"
+        rules={[{ required: true, message: '购方名称必填' }]}
+        onChange={(_, option) => {
+          form.setFieldValue('partyATaxid', option.taxId);
+        }}
+        fieldProps={{
+          optionItemRender(item) {
+            if (item.type === 'add') {
+              return (
+                <>
+                  <Tag key={item.name}>{item.name}</Tag>
+                  <Divider type="vertical" />
+                  <Tag key={item.id}>新增</Tag>
+                </>
+              );
+            }
+            return (
+              <>
+                <Tag key={item.name}>{item.name}</Tag>
+                <Divider type="vertical" />
+                <Tag key={item.taxId}>{item.taxId}</Tag>
+              </>
+            );
+          },
+        }}
+        debounceTime={1000}
+        request={async (value) => {
+          const keywords = value.keyWords;
+          const res = await postServiceInvoiceQueryCompanyInfo({
+            data: { nameLike: keywords },
+          });
+          let options = res?.data?.map((company) => {
+            return {
+              ...company,
+              label: company.name,
+              value: company.name + '|' + company.taxId,
+              key: company.id,
+            };
+          });
+
+          //第一个商品默认为要新增的商品
+          if (keywords.trim() !== '') {
+            options.unshift({
+              name: keywords,
+              type: 'add',
+              label: keywords,
+              value: keywords,
+              key: keywords,
+            });
+          }
+          return options;
+        }}
+      />
+      ,
       <ProFormText
         width="md"
         name="partyATaxid"
@@ -295,6 +356,16 @@ export default ({ dataList, mainOrder, setVisible, onClose }) =&gt; {
                 key={'specification' + listMeta.index}
                 name="specification"
                 label="规格型号"
+                rules={[
+                  {
+                    message: '规格型号不能超过20个字符!',
+                    max: 20,
+                  },
+                  {
+                    message: '规格型号不能为空!',
+                    required: true,
+                  },
+                ]}
                 placeholder="请输入名称"
               />
               <ProFormText
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postServiceInvoiceFindInvoiceOld,
+  postServiceInvoiceReissueOld,
+  postServiceOrderFindServiceOrder,
+} from '@/services';
+import {
+  ModalForm,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+} from '@ant-design/pro-components';
+import { Form } from 'antd';
+import { useEffect, useState } from 'react';
+
+export default ({ setVisible, mainOrder, onClose }) => {
+  const [invoiceSelectList, setInvoiceSelectList] = useState([]);
+  const [mainOrders, setMainOrders] = useState('');
+  const [submitting, setSubmitting] = useState(false);
+
+  const [form] = Form.useForm<{ invoiceId: string; notes: string }>();
+
+  let getInvoiceSelectList = async () => {
+    console.log(mainOrder);
+    const res = await postServiceInvoiceFindInvoiceOld({
+      data: {
+        mainOrderId: mainOrder.id,
+      },
+    });
+    setInvoiceSelectList([]);
+    if (res && res.result === RESPONSE_CODE.SUCCESS) {
+      let temInvoiceSelectList = [];
+      res.data.forEach((item) => {
+        temInvoiceSelectList.push({
+          label: item.invoiceNumber,
+          value: item.id,
+        });
+      });
+      setInvoiceSelectList(temInvoiceSelectList);
+    }
+  };
+  useEffect(() => {
+    getInvoiceSelectList();
+  }, []);
+  return (
+    <ModalForm<{
+      invoiceId: string;
+      notes: string;
+    }>
+      title="重新开票(旧)"
+      form={form}
+      width={500}
+      open
+      autoFocusFirstInput
+      initialValues={{}}
+      modalProps={{
+        okText: '确认',
+        cancelText: '取消',
+        destroyOnClose: true,
+        onCancel: () => {
+          setVisible(false);
+        },
+      }}
+      submitting={submitting}
+      onFinish={async (values) => {
+        setSubmitting(true);
+        postServiceInvoiceReissueOld({
+          data: values,
+        });
+        setVisible(false);
+        onClose();
+      }}
+      submitTimeout={2000}
+    >
+      <ProFormSelect
+        width="lg"
+        name="invoiceId"
+        label="选择要重新开的发票"
+        options={invoiceSelectList}
+        onChange={async (value) => {
+          console.log(value);
+          let result = await postServiceOrderFindServiceOrder({
+            data: {
+              invoiceId: value,
+            },
+          });
+          if (result && result.result === RESPONSE_CODE.SUCCESS) {
+            //对data里面每个元素的id用，进行拼接
+            let map = result.data.map((item) => item.id);
+            let str = map.join(',');
+            setMainOrders(str);
+          }
+        }}
+      />
+      <ProFormText
+        width="lg"
+        name="purchaser"
+        label="抬头名称"
+        key="purchaser"
+        placeholder="请输入抬头名称"
+        rules={[{ required: true, message: '抬头名称必填' }]}
+      />
+      <ProFormText
+        width="md"
+        name="关联订单"
+        label="发票关联订单号"
+        readonly={true}
+        value={mainOrders}
+      />
+      <ProFormTextArea
+        width="lg"
+        name="notes"
+        rules={[
+          {
+            required: true, // 设置为必填
+            message: '必须填写重新开票原因', // 当未填写时显示的提示信息
+          },
+        ]}
+        placeholder="请填写订单重新开票的原因"
+      />
+    </ModalForm>
+  );
+};
@@ -105,8 +105,10 @@ export const CHECK_TYPE = {
   NODE_OPERATING_AUDIT: 'NODE_OPERATING_AUDIT',
   MODIFY_LEADER_AUDIT: 'MODIFY_LEADER_AUDIT',
   URGENT_INVOICE_AUDITING: 'URGENT_INVOICE_AUDITING',
+  URGENT_INVOICE_AUDITING_OLD: 'URGENT_INVOICE_AUDITING_OLD',
   PAYMENT_RECEIPTS_AUDIT: 'PAYMENT_RECEIPTS_AUDIT',
   CONFIRM_REISSUE: 'CONFIRM_REISSUE',
+  CONFIRM_REISSUE_OLD: 'CONFIRM_REISSUE_OLD',
   PREPAID_AUDIT: 'PREPAID_AUDIT',
   CREDIT_AUDIT: 'CREDIT_AUDIT',
 };
@@ -3,6 +3,7 @@ import { RESPONSE_CODE } from &#39;@/constants/enum&#39;;
 import ImportExpressBillModal from '@/pages/Order/components/ImportExpressBillModal';
 import InvoicingDrawerForm from '@/pages/Order/components/InvoicingDrawerForm';
 import ReissueModal from '@/pages/Order/components/ReissueModal';
+import ReissueModal_old from '@/pages/Order/components/ReissueModal_old';
 import {
   postKingdeeRepSalBillOutbound,
   postKingdeeRepSalOrderSave,
@@ -153,6 +154,7 @@ const OrderPage = () =&gt; {
   const [isMainOrder, setIsMainOrder] = useState<boolean>(false);
   const [importModalVisible, setImportModalVisible] = useState<boolean>(false);
   const [reissueVisible, setReissueVisible] = useState<boolean>(false);
+  const [reissueVisibleOld, setReissueVisibleOld] = useState<boolean>(false);
   const [applyForInvoicingVisible, setApplyForInvoicingVisible] =
     useState<boolean>(false);
   const [procureCheckModalVisible, setProcureCheckModalVisible] =
@@ -1314,6 +1316,23 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
+            {optRecord.subPath?.includes('URGENT_INVOICE_AUDITING') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  console.log('here');
+                  setCurrentMainId(record.id);
+                  setCurretnOptSubId(optRecord.id);
+                  setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING_OLD);
+                }}
+              >
+                加急审核(旧)
+              </Button>
+            ) : (
+              ''
+            )}
             {optRecord.subPath?.includes('salesConfirm') && (
               <ButtonConfirm
                 className="p-0"
@@ -1347,6 +1366,22 @@ const OrderPage = () =&gt; {
             ) : (
               ''
             )}
+            {optRecord.subPath?.includes('reissue_old') ? (
+              /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'||
+                  optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setCurrentMainId(record.id);
+                  setReissueVisibleOld(true);
+                }}
+              >
+                重新开票(旧)
+              </Button>
+            ) : (
+              ''
+            )}
             {optRecord.subPath?.includes('reissue') ? (
               /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'||
                 optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/
@@ -1373,6 +1408,22 @@ const OrderPage = () =&gt; {
                   setCurrentMainId(record.id);
                   setCurretnOptSubId(optRecord.id);
                   setCheckVisible(true);
+                  setOrderCheckType(CHECK_TYPE.CONFIRM_REISSUE_OLD);
+                }}
+              >
+                重新开票审核(旧)
+              </Button>
+            ) : (
+              ''
+            )}
+            {optRecord.subPath?.includes('confirmReissue') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setCurrentMainId(record.id);
+                  setCurretnOptSubId(optRecord.id);
+                  setCheckVisible(true);
                   setOrderCheckType(CHECK_TYPE.CONFIRM_REISSUE);
                 }}
               >
@@ -1496,11 +1547,11 @@ const OrderPage = () =&gt; {
               ''
             )}
-            {/*{optRecord.subPath?.includes('saleCancelInvoicing') ? (
+            {optRecord.subPath?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
                 title="确认取消申请开票？"
-                text="取消申请"
+                text="取消申请(旧)"
                 onConfirm={async () => {
                   let res = await postServiceOrderSaleCancelInvoicing({
                     data: {
@@ -1516,7 +1567,7 @@ const OrderPage = () =&gt; {
               />
             ) : (
               ''
-            )}*/}
+            )}
             {optRecord.subPath?.includes('saleCancelInvoicing') ? (
               <ButtonConfirm
                 className="p-0"
@@ -1786,6 +1837,23 @@ const OrderPage = () =&gt; {
               ''
             )}
+            {optRecord.subPath?.includes('applyInvoicing') ? (
+              <Button
+                className="p-0"
+                type="link"
+                onClick={() => {
+                  setApplyForInvoicingVisible(true);
+                  createOptObject(optRecord.id, record.id);
+                  setIsEdit(false);
+                  setIsMainOrder(false);
+                }}
+              >
+                申请开票(旧)
+              </Button>
+            ) : (
+              ''
+            )}
+
             {optRecord.subPath?.includes('checkOrder') ? (
               <Button
                 className="p-0"
@@ -2657,6 +2725,23 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
+                  {record.mainPath?.includes('URGENT_INVOICE_AUDITING') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        createOptObject(null, record.id);
+                        setCheckVisible(true);
+                        setOrderCheckType(
+                          CHECK_TYPE.URGENT_INVOICE_AUDITING_OLD,
+                        );
+                      }}
+                    >
+                      加急审核(旧)
+                    </Button>
+                  ) : (
+                    ''
+                  )}
                   {record.mainPath?.includes('salesConfirm') && (
                     <ButtonConfirm
                       className="p-0"
@@ -2767,6 +2852,41 @@ const OrderPage = () =&gt; {
                     ''
                   )}
+                  {record.mainPath?.includes('reissue_old') ? (
+                    /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'||
+                        optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setCurrentMainId(record.id);
+                        setReissueVisibleOld(true);
+                        console.log(reissueVisible);
+                      }}
+                    >
+                      重新开票(旧)
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
+                  {record.mainPath?.includes('confirmReissue') ? (
+                    <Button
+                      className="p-0"
+                      type="link"
+                      onClick={() => {
+                        setCurrentMainId(record.id);
+                        setCurretnOptSubId(null);
+                        setCheckVisible(true);
+                        setOrderCheckType(CHECK_TYPE.CONFIRM_REISSUE_OLD);
+                      }}
+                    >
+                      重新开票审核（旧）
+                    </Button>
+                  ) : (
+                    ''
+                  )}
+
                   {record.mainPath?.includes('reissue') ? (
                     /*optRecord.afterInvoicingStatus==='PARTIAL_INVOICING'||
                       optRecord.afterInvoicingStatus==='COMPLETE_INVOICING'*/
@@ -3214,7 +3334,7 @@ const OrderPage = () =&gt; {
                     ''
                   )}
-                  {/*{record.mainPath?.includes('applyInvoicing') ? (
+                  {record.mainPath?.includes('applyInvoicing') ? (
                     <Button
                       type="link"
                       className="p-0"
@@ -3245,11 +3365,11 @@ const OrderPage = () =&gt; {
                         setIsMainOrder(false);
                       }}
                     >
-                      申请开票
+                      申请开票(旧)
                     </Button>
                   ) : (
                     ''
-                  )}*/}
+                  )}
                   {record.mainPath?.includes('applyInvoicing') ? (
                     <Button
@@ -3494,7 +3614,7 @@ const OrderPage = () =&gt; {
                     <ButtonConfirm
                       className="p-0"
                       title="确认取消申请开票？"
-                      text="取消申请"
+                      text="取消申请(旧)"
                       onConfirm={async () => {
                         let selectedSubOrders = subOrderSelectedMap.get(
                           record.id,
@@ -3503,6 +3623,7 @@ const OrderPage = () =&gt; {
                           selectedSubOrders = record.subOrderInformationLists;
                         }
+                        console.log(selectedSubOrders);
                         for (let i = 0; i < selectedSubOrders.length; i++) {
                           if (
                             selectedSubOrders[i].afterInvoicingStatus !==
@@ -3531,7 +3652,6 @@ const OrderPage = () =&gt; {
                   ) : (
                     ''
                   )}
-
                   {/* 财务审核：主订单暂无 */}
                   {record.mainPath?.includes('financeCheckOrder') ? (
                     <Button
@@ -4099,12 +4219,12 @@ const OrderPage = () =&gt; {
         },
       },
       {
-        label: '加急开票审核',
+        label: '加急开票审核(旧)',
         key: '2',
         onClick: async () => {
           setIsMainOrder(true);
           setCheckVisible(true);
-          setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING);
+          setOrderCheckType(CHECK_TYPE.URGENT_INVOICE_AUDITING_OLD);
         },
       },
       {
@@ -4199,7 +4319,7 @@ const OrderPage = () =&gt; {
       );
     }
-    /*if (rolePath?.includes('mergeApplyInvoicing')) {
+    if (rolePath?.includes('mergeApplyInvoicing')) {
       toolBtns.push(
         <Button
           type="primary"
@@ -4214,9 +4334,22 @@ const OrderPage = () =&gt; {
           {roleCode === 'admin' ? '合并(销售)' : '合并开票'}
         </Button>,
       );
-    }*/
+    }
-    /*if (rolePath?.includes('mergeInvoicing')) {
+    <Button
+      type="primary"
+      key="out"
+      onClick={() => {
+        setIsEdit(false);
+        setIsMainOrder(true);
+        setInvoicingDrawerFormVisible(true);
+      }}
+      disabled={selectedSubOrderKeys?.length === 0}
+    >
+      申请开票(旧)
+    </Button>;
+
+    if (rolePath?.includes('mergeInvoicing')) {
       toolBtns.push(
         <Button
           type="primary"
@@ -4250,7 +4383,7 @@ const OrderPage = () =&gt; {
           {roleCode === 'admin' ? '合并(财务)' : '合并开票'}
         </Button>,
       );
-    }*/
+    }
     toolBtns.push(
       <Button
@@ -4841,6 +4974,24 @@ const OrderPage = () =&gt; {
           }}
         />
       )}
+      {reissueVisibleOld && (
+        <ReissueModal_old
+          setVisible={(val: boolean) => {
+            setReissueVisibleOld(val);
+            console.log(reissueVisible);
+            if (!val) {
+              clearOptObject();
+            }
+          }}
+          mainOrder={buildMainOrder()}
+          subOrders={buildSubOrders()}
+          onClose={() => {
+            setReissueVisibleOld(false);
+            clearOptObject();
+            refreshTable();
+          }}
+        />
+      )}
       {productionTimeModalVisible && (
         <ProductionTimeModal
           setVisible={(val: boolean) => {
@@ -723,6 +723,7 @@ export interface ApplyInvoiceDto {
    *   卖方税号
    */
   partyBTaxid?: string;
+  paths?: Array<string>;
   /**
    * @description
    *   发票金额
@@ -1410,6 +1411,7 @@ export interface InvoiceRecordDto {
    *   卖方税号
    */
   partyBTaxid?: string;
+  paths?: Array<string>;
   /**
    * @description
    *   发票金额
@@ -3028,325 +3030,6 @@ export interface ResearchGroupMemberRequestsRequest {
   total?: number;
 }
-export interface ResearchGroupAccountAddRequest {
-  /**
-   * @description
-   *   关联的账号id
-   * @format int64
-   */
-  accountId?: number;
-  /**
-   * @description
-   *   关联的账号名称
-   */
-  accountName?: string;
-  /**
-   * @description
-   *   关联的账号手机号
-   */
-  accountPhone?: string;
-  /**
-   * @description
-   *   课题组id
-   * @format int64
-   */
-  groupId?: number;
-}
-
-export interface ResearchGroupAccountEditRequest {
-  /**
-   * @description
-   *   关联的账号id
-   * @format int64
-   */
-  accountId?: number;
-  /**
-   * @description
-   *   关联的账号名称
-   */
-  accountName?: string;
-  /**
-   * @description
-   *   关联的账号手机号
-   */
-  accountPhone?: string;
-  /**
-   * @description
-   *   课题组id
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupAddRequest {
-  accounts?: Array<ResearchGroupAccountAddRequest>;
-  /**
-   * @description
-   *   课题组名称
-   */
-  group?: string;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leader?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
-}
-
-export interface ResearchGroupDeleteRequest {
-  /**
-   * @description
-   *   主键id
-   */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupDetailRequest {
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupEditRequest {
-  /**
-   * @description
-   *   课题组预存账号
-   */
-  accounts?: Array<ResearchGroupAccountEditRequest>;
-  /**
-   * @description
-   *   课题组名称
-   */
-  group?: string;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leader?: string;
-  /**
-   * @description
-   *   课题组成员集合
-   */
-  members?: Array<ResearchGroupMemberEditRequest>;
-}
-
-export interface ResearchGroupListRequest {
-  /**
-   * @description
-   *   预存账号手机号
-   */
-  accountPhone?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   课题组负责人
-   */
-  leaderName?: string;
-  /**
-   * @description
-   *   课题组成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   课题组成员手机号
-   */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
-export interface ResearchGroupMemberAddRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberEditRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberRequestAddRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestDeleteRequest {
-  /**
-   * @description
-   *   主键id
-   */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupMemberRequestDetailRequest {
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-}
-
-export interface ResearchGroupMemberRequestEditRequest {
-  /**
-   * @description
-   *   课题组ID
-   * @format int64
-   */
-  groupId?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   主键id
-   * @format int64
-   */
-  id?: number;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestsRequest {
-  /**
-   * @description
-   *   审核备注
-   */
-  auditNotes?: string;
-  /**
-   * @description
-   *   审核状态
-   */
-  auditStatus?: string;
-  /**
-   * @description
-   *   创建人
-   */
-  createByName?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
-  /**
-   * @description
-   *   课题组名称
-   */
-  groupName?: string;
-  /**
-   * @description
-   *   成员名称
-   */
-  memberName?: string;
-  /**
-   * @description
-   *   成员手机号
-   */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /**
-   * @description
-   *   申请备注
-   */
-  requestNotes?: string;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
 export interface ResetPwdVO {
   /** @format int64 */
   userId?: number;
@@ -3835,6 +3518,52 @@ export interface ApiOrderConfirmReceiveRequest {
   subOrderIds?: Array<number>;
 }
+export interface CompanyInfo {
+  address?: string;
+  addressLike?: string;
+  bank?: string;
+  bankAccount?: string;
+  /**
+   * @description
+   *   创建字段的用户的名字
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   创建时间
+   * @format date-time
+   */
+  createTime?: string;
+  /** @format int64 */
+  id?: number;
+  /**
+   * @description
+   *   逻辑删除 默认为1表示未删除，为0表示已经删除
+   */
+  logicDelete?: boolean;
+  name?: string;
+  nameLike?: string;
+  phoneNumber?: string;
+  taxId?: string;
+  /**
+   * @description
+   *   更新字段的用户的名字
+   */
+  updateByName?: string;
+  /**
+   * @description
+   *   更新时间
+   * @format date-time
+   */
+  updateTime?: string;
+  /**
+   * @description
+   *   版本号
+   * @format int32
+   */
+  version?: number;
+}
+
 export interface TsgFile {
   absolute?: boolean;
   absoluteFile?: TsgFile;
@@ -36,6 +36,7 @@ import type {
   CancelSendOrderDto,
   CaptchaMessageVO,
   CommonAuditRequest,
+  CompanyInfo,
   CustomFieldRes,
   CustomerCustomerListReq,
   CustomerDetailDto,
@@ -58,6 +59,7 @@ import type {
   MaterialUnitListRes,
   MeasureUnitListRes,
   MessageQueryDTO,
+  ModelAndView,
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
@@ -2394,9 +2396,7 @@ export interface GetErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Unauthorized
@@ -2417,9 +2417,9 @@ export interface GetErrorResponse {
 export type GetErrorResponseSuccess = GetErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const getError = /* #__PURE__ */ (() => {
   const method = 'get';
@@ -2443,9 +2443,7 @@ export interface PutErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -2471,9 +2469,9 @@ export interface PutErrorResponse {
 export type PutErrorResponseSuccess = PutErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const putError = /* #__PURE__ */ (() => {
@@ -2498,9 +2496,7 @@ export interface PostErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   Created
@@ -2526,9 +2522,9 @@ export interface PostErrorResponse {
 export type PostErrorResponseSuccess = PostErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const postError = /* #__PURE__ */ (() => {
@@ -2553,9 +2549,7 @@ export interface DeleteErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2576,9 +2570,9 @@ export interface DeleteErrorResponse {
 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  */
 export const deleteError = /* #__PURE__ */ (() => {
   const method = 'delete';
@@ -2602,9 +2596,7 @@ export interface OptionsErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2625,9 +2617,9 @@ export interface OptionsErrorResponse {
 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const optionsError = /* #__PURE__ */ (() => {
@@ -2652,9 +2644,7 @@ export interface HeadErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2675,9 +2665,9 @@ export interface HeadErrorResponse {
 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const headError = /* #__PURE__ */ (() => {
@@ -2702,9 +2692,7 @@ export interface PatchErrorResponse {
    * @description
    *   OK
    */
-  200: {
-    [propertyName: string]: any;
-  };
+  200: ModelAndView;
   /**
    * @description
    *   No Content
@@ -2725,9 +2713,9 @@ export interface PatchErrorResponse {
 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
 /**
  * @description
- *   error
+ *   errorHtml
  * @tags basic-error-controller
- * @produces *
+ * @produces text/html
  * @consumes application/json
  */
 export const patchError = /* #__PURE__ */ (() => {
@@ -7414,7 +7402,7 @@ export type PostOrderErpOrderStagesUploadResponseSuccess =
   PostOrderErpOrderStagesUploadResponse[200];
 /**
  * @description
- *   合同文件上传
+ *   文件上传
  * @tags order-stages-controller
  * @produces *
  * @consumes multipart/form-data
@@ -12082,6 +12070,77 @@ export const postServiceInvoiceFindInvoice = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceFindInvoiceOld */
+export interface PostServiceInvoiceFindInvoiceOldOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceInvoiceFindInvoiceOld */
+export interface PostServiceInvoiceFindInvoiceOldResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceFindInvoiceOldResponseSuccess =
+  PostServiceInvoiceFindInvoiceOldResponse[200];
+/**
+ * @description
+ *   不分页查询发票
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceFindInvoiceOld = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/findInvoiceOld';
+  function request(
+    option: PostServiceInvoiceFindInvoiceOldOption,
+  ): Promise<PostServiceInvoiceFindInvoiceOldResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceFindInvoiceOldResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceGetInvoiceRecord */
 export interface PostServiceInvoiceGetInvoiceRecordOption {
   /**
@@ -12455,6 +12514,148 @@ export const postServiceInvoiceModifyRecord = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoicePutCompanyInfo */
+export interface PostServiceInvoicePutCompanyInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: CompanyInfo;
+  };
+}
+
+/** @description response type for postServiceInvoicePutCompanyInfo */
+export interface PostServiceInvoicePutCompanyInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoicePutCompanyInfoResponseSuccess =
+  PostServiceInvoicePutCompanyInfoResponse[200];
+/**
+ * @description
+ *   添加/修改抬头信息
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoicePutCompanyInfo = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/putCompanyInfo';
+  function request(
+    option: PostServiceInvoicePutCompanyInfoOption,
+  ): Promise<PostServiceInvoicePutCompanyInfoResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoicePutCompanyInfoResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postServiceInvoiceQueryCompanyInfo */
+export interface PostServiceInvoiceQueryCompanyInfoOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: CompanyInfo;
+  };
+}
+
+/** @description response type for postServiceInvoiceQueryCompanyInfo */
+export interface PostServiceInvoiceQueryCompanyInfoResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceQueryCompanyInfoResponseSuccess =
+  PostServiceInvoiceQueryCompanyInfoResponse[200];
+/**
+ * @description
+ *   獲取擡頭信息
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceQueryCompanyInfo = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/queryCompanyInfo';
+  function request(
+    option: PostServiceInvoiceQueryCompanyInfoOption,
+  ): Promise<PostServiceInvoiceQueryCompanyInfoResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceQueryCompanyInfoResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceQueryInvoice */
 export interface PostServiceInvoiceQueryInvoiceOption {
   /**
@@ -12788,6 +12989,77 @@ export const postServiceInvoiceReissue = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceInvoiceReissueOld */
+export interface PostServiceInvoiceReissueOldOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ReissueInvoiceDto;
+  };
+}
+
+/** @description response type for postServiceInvoiceReissueOld */
+export interface PostServiceInvoiceReissueOldResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceInvoiceReissueOldResponseSuccess =
+  PostServiceInvoiceReissueOldResponse[200];
+/**
+ * @description
+ *   重新开票
+ * @tags 发票
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceInvoiceReissueOld = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/invoice/reissueOld';
+  function request(
+    option: PostServiceInvoiceReissueOldOption,
+  ): Promise<PostServiceInvoiceReissueOldResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceInvoiceReissueOldResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceInvoiceUrgentInvoicing */
 export interface PostServiceInvoiceUrgentInvoicingOption {
   /**