feat(productCollectBill): 新增礼品认领功能

- 添加礼品认领相关的数据模型和接口 - 实现礼品认领的新增、修改、删除和审核功能 - 集成礼品认领页面到系统菜单中

feat(productCollectBill): 新增礼品认领功能
- 添加礼品认领相关的数据模型和接口 - 实现礼品认领的新增、修改、删除和审核功能 - 集成礼品认领页面到系统菜单中
曾国涛
1 parent cdacd5b4
Showing 10 changed files with 1219 additions and 8 deletions
.umirc.ts
src/models/enum.ts
src/pages/Invoice/ReissueRecord/index.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/constant.ts
src/pages/productCollectBill/components/AddOrUpdate.tsx
src/pages/productCollectBill/components/Audit.tsx
src/pages/productCollectBill/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -151,6 +151,12 @@ export default defineConfig({
       access: 'canReadAdmin',
     },
     {
+      name: '礼品认领',
+      path: '/productCollectBill',
+      component: './productCollectBill',
+      icon: 'BookOutlined',
+    },
+    {
       name: '客户管理',
       path: '/Client',
       icon: 'BookOutlined',
@@ -2,6 +2,8 @@ import {
   postServiceConstInvoiceFlushStatus,
   postServiceConstInvoiceReissueRecordStatus,
   postServiceConstPayees,
+  postServiceConstProductCollectBillStatus,
+  postServiceConstStores,
 } from '@/services';
 import { useCallback } from 'react';
@@ -18,5 +20,19 @@ export default () =&gt; {
     const result = await postServiceConstInvoiceFlushStatus();
     return result.data;
   }, []);
-  return { getPayees, getInvoiceReissueRecordStatus, getInvoiceFlushStatus };
+  const getProductCollectBillAuditStatus = useCallback(async () => {
+    const result = await postServiceConstProductCollectBillStatus();
+    return result.data;
+  }, []);
+  const getWarehouse = useCallback(async () => {
+    const result = await postServiceConstStores();
+    return result.data;
+  }, []);
+  return {
+    getPayees,
+    getInvoiceReissueRecordStatus,
+    getInvoiceFlushStatus,
+    getProductCollectBillAuditStatus,
+    getWarehouse,
+  };
 };
@@ -127,7 +127,6 @@ export default () =&gt; {
       title: '审核备注',
       dataIndex: 'auditNotes',
       width: 100,
-      width: 180,
       hideInSearch: true,
     },
     {
@@ -49,7 +49,7 @@ import {
   INVOCING_STATUS_OPTIONS_OLD,
   PAYEE_OPTIONS,
   PAYMENT_CHANNEL_OPTIONS,
-  PAYMENT_METHOD_OPTIONS,
+  PAYMENT_METHOD_OPTIONS_4_ADD,
   PRODUCT_BELONG_DEPARTMENT_OPTIONS,
   SHIPPING_WAREHOUSE_OPTIONS,
 } from '../constant';
@@ -1511,7 +1511,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           onChange={(val: any) => {
             setPaymentMethod(val);
           }}
-          options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
+          options={enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD)}
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
@@ -34,6 +34,18 @@ export const PAYMENT_METHOD_OPTIONS = {
   PREPAID_NO_NEED_SEND: '预存款无需发货',
 };
+export const PAYMENT_METHOD_OPTIONS_4_ADD = {
+  UNPAID: '未付款',
+  TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
+  OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
+  PAYMENT_IN_ADVANCE: '预付款',
+  WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
+  PLATFORM_SETTLEMENT: '平台结算',
+  CASH_ON_DELIVERY: '货到付款',
+  HIRE_PURCHASE: '分期付款',
+  PREPAID_NO_NEED_SEND: '预存款无需发货',
+};
+
 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
   APPLICATION_PROJECT: '应用项目事业部门',
   TEST: '测试事业部门',
@@ -62,6 +74,7 @@ export const PAYEE_OPTIONS = {
   INNOVATION_PUBLIC_ACCOUNT: '东莞科路得创新科技有限公司',
   JIANTU_PUBLIC_ACCOUNT: '东莞市坚途新材料科技有限公司',
   HUIZHOU_JIANTU_PUBLIC_ACCOUNT: '惠州市坚途新材料科技有限公司',
+  HUIZHOU_EXPERIMENT_PUBLIC_ACCOUNT: '惠州市科路得新材料科技有限公司',
   KNOWLEDGE_PUBLIC_ACCOUNT: '东莞市科路得知识产权代理有限公司',
   // ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
   LIUPING_ACCOUNT: '刘平账户',
+import { postProductCollectBillAddOrModify } from '@/services';
+import { useModel } from '@@/exports';
+import {
+  ModalForm,
+  ProFormDigit,
+  ProFormSelect,
+  ProFormText,
+  ProFormTextArea,
+} from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+
+export default ({ record, onFinish }) => {
+  const [form] = Form.useForm();
+  const { getWarehouse } = useModel('enum');
+  return (
+    <ModalForm
+      title="新建表单"
+      trigger={
+        record?.id ? (
+          <Button type="link">修改</Button>
+        ) : (
+          <Button type="primary">新建</Button>
+        )
+      }
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => console.log('run'),
+      }}
+      submitTimeout={2000}
+      onFinish={async (values) => {
+        let res = await postProductCollectBillAddOrModify({
+          data: values,
+        });
+        if (res) {
+          message.success(res.message);
+          onFinish();
+        }
+        return true;
+      }}
+    >
+      <ProFormDigit
+        label="id"
+        name="id"
+        initialValue={record?.id}
+        width="sm"
+        hidden={true}
+      />
+      <ProFormText
+        width="md"
+        initialValue={record?.productName}
+        name="productName"
+        label="申领物品"
+        rules={[{ required: true, message: '申领物品必填' }]}
+      />
+      <ProFormDigit
+        label="申领数量"
+        name="productNumber"
+        initialValue={record?.productNumber}
+        width="sm"
+        min={1}
+        rules={[{ required: true, message: '申领数量必填' }]}
+      />
+      <ProFormSelect
+        width="md"
+        request={async () => {
+          const res = await getWarehouse();
+          console.log('options:' + res);
+          let options = Object.entries(res).map(([value, label]) => ({
+            label,
+            value,
+          }));
+          console.log('options:' + options);
+          return options;
+        }}
+        // initialValue={record?.warehouseCode}
+        name="warehouseCode"
+        label="申领仓库"
+        rules={[{ required: true, message: '申领仓库为必填项' }]}
+      />
+      <ProFormTextArea
+        initialValue={record?.applyRemarks}
+        name="applyRemarks"
+        label="申领备注"
+      />
+    </ModalForm>
+  );
+};
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postProductCollectBillAudit } from '@/services';
+import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
+import { Button, Form, message } from 'antd';
+
+export default ({ recordId, onClose }) => {
+  const [form] = Form.useForm<{ name: string; company: string }>();
+  return (
+    <ModalForm
+      title="审核"
+      trigger={<Button type="link">审核</Button>}
+      form={form}
+      autoFocusFirstInput
+      modalProps={{
+        destroyOnClose: true,
+        onCancel: () => console.log('run'),
+      }}
+      submitTimeout={2000}
+      submitter={{
+        searchConfig: {
+          submitText: '通过',
+          resetText: '取消',
+        },
+        render: (props, defaultDoms) => {
+          return [
+            defaultDoms[0],
+            <Button
+              type={'primary'}
+              key="ok"
+              onClick={async () => {
+                const res = await postProductCollectBillAudit({
+                  data: {
+                    ...form.getFieldsValue(),
+                    id: recordId,
+                    passed: false,
+                  },
+                });
+                if (res.result === RESPONSE_CODE.SUCCESS) {
+                  message.success('提交成功');
+                }
+                props.submit();
+              }}
+            >
+              驳回
+            </Button>,
+            <Button
+              type={'primary'}
+              key="ok"
+              onClick={async () => {
+                const res = await postProductCollectBillAudit({
+                  data: {
+                    ...form.getFieldsValue(),
+                    id: recordId,
+                    passed: true,
+                  },
+                });
+                if (res.result === RESPONSE_CODE.SUCCESS) {
+                  message.success('提交成功');
+                }
+                props.submit();
+              }}
+            >
+              通过
+            </Button>,
+          ];
+        },
+      }}
+      onFinish={async () => {
+        onClose();
+        return true;
+      }}
+    >
+      <ProFormTextArea name="auditRemarks" label="备注" />
+    </ModalForm>
+  );
+};
+import ButtonConfirm from '@/components/ButtomConfirm';
+import { RESPONSE_CODE } from '@/constants/enum';
+import AddOrUpdate from '@/pages/productCollectBill/components/AddOrUpdate';
+import Audit from '@/pages/productCollectBill/components/Audit';
+import {
+  postProductCollectBillDelete,
+  postProductCollectBillPage,
+  postServiceConstProductCollectBillStatus,
+  postServiceConstStores,
+} from '@/services';
+import { enumToSelect } from '@/utils';
+import type { ActionType, ProColumns } from '@ant-design/pro-components';
+import { ProTable } from '@ant-design/pro-components';
+import { message } from 'antd';
+import { useRef } from 'react';
+
+export default () => {
+  const actionRef = useRef<ActionType>();
+  const columns: ProColumns[] = [
+    {
+      dataIndex: 'index',
+      valueType: 'indexBorder',
+      width: 48,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'productName',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '申领数量',
+      dataIndex: 'productNumber',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '申领人',
+      dataIndex: 'createByName',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '申请时间',
+      dataIndex: 'createTime',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '申领仓库',
+      dataIndex: 'warehouseText',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '审核状态',
+      dataIndex: 'auditStatusText',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '申领备注',
+      dataIndex: 'applyRemarks',
+      valueType: 'textarea',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+    {
+      title: '审核备注',
+      dataIndex: 'auditRemarks',
+      valueType: 'textarea',
+      ellipsis: true,
+      width: 180,
+      hideInSearch: true,
+    },
+
+    {
+      title: '商品名称',
+      dataIndex: 'productNameLike',
+      hideInTable: true,
+    },
+    {
+      title: '申领仓库',
+      valueType: 'select',
+      key: 'warehouse',
+      dataIndex: 'warehouse',
+      filters: true,
+      onFilter: true,
+      hideInTable: true,
+      request: async () => {
+        const res = await postServiceConstStores();
+        console.log('Stores' + JSON.stringify(res));
+        console.log('Stores' + JSON.stringify(res.data));
+        return enumToSelect(res.data);
+      },
+    },
+    {
+      title: '申领人',
+      dataIndex: 'createByNameLike',
+      hideInTable: true,
+    },
+    {
+      title: '申请时间',
+      valueType: 'dateTimeRange',
+      hideInTable: true,
+      search: {
+        transform: (value) => {
+          if (value) {
+            return {
+              createTimeGe: value[0],
+              createTimeLe: value[1],
+            };
+          }
+        },
+      },
+    },
+    {
+      title: '审核状态',
+      valueType: 'select',
+      key: 'auditStatus',
+      dataIndex: 'auditStatus',
+      filters: true,
+      onFilter: true,
+      hideInTable: true,
+      request: async () => {
+        const res = await postServiceConstProductCollectBillStatus();
+        console.log('auditStaus' + JSON.stringify(res));
+        console.log('auditStaus' + JSON.stringify(res.data));
+        return enumToSelect(res.data);
+      },
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      render: ({ record }) => [
+        record.paths?.includes('UPDATE') && (
+          <AddOrUpdate
+            record={record}
+            onFinish={() => {
+              actionRef.current?.reload();
+            }}
+          />
+        ),
+        record.paths?.includes('UPDATE') && (
+          <ButtonConfirm
+            key="delete"
+            className="p-0"
+            title={'确认删除该记录？'}
+            text="删除"
+            onConfirm={async () => {
+              let res = await postProductCollectBillDelete({
+                query: { id: record.id },
+              });
+              if (res) {
+                message.success(res.message);
+                actionRef.current?.reload();
+              }
+            }}
+          />
+        ),
+        record.paths?.includes('AUDIT') && (
+          <Audit
+            recordId={record.id}
+            onClose={() => {
+              actionRef.current?.reload();
+            }}
+          />
+        ),
+      ],
+    },
+  ];
+  return (
+    <ProTable
+      columns={columns}
+      actionRef={actionRef}
+      cardBordered
+      request={async (params) => {
+        const res = await postProductCollectBillPage({
+          data: {
+            ...params,
+          },
+        });
+        if (res.result === RESPONSE_CODE.SUCCESS) {
+          return {
+            data: res?.data?.data,
+            total: res?.data?.total || 0,
+          };
+        }
+        return {
+          data: [],
+          success: false,
+        };
+      }}
+      editable={{
+        type: 'multiple',
+      }}
+      columnsState={{
+        persistenceKey: 'pro-table-singe-demos',
+        persistenceType: 'localStorage',
+        defaultValue: {
+          option: { fixed: 'right', disable: true },
+        },
+        onChange(value) {
+          console.log('value: ', value);
+        },
+      }}
+      rowKey="id"
+      search={{
+        labelWidth: 'auto',
+      }}
+      options={{
+        setting: {
+          listsHeight: 400,
+        },
+      }}
+      form={{
+        // 由于配置了 transform，提交的参数与定义的不同这里需要转化一下
+        syncToUrl: (values, type) => {
+          if (type === 'get') {
+            return {
+              ...values,
+              created_at: [values.startTime, values.endTime],
+            };
+          }
+          return values;
+        },
+      }}
+      pagination={{
+        pageSize: 5,
+        onChange: (page) => console.log(page),
+      }}
+      dateFormatter="string"
+      headerTitle="高级表格"
+      scroll={{ x: 'max-content' }}
+      toolBarRender={() => [
+        <AddOrUpdate
+          key="AddOrUpdate"
+          record={null}
+          onFinish={() => {
+            actionRef.current?.reload();
+          }}
+        />,
+      ]}
+    />
+  );
+};
@@ -79,6 +79,11 @@ export type ProcureReturnBillDtoStatus =
   | 'WAIT_SEND'
   | 'SENDED'
   | 'WAIT_AUDIT';
+export type ProductCollectBillAuditStatus =
+  | 'WAIT_AUDIT'
+  | 'AUDIT_PASS'
+  | 'AUDIT_FAIL';
+export type ProductCollectBillWarehouse = ProcureReturnBillDtoSendStore;
 export interface AdminAuthRoleVO {
   menuIds?: Array<number>;
   /** @format int64 */
@@ -209,6 +214,11 @@ export interface AdminClientDto {
 export interface AdminDeptQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -254,6 +264,11 @@ export interface AdminInvoicingAccountDTO {
 export interface AdminJobQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -285,6 +300,11 @@ export interface AdminMenuQueryVO {
   cache?: number;
   component?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -335,6 +355,11 @@ export interface AdminMenuVO {
 export interface AdminRoleQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   dataScope?: string;
@@ -368,6 +393,11 @@ export interface AdminRoleVO {
 export interface AdminUserLoginByPhoneVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -384,6 +414,11 @@ export interface AdminUserLoginByPhoneVO {
 export interface AdminUserLoginByPwdVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -403,6 +438,11 @@ export interface AdminUserLoginByPwdVO {
 export interface AdminUserModifyPwdVO {
   confirmPassword?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -420,6 +460,11 @@ export interface AdminUserModifyPwdVO {
 export interface AdminUserPasswordRecoverEmailVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -435,6 +480,11 @@ export interface AdminUserPasswordRecoverEmailVO {
 export interface AdminUserQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   email?: string;
@@ -460,6 +510,11 @@ export interface AdminUserQueryVO {
 export interface AdminUserRegisterVO {
   confirmPassword?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   email?: string;
@@ -691,6 +746,11 @@ export interface ApiCreateProductRequest {
 export interface ApiOrderCustomersRequest {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -999,6 +1059,11 @@ export interface AuditDto {
 export interface AuditVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -1082,6 +1147,11 @@ export interface CancelSendOrderDto {
 export interface CaptchaMessageVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -1356,6 +1426,11 @@ export interface CustomerSaveReq {
 export interface DictionaryQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   dictCode?: string;
@@ -1853,6 +1928,7 @@ export interface InvoiceRecordQueryRequest {
    */
   contactsLike?: string;
   createByName?: string;
+  createByNameLike?: string;
   createNameIn?: Array<string>;
   /** @format date-time */
   createTimeGe?: string;
@@ -2223,6 +2299,11 @@ export interface MergeIntegralDto {
 export interface MessageQueryDTO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2267,6 +2348,11 @@ export interface OrderAuditLogQueryVO {
   /** @format int64 */
   applyId?: number;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2312,6 +2398,11 @@ export interface OrderBaseInfoQueryVO {
   cnColor?: string;
   collection?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   customerCode?: string;
@@ -2395,12 +2486,23 @@ export interface OrderCompletionReportVO {
   orderStatus?: number;
 }
+export interface OrderDistrictSelVo {
+  /** @format int64 */
+  oid?: number;
+  orderType?: string;
+}
+
 export interface OrderFieldLockApplyQueryVO {
   /** @format int64 */
   applyUserId?: number;
   /** @format int64 */
   auditUserId?: number;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2471,6 +2573,11 @@ export interface OrderMainProDo {
 export interface OrderOptLogQueryVO {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2893,6 +3000,11 @@ export interface QueryBankStatementDto {
    */
   collectionDatetimeEnd?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -2934,6 +3046,7 @@ export interface QueryClientDto {
   companyIds?: Array<number>;
   companyNameLike?: string;
   createByName?: string;
+  createByNameLike?: string;
   createByUserIdIn?: Array<number>;
   /** @format date-time */
   createTimeGe?: string;
@@ -2979,6 +3092,7 @@ export interface QueryCommunicationInfoDto {
   content?: string;
   createByName?: string;
   createByNameIn?: Array<string>;
+  createByNameLike?: string;
   /** @format date-time */
   createTimeGe?: string;
   /** @format date-time */
@@ -3027,6 +3141,7 @@ export interface QueryCustomerInformationDto {
 export interface QueryGroupIntegralRecordDto {
   createByName?: string;
+  createByNameLike?: string;
   /** @format date-time */
   createTimeGe?: string;
   /** @format date-time */
@@ -3071,6 +3186,11 @@ export interface QueryInvoiceDetailDto {
 export interface QueryInvoiceProjectDto {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3091,6 +3211,7 @@ export interface QueryInvoiceRecordDto {
    */
   contactsLike?: string;
   createByName?: string;
+  createByNameLike?: string;
   createNameIn?: Array<string>;
   /** @format date-time */
   createTimeGe?: string;
@@ -3353,6 +3474,7 @@ export interface QueryReportFormsDto {
 export interface QueryUseOldInvoicingDto {
   createByName?: string;
+  createByNameLike?: string;
   /** @format date-time */
   createTimeGe?: string;
   /** @format date-time */
@@ -3373,6 +3495,11 @@ export interface QueryUseOldInvoicingDto {
 export interface QueryUserIntegralRecordDto {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3406,6 +3533,7 @@ export interface QueryWarningOrderStatistics {
 export interface QueryWarningOrderWhiteListDto {
   createByName?: string;
+  createByNameLike?: string;
   /** @format date-time */
   createTimeGe?: string;
   /** @format date-time */
@@ -3426,6 +3554,7 @@ export interface QueryWarningOrderWhiteListDto {
 export interface QueryWarningUserWhiteListDto {
   createByName?: string;
+  createByNameLike?: string;
   /** @format date-time */
   createTimeGe?: string;
   /** @format date-time */
@@ -3538,6 +3667,11 @@ export interface ResearchGroupListRequest {
    */
   companyNameLike?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -3689,6 +3823,11 @@ export interface ResearchGroupMemberRequestsRequest {
    *   创建人
    */
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4026,6 +4165,11 @@ export interface SysLogQueryVO {
   address?: string;
   browser?: string;
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   description?: string;
@@ -4063,7 +4207,12 @@ export interface TicketsSearchVo {
   annexUrl?: string;
   assignPeople?: string;
   createByName?: string;
+  createByNameLike?: string;
   createTime?: Array<LocalDateTime>;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   detailText?: string;
@@ -4254,6 +4403,11 @@ export interface UserAddressListRequest {
 export interface UserCenterInfoRequest {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4280,6 +4434,11 @@ export interface UserCenterInfoRequest {
 export interface UserDetailRequest {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4304,6 +4463,11 @@ export interface UserDetailRequest {
 export interface UserListRequest {
   createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /**
@@ -4618,6 +4782,8 @@ export interface InvoiceDetail {
 }
 export interface InvoiceReissueRecord {
+  auditNotes?: string;
+  contacts?: Array<string>;
   createByName?: string;
   /**
    * @description
@@ -4638,6 +4804,10 @@ export interface InvoiceReissueRecord {
   createDatetimeLe?: string;
   /** @format date-time */
   createTime?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /** @format int32 */
@@ -4701,6 +4871,7 @@ export interface InvoiceReissueRecord {
   pageSize?: number;
   passed?: boolean;
   paths?: Array<string>;
+  payees?: Array<string>;
   recordIds?: Array<number>;
   reissueStatus?: string;
   /** @format int32 */
@@ -4718,6 +4889,97 @@ export interface InvoiceReissueRecord {
   updateTime?: string;
 }
+/**
+ * @description
+ *   礼品申领单
+ */
+export interface ProductCollectBill {
+  /**
+   * @description
+   *   申领备注
+   */
+  applyRemarks?: string;
+  /**
+   * @description
+   *   审核备注
+   */
+  auditRemarks?: string;
+  /**
+   * @description
+   *   审核状态
+   */
+  auditStatus?: ProductCollectBillAuditStatus;
+  /**
+   * @description
+   *   审核状态
+   * @format int32
+   */
+  auditStatusCode?: number;
+  /**
+   * @description
+   *   审核状态
+   */
+  auditStatusText?: string;
+  createByName?: string;
+  createByNameLike?: string;
+  /** @format date-time */
+  createTime?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
+  /** @format int32 */
+  current?: number;
+  /** @format int32 */
+  end?: number;
+  /** @format int64 */
+  id?: number;
+  logicDelete?: boolean;
+  /** @format int32 */
+  pageSize?: number;
+  passed?: boolean;
+  paths?: Array<string>;
+  /**
+   * @description
+   *   商品名称
+   */
+  productName?: string;
+  /**
+   * @description
+   *   商品名称
+   */
+  productNameLike?: string;
+  /**
+   * @description
+   *   商品名称
+   * @format double
+   */
+  productNumber?: number;
+  /** @format int32 */
+  start?: number;
+  /** @format int32 */
+  total?: number;
+  updateByName?: string;
+  /** @format date-time */
+  updateTime?: string;
+  /**
+   * @description
+   *   申领仓库
+   */
+  warehouse?: ProductCollectBillWarehouse;
+  /**
+   * @description
+   *   申领仓库
+   * @format int32
+   */
+  warehouseCode?: number;
+  /**
+   * @description
+   *   申领仓库
+   */
+  warehouseText?: string;
+}
+
 export interface ResearchGroupAccounts {
   /**
    * @description
@@ -4897,6 +5159,7 @@ export interface SalesRechargePrepaymentRequest {
    */
   createBy?: string;
   createByName?: string;
+  createByNameLike?: string;
   /**
    * @description
    *   创建时间开始时间
@@ -4909,6 +5172,10 @@ export interface SalesRechargePrepaymentRequest {
    * @format date-time
    */
   createTimeEndTime?: string;
+  /** @format date-time */
+  createTimeGe?: string;
+  /** @format date-time */
+  createTimeLe?: string;
   /** @format int32 */
   current?: number;
   /**
@@ -74,6 +74,7 @@ import type {
   OrderAddVO,
   OrderAuditLogQueryVO,
   OrderBaseInfoQueryVO,
+  OrderDistrictSelVo,
   OrderFieldLockApplyQueryVO,
   OrderMainProDo,
   OrderOptLogQueryVO,
@@ -93,6 +94,7 @@ import type {
   ProcurePrintDto,
   ProcureReturnBillApprovalDto,
   ProcureReturnBillDto,
+  ProductCollectBill,
   ProductInformationDto,
   QueryAfterSalesInfoSnapshotDto,
   QueryAnnexDto,
@@ -3062,13 +3064,13 @@ export const postDistrictFindProvinceAndCityAndDistrict =
 export interface PostDistrictSelOrderProvinceOption {
   /**
    * @description
-   *   oId
+   *   OrderDistrictSelVo
    */
   body: {
     /**
         @description
-          oId */
-    oId: number;
+          OrderDistrictSelVo */
+    OrderDistrictSelVo: OrderDistrictSelVo;
   };
 }
@@ -12957,6 +12959,292 @@ export const postProcureReturnBillSend = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postProductCollectBillAddOrModify */
+export interface PostProductCollectBillAddOrModifyOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProductCollectBill;
+  };
+}
+
+/** @description response type for postProductCollectBillAddOrModify */
+export interface PostProductCollectBillAddOrModifyResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProductCollectBillAddOrModifyResponseSuccess =
+  PostProductCollectBillAddOrModifyResponse[200];
+/**
+ * @description
+ *   新增或修改
+ * @tags product-collect-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProductCollectBillAddOrModify = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/productCollectBill/addOrModify';
+  function request(
+    option: PostProductCollectBillAddOrModifyOption,
+  ): Promise<PostProductCollectBillAddOrModifyResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProductCollectBillAddOrModifyResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postProductCollectBillAudit */
+export interface PostProductCollectBillAuditOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProductCollectBill;
+  };
+}
+
+/** @description response type for postProductCollectBillAudit */
+export interface PostProductCollectBillAuditResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProductCollectBillAuditResponseSuccess =
+  PostProductCollectBillAuditResponse[200];
+/**
+ * @description
+ *   审核
+ * @tags product-collect-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProductCollectBillAudit = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/productCollectBill/audit';
+  function request(
+    option: PostProductCollectBillAuditOption,
+  ): Promise<PostProductCollectBillAuditResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProductCollectBillAuditResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postProductCollectBillDelete */
+export interface PostProductCollectBillDeleteOption {
+  /**
+   * @description
+   *   id
+   * @format int64
+   */
+  query: {
+    /**
+        @description
+          id
+        @format int64 */
+    id: number;
+  };
+}
+
+/** @description response type for postProductCollectBillDelete */
+export interface PostProductCollectBillDeleteResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProductCollectBillDeleteResponseSuccess =
+  PostProductCollectBillDeleteResponse[200];
+/**
+ * @description
+ *   删除
+ * @tags product-collect-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProductCollectBillDelete = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/productCollectBill/delete';
+  function request(
+    option: PostProductCollectBillDeleteOption,
+  ): Promise<PostProductCollectBillDeleteResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProductCollectBillDeleteResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postProductCollectBillPage */
+export interface PostProductCollectBillPageOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: ProductCollectBill;
+  };
+}
+
+/** @description response type for postProductCollectBillPage */
+export interface PostProductCollectBillPageResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostProductCollectBillPageResponseSuccess =
+  PostProductCollectBillPageResponse[200];
+/**
+ * @description
+ *   分页查询
+ * @tags product-collect-bill-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postProductCollectBillPage = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/productCollectBill/page';
+  function request(
+    option: PostProductCollectBillPageOption,
+  ): Promise<PostProductCollectBillPageResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostProductCollectBillPageResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postResearchGroupMemberRequestsAdd */
 export interface PostResearchGroupMemberRequestsAddOption {
   /**
@@ -15374,7 +15662,7 @@ export type PostServiceConstProcureReturnBillsResponseSuccess =
   PostServiceConstProcureReturnBillsResponse[200];
 /**
  * @description
- *   获取仓库
+ *   采购退货单状态
  * @tags front-const-controller
  * @produces *
  * @consumes application/json
@@ -15395,6 +15683,60 @@ export const postServiceConstProcureReturnBills = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description response type for postServiceConstProductCollectBillStatus */
+export interface PostServiceConstProductCollectBillStatusResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceConstProductCollectBillStatusResponseSuccess =
+  PostServiceConstProductCollectBillStatusResponse[200];
+/**
+ * @description
+ *   商品申领单状态
+ * @tags front-const-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceConstProductCollectBillStatus = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/const/productCollectBillStatus';
+  function request(): Promise<PostServiceConstProductCollectBillStatusResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+    }) as unknown as Promise<PostServiceConstProductCollectBillStatusResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description response type for postServiceConstStores */
 export interface PostServiceConstStoresResponse {
   /**
@@ -15507,6 +15849,13 @@ export const postServiceConstTradeStatus = /* #__PURE__ */ (() =&gt; {
 export interface GetServiceInvoiceListInvoiceProjectOption {
   query?: {
     createByName?: string;
+    createByNameLike?: string;
+    /**
+        @format date-time */
+    createTimeGe?: string;
+    /**
+        @format date-time */
+    createTimeLe?: string;
     /**
         @format int32 */
     current?: number;
@@ -18867,6 +19216,77 @@ export const postServiceOrderAfterSalesQuerySnapshotOrder =
     return request;
   })();
+/** @description request parameter type for postServiceOrderAfterSalesStoreSure */
+export interface PostServiceOrderAfterSalesStoreSureOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderAfterSalesStoreSure */
+export interface PostServiceOrderAfterSalesStoreSureResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderAfterSalesStoreSureResponseSuccess =
+  PostServiceOrderAfterSalesStoreSureResponse[200];
+/**
+ * @description
+ *   仓库确认售后订单
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderAfterSalesStoreSure = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/afterSalesStoreSure';
+  function request(
+    option: PostServiceOrderAfterSalesStoreSureOption,
+  ): Promise<PostServiceOrderAfterSalesStoreSureResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderAfterSalesStoreSureResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderApplyAfterSales */
 export interface PostServiceOrderApplyAfterSalesOption {
   /**
@@ -22077,6 +22497,77 @@ export const getServiceOrderProvideToken = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postServiceOrderPurchaseRejectionToSale */
+export interface PostServiceOrderPurchaseRejectionToSaleOption {
+  /**
+   * @description
+   *   dto
+   */
+  body: {
+    /**
+        @description
+          dto */
+    dto: Dto;
+  };
+}
+
+/** @description response type for postServiceOrderPurchaseRejectionToSale */
+export interface PostServiceOrderPurchaseRejectionToSaleResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostServiceOrderPurchaseRejectionToSaleResponseSuccess =
+  PostServiceOrderPurchaseRejectionToSaleResponse[200];
+/**
+ * @description
+ *   采购驳回至销售
+ * @tags 内部订单
+ * @produces *
+ * @consumes application/json
+ */
+export const postServiceOrderPurchaseRejectionToSale = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/service/order/purchaseRejectionToSale';
+  function request(
+    option: PostServiceOrderPurchaseRejectionToSaleOption,
+  ): Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postServiceOrderQueryAfterSalesInfoSnapshot */
 export interface PostServiceOrderQueryAfterSalesInfoSnapshotOption {
   /**