Commit 948eea24cc9e2e8d5b30f09242bb664a2e5f1a1f
1 parent
7581eedf
fix(invoice): 修复状态过滤导致的核销问题
取消了对银行状态查询的异常状态过滤,以允许正常状态的银行记录被正确核销。此更改确保了核销流程能够顺利进行,不再因错误的状态过滤而受到影响。
Showing
2 changed files
with
152 additions
and
34 deletions
src/services/definition.ts
... | ... | @@ -948,6 +948,7 @@ export interface ApplyInvoiceDTO { |
948 | 948 | } |
949 | 949 | |
950 | 950 | export interface AuditDto { |
951 | + extend1?: string; | |
951 | 952 | /** |
952 | 953 | * @description |
953 | 954 | * 主订单id |
... | ... | @@ -1381,32 +1382,6 @@ export interface Entry { |
1381 | 1382 | unEmpInsuranceC?: string; |
1382 | 1383 | } |
1383 | 1384 | |
1384 | -export interface File { | |
1385 | - absolute?: boolean; | |
1386 | - absoluteFile?: File; | |
1387 | - absolutePath?: string; | |
1388 | - canonicalFile?: File; | |
1389 | - canonicalPath?: string; | |
1390 | - directory?: boolean; | |
1391 | - executable?: boolean; | |
1392 | - file?: boolean; | |
1393 | - /** @format int64 */ | |
1394 | - freeSpace?: number; | |
1395 | - hidden?: boolean; | |
1396 | - /** @format int64 */ | |
1397 | - lastModified?: number; | |
1398 | - name?: string; | |
1399 | - parent?: string; | |
1400 | - parentFile?: File; | |
1401 | - path?: string; | |
1402 | - readable?: boolean; | |
1403 | - /** @format int64 */ | |
1404 | - totalSpace?: number; | |
1405 | - /** @format int64 */ | |
1406 | - usableSpace?: number; | |
1407 | - writable?: boolean; | |
1408 | -} | |
1409 | - | |
1410 | 1385 | export interface FilePathDto { |
1411 | 1386 | url?: string; |
1412 | 1387 | } |
... | ... | @@ -1423,6 +1398,11 @@ export interface InventoryMaterialStockReq { |
1423 | 1398 | export interface InvoiceDto { |
1424 | 1399 | /** |
1425 | 1400 | * @description |
1401 | + * 关联子订单id | |
1402 | + */ | |
1403 | + bankStatementIds?: Array<number>; | |
1404 | + /** | |
1405 | + * @description | |
1426 | 1406 | * 收款时间 |
1427 | 1407 | * @format date-time |
1428 | 1408 | */ |
... | ... | @@ -1438,6 +1418,9 @@ export interface InvoiceDto { |
1438 | 1418 | * 联系人 |
1439 | 1419 | */ |
1440 | 1420 | contacts?: string; |
1421 | + createByName?: string; | |
1422 | + /** @format date-time */ | |
1423 | + createTime?: string; | |
1441 | 1424 | /** |
1442 | 1425 | * @description |
1443 | 1426 | * id |
... | ... | @@ -1460,6 +1443,9 @@ export interface InvoiceDto { |
1460 | 1443 | * @format date-time |
1461 | 1444 | */ |
1462 | 1445 | invoicingTime?: string; |
1446 | + invoicingType?: string; | |
1447 | + invoicingTypeText?: string; | |
1448 | + logicDelete?: boolean; | |
1463 | 1449 | /** |
1464 | 1450 | * @description |
1465 | 1451 | * 关联主订单id |
... | ... | @@ -1480,6 +1466,7 @@ export interface InvoiceDto { |
1480 | 1466 | * 权限路径 |
1481 | 1467 | */ |
1482 | 1468 | path?: Array<string>; |
1469 | + paths?: Array<string>; | |
1483 | 1470 | /** |
1484 | 1471 | * @description |
1485 | 1472 | * 收款单位 |
... | ... | @@ -1502,9 +1489,17 @@ export interface InvoiceDto { |
1502 | 1489 | status?: string; |
1503 | 1490 | /** |
1504 | 1491 | * @description |
1492 | + * 状态 | |
1493 | + */ | |
1494 | + statusText?: string; | |
1495 | + /** | |
1496 | + * @description | |
1505 | 1497 | * 关联子订单id |
1506 | 1498 | */ |
1507 | 1499 | subOrderIds?: Array<number>; |
1500 | + updateByName?: string; | |
1501 | + /** @format date-time */ | |
1502 | + updateTime?: string; | |
1508 | 1503 | } |
1509 | 1504 | |
1510 | 1505 | export interface InvoiceRecordDTO { |
... | ... | @@ -2401,6 +2396,13 @@ export interface OrderStageFileDo { |
2401 | 2396 | file?: File; |
2402 | 2397 | } |
2403 | 2398 | |
2399 | +export interface OrderStagesCheckDo { | |
2400 | + /** @format int32 */ | |
2401 | + id?: number; | |
2402 | + isPass?: boolean; | |
2403 | + mark?: string; | |
2404 | +} | |
2405 | + | |
2404 | 2406 | export interface OrderStagesDelDo { |
2405 | 2407 | deviceIds?: Array<number>; |
2406 | 2408 | ids?: Array<number>; |
... | ... | @@ -2429,39 +2431,47 @@ export interface OrderStagesDeviceDo { |
2429 | 2431 | export interface OrderStagesFromDo { |
2430 | 2432 | annex?: string; |
2431 | 2433 | contract?: string; |
2432 | - createByName?: string; | |
2434 | + createBy?: string; | |
2433 | 2435 | /** @format date-time */ |
2434 | 2436 | createTime?: string; |
2435 | 2437 | /** @format date-time */ |
2436 | 2438 | dateRange?: string; |
2437 | 2439 | /** @format int32 */ |
2440 | + enableFlag?: number; | |
2441 | + /** @format int32 */ | |
2438 | 2442 | id?: number; |
2439 | - logicDelete?: boolean; | |
2443 | + modifyBy?: string; | |
2444 | + /** @format date-time */ | |
2445 | + modifyTime?: string; | |
2440 | 2446 | orderStagesDeviceDoList?: Array<OrderStagesDeviceDo>; |
2441 | 2447 | payWay?: string; |
2442 | 2448 | remark?: string; |
2443 | 2449 | terminal?: string; |
2444 | 2450 | /** @format double */ |
2445 | 2451 | totalPrice?: number; |
2446 | - updateByName?: string; | |
2447 | - /** @format date-time */ | |
2448 | - updateTime?: string; | |
2449 | 2452 | vendor?: string; |
2450 | 2453 | /** @format int32 */ |
2451 | 2454 | version?: number; |
2452 | 2455 | } |
2453 | 2456 | |
2454 | 2457 | export interface OrderStagesPayWay { |
2458 | + createByName?: string; | |
2459 | + /** @format date-time */ | |
2460 | + createTime?: string; | |
2455 | 2461 | /** @format date-time */ |
2456 | 2462 | dateRange?: string; |
2457 | 2463 | fileName?: string; |
2458 | 2464 | fileUrl?: string; |
2459 | 2465 | /** @format int32 */ |
2460 | 2466 | id?: number; |
2467 | + logicDelete?: boolean; | |
2461 | 2468 | /** @format int32 */ |
2462 | 2469 | number?: number; |
2463 | 2470 | /** @format int32 */ |
2464 | 2471 | ossId?: number; |
2472 | + updateByName?: string; | |
2473 | + /** @format date-time */ | |
2474 | + updateTime?: string; | |
2465 | 2475 | } |
2466 | 2476 | |
2467 | 2477 | export interface OrderStagesPayWayDo { |
... | ... | @@ -2475,11 +2485,14 @@ export interface OrderStagesPayWayFileDo { |
2475 | 2485 | |
2476 | 2486 | export interface OrderStagesSelDo { |
2477 | 2487 | contract?: string; |
2488 | + createName?: string; | |
2478 | 2489 | /** @format date-time */ |
2479 | 2490 | dateRange?: string; |
2480 | 2491 | deviceName?: string; |
2481 | 2492 | /** @format int64 */ |
2482 | 2493 | id?: number; |
2494 | + /** @format int32 */ | |
2495 | + status?: number; | |
2483 | 2496 | terminal?: string; |
2484 | 2497 | vendor?: string; |
2485 | 2498 | } |
... | ... | @@ -3535,7 +3548,7 @@ export interface ResetPwdVO { |
3535 | 3548 | |
3536 | 3549 | export interface Resource { |
3537 | 3550 | description?: string; |
3538 | - file?: File; | |
3551 | + file?: TsgFile; | |
3539 | 3552 | filename?: string; |
3540 | 3553 | inputStream?: InputStream; |
3541 | 3554 | open?: boolean; |
... | ... | @@ -4061,7 +4074,36 @@ export interface CompanyInfo { |
4061 | 4074 | taxIdIsNotNull?: boolean; |
4062 | 4075 | } |
4063 | 4076 | |
4077 | +export interface TsgFile { | |
4078 | + absolute?: boolean; | |
4079 | + absoluteFile?: TsgFile; | |
4080 | + absolutePath?: string; | |
4081 | + canonicalFile?: TsgFile; | |
4082 | + canonicalPath?: string; | |
4083 | + directory?: boolean; | |
4084 | + executable?: boolean; | |
4085 | + file?: boolean; | |
4086 | + /** @format int64 */ | |
4087 | + freeSpace?: number; | |
4088 | + hidden?: boolean; | |
4089 | + /** @format int64 */ | |
4090 | + lastModified?: number; | |
4091 | + name?: string; | |
4092 | + parent?: string; | |
4093 | + parentFile?: TsgFile; | |
4094 | + path?: string; | |
4095 | + readable?: boolean; | |
4096 | + /** @format int64 */ | |
4097 | + totalSpace?: number; | |
4098 | + /** @format int64 */ | |
4099 | + usableSpace?: number; | |
4100 | + writable?: boolean; | |
4101 | +} | |
4102 | + | |
4064 | 4103 | export interface InvoiceDetail { |
4104 | + createByName?: string; | |
4105 | + /** @format date-time */ | |
4106 | + createTime?: string; | |
4065 | 4107 | /** @format int64 */ |
4066 | 4108 | id?: number; |
4067 | 4109 | /** |
... | ... | @@ -4070,6 +4112,7 @@ export interface InvoiceDetail { |
4070 | 4112 | * @format int64 |
4071 | 4113 | */ |
4072 | 4114 | invoiceRecordId?: number; |
4115 | + logicDelete?: boolean; | |
4073 | 4116 | /** |
4074 | 4117 | * @description |
4075 | 4118 | * 单价 |
... | ... | @@ -4121,6 +4164,9 @@ export interface InvoiceDetail { |
4121 | 4164 | * 单位 |
4122 | 4165 | */ |
4123 | 4166 | unit?: string; |
4167 | + updateByName?: string; | |
4168 | + /** @format date-time */ | |
4169 | + updateTime?: string; | |
4124 | 4170 | } |
4125 | 4171 | |
4126 | 4172 | export interface ResearchGroupAccounts { | ... | ... |
src/services/request.ts
... | ... | @@ -71,6 +71,7 @@ import type { |
71 | 71 | OrderMainProDo, |
72 | 72 | OrderOptLogQueryVO, |
73 | 73 | OrderProfitAnalysisVo, |
74 | + OrderStagesCheckDo, | |
74 | 75 | OrderStagesDelDo, |
75 | 76 | OrderStagesFromDo, |
76 | 77 | OrderStagesPayWay, |
... | ... | @@ -8077,7 +8078,7 @@ export type PostOrderErpOrderStagesAddResponseSuccess = |
8077 | 8078 | PostOrderErpOrderStagesAddResponse[200]; |
8078 | 8079 | /** |
8079 | 8080 | * @description |
8080 | - * 添加或者修改分期账单 | |
8081 | + * 添加分期账单 | |
8081 | 8082 | * @tags order-stages-controller |
8082 | 8083 | * @produces * |
8083 | 8084 | * @consumes application/json |
... | ... | @@ -8101,6 +8102,77 @@ export const postOrderErpOrderStagesAdd = /* #__PURE__ */ (() => { |
8101 | 8102 | return request; |
8102 | 8103 | })(); |
8103 | 8104 | |
8105 | +/** @description request parameter type for postOrderErpOrderStagesCheckOrderStages */ | |
8106 | +export interface PostOrderErpOrderStagesCheckOrderStagesOption { | |
8107 | + /** | |
8108 | + * @description | |
8109 | + * orderStagesCheckDo | |
8110 | + */ | |
8111 | + body: { | |
8112 | + /** | |
8113 | + @description | |
8114 | + orderStagesCheckDo */ | |
8115 | + orderStagesCheckDo: OrderStagesCheckDo; | |
8116 | + }; | |
8117 | +} | |
8118 | + | |
8119 | +/** @description response type for postOrderErpOrderStagesCheckOrderStages */ | |
8120 | +export interface PostOrderErpOrderStagesCheckOrderStagesResponse { | |
8121 | + /** | |
8122 | + * @description | |
8123 | + * OK | |
8124 | + */ | |
8125 | + 200: ServerResult; | |
8126 | + /** | |
8127 | + * @description | |
8128 | + * Created | |
8129 | + */ | |
8130 | + 201: any; | |
8131 | + /** | |
8132 | + * @description | |
8133 | + * Unauthorized | |
8134 | + */ | |
8135 | + 401: any; | |
8136 | + /** | |
8137 | + * @description | |
8138 | + * Forbidden | |
8139 | + */ | |
8140 | + 403: any; | |
8141 | + /** | |
8142 | + * @description | |
8143 | + * Not Found | |
8144 | + */ | |
8145 | + 404: any; | |
8146 | +} | |
8147 | + | |
8148 | +export type PostOrderErpOrderStagesCheckOrderStagesResponseSuccess = | |
8149 | + PostOrderErpOrderStagesCheckOrderStagesResponse[200]; | |
8150 | +/** | |
8151 | + * @description | |
8152 | + * 对分期账单审核 | |
8153 | + * @tags order-stages-controller | |
8154 | + * @produces * | |
8155 | + * @consumes application/json | |
8156 | + */ | |
8157 | +export const postOrderErpOrderStagesCheckOrderStages = /* #__PURE__ */ (() => { | |
8158 | + const method = 'post'; | |
8159 | + const url = '/order/erp/orderStages/checkOrderStages'; | |
8160 | + function request( | |
8161 | + option: PostOrderErpOrderStagesCheckOrderStagesOption, | |
8162 | + ): Promise<PostOrderErpOrderStagesCheckOrderStagesResponseSuccess> { | |
8163 | + return requester(request.url, { | |
8164 | + method: request.method, | |
8165 | + ...option, | |
8166 | + }) as unknown as Promise<PostOrderErpOrderStagesCheckOrderStagesResponseSuccess>; | |
8167 | + } | |
8168 | + | |
8169 | + /** http method */ | |
8170 | + request.method = method; | |
8171 | + /** request url */ | |
8172 | + request.url = url; | |
8173 | + return request; | |
8174 | +})(); | |
8175 | + | |
8104 | 8176 | /** @description request parameter type for deleteOrderErpOrderStagesDelect */ |
8105 | 8177 | export interface DeleteOrderErpOrderStagesDelectOption { |
8106 | 8178 | /** |
... | ... | @@ -8172,7 +8244,7 @@ export interface GetOrderErpOrderStagesExportResponse { |
8172 | 8244 | * @description |
8173 | 8245 | * OK |
8174 | 8246 | */ |
8175 | - 200: any; | |
8247 | + 200: ServerResult; | |
8176 | 8248 | /** |
8177 | 8249 | * @description |
8178 | 8250 | * Unauthorized | ... | ... |