canrd-main / canrd-erp-front · Commits

Commit b7d021648addf80d64e6f45cf09434807646a0bb

Authored by 曾国涛
1 parent cdacd5b4

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

- 添加礼品认领相关的数据模型和接口
- 实现礼品认领的新增、修改、删除和审核功能
- 集成礼品认领页面到系统菜单中
Inline Side-by-side
Showing 10 changed files with 1219 additions and 8 deletions
.umirc.ts
  View file @b7d0216
... ... @@ -151,6 +151,12 @@ export default defineConfig({
151 151 access: 'canReadAdmin',
152 152 },
153 153 {
  154 + name: '礼品认领',
  155 + path: '/productCollectBill',
  156 + component: './productCollectBill',
  157 + icon: 'BookOutlined',
  158 + },
  159 + {
154 160 name: '客户管理',
155 161 path: '/Client',
156 162 icon: 'BookOutlined',
... ...
src/models/enum.ts
  View file @b7d0216
... ... @@ -2,6 +2,8 @@ import {
2 2 postServiceConstInvoiceFlushStatus,
3 3 postServiceConstInvoiceReissueRecordStatus,
4 4 postServiceConstPayees,
  5 + postServiceConstProductCollectBillStatus,
  6 + postServiceConstStores,
5 7 } from '@/services';
6 8 import { useCallback } from 'react';
7 9  
... ... @@ -18,5 +20,19 @@ export default () => {
18 20 const result = await postServiceConstInvoiceFlushStatus();
19 21 return result.data;
20 22 }, []);
21   - return { getPayees, getInvoiceReissueRecordStatus, getInvoiceFlushStatus };
  23 + const getProductCollectBillAuditStatus = useCallback(async () => {
  24 + const result = await postServiceConstProductCollectBillStatus();
  25 + return result.data;
  26 + }, []);
  27 + const getWarehouse = useCallback(async () => {
  28 + const result = await postServiceConstStores();
  29 + return result.data;
  30 + }, []);
  31 + return {
  32 + getPayees,
  33 + getInvoiceReissueRecordStatus,
  34 + getInvoiceFlushStatus,
  35 + getProductCollectBillAuditStatus,
  36 + getWarehouse,
  37 + };
22 38 };
... ...
src/pages/Invoice/ReissueRecord/index.tsx
  View file @b7d0216
... ... @@ -127,7 +127,6 @@ export default () => {
127 127 title: '审核备注',
128 128 dataIndex: 'auditNotes',
129 129 width: 100,
130   - width: 180,
131 130 hideInSearch: true,
132 131 },
133 132 {
... ...
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @b7d0216
... ... @@ -49,7 +49,7 @@ import {
49 49 INVOCING_STATUS_OPTIONS_OLD,
50 50 PAYEE_OPTIONS,
51 51 PAYMENT_CHANNEL_OPTIONS,
52   - PAYMENT_METHOD_OPTIONS,
  52 + PAYMENT_METHOD_OPTIONS_4_ADD,
53 53 PRODUCT_BELONG_DEPARTMENT_OPTIONS,
54 54 SHIPPING_WAREHOUSE_OPTIONS,
55 55 } from '../constant';
... ... @@ -1511,7 +1511,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
1511 1511 onChange={(val: any) => {
1512 1512 setPaymentMethod(val);
1513 1513 }}
1514   - options={enumToSelect(PAYMENT_METHOD_OPTIONS)}
  1514 + options={enumToSelect(PAYMENT_METHOD_OPTIONS_4_ADD)}
1515 1515 rules={[{ required: true, message: '支付方式必填' }]}
1516 1516 disabled={optType('after-sales-check')}
1517 1517 />
... ...
src/pages/Order/constant.ts
  View file @b7d0216
... ... @@ -34,6 +34,18 @@ export const PAYMENT_METHOD_OPTIONS = {
34 34 PREPAID_NO_NEED_SEND: '预存款无需发货',
35 35 };
36 36  
  37 +export const PAYMENT_METHOD_OPTIONS_4_ADD = {
  38 + UNPAID: '未付款',
  39 + TAOBAO_ORDER_HAS_BEEN_PAID: '淘宝订单已付款',
  40 + OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID: '官网订单已付款',
  41 + PAYMENT_IN_ADVANCE: '预付款',
  42 + WITHHOLDING_ADVANCE_DEPOSIT: '扣预存',
  43 + PLATFORM_SETTLEMENT: '平台结算',
  44 + CASH_ON_DELIVERY: '货到付款',
  45 + HIRE_PURCHASE: '分期付款',
  46 + PREPAID_NO_NEED_SEND: '预存款无需发货',
  47 +};
  48 +
37 49 export const PRODUCT_BELONG_DEPARTMENT_OPTIONS = {
38 50 APPLICATION_PROJECT: '应用项目事业部门',
39 51 TEST: '测试事业部门',
... ... @@ -62,6 +74,7 @@ export const PAYEE_OPTIONS = {
62 74 INNOVATION_PUBLIC_ACCOUNT: '东莞科路得创新科技有限公司',
63 75 JIANTU_PUBLIC_ACCOUNT: '东莞市坚途新材料科技有限公司',
64 76 HUIZHOU_JIANTU_PUBLIC_ACCOUNT: '惠州市坚途新材料科技有限公司',
  77 + HUIZHOU_EXPERIMENT_PUBLIC_ACCOUNT: '惠州市科路得新材料科技有限公司',
65 78 KNOWLEDGE_PUBLIC_ACCOUNT: '东莞市科路得知识产权代理有限公司',
66 79 // ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
67 80 LIUPING_ACCOUNT: '刘平账户',
... ...
src/pages/productCollectBill/components/AddOrUpdate.tsx 0 → 100644
  View file @b7d0216
  1 +import { postProductCollectBillAddOrModify } from '@/services';
  2 +import { useModel } from '@@/exports';
  3 +import {
  4 + ModalForm,
  5 + ProFormDigit,
  6 + ProFormSelect,
  7 + ProFormText,
  8 + ProFormTextArea,
  9 +} from '@ant-design/pro-components';
  10 +import { Button, Form, message } from 'antd';
  11 +
  12 +export default ({ record, onFinish }) => {
  13 + const [form] = Form.useForm();
  14 + const { getWarehouse } = useModel('enum');
  15 + return (
  16 + <ModalForm
  17 + title="新建表单"
  18 + trigger={
  19 + record?.id ? (
  20 + <Button type="link">修改</Button>
  21 + ) : (
  22 + <Button type="primary">新建</Button>
  23 + )
  24 + }
  25 + form={form}
  26 + autoFocusFirstInput
  27 + modalProps={{
  28 + destroyOnClose: true,
  29 + onCancel: () => console.log('run'),
  30 + }}
  31 + submitTimeout={2000}
  32 + onFinish={async (values) => {
  33 + let res = await postProductCollectBillAddOrModify({
  34 + data: values,
  35 + });
  36 + if (res) {
  37 + message.success(res.message);
  38 + onFinish();
  39 + }
  40 + return true;
  41 + }}
  42 + >
  43 + <ProFormDigit
  44 + label="id"
  45 + name="id"
  46 + initialValue={record?.id}
  47 + width="sm"
  48 + hidden={true}
  49 + />
  50 + <ProFormText
  51 + width="md"
  52 + initialValue={record?.productName}
  53 + name="productName"
  54 + label="申领物品"
  55 + rules={[{ required: true, message: '申领物品必填' }]}
  56 + />
  57 + <ProFormDigit
  58 + label="申领数量"
  59 + name="productNumber"
  60 + initialValue={record?.productNumber}
  61 + width="sm"
  62 + min={1}
  63 + rules={[{ required: true, message: '申领数量必填' }]}
  64 + />
  65 + <ProFormSelect
  66 + width="md"
  67 + request={async () => {
  68 + const res = await getWarehouse();
  69 + console.log('options:' + res);
  70 + let options = Object.entries(res).map(([value, label]) => ({
  71 + label,
  72 + value,
  73 + }));
  74 + console.log('options:' + options);
  75 + return options;
  76 + }}
  77 + // initialValue={record?.warehouseCode}
  78 + name="warehouseCode"
  79 + label="申领仓库"
  80 + rules={[{ required: true, message: '申领仓库为必填项' }]}
  81 + />
  82 + <ProFormTextArea
  83 + initialValue={record?.applyRemarks}
  84 + name="applyRemarks"
  85 + label="申领备注"
  86 + />
  87 + </ModalForm>
  88 + );
  89 +};
... ...
src/pages/productCollectBill/components/Audit.tsx 0 → 100644
  View file @b7d0216
  1 +import { RESPONSE_CODE } from '@/constants/enum';
  2 +import { postProductCollectBillAudit } from '@/services';
  3 +import { ModalForm, ProFormTextArea } from '@ant-design/pro-components';
  4 +import { Button, Form, message } from 'antd';
  5 +
  6 +export default ({ recordId, onClose }) => {
  7 + const [form] = Form.useForm<{ name: string; company: string }>();
  8 + return (
  9 + <ModalForm
  10 + title="审核"
  11 + trigger={<Button type="link">审核</Button>}
  12 + form={form}
  13 + autoFocusFirstInput
  14 + modalProps={{
  15 + destroyOnClose: true,
  16 + onCancel: () => console.log('run'),
  17 + }}
  18 + submitTimeout={2000}
  19 + submitter={{
  20 + searchConfig: {
  21 + submitText: '通过',
  22 + resetText: '取消',
  23 + },
  24 + render: (props, defaultDoms) => {
  25 + return [
  26 + defaultDoms[0],
  27 + <Button
  28 + type={'primary'}
  29 + key="ok"
  30 + onClick={async () => {
  31 + const res = await postProductCollectBillAudit({
  32 + data: {
  33 + ...form.getFieldsValue(),
  34 + id: recordId,
  35 + passed: false,
  36 + },
  37 + });
  38 + if (res.result === RESPONSE_CODE.SUCCESS) {
  39 + message.success('提交成功');
  40 + }
  41 + props.submit();
  42 + }}
  43 + >
  44 + 驳回
  45 + </Button>,
  46 + <Button
  47 + type={'primary'}
  48 + key="ok"
  49 + onClick={async () => {
  50 + const res = await postProductCollectBillAudit({
  51 + data: {
  52 + ...form.getFieldsValue(),
  53 + id: recordId,
  54 + passed: true,
  55 + },
  56 + });
  57 + if (res.result === RESPONSE_CODE.SUCCESS) {
  58 + message.success('提交成功');
  59 + }
  60 + props.submit();
  61 + }}
  62 + >
  63 + 通过
  64 + </Button>,
  65 + ];
  66 + },
  67 + }}
  68 + onFinish={async () => {
  69 + onClose();
  70 + return true;
  71 + }}
  72 + >
  73 + <ProFormTextArea name="auditRemarks" label="备注" />
  74 + </ModalForm>
  75 + );
  76 +};
... ...
src/pages/productCollectBill/index.tsx 0 → 100644
  View file @b7d0216
  1 +import ButtonConfirm from '@/components/ButtomConfirm';
  2 +import { RESPONSE_CODE } from '@/constants/enum';
  3 +import AddOrUpdate from '@/pages/productCollectBill/components/AddOrUpdate';
  4 +import Audit from '@/pages/productCollectBill/components/Audit';
  5 +import {
  6 + postProductCollectBillDelete,
  7 + postProductCollectBillPage,
  8 + postServiceConstProductCollectBillStatus,
  9 + postServiceConstStores,
  10 +} from '@/services';
  11 +import { enumToSelect } from '@/utils';
  12 +import type { ActionType, ProColumns } from '@ant-design/pro-components';
  13 +import { ProTable } from '@ant-design/pro-components';
  14 +import { message } from 'antd';
  15 +import { useRef } from 'react';
  16 +
  17 +export default () => {
  18 + const actionRef = useRef<ActionType>();
  19 + const columns: ProColumns[] = [
  20 + {
  21 + dataIndex: 'index',
  22 + valueType: 'indexBorder',
  23 + width: 48,
  24 + },
  25 + {
  26 + title: '商品名称',
  27 + dataIndex: 'productName',
  28 + ellipsis: true,
  29 + width: 180,
  30 + hideInSearch: true,
  31 + },
  32 + {
  33 + title: '申领数量',
  34 + dataIndex: 'productNumber',
  35 + ellipsis: true,
  36 + width: 180,
  37 + hideInSearch: true,
  38 + },
  39 + {
  40 + title: '申领人',
  41 + dataIndex: 'createByName',
  42 + ellipsis: true,
  43 + width: 180,
  44 + hideInSearch: true,
  45 + },
  46 + {
  47 + title: '申请时间',
  48 + dataIndex: 'createTime',
  49 + ellipsis: true,
  50 + width: 180,
  51 + hideInSearch: true,
  52 + },
  53 + {
  54 + title: '申领仓库',
  55 + dataIndex: 'warehouseText',
  56 + ellipsis: true,
  57 + width: 180,
  58 + hideInSearch: true,
  59 + },
  60 + {
  61 + title: '审核状态',
  62 + dataIndex: 'auditStatusText',
  63 + ellipsis: true,
  64 + width: 180,
  65 + hideInSearch: true,
  66 + },
  67 + {
  68 + title: '申领备注',
  69 + dataIndex: 'applyRemarks',
  70 + valueType: 'textarea',
  71 + ellipsis: true,
  72 + width: 180,
  73 + hideInSearch: true,
  74 + },
  75 + {
  76 + title: '审核备注',
  77 + dataIndex: 'auditRemarks',
  78 + valueType: 'textarea',
  79 + ellipsis: true,
  80 + width: 180,
  81 + hideInSearch: true,
  82 + },
  83 +
  84 + {
  85 + title: '商品名称',
  86 + dataIndex: 'productNameLike',
  87 + hideInTable: true,
  88 + },
  89 + {
  90 + title: '申领仓库',
  91 + valueType: 'select',
  92 + key: 'warehouse',
  93 + dataIndex: 'warehouse',
  94 + filters: true,
  95 + onFilter: true,
  96 + hideInTable: true,
  97 + request: async () => {
  98 + const res = await postServiceConstStores();
  99 + console.log('Stores' + JSON.stringify(res));
  100 + console.log('Stores' + JSON.stringify(res.data));
  101 + return enumToSelect(res.data);
  102 + },
  103 + },
  104 + {
  105 + title: '申领人',
  106 + dataIndex: 'createByNameLike',
  107 + hideInTable: true,
  108 + },
  109 + {
  110 + title: '申请时间',
  111 + valueType: 'dateTimeRange',
  112 + hideInTable: true,
  113 + search: {
  114 + transform: (value) => {
  115 + if (value) {
  116 + return {
  117 + createTimeGe: value[0],
  118 + createTimeLe: value[1],
  119 + };
  120 + }
  121 + },
  122 + },
  123 + },
  124 + {
  125 + title: '审核状态',
  126 + valueType: 'select',
  127 + key: 'auditStatus',
  128 + dataIndex: 'auditStatus',
  129 + filters: true,
  130 + onFilter: true,
  131 + hideInTable: true,
  132 + request: async () => {
  133 + const res = await postServiceConstProductCollectBillStatus();
  134 + console.log('auditStaus' + JSON.stringify(res));
  135 + console.log('auditStaus' + JSON.stringify(res.data));
  136 + return enumToSelect(res.data);
  137 + },
  138 + },
  139 + {
  140 + title: '操作',
  141 + valueType: 'option',
  142 + key: 'option',
  143 + render: ({ record }) => [
  144 + record.paths?.includes('UPDATE') && (
  145 + <AddOrUpdate
  146 + record={record}
  147 + onFinish={() => {
  148 + actionRef.current?.reload();
  149 + }}
  150 + />
  151 + ),
  152 + record.paths?.includes('UPDATE') && (
  153 + <ButtonConfirm
  154 + key="delete"
  155 + className="p-0"
  156 + title={'确认删除该记录？'}
  157 + text="删除"
  158 + onConfirm={async () => {
  159 + let res = await postProductCollectBillDelete({
  160 + query: { id: record.id },
  161 + });
  162 + if (res) {
  163 + message.success(res.message);
  164 + actionRef.current?.reload();
  165 + }
  166 + }}
  167 + />
  168 + ),
  169 + record.paths?.includes('AUDIT') && (
  170 + <Audit
  171 + recordId={record.id}
  172 + onClose={() => {
  173 + actionRef.current?.reload();
  174 + }}
  175 + />
  176 + ),
  177 + ],
  178 + },
  179 + ];
  180 + return (
  181 + <ProTable
  182 + columns={columns}
  183 + actionRef={actionRef}
  184 + cardBordered
  185 + request={async (params) => {
  186 + const res = await postProductCollectBillPage({
  187 + data: {
  188 + ...params,
  189 + },
  190 + });
  191 + if (res.result === RESPONSE_CODE.SUCCESS) {
  192 + return {
  193 + data: res?.data?.data,
  194 + total: res?.data?.total || 0,
  195 + };
  196 + }
  197 + return {
  198 + data: [],
  199 + success: false,
  200 + };
  201 + }}
  202 + editable={{
  203 + type: 'multiple',
  204 + }}
  205 + columnsState={{
  206 + persistenceKey: 'pro-table-singe-demos',
  207 + persistenceType: 'localStorage',
  208 + defaultValue: {
  209 + option: { fixed: 'right', disable: true },
  210 + },
  211 + onChange(value) {
  212 + console.log('value: ', value);
  213 + },
  214 + }}
  215 + rowKey="id"
  216 + search={{
  217 + labelWidth: 'auto',
  218 + }}
  219 + options={{
  220 + setting: {
  221 + listsHeight: 400,
  222 + },
  223 + }}
  224 + form={{
  225 + // 由于配置了 transform，提交的参数与定义的不同这里需要转化一下
  226 + syncToUrl: (values, type) => {
  227 + if (type === 'get') {
  228 + return {
  229 + ...values,
  230 + created_at: [values.startTime, values.endTime],
  231 + };
  232 + }
  233 + return values;
  234 + },
  235 + }}
  236 + pagination={{
  237 + pageSize: 5,
  238 + onChange: (page) => console.log(page),
  239 + }}
  240 + dateFormatter="string"
  241 + headerTitle="高级表格"
  242 + scroll={{ x: 'max-content' }}
  243 + toolBarRender={() => [
  244 + <AddOrUpdate
  245 + key="AddOrUpdate"
  246 + record={null}
  247 + onFinish={() => {
  248 + actionRef.current?.reload();
  249 + }}
  250 + />,
  251 + ]}
  252 + />
  253 + );
  254 +};
... ...
src/services/definition.ts
  View file @b7d0216
... ... @@ -79,6 +79,11 @@ export type ProcureReturnBillDtoStatus =
79 79 | 'WAIT_SEND'
80 80 | 'SENDED'
81 81 | 'WAIT_AUDIT';
  82 +export type ProductCollectBillAuditStatus =
  83 + | 'WAIT_AUDIT'
  84 + | 'AUDIT_PASS'
  85 + | 'AUDIT_FAIL';
  86 +export type ProductCollectBillWarehouse = ProcureReturnBillDtoSendStore;
82 87 export interface AdminAuthRoleVO {
83 88 menuIds?: Array<number>;
84 89 /** @format int64 */
... ... @@ -209,6 +214,11 @@ export interface AdminClientDto {
209 214  
210 215 export interface AdminDeptQueryVO {
211 216 createByName?: string;
  217 + createByNameLike?: string;
  218 + /** @format date-time */
  219 + createTimeGe?: string;
  220 + /** @format date-time */
  221 + createTimeLe?: string;
212 222 /** @format int32 */
213 223 current?: number;
214 224 /** @format int32 */
... ... @@ -254,6 +264,11 @@ export interface AdminInvoicingAccountDTO {
254 264  
255 265 export interface AdminJobQueryVO {
256 266 createByName?: string;
  267 + createByNameLike?: string;
  268 + /** @format date-time */
  269 + createTimeGe?: string;
  270 + /** @format date-time */
  271 + createTimeLe?: string;
257 272 /** @format int32 */
258 273 current?: number;
259 274 /** @format int32 */
... ... @@ -285,6 +300,11 @@ export interface AdminMenuQueryVO {
285 300 cache?: number;
286 301 component?: string;
287 302 createByName?: string;
  303 + createByNameLike?: string;
  304 + /** @format date-time */
  305 + createTimeGe?: string;
  306 + /** @format date-time */
  307 + createTimeLe?: string;
288 308 /** @format int32 */
289 309 current?: number;
290 310 /** @format int32 */
... ... @@ -335,6 +355,11 @@ export interface AdminMenuVO {
335 355  
336 356 export interface AdminRoleQueryVO {
337 357 createByName?: string;
  358 + createByNameLike?: string;
  359 + /** @format date-time */
  360 + createTimeGe?: string;
  361 + /** @format date-time */
  362 + createTimeLe?: string;
338 363 /** @format int32 */
339 364 current?: number;
340 365 dataScope?: string;
... ... @@ -368,6 +393,11 @@ export interface AdminRoleVO {
368 393  
369 394 export interface AdminUserLoginByPhoneVO {
370 395 createByName?: string;
  396 + createByNameLike?: string;
  397 + /** @format date-time */
  398 + createTimeGe?: string;
  399 + /** @format date-time */
  400 + createTimeLe?: string;
371 401 /** @format int32 */
372 402 current?: number;
373 403 /** @format int32 */
... ... @@ -384,6 +414,11 @@ export interface AdminUserLoginByPhoneVO {
384 414  
385 415 export interface AdminUserLoginByPwdVO {
386 416 createByName?: string;
  417 + createByNameLike?: string;
  418 + /** @format date-time */
  419 + createTimeGe?: string;
  420 + /** @format date-time */
  421 + createTimeLe?: string;
387 422 /** @format int32 */
388 423 current?: number;
389 424 /** @format int32 */
... ... @@ -403,6 +438,11 @@ export interface AdminUserLoginByPwdVO {
403 438 export interface AdminUserModifyPwdVO {
404 439 confirmPassword?: string;
405 440 createByName?: string;
  441 + createByNameLike?: string;
  442 + /** @format date-time */
  443 + createTimeGe?: string;
  444 + /** @format date-time */
  445 + createTimeLe?: string;
406 446 /** @format int32 */
407 447 current?: number;
408 448 /** @format int32 */
... ... @@ -420,6 +460,11 @@ export interface AdminUserModifyPwdVO {
420 460  
421 461 export interface AdminUserPasswordRecoverEmailVO {
422 462 createByName?: string;
  463 + createByNameLike?: string;
  464 + /** @format date-time */
  465 + createTimeGe?: string;
  466 + /** @format date-time */
  467 + createTimeLe?: string;
423 468 /** @format int32 */
424 469 current?: number;
425 470 /** @format int32 */
... ... @@ -435,6 +480,11 @@ export interface AdminUserPasswordRecoverEmailVO {
435 480  
436 481 export interface AdminUserQueryVO {
437 482 createByName?: string;
  483 + createByNameLike?: string;
  484 + /** @format date-time */
  485 + createTimeGe?: string;
  486 + /** @format date-time */
  487 + createTimeLe?: string;
438 488 /** @format int32 */
439 489 current?: number;
440 490 email?: string;
... ... @@ -460,6 +510,11 @@ export interface AdminUserQueryVO {
460 510 export interface AdminUserRegisterVO {
461 511 confirmPassword?: string;
462 512 createByName?: string;
  513 + createByNameLike?: string;
  514 + /** @format date-time */
  515 + createTimeGe?: string;
  516 + /** @format date-time */
  517 + createTimeLe?: string;
463 518 /** @format int32 */
464 519 current?: number;
465 520 email?: string;
... ... @@ -691,6 +746,11 @@ export interface ApiCreateProductRequest {
691 746  
692 747 export interface ApiOrderCustomersRequest {
693 748 createByName?: string;
  749 + createByNameLike?: string;
  750 + /** @format date-time */
  751 + createTimeGe?: string;
  752 + /** @format date-time */
  753 + createTimeLe?: string;
694 754 /** @format int32 */
695 755 current?: number;
696 756 /** @format int32 */
... ... @@ -999,6 +1059,11 @@ export interface AuditDto {
999 1059  
1000 1060 export interface AuditVO {
1001 1061 createByName?: string;
  1062 + createByNameLike?: string;
  1063 + /** @format date-time */
  1064 + createTimeGe?: string;
  1065 + /** @format date-time */
  1066 + createTimeLe?: string;
1002 1067 /** @format int32 */
1003 1068 current?: number;
1004 1069 /** @format int32 */
... ... @@ -1082,6 +1147,11 @@ export interface CancelSendOrderDto {
1082 1147  
1083 1148 export interface CaptchaMessageVO {
1084 1149 createByName?: string;
  1150 + createByNameLike?: string;
  1151 + /** @format date-time */
  1152 + createTimeGe?: string;
  1153 + /** @format date-time */
  1154 + createTimeLe?: string;
1085 1155 /** @format int32 */
1086 1156 current?: number;
1087 1157 /** @format int32 */
... ... @@ -1356,6 +1426,11 @@ export interface CustomerSaveReq {
1356 1426  
1357 1427 export interface DictionaryQueryVO {
1358 1428 createByName?: string;
  1429 + createByNameLike?: string;
  1430 + /** @format date-time */
  1431 + createTimeGe?: string;
  1432 + /** @format date-time */
  1433 + createTimeLe?: string;
1359 1434 /** @format int32 */
1360 1435 current?: number;
1361 1436 dictCode?: string;
... ... @@ -1853,6 +1928,7 @@ export interface InvoiceRecordQueryRequest {
1853 1928 */
1854 1929 contactsLike?: string;
1855 1930 createByName?: string;
  1931 + createByNameLike?: string;
1856 1932 createNameIn?: Array<string>;
1857 1933 /** @format date-time */
1858 1934 createTimeGe?: string;
... ... @@ -2223,6 +2299,11 @@ export interface MergeIntegralDto {
2223 2299  
2224 2300 export interface MessageQueryDTO {
2225 2301 createByName?: string;
  2302 + createByNameLike?: string;
  2303 + /** @format date-time */
  2304 + createTimeGe?: string;
  2305 + /** @format date-time */
  2306 + createTimeLe?: string;
2226 2307 /** @format int32 */
2227 2308 current?: number;
2228 2309 /** @format int32 */
... ... @@ -2267,6 +2348,11 @@ export interface OrderAuditLogQueryVO {
2267 2348 /** @format int64 */
2268 2349 applyId?: number;
2269 2350 createByName?: string;
  2351 + createByNameLike?: string;
  2352 + /** @format date-time */
  2353 + createTimeGe?: string;
  2354 + /** @format date-time */
  2355 + createTimeLe?: string;
2270 2356 /** @format int32 */
2271 2357 current?: number;
2272 2358 /** @format int32 */
... ... @@ -2312,6 +2398,11 @@ export interface OrderBaseInfoQueryVO {
2312 2398 cnColor?: string;
2313 2399 collection?: string;
2314 2400 createByName?: string;
  2401 + createByNameLike?: string;
  2402 + /** @format date-time */
  2403 + createTimeGe?: string;
  2404 + /** @format date-time */
  2405 + createTimeLe?: string;
2315 2406 /** @format int32 */
2316 2407 current?: number;
2317 2408 customerCode?: string;
... ... @@ -2395,12 +2486,23 @@ export interface OrderCompletionReportVO {
2395 2486 orderStatus?: number;
2396 2487 }
2397 2488  
  2489 +export interface OrderDistrictSelVo {
  2490 + /** @format int64 */
  2491 + oid?: number;
  2492 + orderType?: string;
  2493 +}
  2494 +
2398 2495 export interface OrderFieldLockApplyQueryVO {
2399 2496 /** @format int64 */
2400 2497 applyUserId?: number;
2401 2498 /** @format int64 */
2402 2499 auditUserId?: number;
2403 2500 createByName?: string;
  2501 + createByNameLike?: string;
  2502 + /** @format date-time */
  2503 + createTimeGe?: string;
  2504 + /** @format date-time */
  2505 + createTimeLe?: string;
2404 2506 /** @format int32 */
2405 2507 current?: number;
2406 2508 /** @format int32 */
... ... @@ -2471,6 +2573,11 @@ export interface OrderMainProDo {
2471 2573  
2472 2574 export interface OrderOptLogQueryVO {
2473 2575 createByName?: string;
  2576 + createByNameLike?: string;
  2577 + /** @format date-time */
  2578 + createTimeGe?: string;
  2579 + /** @format date-time */
  2580 + createTimeLe?: string;
2474 2581 /** @format int32 */
2475 2582 current?: number;
2476 2583 /** @format int32 */
... ... @@ -2893,6 +3000,11 @@ export interface QueryBankStatementDto {
2893 3000 */
2894 3001 collectionDatetimeEnd?: string;
2895 3002 createByName?: string;
  3003 + createByNameLike?: string;
  3004 + /** @format date-time */
  3005 + createTimeGe?: string;
  3006 + /** @format date-time */
  3007 + createTimeLe?: string;
2896 3008 /** @format int32 */
2897 3009 current?: number;
2898 3010 /** @format int32 */
... ... @@ -2934,6 +3046,7 @@ export interface QueryClientDto {
2934 3046 companyIds?: Array<number>;
2935 3047 companyNameLike?: string;
2936 3048 createByName?: string;
  3049 + createByNameLike?: string;
2937 3050 createByUserIdIn?: Array<number>;
2938 3051 /** @format date-time */
2939 3052 createTimeGe?: string;
... ... @@ -2979,6 +3092,7 @@ export interface QueryCommunicationInfoDto {
2979 3092 content?: string;
2980 3093 createByName?: string;
2981 3094 createByNameIn?: Array<string>;
  3095 + createByNameLike?: string;
2982 3096 /** @format date-time */
2983 3097 createTimeGe?: string;
2984 3098 /** @format date-time */
... ... @@ -3027,6 +3141,7 @@ export interface QueryCustomerInformationDto {
3027 3141  
3028 3142 export interface QueryGroupIntegralRecordDto {
3029 3143 createByName?: string;
  3144 + createByNameLike?: string;
3030 3145 /** @format date-time */
3031 3146 createTimeGe?: string;
3032 3147 /** @format date-time */
... ... @@ -3071,6 +3186,11 @@ export interface QueryInvoiceDetailDto {
3071 3186  
3072 3187 export interface QueryInvoiceProjectDto {
3073 3188 createByName?: string;
  3189 + createByNameLike?: string;
  3190 + /** @format date-time */
  3191 + createTimeGe?: string;
  3192 + /** @format date-time */
  3193 + createTimeLe?: string;
3074 3194 /** @format int32 */
3075 3195 current?: number;
3076 3196 /** @format int32 */
... ... @@ -3091,6 +3211,7 @@ export interface QueryInvoiceRecordDto {
3091 3211 */
3092 3212 contactsLike?: string;
3093 3213 createByName?: string;
  3214 + createByNameLike?: string;
3094 3215 createNameIn?: Array<string>;
3095 3216 /** @format date-time */
3096 3217 createTimeGe?: string;
... ... @@ -3353,6 +3474,7 @@ export interface QueryReportFormsDto {
3353 3474  
3354 3475 export interface QueryUseOldInvoicingDto {
3355 3476 createByName?: string;
  3477 + createByNameLike?: string;
3356 3478 /** @format date-time */
3357 3479 createTimeGe?: string;
3358 3480 /** @format date-time */
... ... @@ -3373,6 +3495,11 @@ export interface QueryUseOldInvoicingDto {
3373 3495  
3374 3496 export interface QueryUserIntegralRecordDto {
3375 3497 createByName?: string;
  3498 + createByNameLike?: string;
  3499 + /** @format date-time */
  3500 + createTimeGe?: string;
  3501 + /** @format date-time */
  3502 + createTimeLe?: string;
3376 3503 /** @format int32 */
3377 3504 current?: number;
3378 3505 /** @format int32 */
... ... @@ -3406,6 +3533,7 @@ export interface QueryWarningOrderStatistics {
3406 3533  
3407 3534 export interface QueryWarningOrderWhiteListDto {
3408 3535 createByName?: string;
  3536 + createByNameLike?: string;
3409 3537 /** @format date-time */
3410 3538 createTimeGe?: string;
3411 3539 /** @format date-time */
... ... @@ -3426,6 +3554,7 @@ export interface QueryWarningOrderWhiteListDto {
3426 3554  
3427 3555 export interface QueryWarningUserWhiteListDto {
3428 3556 createByName?: string;
  3557 + createByNameLike?: string;
3429 3558 /** @format date-time */
3430 3559 createTimeGe?: string;
3431 3560 /** @format date-time */
... ... @@ -3538,6 +3667,11 @@ export interface ResearchGroupListRequest {
3538 3667 */
3539 3668 companyNameLike?: string;
3540 3669 createByName?: string;
  3670 + createByNameLike?: string;
  3671 + /** @format date-time */
  3672 + createTimeGe?: string;
  3673 + /** @format date-time */
  3674 + createTimeLe?: string;
3541 3675 /** @format int32 */
3542 3676 current?: number;
3543 3677 /** @format int32 */
... ... @@ -3689,6 +3823,11 @@ export interface ResearchGroupMemberRequestsRequest {
3689 3823 * 创建人
3690 3824 */
3691 3825 createByName?: string;
  3826 + createByNameLike?: string;
  3827 + /** @format date-time */
  3828 + createTimeGe?: string;
  3829 + /** @format date-time */
  3830 + createTimeLe?: string;
3692 3831 /** @format int32 */
3693 3832 current?: number;
3694 3833 /** @format int32 */
... ... @@ -4026,6 +4165,11 @@ export interface SysLogQueryVO {
4026 4165 address?: string;
4027 4166 browser?: string;
4028 4167 createByName?: string;
  4168 + createByNameLike?: string;
  4169 + /** @format date-time */
  4170 + createTimeGe?: string;
  4171 + /** @format date-time */
  4172 + createTimeLe?: string;
4029 4173 /** @format int32 */
4030 4174 current?: number;
4031 4175 description?: string;
... ... @@ -4063,7 +4207,12 @@ export interface TicketsSearchVo {
4063 4207 annexUrl?: string;
4064 4208 assignPeople?: string;
4065 4209 createByName?: string;
  4210 + createByNameLike?: string;
4066 4211 createTime?: Array<LocalDateTime>;
  4212 + /** @format date-time */
  4213 + createTimeGe?: string;
  4214 + /** @format date-time */
  4215 + createTimeLe?: string;
4067 4216 /** @format int32 */
4068 4217 current?: number;
4069 4218 detailText?: string;
... ... @@ -4254,6 +4403,11 @@ export interface UserAddressListRequest {
4254 4403  
4255 4404 export interface UserCenterInfoRequest {
4256 4405 createByName?: string;
  4406 + createByNameLike?: string;
  4407 + /** @format date-time */
  4408 + createTimeGe?: string;
  4409 + /** @format date-time */
  4410 + createTimeLe?: string;
4257 4411 /** @format int32 */
4258 4412 current?: number;
4259 4413 /** @format int32 */
... ... @@ -4280,6 +4434,11 @@ export interface UserCenterInfoRequest {
4280 4434  
4281 4435 export interface UserDetailRequest {
4282 4436 createByName?: string;
  4437 + createByNameLike?: string;
  4438 + /** @format date-time */
  4439 + createTimeGe?: string;
  4440 + /** @format date-time */
  4441 + createTimeLe?: string;
4283 4442 /** @format int32 */
4284 4443 current?: number;
4285 4444 /** @format int32 */
... ... @@ -4304,6 +4463,11 @@ export interface UserDetailRequest {
4304 4463  
4305 4464 export interface UserListRequest {
4306 4465 createByName?: string;
  4466 + createByNameLike?: string;
  4467 + /** @format date-time */
  4468 + createTimeGe?: string;
  4469 + /** @format date-time */
  4470 + createTimeLe?: string;
4307 4471 /** @format int32 */
4308 4472 current?: number;
4309 4473 /**
... ... @@ -4618,6 +4782,8 @@ export interface InvoiceDetail {
4618 4782 }
4619 4783  
4620 4784 export interface InvoiceReissueRecord {
  4785 + auditNotes?: string;
  4786 + contacts?: Array<string>;
4621 4787 createByName?: string;
4622 4788 /**
4623 4789 * @description
... ... @@ -4638,6 +4804,10 @@ export interface InvoiceReissueRecord {
4638 4804 createDatetimeLe?: string;
4639 4805 /** @format date-time */
4640 4806 createTime?: string;
  4807 + /** @format date-time */
  4808 + createTimeGe?: string;
  4809 + /** @format date-time */
  4810 + createTimeLe?: string;
4641 4811 /** @format int32 */
4642 4812 current?: number;
4643 4813 /** @format int32 */
... ... @@ -4701,6 +4871,7 @@ export interface InvoiceReissueRecord {
4701 4871 pageSize?: number;
4702 4872 passed?: boolean;
4703 4873 paths?: Array<string>;
  4874 + payees?: Array<string>;
4704 4875 recordIds?: Array<number>;
4705 4876 reissueStatus?: string;
4706 4877 /** @format int32 */
... ... @@ -4718,6 +4889,97 @@ export interface InvoiceReissueRecord {
4718 4889 updateTime?: string;
4719 4890 }
4720 4891  
  4892 +/**
  4893 + * @description
  4894 + * 礼品申领单
  4895 + */
  4896 +export interface ProductCollectBill {
  4897 + /**
  4898 + * @description
  4899 + * 申领备注
  4900 + */
  4901 + applyRemarks?: string;
  4902 + /**
  4903 + * @description
  4904 + * 审核备注
  4905 + */
  4906 + auditRemarks?: string;
  4907 + /**
  4908 + * @description
  4909 + * 审核状态
  4910 + */
  4911 + auditStatus?: ProductCollectBillAuditStatus;
  4912 + /**
  4913 + * @description
  4914 + * 审核状态
  4915 + * @format int32
  4916 + */
  4917 + auditStatusCode?: number;
  4918 + /**
  4919 + * @description
  4920 + * 审核状态
  4921 + */
  4922 + auditStatusText?: string;
  4923 + createByName?: string;
  4924 + createByNameLike?: string;
  4925 + /** @format date-time */
  4926 + createTime?: string;
  4927 + /** @format date-time */
  4928 + createTimeGe?: string;
  4929 + /** @format date-time */
  4930 + createTimeLe?: string;
  4931 + /** @format int32 */
  4932 + current?: number;
  4933 + /** @format int32 */
  4934 + end?: number;
  4935 + /** @format int64 */
  4936 + id?: number;
  4937 + logicDelete?: boolean;
  4938 + /** @format int32 */
  4939 + pageSize?: number;
  4940 + passed?: boolean;
  4941 + paths?: Array<string>;
  4942 + /**
  4943 + * @description
  4944 + * 商品名称
  4945 + */
  4946 + productName?: string;
  4947 + /**
  4948 + * @description
  4949 + * 商品名称
  4950 + */
  4951 + productNameLike?: string;
  4952 + /**
  4953 + * @description
  4954 + * 商品名称
  4955 + * @format double
  4956 + */
  4957 + productNumber?: number;
  4958 + /** @format int32 */
  4959 + start?: number;
  4960 + /** @format int32 */
  4961 + total?: number;
  4962 + updateByName?: string;
  4963 + /** @format date-time */
  4964 + updateTime?: string;
  4965 + /**
  4966 + * @description
  4967 + * 申领仓库
  4968 + */
  4969 + warehouse?: ProductCollectBillWarehouse;
  4970 + /**
  4971 + * @description
  4972 + * 申领仓库
  4973 + * @format int32
  4974 + */
  4975 + warehouseCode?: number;
  4976 + /**
  4977 + * @description
  4978 + * 申领仓库
  4979 + */
  4980 + warehouseText?: string;
  4981 +}
  4982 +
4721 4983 export interface ResearchGroupAccounts {
4722 4984 /**
4723 4985 * @description
... ... @@ -4897,6 +5159,7 @@ export interface SalesRechargePrepaymentRequest {
4897 5159 */
4898 5160 createBy?: string;
4899 5161 createByName?: string;
  5162 + createByNameLike?: string;
4900 5163 /**
4901 5164 * @description
4902 5165 * 创建时间开始时间
... ... @@ -4909,6 +5172,10 @@ export interface SalesRechargePrepaymentRequest {
4909 5172 * @format date-time
4910 5173 */
4911 5174 createTimeEndTime?: string;
  5175 + /** @format date-time */
  5176 + createTimeGe?: string;
  5177 + /** @format date-time */
  5178 + createTimeLe?: string;
4912 5179 /** @format int32 */
4913 5180 current?: number;
4914 5181 /**
... ...
src/services/request.ts
  View file @b7d0216
... ... @@ -74,6 +74,7 @@ import type {
74 74 OrderAddVO,
75 75 OrderAuditLogQueryVO,
76 76 OrderBaseInfoQueryVO,
  77 + OrderDistrictSelVo,
77 78 OrderFieldLockApplyQueryVO,
78 79 OrderMainProDo,
79 80 OrderOptLogQueryVO,
... ... @@ -93,6 +94,7 @@ import type {
93 94 ProcurePrintDto,
94 95 ProcureReturnBillApprovalDto,
95 96 ProcureReturnBillDto,
  97 + ProductCollectBill,
96 98 ProductInformationDto,
97 99 QueryAfterSalesInfoSnapshotDto,
98 100 QueryAnnexDto,
... ... @@ -3062,13 +3064,13 @@ export const postDistrictFindProvinceAndCityAndDistrict =
3062 3064 export interface PostDistrictSelOrderProvinceOption {
3063 3065 /**
3064 3066 * @description
3065   - * oId
  3067 + * OrderDistrictSelVo
3066 3068 */
3067 3069 body: {
3068 3070 /**
3069 3071 @description
3070   - oId */
3071   - oId: number;
  3072 + OrderDistrictSelVo */
  3073 + OrderDistrictSelVo: OrderDistrictSelVo;
3072 3074 };
3073 3075 }
3074 3076  
... ... @@ -12957,6 +12959,292 @@ export const postProcureReturnBillSend = /* #__PURE__ */ (() =&gt; {
12957 12959 return request;
12958 12960 })();
12959 12961  
  12962 +/** @description request parameter type for postProductCollectBillAddOrModify */
  12963 +export interface PostProductCollectBillAddOrModifyOption {
  12964 + /**
  12965 + * @description
  12966 + * dto
  12967 + */
  12968 + body: {
  12969 + /**
  12970 + @description
  12971 + dto */
  12972 + dto: ProductCollectBill;
  12973 + };
  12974 +}
  12975 +
  12976 +/** @description response type for postProductCollectBillAddOrModify */
  12977 +export interface PostProductCollectBillAddOrModifyResponse {
  12978 + /**
  12979 + * @description
  12980 + * OK
  12981 + */
  12982 + 200: ServerResult;
  12983 + /**
  12984 + * @description
  12985 + * Created
  12986 + */
  12987 + 201: any;
  12988 + /**
  12989 + * @description
  12990 + * Unauthorized
  12991 + */
  12992 + 401: any;
  12993 + /**
  12994 + * @description
  12995 + * Forbidden
  12996 + */
  12997 + 403: any;
  12998 + /**
  12999 + * @description
  13000 + * Not Found
  13001 + */
  13002 + 404: any;
  13003 +}
  13004 +
  13005 +export type PostProductCollectBillAddOrModifyResponseSuccess =
  13006 + PostProductCollectBillAddOrModifyResponse[200];
  13007 +/**
  13008 + * @description
  13009 + * 新增或修改
  13010 + * @tags product-collect-bill-controller
  13011 + * @produces *
  13012 + * @consumes application/json
  13013 + */
  13014 +export const postProductCollectBillAddOrModify = /* #__PURE__ */ (() => {
  13015 + const method = 'post';
  13016 + const url = '/productCollectBill/addOrModify';
  13017 + function request(
  13018 + option: PostProductCollectBillAddOrModifyOption,
  13019 + ): Promise<PostProductCollectBillAddOrModifyResponseSuccess> {
  13020 + return requester(request.url, {
  13021 + method: request.method,
  13022 + ...option,
  13023 + }) as unknown as Promise<PostProductCollectBillAddOrModifyResponseSuccess>;
  13024 + }
  13025 +
  13026 + /** http method */
  13027 + request.method = method;
  13028 + /** request url */
  13029 + request.url = url;
  13030 + return request;
  13031 +})();
  13032 +
  13033 +/** @description request parameter type for postProductCollectBillAudit */
  13034 +export interface PostProductCollectBillAuditOption {
  13035 + /**
  13036 + * @description
  13037 + * dto
  13038 + */
  13039 + body: {
  13040 + /**
  13041 + @description
  13042 + dto */
  13043 + dto: ProductCollectBill;
  13044 + };
  13045 +}
  13046 +
  13047 +/** @description response type for postProductCollectBillAudit */
  13048 +export interface PostProductCollectBillAuditResponse {
  13049 + /**
  13050 + * @description
  13051 + * OK
  13052 + */
  13053 + 200: ServerResult;
  13054 + /**
  13055 + * @description
  13056 + * Created
  13057 + */
  13058 + 201: any;
  13059 + /**
  13060 + * @description
  13061 + * Unauthorized
  13062 + */
  13063 + 401: any;
  13064 + /**
  13065 + * @description
  13066 + * Forbidden
  13067 + */
  13068 + 403: any;
  13069 + /**
  13070 + * @description
  13071 + * Not Found
  13072 + */
  13073 + 404: any;
  13074 +}
  13075 +
  13076 +export type PostProductCollectBillAuditResponseSuccess =
  13077 + PostProductCollectBillAuditResponse[200];
  13078 +/**
  13079 + * @description
  13080 + * 审核
  13081 + * @tags product-collect-bill-controller
  13082 + * @produces *
  13083 + * @consumes application/json
  13084 + */
  13085 +export const postProductCollectBillAudit = /* #__PURE__ */ (() => {
  13086 + const method = 'post';
  13087 + const url = '/productCollectBill/audit';
  13088 + function request(
  13089 + option: PostProductCollectBillAuditOption,
  13090 + ): Promise<PostProductCollectBillAuditResponseSuccess> {
  13091 + return requester(request.url, {
  13092 + method: request.method,
  13093 + ...option,
  13094 + }) as unknown as Promise<PostProductCollectBillAuditResponseSuccess>;
  13095 + }
  13096 +
  13097 + /** http method */
  13098 + request.method = method;
  13099 + /** request url */
  13100 + request.url = url;
  13101 + return request;
  13102 +})();
  13103 +
  13104 +/** @description request parameter type for postProductCollectBillDelete */
  13105 +export interface PostProductCollectBillDeleteOption {
  13106 + /**
  13107 + * @description
  13108 + * id
  13109 + * @format int64
  13110 + */
  13111 + query: {
  13112 + /**
  13113 + @description
  13114 + id
  13115 + @format int64 */
  13116 + id: number;
  13117 + };
  13118 +}
  13119 +
  13120 +/** @description response type for postProductCollectBillDelete */
  13121 +export interface PostProductCollectBillDeleteResponse {
  13122 + /**
  13123 + * @description
  13124 + * OK
  13125 + */
  13126 + 200: ServerResult;
  13127 + /**
  13128 + * @description
  13129 + * Created
  13130 + */
  13131 + 201: any;
  13132 + /**
  13133 + * @description
  13134 + * Unauthorized
  13135 + */
  13136 + 401: any;
  13137 + /**
  13138 + * @description
  13139 + * Forbidden
  13140 + */
  13141 + 403: any;
  13142 + /**
  13143 + * @description
  13144 + * Not Found
  13145 + */
  13146 + 404: any;
  13147 +}
  13148 +
  13149 +export type PostProductCollectBillDeleteResponseSuccess =
  13150 + PostProductCollectBillDeleteResponse[200];
  13151 +/**
  13152 + * @description
  13153 + * 删除
  13154 + * @tags product-collect-bill-controller
  13155 + * @produces *
  13156 + * @consumes application/json
  13157 + */
  13158 +export const postProductCollectBillDelete = /* #__PURE__ */ (() => {
  13159 + const method = 'post';
  13160 + const url = '/productCollectBill/delete';
  13161 + function request(
  13162 + option: PostProductCollectBillDeleteOption,
  13163 + ): Promise<PostProductCollectBillDeleteResponseSuccess> {
  13164 + return requester(request.url, {
  13165 + method: request.method,
  13166 + ...option,
  13167 + }) as unknown as Promise<PostProductCollectBillDeleteResponseSuccess>;
  13168 + }
  13169 +
  13170 + /** http method */
  13171 + request.method = method;
  13172 + /** request url */
  13173 + request.url = url;
  13174 + return request;
  13175 +})();
  13176 +
  13177 +/** @description request parameter type for postProductCollectBillPage */
  13178 +export interface PostProductCollectBillPageOption {
  13179 + /**
  13180 + * @description
  13181 + * dto
  13182 + */
  13183 + body: {
  13184 + /**
  13185 + @description
  13186 + dto */
  13187 + dto: ProductCollectBill;
  13188 + };
  13189 +}
  13190 +
  13191 +/** @description response type for postProductCollectBillPage */
  13192 +export interface PostProductCollectBillPageResponse {
  13193 + /**
  13194 + * @description
  13195 + * OK
  13196 + */
  13197 + 200: ServerResult;
  13198 + /**
  13199 + * @description
  13200 + * Created
  13201 + */
  13202 + 201: any;
  13203 + /**
  13204 + * @description
  13205 + * Unauthorized
  13206 + */
  13207 + 401: any;
  13208 + /**
  13209 + * @description
  13210 + * Forbidden
  13211 + */
  13212 + 403: any;
  13213 + /**
  13214 + * @description
  13215 + * Not Found
  13216 + */
  13217 + 404: any;
  13218 +}
  13219 +
  13220 +export type PostProductCollectBillPageResponseSuccess =
  13221 + PostProductCollectBillPageResponse[200];
  13222 +/**
  13223 + * @description
  13224 + * 分页查询
  13225 + * @tags product-collect-bill-controller
  13226 + * @produces *
  13227 + * @consumes application/json
  13228 + */
  13229 +export const postProductCollectBillPage = /* #__PURE__ */ (() => {
  13230 + const method = 'post';
  13231 + const url = '/productCollectBill/page';
  13232 + function request(
  13233 + option: PostProductCollectBillPageOption,
  13234 + ): Promise<PostProductCollectBillPageResponseSuccess> {
  13235 + return requester(request.url, {
  13236 + method: request.method,
  13237 + ...option,
  13238 + }) as unknown as Promise<PostProductCollectBillPageResponseSuccess>;
  13239 + }
  13240 +
  13241 + /** http method */
  13242 + request.method = method;
  13243 + /** request url */
  13244 + request.url = url;
  13245 + return request;
  13246 +})();
  13247 +
12960 13248 /** @description request parameter type for postResearchGroupMemberRequestsAdd */
12961 13249 export interface PostResearchGroupMemberRequestsAddOption {
12962 13250 /**
... ... @@ -15374,7 +15662,7 @@ export type PostServiceConstProcureReturnBillsResponseSuccess =
15374 15662 PostServiceConstProcureReturnBillsResponse[200];
15375 15663 /**
15376 15664 * @description
15377   - * 获取仓库
  15665 + * 采购退货单状态
15378 15666 * @tags front-const-controller
15379 15667 * @produces *
15380 15668 * @consumes application/json
... ... @@ -15395,6 +15683,60 @@ export const postServiceConstProcureReturnBills = /* #__PURE__ */ (() =&gt; {
15395 15683 return request;
15396 15684 })();
15397 15685  
  15686 +/** @description response type for postServiceConstProductCollectBillStatus */
  15687 +export interface PostServiceConstProductCollectBillStatusResponse {
  15688 + /**
  15689 + * @description
  15690 + * OK
  15691 + */
  15692 + 200: ServerResult;
  15693 + /**
  15694 + * @description
  15695 + * Created
  15696 + */
  15697 + 201: any;
  15698 + /**
  15699 + * @description
  15700 + * Unauthorized
  15701 + */
  15702 + 401: any;
  15703 + /**
  15704 + * @description
  15705 + * Forbidden
  15706 + */
  15707 + 403: any;
  15708 + /**
  15709 + * @description
  15710 + * Not Found
  15711 + */
  15712 + 404: any;
  15713 +}
  15714 +
  15715 +export type PostServiceConstProductCollectBillStatusResponseSuccess =
  15716 + PostServiceConstProductCollectBillStatusResponse[200];
  15717 +/**
  15718 + * @description
  15719 + * 商品申领单状态
  15720 + * @tags front-const-controller
  15721 + * @produces *
  15722 + * @consumes application/json
  15723 + */
  15724 +export const postServiceConstProductCollectBillStatus = /* #__PURE__ */ (() => {
  15725 + const method = 'post';
  15726 + const url = '/service/const/productCollectBillStatus';
  15727 + function request(): Promise<PostServiceConstProductCollectBillStatusResponseSuccess> {
  15728 + return requester(request.url, {
  15729 + method: request.method,
  15730 + }) as unknown as Promise<PostServiceConstProductCollectBillStatusResponseSuccess>;
  15731 + }
  15732 +
  15733 + /** http method */
  15734 + request.method = method;
  15735 + /** request url */
  15736 + request.url = url;
  15737 + return request;
  15738 +})();
  15739 +
15398 15740 /** @description response type for postServiceConstStores */
15399 15741 export interface PostServiceConstStoresResponse {
15400 15742 /**
... ... @@ -15507,6 +15849,13 @@ export const postServiceConstTradeStatus = /* #__PURE__ */ (() =&gt; {
15507 15849 export interface GetServiceInvoiceListInvoiceProjectOption {
15508 15850 query?: {
15509 15851 createByName?: string;
  15852 + createByNameLike?: string;
  15853 + /**
  15854 + @format date-time */
  15855 + createTimeGe?: string;
  15856 + /**
  15857 + @format date-time */
  15858 + createTimeLe?: string;
15510 15859 /**
15511 15860 @format int32 */
15512 15861 current?: number;
... ... @@ -18867,6 +19216,77 @@ export const postServiceOrderAfterSalesQuerySnapshotOrder =
18867 19216 return request;
18868 19217 })();
18869 19218  
  19219 +/** @description request parameter type for postServiceOrderAfterSalesStoreSure */
  19220 +export interface PostServiceOrderAfterSalesStoreSureOption {
  19221 + /**
  19222 + * @description
  19223 + * dto
  19224 + */
  19225 + body: {
  19226 + /**
  19227 + @description
  19228 + dto */
  19229 + dto: Dto;
  19230 + };
  19231 +}
  19232 +
  19233 +/** @description response type for postServiceOrderAfterSalesStoreSure */
  19234 +export interface PostServiceOrderAfterSalesStoreSureResponse {
  19235 + /**
  19236 + * @description
  19237 + * OK
  19238 + */
  19239 + 200: ServerResult;
  19240 + /**
  19241 + * @description
  19242 + * Created
  19243 + */
  19244 + 201: any;
  19245 + /**
  19246 + * @description
  19247 + * Unauthorized
  19248 + */
  19249 + 401: any;
  19250 + /**
  19251 + * @description
  19252 + * Forbidden
  19253 + */
  19254 + 403: any;
  19255 + /**
  19256 + * @description
  19257 + * Not Found
  19258 + */
  19259 + 404: any;
  19260 +}
  19261 +
  19262 +export type PostServiceOrderAfterSalesStoreSureResponseSuccess =
  19263 + PostServiceOrderAfterSalesStoreSureResponse[200];
  19264 +/**
  19265 + * @description
  19266 + * 仓库确认售后订单
  19267 + * @tags 内部订单
  19268 + * @produces *
  19269 + * @consumes application/json
  19270 + */
  19271 +export const postServiceOrderAfterSalesStoreSure = /* #__PURE__ */ (() => {
  19272 + const method = 'post';
  19273 + const url = '/service/order/afterSalesStoreSure';
  19274 + function request(
  19275 + option: PostServiceOrderAfterSalesStoreSureOption,
  19276 + ): Promise<PostServiceOrderAfterSalesStoreSureResponseSuccess> {
  19277 + return requester(request.url, {
  19278 + method: request.method,
  19279 + ...option,
  19280 + }) as unknown as Promise<PostServiceOrderAfterSalesStoreSureResponseSuccess>;
  19281 + }
  19282 +
  19283 + /** http method */
  19284 + request.method = method;
  19285 + /** request url */
  19286 + request.url = url;
  19287 + return request;
  19288 +})();
  19289 +
18870 19290 /** @description request parameter type for postServiceOrderApplyAfterSales */
18871 19291 export interface PostServiceOrderApplyAfterSalesOption {
18872 19292 /**
... ... @@ -22077,6 +22497,77 @@ export const getServiceOrderProvideToken = /* #__PURE__ */ (() =&gt; {
22077 22497 return request;
22078 22498 })();
22079 22499  
  22500 +/** @description request parameter type for postServiceOrderPurchaseRejectionToSale */
  22501 +export interface PostServiceOrderPurchaseRejectionToSaleOption {
  22502 + /**
  22503 + * @description
  22504 + * dto
  22505 + */
  22506 + body: {
  22507 + /**
  22508 + @description
  22509 + dto */
  22510 + dto: Dto;
  22511 + };
  22512 +}
  22513 +
  22514 +/** @description response type for postServiceOrderPurchaseRejectionToSale */
  22515 +export interface PostServiceOrderPurchaseRejectionToSaleResponse {
  22516 + /**
  22517 + * @description
  22518 + * OK
  22519 + */
  22520 + 200: ServerResult;
  22521 + /**
  22522 + * @description
  22523 + * Created
  22524 + */
  22525 + 201: any;
  22526 + /**
  22527 + * @description
  22528 + * Unauthorized
  22529 + */
  22530 + 401: any;
  22531 + /**
  22532 + * @description
  22533 + * Forbidden
  22534 + */
  22535 + 403: any;
  22536 + /**
  22537 + * @description
  22538 + * Not Found
  22539 + */
  22540 + 404: any;
  22541 +}
  22542 +
  22543 +export type PostServiceOrderPurchaseRejectionToSaleResponseSuccess =
  22544 + PostServiceOrderPurchaseRejectionToSaleResponse[200];
  22545 +/**
  22546 + * @description
  22547 + * 采购驳回至销售
  22548 + * @tags 内部订单
  22549 + * @produces *
  22550 + * @consumes application/json
  22551 + */
  22552 +export const postServiceOrderPurchaseRejectionToSale = /* #__PURE__ */ (() => {
  22553 + const method = 'post';
  22554 + const url = '/service/order/purchaseRejectionToSale';
  22555 + function request(
  22556 + option: PostServiceOrderPurchaseRejectionToSaleOption,
  22557 + ): Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess> {
  22558 + return requester(request.url, {
  22559 + method: request.method,
  22560 + ...option,
  22561 + }) as unknown as Promise<PostServiceOrderPurchaseRejectionToSaleResponseSuccess>;
  22562 + }
  22563 +
  22564 + /** http method */
  22565 + request.method = method;
  22566 + /** request url */
  22567 + request.url = url;
  22568 + return request;
  22569 +})();
  22570 +
22080 22571 /** @description request parameter type for postServiceOrderQueryAfterSalesInfoSnapshot */
22081 22572 export interface PostServiceOrderQueryAfterSalesInfoSnapshotOption {
22082 22573 /**
... ...