feat: update 合并

zhongnanhuang
2 parents 37bc9823 c56d1a59
Showing 20 changed files with 1405 additions and 522 deletions
.umirc.ts
src/pages/Instalment/components/comfire/comfire.tsx
src/pages/Instalment/components/payWayDetail/payWayDetail.tsx
src/pages/Instalment/components/read/readPayWay.tsx
src/pages/Instalment/components/read/readProduct.tsx
src/pages/Instalment/components/title/title.tsx
src/pages/Instalment/components/upload/uploadApp.css
src/pages/Instalment/components/upload/uploadApp.less
src/pages/Instalment/components/upload/uploadApp.tsx
src/pages/Instalment/components/upload/uploadModel.tsx
src/pages/Order/components/ApplyForInvoicingModal.tsx
src/pages/Order/components/FinancialDrawer.tsx
src/pages/Order/components/ImportExpressBillModal.tsx
src/pages/Order/components/ReissueModal.tsx
src/pages/Order/index.tsx
src/pages/ZoNing/components/constant.tsx
src/pages/ZoNing/components/modal.tsx
src/pages/ZoNing/components/table.tsx
src/pages/ZoNing/index.tsx
src/services/definition.ts
@@ -80,6 +80,13 @@ export default defineConfig({
       access: 'canReadLinda',
     },
     {
+      name: '区域管理',
+      path: '/zoning',
+      component: './ZoNing',
+      icon: 'BookOutlined',
+      access: 'canReadAdminAndSales',
+    },
+    {
       name: '打印',
       path: '/print',
       component: './OrderPrint',
@@ -34,7 +34,7 @@ export default ({ currtDid, sureDelete }) =&gt; {
       }
       form={form}
       autoFocusFirstInput
-      width={190}
+      width={280}
       modalProps={{
         destroyOnClose: true,
       }}
@@ -223,7 +223,7 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
             <ProFormUploadButton
               name={record.id}
               onChange={(value) => {
-                // console.log(value);
+                console.log(value);
                 // console.log(payWayDetailBody);
                 let remakeBody = [];
                 let remakeBodyItem = {};
@@ -231,8 +231,8 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
                   if (item.id === record.id) {
                     remakeBodyItem = {
                       ...item,
-                      fileUrl: value.file.originFileObj,
-                      fileName: value.file.name,
+                      fileUrl: value.fileList.originFileObj,
+                      fileName: value.fileList.name,
                     };
                   } else {
                     remakeBodyItem = { ...item };
@@ -167,25 +167,19 @@ export default ({ payBody, thisId, currtSave }) =&gt; {
       dataIndex: 'payDate',
       editable: false,
       render: (_text, record) => {
-        return (
-          <span>
-            {new Intl.DateTimeFormat('zh-CN', {
-              year: 'numeric',
-              month: 'long',
-              day: 'numeric',
-            }).format(record.payDate)}
-          </span>
-          // <ProFormDatePicker
-          //     className='dataChoose'
-          //     initialValue={record.payDate}
-          //     value={record.payDate}
-          //     placeholder={"请填写时间"}
-          //     fieldProps={{
-          //         format: (value) => value.format('YYYY-MM-DD'),
-          //         onChange: handleChange,
-          //     }}
-          // />
-        );
+        if (record.payDate) {
+          return (
+            <span>
+              {new Intl.DateTimeFormat('zh-CN', {
+                year: 'numeric',
+                month: 'long',
+                day: 'numeric',
+              }).format(record.payDate)}
+            </span>
+          );
+        } else {
+          return <span></span>;
+        }
       },
     },
     {
@@ -85,7 +85,7 @@ export default ({ productBody, EditProductBody }) =&gt; {
     {
       title: '设备型号',
       dataIndex: 'deviceModel',
-      width: '15%',
+      width: '20%',
       formItemProps: () => {
         return {
           rules: [{ required: true, message: '此项为必填项' }],
@@ -166,7 +166,10 @@ export default () =&gt; {
     {
       title: '文件编号',
       dataIndex: 'id',
-      width: '7%',
+      width: 100,
+      disable: true,
+      onFilter: true,
+      ellipsis: true,
       render: (_, record) => {
         if (record.id) {
           const text = record.id.toString();
@@ -179,116 +182,108 @@ export default () =&gt; {
       title: '签合同日期',
       dataIndex: 'dateRange',
       valueType: 'date',
-      filters: true,
+      width: 100,
+      disable: true,
       onFilter: true,
       ellipsis: true,
-      width: '8%',
     },
     {
-      disable: true,
       title: '合同编号',
       dataIndex: 'contract',
-      filters: true,
+      width: 200,
+      disable: true,
       onFilter: true,
       ellipsis: true,
-      width: '9%',
     },
     {
-      disable: true,
       title: '供应商名称',
       dataIndex: 'vendor',
-      filters: true,
+      width: 200,
+      disable: true,
       onFilter: true,
       ellipsis: true,
     },
     {
-      disable: true,
       title: '终端名称',
       dataIndex: 'terminal',
-      filters: true,
+      width: 200,
+      disable: true,
       onFilter: true,
       ellipsis: true,
-      width: '6%',
     },
     {
-      disable: true,
       title: '设备名称',
       dataIndex: 'deviceName',
-      filters: true,
+      width: 200,
+      disable: true,
       onFilter: true,
       ellipsis: true,
     },
     {
-      disable: true,
       title: '设备型号',
       dataIndex: 'deviceModel',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 200,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '10%',
     },
     {
-      disable: true,
       title: '数量',
       dataIndex: 'count',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '4%',
     },
     {
-      disable: true,
       title: '单价',
       dataIndex: 'unitPrice',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '5%',
     },
     {
-      disable: true,
       title: '总价',
       dataIndex: 'price',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '5%',
     },
     {
-      disable: true,
       title: '合同总金额',
       dataIndex: 'totalPrice',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '6%',
     },
     {
-      disable: true,
       title: '付款方式',
       dataIndex: 'payWay',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
     },
     {
-      disable: true,
       title: '附件',
       dataIndex: 'annex',
-      filters: true,
       hideInSearch: true,
-      onFilter: false,
+      width: 100,
+      disable: true,
+      onFilter: true,
       ellipsis: true,
-      width: '5%',
       render: (_, record) => {
-        if (record.id) {
-          return <a href={record.annex}>{record.annex}</a>;
+        if (record.id && record.annex !== null) {
+          return <a href={record.annex}>附件文件</a>;
         }
       },
     },
@@ -300,13 +295,20 @@ export default () =&gt; {
       hideInSearch: true,
       onFilter: false,
       ellipsis: true,
-      width: '5%',
+      width: 100,
+      disable: true,
+      onFilter: true,
+      ellipsis: true,
     },
     {
       title: '操作',
       valueType: 'option',
       key: 'option',
-      width: '10%',
+      fixed: 'right',
+      width: 120,
+      disable: true,
+      onFilter: true,
+      ellipsis: true,
       render: (_text, record) => {
         if (record?.id) {
           return (
@@ -335,8 +337,9 @@ export default () =&gt; {
       className="title-index"
       columnEmptyText=""
       columns={columns}
-      actionRef={ref}
       cardBordered
+      actionRef={ref}
+      scroll={{ x: 1400, y: 360 }}
       request={async (params) => {
         // console.log(params);
         if (
+.modul-a {
+  position: absolute;
+  bottom: 25px;
+}
+.modul-a {
+  position: absolute;
+  bottom: 25px;
+}
 import { InboxOutlined } from '@ant-design/icons';
 import { Upload } from 'antd';
 import React from 'react';
+import './uploadApp.less';
 const App: React.FC = ({ uploadFile }) => {
   const { Dragger } = Upload;
@@ -15,18 +16,26 @@ const App: React.FC = ({ uploadFile }) =&gt; {
   };
   return (
-    <Dragger {...props}>
-      <p className="ant-upload-drag-icon">
-        <InboxOutlined />
-      </p>
-      <p className="ant-upload-text">
-        Click or drag file to this area to upload
-      </p>
-      <p className="ant-upload-hint">
-        Support for a single or bulk upload. Strictly prohibited from uploading
-        company data or other banned files.
-      </p>
-    </Dragger>
+    <>
+      <Dragger {...props}>
+        <p className="ant-upload-drag-icon">
+          <InboxOutlined />
+        </p>
+        <p className="ant-upload-text">
+          Click or drag file to this area to upload
+        </p>
+        <p className="ant-upload-hint">
+          Support for a single or bulk upload. Strictly prohibited from
+          uploading company data or other banned files.
+        </p>
+      </Dragger>
+      <a
+        href="https://order-erp.oss-cn-qingdao.aliyuncs.com/%E5%88%86%E6%9C%9F%E4%BB%98%E6%AC%BE-%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx?Expires=2035527699&OSSAccessKeyId=LTAIZCPI7OaWud0m&Signature=npHyEhfRd6LugJ0St8OkvRmLYtQ%3D"
+        className="modul-a"
+      >
+        下载模板
+      </a>
+    </>
   );
 };
@@ -27,7 +27,12 @@ export default ({ toReload }) =&gt; {
     }>
       title="新建表单"
       trigger={
-        <Button type="primary">
+        <Button
+          type="primary"
+          onClick={() => {
+            setUploadFile({});
+          }}
+        >
           <VerticalAlignBottomOutlined />
           导入
         </Button>
@@ -39,6 +44,9 @@ export default ({ toReload }) =&gt; {
       }}
       submitTimeout={2000}
       onFinish={async () => {
+        if (!(uploadFile instanceof File)) {
+          return false;
+        }
         const formData = new FormData();
         formData.append('file', uploadFile as RcFile);
         const res = await postOrderErpOrderStagesImport({
@@ -4,6 +4,7 @@ import { enumToSelect, getAliYunOSSFileNameFromUrl } from &#39;@/utils&#39;;
 import {
   ModalForm,
   ProFormSelect,
+  ProFormText,
   ProFormTextArea,
   ProFormUploadDragger,
 } from '@ant-design/pro-components';
@@ -139,6 +140,14 @@ export default ({
           },
         }}
       />
+      <ProFormText
+        width="lg"
+        name="purchaser"
+        label="抬头名称"
+        key="purchaser"
+        placeholder="请输入抬头名称"
+        rules={[{ required: true, message: '抬头名称必填' }]}
+      />
       <ProFormSelect
         placeholder="选择收款单位"
         name="receivingCompany"
@@ -34,6 +34,9 @@ export default ({
       setInvoicingStatus(subOrders[0]?.invoicingStatus);
     }
   }, [mainOrder]);
+  useEffect(() => {
+    console.log(JSON.stringify(subOrders));
+  }, []);
   const [form] = Form.useForm<{ name: string; company: string }>();
@@ -153,6 +156,17 @@ export default ({
               ]}
               initialValue={subOrders[0]?.invoicingTime}
             />,
+            <ProFormText
+              key="purchaser"
+              width="lg"
+              name="purchaser"
+              label="抬头名称"
+              disabled={isEdit}
+              rules={[
+                { required: !isEdit ? true : false, message: '这是必填项' },
+              ]}
+              initialValue={subOrders[0]?.purchaser}
+            />,
             <ProFormDatePicker
               key="financialReceiptIssuanceTime"
               width="lg"
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postOrderImportImportWeightAndVolume } from '@/services';
+import { ModalForm, ProFormUploadDragger } from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+
+export default () => {
+  const [form] = Form.useForm();
+  const [messageApi, contextHolder] = message.useMessage();
+  return (
+    <>
+      <ModalForm
+        title="导入重量、体积"
+        trigger={<Button type="primary">导入重量、体积</Button>}
+        form={form}
+        autoFocusFirstInput
+        modalProps={{
+          destroyOnClose: true,
+        }}
+        submitTimeout={2000}
+        onFinish={async (values) => {
+          console.log(values);
+          const formData = new FormData();
+          formData.append('file', values.express[0].originFileObj);
+          messageApi.open({
+            type: 'loading',
+            content: '正在导入...',
+            duration: 0,
+          });
+          const res = await postOrderImportImportWeightAndVolume({
+            data: formData,
+            headers: {
+              'Content-Type':
+                'multipart/form-data; boundary=----WebKitFormBoundarynl6gT1BKdPWIejNq',
+            },
+          });
+          if (res.result === RESPONSE_CODE.SUCCESS) {
+            message.error('导入成功');
+          } else {
+            message.error('导入失败');
+          }
+          messageApi.destroy();
+          return true;
+        }}
+      >
+        <ProFormUploadDragger max={1} label="上传快递单" name="express" />
+      </ModalForm>
+      {contextHolder}
+    </>
+  );
+};
@@ -65,10 +65,7 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
       onFinish={async (values) => {
         setSubmitting(true);
         postServiceInvoiceReissue({
-          data: {
-            invoiceId: values.invoiceId,
-            notes: values.notes,
-          },
+          data: values,
         });
         setVisible(false);
         onClose();
@@ -96,6 +93,14 @@ export default ({ setVisible, mainOrder, onClose }) =&gt; {
         }}
       />
       <ProFormText
+        width="lg"
+        name="purchaser"
+        label="抬头名称"
+        key="purchaser"
+        placeholder="请输入抬头名称"
+        rules={[{ required: true, message: '抬头名称必填' }]}
+      />
+      <ProFormText
         width="md"
         name="关联订单"
         label="发票关联订单号"
 import ButtonConfirm from '@/components/ButtomConfirm';
 import { RESPONSE_CODE } from '@/constants/enum';
+import ImportExpressBillModal from '@/pages/Order/components/ImportExpressBillModal';
 import InvoicingDrawerForm from '@/pages/Order/components/InvoicingDrawerForm';
 import ReissueModal from '@/pages/Order/components/ReissueModal';
 import {
@@ -3896,6 +3897,8 @@ const OrderPage = () =&gt; {
     toolBtns.push(radioGroup);
+    toolBtns.push(<ImportExpressBillModal></ImportExpressBillModal>);
+
     //导出按钮配置
     const exportItems: MenuProps['items'] = [
       {
+import { List } from 'lodash';
+
+export type zoningItem = {
+  id: number; //id
+  zoning: string; //区域名称
+  orderProvinceVoList: List<provinceItem>; //所包含的省份列表
+  orderUserVoList: List<userItem>; //所包含的销售列表
+};
+
+export type zoningShowItem = {
+  id: number; //id
+  zoning: string; //区域名称
+  orderProvinceShowList: string; //所包含的省份列表
+  orderUserShowList: string; //所包含的销售列表
+};
+
+export type provinceItem = {
+  pId: number;
+  province: string;
+};
+
+export type userItem = {
+  uId: number;
+  userName: string;
+};
+import { getOrderErpOrderZoNingSelectProvinceAll } from '@/services';
+import { PlusOutlined } from '@ant-design/icons';
+import {
+  ModalForm,
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+import { zoningItem } from './constant';
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+export default () => {
+  const [form] = Form.useForm<zoningItem>();
+  return (
+    <ModalForm<{
+      name: string;
+      company: string;
+    }>
+      title="新增区域"
+      trigger={
+        <Button type="primary">
+          <PlusOutlined />
+          新增区域
+        </Button>
+      }
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => console.log('run'),
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        await waitTime(2000);
+        console.log(values.name);
+        message.success('提交成功');
+        return true;
+      }}
+    >
+      <ProForm.Group>
+        <ProFormText
+          width="md"
+          name="zoning"
+          label="区域名称"
+          placeholder="请输入"
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormSelect
+          request={async () => {
+            const provinceList =
+              await getOrderErpOrderZoNingSelectProvinceAll();
+            if (provinceList) {
+              return provinceList.data.map((item) => ({
+                value: { pId: item.pId, province: item.province },
+                label: item.province,
+              }));
+            }
+            return [];
+          }}
+          width="xs"
+          name="orderProvinceVoList"
+          label="合同约定生效方式"
+        />
+      </ProForm.Group>
+      <ProForm.Group>
+        <ProFormSelect
+          width="xs"
+          options={[
+            {
+              value: 'time',
+              label: '履行完终止',
+            },
+          ]}
+          name="orderUserVoList"
+          label="合同约定失效效方式"
+        />
+      </ProForm.Group>
+    </ModalForm>
+  );
+};
+import type { ProColumns } from '@ant-design/pro-components';
+import {
+  EditableProTable,
+  ProCard,
+  ProFormField,
+} from '@ant-design/pro-components';
+import React, { useState } from 'react';
+import { zoningItem, zoningShowItem } from './constant';
+import Modal from './modal';
+
+const waitTime = (time: number = 100) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve(true);
+    }, time);
+  });
+};
+
+const defaultData: zoningItem[] = [
+  {
+    id: 1,
+    zoning: '华南地区',
+    orderProvinceVoList: [
+      {
+        pId: 1,
+        province: '广东省',
+      },
+      {
+        pId: 2,
+        province: '四川省',
+      },
+      {
+        pId: 3,
+        province: '北京市',
+      },
+      {
+        pId: 4,
+        province: '上海市',
+      },
+    ],
+    orderUserVoList: [
+      {
+        uId: 1,
+        userName: '李华',
+      },
+    ],
+  },
+];
+
+const defaultShowData: zoningShowItem[] = defaultData.map((item) => {
+  let orderProvinceShowList = '';
+  let orderUserShowList = '';
+
+  item.orderProvinceVoList.forEach((element, index) => {
+    orderProvinceShowList += element.province;
+    if (index < item.orderProvinceVoList.length - 1) {
+      orderProvinceShowList += '、';
+    }
+  });
+
+  item.orderUserVoList.forEach((event, index) => {
+    orderUserShowList += event.userName;
+    if (index < item.orderUserVoList.length - 1) {
+      orderUserShowList += '、';
+    }
+  });
+
+  return {
+    id: item.id,
+    zoning: item.zoning,
+    orderProvinceShowList,
+    orderUserShowList,
+  };
+});
+
+export default () => {
+  const [editableKeys, setEditableRowKeys] = useState<React.Key[]>([]);
+  const [dataSource, setDataSource] = useState<readonly zoningItem[]>([]);
+  const [position] = useState<'top' | 'bottom' | 'hidden'>('hidden');
+
+  const columns: ProColumns<zoningItem>[] = [
+    {
+      title: '区域名称',
+      dataIndex: 'zoning',
+      width: 200,
+    },
+    {
+      title: '管辖省份',
+      dataIndex: 'orderProvinceShowList',
+      readonly: true,
+      width: 600,
+    },
+    {
+      title: '负责销售',
+      key: 'state',
+      dataIndex: 'orderUserShowList',
+      valueType: 'select',
+      width: 200,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 200,
+      render: (text, record, _, action) => [
+        <a
+          key="editable"
+          onClick={() => {
+            action?.startEditable?.(record.id);
+          }}
+        >
+          编辑
+        </a>,
+        <a
+          key="delete"
+          onClick={() => {
+            setDataSource(dataSource.filter((item) => item.id !== record.id));
+          }}
+        >
+          删除
+        </a>,
+      ],
+    },
+  ];
+
+  return (
+    <>
+      <EditableProTable<zoningItem>
+        rowKey="id"
+        headerTitle={<Modal></Modal>}
+        maxLength={5}
+        scroll={{
+          x: 960,
+        }}
+        recordCreatorProps={
+          position !== 'hidden'
+            ? {
+                position: position as 'top',
+                record: () => ({ id: (Math.random() * 1000000).toFixed(0) }),
+              }
+            : false
+        }
+        loading={false}
+        columns={columns}
+        request={async () => ({
+          data: defaultShowData,
+        })}
+        value={dataSource}
+        onChange={setDataSource}
+        editable={{
+          type: 'multiple',
+          editableKeys,
+          onSave: async (rowKey, data, row) => {
+            console.log(rowKey, data, row);
+            await waitTime(2000);
+          },
+          onChange: setEditableRowKeys,
+        }}
+      />
+      <ProCard title="表格数据" headerBordered collapsible defaultCollapsed>
+        <ProFormField
+          ignoreFormItem
+          fieldProps={{
+            style: {
+              width: '100%',
+            },
+          }}
+          mode="read"
+          valueType="jsonCode"
+          text={JSON.stringify(dataSource)}
+        />
+      </ProCard>
+    </>
+  );
+};
+import Table from './components/table';
+const instalment_contect: React.FC = () => (
+  <>
+    <Table></Table>
+  </>
+);
+
+export default instalment_contect;
@@ -86,8 +86,6 @@ export interface AdminAuthUserVO {
 export interface AdminDeptQueryVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -97,8 +95,6 @@ export interface AdminDeptQueryVO {
   /** @format int64 */
   pid?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -113,8 +109,6 @@ export interface AdminDeptVO {
 export interface AdminJobQueryVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -124,8 +118,6 @@ export interface AdminJobQueryVO {
   /** @format int32 */
   sort?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -144,8 +136,6 @@ export interface AdminMenuQueryVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   hidden?: number;
   icon?: string;
   /** @format int64 */
@@ -161,8 +151,6 @@ export interface AdminMenuQueryVO {
   /** @format int64 */
   pid?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   /** @format int32 */
   type?: number;
@@ -193,8 +181,6 @@ export interface AdminRoleQueryVO {
   /** @format int32 */
   current?: number;
   dataScope?: string;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -206,8 +192,6 @@ export interface AdminRoleQueryVO {
   permission?: string;
   remark?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -225,30 +209,22 @@ export interface AdminUserLoginByPhoneVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   phone?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
 export interface AdminUserLoginByPwdVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   imgCaptchaCode?: string;
   imgCaptchaUuid?: string;
   /** @format int32 */
   pageSize?: number;
   password?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -258,15 +234,11 @@ export interface AdminUserModifyPwdVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   password?: string;
   phone?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -274,12 +246,8 @@ export interface AdminUserPasswordRecoverEmailVO {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -288,8 +256,6 @@ export interface AdminUserQueryVO {
   /** @format int32 */
   current?: number;
   email?: string;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -300,8 +266,6 @@ export interface AdminUserQueryVO {
   phone?: string;
   sex?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   userName?: string;
   workerType?: string;
@@ -312,8 +276,6 @@ export interface AdminUserRegisterVO {
   /** @format int32 */
   current?: number;
   email?: string;
-  /** @format int32 */
-  end?: number;
   isAgreeAgreement?: boolean;
   /** @format int32 */
   pageSize?: number;
@@ -323,8 +285,6 @@ export interface AdminUserRegisterVO {
   safeQuestion?: string;
   smsCaptchaCode?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   userName?: string;
 }
@@ -520,12 +480,8 @@ export interface ApiOrderCustomersRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -572,6 +528,221 @@ export interface ApiQueryOrderStatusCountsRequest {
   uid?: number;
 }
+export interface ApplyInvoiceDto {
+  /**
+   * @description
+   *   备注
+   */
+  applyInvoicingNotes?: string;
+  /**
+   * @description
+   *   开票备注
+   */
+  comment?: string;
+  /**
+   * @description
+   *   联系人
+   */
+  contacts?: string;
+  /**
+   * @description
+   *   开票内容
+   */
+  content?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  failureReason?: string;
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   发票地址
+   */
+  invoiceAddress?: string;
+  /**
+   * @description
+   *   发票明细
+   */
+  invoiceDetails?: Array<InvoiceDetail>;
+  /**
+   * @description
+   *   关联发票id
+   */
+  invoiceId?: string;
+  /**
+   * @description
+   *   发票号码
+   */
+  invoiceNumber?: string;
+  /**
+   * @description
+   *   开票人
+   */
+  invoicingPerson?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTime?: string;
+  /**
+   * @description
+   *   开具类型
+   */
+  invoicingType?: string;
+  /**
+   * @description
+   *   开具类型
+   */
+  invoicingTypeText?: string;
+  /** @format date */
+  invoicingdate?: string;
+  /**
+   * @description
+   *   是否加急
+   */
+  isUrgent?: boolean;
+  /**
+   * @description
+   *   是否加急文本
+   */
+  isUrgentText?: string;
+  logicDelete?: boolean;
+  /**
+   * @description
+   *   买方注册地址
+   */
+  partyAAddress?: string;
+  /**
+   * @description
+   *   买方开户行账号
+   */
+  partyABankAccount?: string;
+  /**
+   * @description
+   *   买方名称
+   */
+  partyAName?: string;
+  /**
+   * @description
+   *   买方开户行
+   */
+  partyAOpenBank?: string;
+  /**
+   * @description
+   *   买方电话号码
+   */
+  partyAPhoneNumber?: string;
+  /**
+   * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
+   *   抬头类型
+   */
+  partyAType?: string;
+  partyB?: string;
+  /**
+   * @description
+   *   卖方注册地址
+   */
+  partyBAddress?: string;
+  /**
+   * @description
+   *   卖方开户行账号
+   */
+  partyBBankAccount?: string;
+  /**
+   * @description
+   *   卖方名称
+   */
+  partyBName?: string;
+  /**
+   * @description
+   *   卖方开户行
+   */
+  partyBOpenBank?: string;
+  /**
+   * @description
+   *   卖方电话号码
+   */
+  partyBPhoneNumber?: string;
+  /**
+   * @description
+   *   卖方税号
+   */
+  partyBTaxid?: string;
+  /**
+   * @description
+   *   发票金额
+   * @format double
+   */
+  price?: number;
+  /**
+   * @description
+   *   接收邮箱地址
+   */
+  receiveEmail?: string;
+  /**
+   * @description
+   *   订单来源
+   */
+  salesCodes?: Array<string>;
+  /**
+   * @description
+   *   订单来源
+   */
+  salesCodesText?: string;
+  /**
+   * @description
+   *   开票状态
+   */
+  status?: string;
+  /**
+   * @description
+   *   开票状态
+   */
+  statusText?: string;
+  /**
+   * @description
+   *   子订单id
+   */
+  subOrderIds?: Array<number>;
+  /**
+   * @description
+   *   关联订单
+   */
+  subOrders?: Array<SubOrder>;
+  /** @format double */
+  totalPrice?: number;
+  totalPriceText?: string;
+  /**
+   * @description
+   *   开票类型
+   */
+  type?: string;
+  /**
+   * @description
+   *   开票类型文本
+   */
+  typeText?: string;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
 export interface AuditDto {
   /**
    * @description
@@ -596,15 +767,11 @@ export interface AuditDto {
 export interface AuditVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   status?: number;
   /** @format int32 */
   total?: number;
@@ -674,32 +841,16 @@ export interface CancelSendOrderDto {
 export interface CaptchaMessageVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   imgCaptchaCode?: string;
   imgCaptchaUuid?: string;
   /** @format int32 */
   pageSize?: number;
   phone?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   type?: string;
 }
-export interface CommonAuditRequest {
-  extend?: any;
-  /**
-   * @description
-   *   id集合
-   */
-  ids?: Array<string>;
-  notes?: string;
-  pass?: boolean;
-  type?: string;
-}
-
 export interface Contactperson {
   birthday?: string;
   contactAddress?: string;
@@ -887,8 +1038,6 @@ export interface DictionaryQueryVO {
   dictCode?: string;
   dictName?: string;
   dictValue?: string;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -898,8 +1047,6 @@ export interface DictionaryQueryVO {
   /** @format int32 */
   sort?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -1030,28 +1177,401 @@ export interface InvoiceDto {
   status?: string;
 }
-export interface InvoiceRecordQueryRequest {
-  /** @format date */
-  createTimeGe?: string;
-  /** @format date */
-  createTimeLe?: string;
-  /** @format int32 */
-  pageNumber?: number;
-  /** @format int32 */
-  pageSize?: number;
+export interface InvoiceRecordDto {
+  applyInvoicingNotes?: string;
   /**
    * @description
-   *   用户id
+   *   开票备注
    */
-  uid?: string;
-}
-
-export interface Item {
-  billDate?: string;
-  billNo?: string;
-  entryList?: Array<Entry>;
-  id?: string;
-  remark?: string;
+  comment?: string;
+  /**
+   * @description
+   *   联系人
+   */
+  contacts?: string;
+  /**
+   * @description
+   *   开票内容
+   */
+  content?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  failureReason?: string;
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   发票地址
+   */
+  invoiceAddress?: string;
+  /**
+   * @description
+   *   发票明细
+   */
+  invoiceDetails?: Array<InvoiceDetail>;
+  /**
+   * @description
+   *   关联发票id
+   */
+  invoiceId?: string;
+  /**
+   * @description
+   *   发票号码
+   */
+  invoiceNumber?: string;
+  /**
+   * @description
+   *   开票人
+   */
+  invoicingPerson?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTime?: string;
+  /**
+   * @description
+   *   开具类型
+   */
+  invoicingType?: string;
+  /**
+   * @description
+   *   开具类型
+   */
+  invoicingTypeText?: string;
+  /** @format date */
+  invoicingdate?: string;
+  /**
+   * @description
+   *   是否加急
+   */
+  isUrgent?: boolean;
+  /**
+   * @description
+   *   是否加急文本
+   */
+  isUrgentText?: string;
+  logicDelete?: boolean;
+  /**
+   * @description
+   *   买方注册地址
+   */
+  partyAAddress?: string;
+  /**
+   * @description
+   *   买方开户行账号
+   */
+  partyABankAccount?: string;
+  /**
+   * @description
+   *   买方名称
+   */
+  partyAName?: string;
+  /**
+   * @description
+   *   买方开户行
+   */
+  partyAOpenBank?: string;
+  /**
+   * @description
+   *   买方电话号码
+   */
+  partyAPhoneNumber?: string;
+  /**
+   * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
+   *   抬头类型
+   */
+  partyAType?: string;
+  partyB?: string;
+  /**
+   * @description
+   *   卖方注册地址
+   */
+  partyBAddress?: string;
+  /**
+   * @description
+   *   卖方开户行账号
+   */
+  partyBBankAccount?: string;
+  /**
+   * @description
+   *   卖方名称
+   */
+  partyBName?: string;
+  /**
+   * @description
+   *   卖方开户行
+   */
+  partyBOpenBank?: string;
+  /**
+   * @description
+   *   卖方电话号码
+   */
+  partyBPhoneNumber?: string;
+  /**
+   * @description
+   *   卖方税号
+   */
+  partyBTaxid?: string;
+  /**
+   * @description
+   *   发票金额
+   * @format double
+   */
+  price?: number;
+  /**
+   * @description
+   *   接收邮箱地址
+   */
+  receiveEmail?: string;
+  /**
+   * @description
+   *   订单来源
+   */
+  salesCodes?: Array<string>;
+  /**
+   * @description
+   *   订单来源
+   */
+  salesCodesText?: string;
+  /**
+   * @description
+   *   开票状态
+   */
+  status?: string;
+  /**
+   * @description
+   *   开票状态
+   */
+  statusText?: string;
+  /**
+   * @description
+   *   子订单id
+   */
+  subOrderIds?: Array<number>;
+  /**
+   * @description
+   *   关联订单
+   */
+  subOrders?: Array<SubOrder>;
+  /** @format double */
+  totalPrice?: number;
+  totalPriceText?: string;
+  /**
+   * @description
+   *   开票类型
+   */
+  type?: string;
+  /**
+   * @description
+   *   开票类型文本
+   */
+  typeText?: string;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+}
+
+export interface InvoiceRecordQueryRequest {
+  /**
+   * @description
+   *   联系人
+   */
+  contactsLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  id?: number;
+  /**
+   * @description
+   *   IdIn
+   */
+  idIn?: Array<number>;
+  /**
+   * @description
+   *   关联发票id
+   */
+  invoiceId?: string;
+  /**
+   * @description
+   *   发票号码
+   */
+  invoiceNumber?: string;
+  /**
+   * @description
+   *   发票号码
+   */
+  invoiceNumberLike?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTimeGe?: string;
+  /**
+   * @description
+   *   开票时间
+   * @format date-time
+   */
+  invoicingTimeLe?: string;
+  /**
+   * @description
+   *   开票类型
+   */
+  invoicingType?: string;
+  /**
+   * @description
+   *   是否加急
+   */
+  isUrgent?: boolean;
+  /**
+   * @description
+   *   订单号
+   * @format int64
+   */
+  mainOrderId?: number;
+  /**
+   * @description
+   *   主订单idIn
+   */
+  mainOrderIdIn?: Array<number>;
+  /**
+   * @description
+   *   订单号
+   */
+  mainOrderIdLike?: string;
+  /**
+   * @description
+   *   是否需要构建发票明细
+   */
+  needBuildDetails?: boolean;
+  /**
+   * @description
+   *   是否需要构建发票明细
+   */
+  needBuildSubOrders?: boolean;
+  /** @format int32 */
+  pageSize?: number;
+  /**
+   * @description
+   *   买方名称
+   */
+  partyANameLike?: string;
+  /**
+   * @description
+   *   买方电话号码
+   */
+  partyAPhoneNumberLike?: string;
+  /**
+   * @description
+   *   买方税号
+   */
+  partyATaxid?: string;
+  /**
+   * @description
+   *   买方税号
+   */
+  partyATaxidLike?: string;
+  partyB?: string;
+  /**
+   * @description
+   *   卖方名称
+   */
+  partyBName?: string;
+  /**
+   * @description
+   *   销售代表
+   */
+  salesCode?: string;
+  /**
+   * @description
+   *   销售代表
+   */
+  salesCodeLike?: string;
+  /** @format int32 */
+  start?: number;
+  /**
+   * @description
+   *   发票状态
+   */
+  status?: string;
+  /**
+   * @description
+   *   状态非空
+   */
+  statusIn?: Array<string>;
+  /**
+   * @description
+   *   状态非空
+   */
+  statusIsNotNull?: boolean;
+  /**
+   * @description
+   *   状态为空
+   */
+  statusIsNull?: boolean;
+  /**
+   * @description
+   *   子订单
+   * @format int64
+   */
+  subOrderId?: number;
+  /**
+   * @description
+   *   子订单idIn
+   */
+  subOrderIdIn?: Array<number>;
+  /**
+   * @description
+   *   子订单
+   */
+  subOrderIdLike?: string;
+  /** @format int32 */
+  total?: number;
+  /**
+   * @description
+   *   开票类型
+   */
+  type?: string;
+  /**
+   * @description
+   *   用户id
+   */
+  uid?: string;
+}
+
+export interface Item {
+  billDate?: string;
+  billNo?: string;
+  entryList?: Array<Entry>;
+  id?: string;
+  remark?: string;
 }
 export interface ItemSaItem {
@@ -1061,6 +1581,14 @@ export interface ItemSaItem {
 export interface MainOrderqueryRequest {
   afterInvoicingStatusIsNull?: boolean;
+  /** @format date */
+  createDateGe?: string;
+  /** @format date */
+  createDateLe?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   orderStatusNotIn?: Array<string>;
   /** @format int32 */
   pageNumber?: number;
@@ -1202,14 +1730,10 @@ export interface MeasureUnitListResRow {
 export interface MessageQueryDTO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   isReaded?: string;
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   username?: string;
 }
@@ -1245,8 +1769,6 @@ export interface OrderAuditLogQueryVO {
   applyId?: number;
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1256,8 +1778,6 @@ export interface OrderAuditLogQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -1292,8 +1812,6 @@ export interface OrderBaseInfoQueryVO {
   customerCode?: string;
   customerPo?: string;
   customerStyle?: string;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1315,8 +1833,6 @@ export interface OrderBaseInfoQueryVO {
   productionDepartmentConsignTime?: string;
   projectNo?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -1377,8 +1893,6 @@ export interface OrderFieldLockApplyQueryVO {
   auditUserId?: number;
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   fields?: string;
   /** @format int64 */
   id?: number;
@@ -1388,8 +1902,6 @@ export interface OrderFieldLockApplyQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   status?: number;
   statusList?: Array<number>;
   /** @format int32 */
@@ -1438,8 +1950,6 @@ export interface OrderInspectionStageVO {
 export interface OrderOptLogQueryVO {
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   ids?: Array<number>;
@@ -1448,8 +1958,6 @@ export interface OrderOptLogQueryVO {
   /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
 }
@@ -1499,6 +2007,12 @@ export interface OrderProfitAnalysisVo {
   orderIds?: Array<number>;
 }
+export interface OrderProvinceVo {
+  /** @format int32 */
+  pid?: number;
+  province?: string;
+}
+
 export interface OrderStageFileDo {
   file?: File;
 }
@@ -1645,6 +2159,20 @@ export interface OrderUpdateVO {
   trackStageInfo?: OrderTrackStageVO;
 }
+export interface OrderUserVo {
+  /** @format int32 */
+  uid?: number;
+  userName?: string;
+}
+
+export interface OrderZoNingProvinceUserDo {
+  /** @format int32 */
+  id?: number;
+  orderProvinceVoList?: Array<OrderProvinceVo>;
+  orderUserVoList?: Array<OrderUserVo>;
+  zoning?: string;
+}
+
 export interface ProcureConvertProcureDto {
   /**
    * @description
@@ -1735,8 +2263,6 @@ export interface QueryBankStatementDto {
   collectionDatetimeEnd?: string;
   /** @format int32 */
   current?: number;
-  /** @format int32 */
-  end?: number;
   /** @format int64 */
   id?: number;
   /** @format int32 */
@@ -1758,8 +2284,6 @@ export interface QueryBankStatementDto {
   remark?: string;
   remarkNote?: string;
   serialNumber?: string;
-  /** @format int32 */
-  start?: number;
   status?: string;
   /** @format int32 */
   total?: number;
@@ -1805,367 +2329,240 @@ export interface QueryInvoiceDetailDto {
   invoiceId?: number;
 }
-export interface QueryMainOrderDto {
-  /**
-   * @description
-   *   收货人姓名
-   */
-  customerName?: string;
-}
-
-export interface QueryReportFormsDto {
-  /**
-   * @description
-   *   是否包含实验设备事业部
-   */
-  includeExperimentalEquipment?: boolean;
-  /**
-   * @description
-   *   最大金额
-   * @example
-   *   2343
-   */
-  maxAccount?: number;
-  /**
-   * @description
-   *   所属部门
-   */
-  productBelongBusiness?: string;
-  /**
-   * @description
-   *   销售代表
-   */
-  salesCode?: string;
-  /**
-   * @description
-   *   统计方式
-   */
-  statisticsMethod?: string;
-}
-
-export interface ReissueInvoiceDto {
-  /** @format int64 */
-  invoiceId?: number;
-  notes?: string;
-}
-
-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 QueryInvoiceProjectDto {
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  nameLike?: string;
+  /** @format int32 */
+  pageSize?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
 }
-export interface ResearchGroupDeleteRequest {
+export interface QueryInvoiceRecordDto {
   /**
    * @description
-   *   主键id
+   *   联系人
    */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupDetailRequest {
+  contactsLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
   /**
    * @description
-   *   主键id
+   *   id
    * @format int64
    */
   id?: number;
-}
-
-export interface ResearchGroupEditRequest {
   /**
    * @description
-   *   课题组预存账号
+   *   IdIn
    */
-  accounts?: Array<ResearchGroupAccountEditRequest>;
+  idIn?: Array<number>;
   /**
    * @description
-   *   课题组名称
+   *   关联发票id
    */
-  group?: string;
+  invoiceId?: string;
   /**
    * @description
-   *   主键id
-   * @format int64
+   *   发票号码
    */
-  id?: number;
+  invoiceNumber?: string;
   /**
    * @description
-   *   课题组负责人
+   *   发票号码
    */
-  leader?: string;
+  invoiceNumberLike?: string;
   /**
    * @description
-   *   课题组成员集合
+   *   开票时间
+   * @format date-time
    */
-  members?: Array<ResearchGroupMemberEditRequest>;
-}
-
-export interface ResearchGroupListRequest {
+  invoicingTimeGe?: string;
   /**
    * @description
-   *   预存账号手机号
+   *   开票时间
+   * @format date-time
    */
-  accountPhone?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
+  invoicingTimeLe?: string;
   /**
    * @description
-   *   课题组名称
+   *   开票类型
    */
-  groupName?: string;
+  invoicingType?: string;
   /**
    * @description
-   *   课题组负责人
+   *   是否加急
    */
-  leaderName?: string;
+  isUrgent?: boolean;
   /**
    * @description
-   *   课题组成员名称
+   *   订单号
+   * @format int64
    */
-  memberName?: string;
+  mainOrderId?: number;
   /**
    * @description
-   *   课题组成员手机号
+   *   主订单idIn
    */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
-}
-
-export interface ResearchGroupMemberAddRequest {
+  mainOrderIdIn?: Array<number>;
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   订单号
    */
-  groupId?: number;
+  mainOrderIdLike?: string;
   /**
    * @description
-   *   成员名称
+   *   是否需要构建发票明细
    */
-  memberName?: string;
+  needBuildDetails?: boolean;
   /**
    * @description
-   *   成员手机号
+   *   是否需要构建发票明细
    */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberEditRequest {
+  needBuildSubOrders?: boolean;
+  /** @format int32 */
+  pageSize?: number;
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   买方名称
    */
-  groupId?: number;
+  partyANameLike?: string;
   /**
    * @description
-   *   主键id
-   * @format int64
+   *   买方电话号码
    */
-  id?: number;
+  partyAPhoneNumberLike?: string;
   /**
    * @description
-   *   成员名称
+   *   买方税号
    */
-  memberName?: string;
+  partyATaxid?: string;
   /**
    * @description
-   *   成员手机号
+   *   买方税号
    */
-  memberPhone?: string;
-}
-
-export interface ResearchGroupMemberRequestAddRequest {
+  partyATaxidLike?: string;
+  partyB?: string;
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   卖方名称
    */
-  groupId?: number;
+  partyBName?: string;
   /**
    * @description
-   *   课题组名称
+   *   销售代表
    */
-  groupName?: string;
-  members?: Array<ResearchGroupMemberAddRequest>;
+  salesCode?: string;
   /**
    * @description
-   *   申请备注
+   *   销售代表
    */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestDeleteRequest {
+  salesCodeLike?: string;
+  /** @format int32 */
+  start?: number;
   /**
    * @description
-   *   主键id
+   *   发票状态
    */
-  ids?: Array<number>;
-}
-
-export interface ResearchGroupMemberRequestDetailRequest {
+  status?: string;
   /**
    * @description
-   *   主键id
-   * @format int64
+   *   状态非空
    */
-  id?: number;
-}
-
-export interface ResearchGroupMemberRequestEditRequest {
+  statusIn?: Array<string>;
   /**
    * @description
-   *   课题组ID
-   * @format int64
+   *   状态非空
    */
-  groupId?: number;
+  statusIsNotNull?: boolean;
   /**
    * @description
-   *   课题组名称
+   *   状态为空
    */
-  groupName?: string;
+  statusIsNull?: boolean;
   /**
    * @description
-   *   主键id
+   *   子订单
    * @format int64
    */
-  id?: number;
+  subOrderId?: number;
   /**
    * @description
-   *   成员名称
+   *   子订单idIn
    */
-  memberName?: string;
+  subOrderIdIn?: Array<number>;
   /**
    * @description
-   *   成员手机号
+   *   子订单
    */
-  memberPhone?: string;
+  subOrderIdLike?: string;
+  /** @format int32 */
+  total?: number;
   /**
    * @description
-   *   申请备注
+   *   开票类型
    */
-  requestNotes?: string;
-}
-
-export interface ResearchGroupMemberRequestsRequest {
+  type?: string;
   /**
    * @description
-   *   审核备注
+   *   用户id
    */
-  auditNotes?: string;
+  uid?: string;
+}
+
+export interface QueryMainOrderDto {
   /**
    * @description
-   *   审核状态
+   *   收货人姓名
    */
-  auditStatus?: string;
+  customerName?: string;
+}
+
+export interface QueryReportFormsDto {
   /**
    * @description
-   *   创建人
+   *   是否包含实验设备事业部
    */
-  createByName?: string;
-  /** @format int32 */
-  current?: number;
-  /** @format int32 */
-  end?: number;
+  includeExperimentalEquipment?: boolean;
   /**
    * @description
-   *   课题组名称
+   *   最大金额
+   * @example
+   *   2343
    */
-  groupName?: string;
+  maxAccount?: number;
   /**
    * @description
-   *   成员名称
+   *   所属部门
    */
-  memberName?: string;
+  productBelongBusiness?: string;
   /**
    * @description
-   *   成员手机号
+   *   销售代表
    */
-  memberPhone?: string;
-  /** @format int32 */
-  pageSize?: number;
+  salesCode?: string;
   /**
    * @description
-   *   申请备注
+   *   统计方式
    */
-  requestNotes?: string;
-  /** @format int32 */
-  start?: number;
-  /** @format int32 */
-  total?: number;
+  statisticsMethod?: string;
+}
+
+export interface ReissueInvoiceDto {
+  /** @format int64 */
+  invoiceId?: number;
+  notes?: string;
 }
 export interface ResetPwdVO {
@@ -2207,14 +2604,134 @@ export interface ShippingWarehouseChangeDto {
   shippingWarehouse?: string;
 }
+export interface SubOrder {
+  afterInvoicingStatus?: string;
+  /** @format date-time */
+  afterInvoicingStatusUpdateTime?: string;
+  afterSalesAnnex?: string;
+  afterSalesNotes?: string;
+  afterSalesPlan?: string;
+  annex?: string;
+  applyInvoicingAnnex?: string;
+  applyInvoicingNotes?: string;
+  /** @format date-time */
+  applyTime?: string;
+  /** @format int32 */
+  attrId?: number;
+  checkNotes?: string;
+  /** @format date-time */
+  collectMoneyTime?: string;
+  confirmDeliverNotes?: string;
+  confirmReissueNotes?: string;
+  createByName?: string;
+  /** @format date-time */
+  createTime?: string;
+  /** @format date-time */
+  deadline?: string;
+  ext?: string;
+  extendField?: string;
+  /** @format date-time */
+  financialReceiptIssuanceTime?: string;
+  fullPaymentStatus?: string;
+  /** @format double */
+  goodsVolume?: number;
+  /** @format double */
+  goodsWeight?: number;
+  /** @format int64 */
+  id?: number;
+  image?: string;
+  invoiceApplyUsername?: string;
+  invoiceInformation?: string;
+  /** @format int64 */
+  invoiceRecordId?: number;
+  invoicingCheckAnnex?: string;
+  invoicingNotes?: string;
+  invoicingStatus?: string;
+  /** @format date-time */
+  invoicingTime?: string;
+  invoicingUrgentCause?: string;
+  isUrgent?: boolean;
+  kingdeeErrorMessage?: string;
+  logicDelete?: boolean;
+  logisticsMethod?: string;
+  logisticsNotes?: string;
+  /** @format int64 */
+  mainOrderAmountProportion?: number;
+  /** @format int64 */
+  mainOrderId?: number;
+  materialId?: string;
+  modified?: boolean;
+  modifiedAuditNotes?: string;
+  modifiedAuditStatus?: string;
+  modifiedOptFlag?: string;
+  nextOrderStatus?: string;
+  notes?: string;
+  orderStatus?: string;
+  orderStatusBeforeModify?: string;
+  /** @format date-time */
+  orderStatusUpdateTime?: string;
+  /** @format int32 */
+  packageNumber?: number;
+  parameters?: string;
+  paymentChannel?: string;
+  paymentMethod?: string;
+  paymentReceiptAnnex?: string;
+  paymentReceiptNotes?: string;
+  paymentReceiptStatus?: string;
+  paymentStatus?: string;
+  paymentTransactionId?: string;
+  postAuditNotes?: string;
+  postAuditStatus?: string;
+  /** @format date-time */
+  postAuditStatusUpdateTime?: string;
+  preAfterInvoicingStatus?: string;
+  procureConvertNotes?: string;
+  procureNotes?: string;
+  /** @format date-time */
+  procureOrderDatetime?: string;
+  procureOrderStatus?: string;
+  productBelongBusiness?: string;
+  productCode?: string;
+  /** @format int32 */
+  productId?: number;
+  productName?: string;
+  /** @format int64 */
+  productPrice?: number;
+  /** @format date-time */
+  productionEndTime?: string;
+  /** @format date-time */
+  productionStartTime?: string;
+  productionTimePushStatus?: string;
+  /** @format int32 */
+  quantity?: number;
+  receivingCompany?: string;
+  reissueNotes?: string;
+  serialNumber?: string;
+  shippingWarehouse?: string;
+  /** @format int64 */
+  subOrderPayment?: number;
+  supplierName?: string;
+  supplierNotes?: string;
+  /** @format int64 */
+  totalPayment?: number;
+  /** @format int32 */
+  uid?: number;
+  unit?: string;
+  unitId?: string;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+  urgentInvoiceAuditNotes?: string;
+  /** @format int32 */
+  version?: number;
+}
+
 export interface SysLogQueryVO {
   address?: string;
   browser?: string;
   /** @format int32 */
   current?: number;
   description?: string;
-  /** @format int32 */
-  end?: number;
   exceptionDetail?: string;
   /** @format int64 */
   id?: number;
@@ -2225,8 +2742,6 @@ export interface SysLogQueryVO {
   pageSize?: number;
   params?: string;
   requestIp?: string;
-  /** @format int32 */
-  start?: number;
   /** @format int64 */
   time?: number;
   /** @format int32 */
@@ -2390,12 +2905,8 @@ export interface UserCenterInfoRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2415,8 +2926,6 @@ export interface UserDetailRequest {
   /** @format int32 */
   current?: number;
   /** @format int32 */
-  end?: number;
-  /** @format int32 */
   pageSize?: number;
   /**
    * @description
@@ -2424,8 +2933,6 @@ export interface UserDetailRequest {
    */
   phone?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2442,8 +2949,6 @@ export interface UserListRequest {
    *   创建日期开始时间
    */
   dateLimit?: string;
-  /** @format int32 */
-  end?: number;
   /**
    * @description
    *   单位
@@ -2468,23 +2973,10 @@ export interface UserListRequest {
   phone?: string;
   /**
    * @description
-   *   phones
-   */
-  phones?: Array<string>;
-  /**
-   * @description
-   *   内部订单系统课题组id
-   * @format int64
-   */
-  researchGroupId?: number;
-  /**
-   * @description
    *   salesCode
    */
   salesCode?: string;
   /** @format int32 */
-  start?: number;
-  /** @format int32 */
   total?: number;
   /**
    * @description
@@ -2494,23 +2986,11 @@ export interface UserListRequest {
   uid?: number;
   /**
    * @description
-   *   ids
-   */
-  uids?: Array<number>;
-  /**
-   * @description
    *   用户名
    */
   username?: string;
 }
-export interface UserNowMoneyCheckRequest {
-  phone?: string;
-  subPrice?: number;
-  /** @format int64 */
-  uid?: number;
-}
-
 export interface View {
   contentType?: string;
 }
@@ -2559,6 +3039,44 @@ export interface TsgFile {
   writable?: boolean;
 }
+export interface InvoiceDetail {
+  /** @format int64 */
+  id?: number;
+  /**
+   * @description
+   *   发票id
+   * @format int64
+   */
+  invoiceRecordId?: number;
+  /**
+   * @description
+   *   单价
+   * @format double
+   */
+  price?: number;
+  projectName?: string;
+  /** @format double */
+  quantity?: number;
+  /**
+   * @description
+   *   型号
+   */
+  specification?: string;
+  /** @format int64 */
+  subOrderId?: number;
+  /** @format double */
+  taxPrice?: number;
+  /** @format double */
+  taxRate?: number;
+  /**
+   * @description
+   *   总价
+   * @format double
+   */
+  totalPrice?: number;
+  unit?: string;
+}
+
 export interface SalesRechargePrepaymentAuditRequest {
   /**
    * @description
@@ -2575,11 +3093,6 @@ export interface SalesRechargePrepaymentAuditRequest {
    *   是否通过
    */
   pass?: boolean;
-  /**
-   * @description
-   *   手机号
-   */
-  phone?: string;
 }
 export interface SalesRechargePrepaymentCreateRequest {
@@ -2685,8 +3198,6 @@ export interface SalesRechargePrepaymentRequest {
    * @format int32
    */
   enableFlag?: number;
-  /** @format int32 */
-  end?: number;
   /**
    * @description
    *   id
@@ -2731,8 +3242,6 @@ export interface SalesRechargePrepaymentRequest {
    *   销售代表
    */
   salesCode?: string;
-  /** @format int32 */
-  start?: number;
   /**
    * @description
    *   状态
@@ -2911,38 +3420,6 @@ export interface TsgURL {
   userInfo?: string;
 }
-/**
- * @description
- *   保存用户地址请求对象
- */
-export interface UserAddressSaveRequest {
-  /**
-   * @description
-   *   联系电话
-   */
-  customerContactNumber: string;
-  /**
-   * @description
-   *   客户姓名
-   */
-  customerName: string;
-  /**
-   * @description
-   *   收货地址
-   */
-  customerShippingAddress?: string;
-  /**
-   * @description
-   *   客户单位
-   */
-  institution?: string;
-  /**
-   * @description
-   *   课题组老师
-   */
-  institutionContactName?: string;
-}
-
 export interface UploadPaymentReceiptDTO {
   /**
    * @description