canrd-main / canrd-erp-front · Commits

Commit eee7cccd6f9441361fccd2c5c99b26bf9f8cb3df

Authored by 曾国涛
1 parent 7302113c

feat(order): 新增订单发货功能并优化订单列表 

- 新增订单发货相关的字段和功能，包括自研产品、代买代购、竞标/打折等选项- 优化订单列表的展示和筛选功能，增加新的查询条件- 调整订单详情页面的布局和内容，提高可读性和易用性
Inline Side-by-side
Showing 4 changed files with 276 additions and 109 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
  View file @eee7ccc
... ... @@ -35,6 +35,7 @@ import {
35 35 DrawerForm,
36 36 FormListActionType,
37 37 ProCard,
  38 + ProFormDatePicker,
38 39 ProFormDateTimePicker,
39 40 ProFormDependency,
40 41 ProFormDigit,
... ... @@ -86,42 +87,7 @@ export default ({ onClose, data, subOrders, orderOptType }) => {
86 87 const [district, setDistrict] = useState('');
87 88 // const [productCustomerContactOptions, setProductCustomerContactOptions] =
88 89 // useState([]); //客户的收货人选项
89   - const [form] = Form.useForm<{
90   - isLocalData: boolean;
91   - salesCode: '';
92   - customerName: '';
93   - customerContactNumber: '';
94   - institution: '';
95   - institutionContactName: '';
96   - customerShippingAddress: '';
97   - totalPayment: '';
98   - paymentChannel: '';
99   - paymentMethod: '';
100   - productBelongBusiness: '';
101   - invoicingStatus: '';
102   - invoiceIdentificationNumber: '';
103   - invoicingTime: '';
104   - productBelongBusinessUpdateTime: '';
105   - bank: '';
106   - bankAccountNumber: '';
107   - deleteSubOrderLists: [];
108   - filePaths: [];
109   - notes: '';
110   - invoiceFirst: boolean;
111   - list: [
112   - {
113   - productCode: '';
114   - productName: '';
115   - quantity: '';
116   - productPrice: '';
117   - parameters: '';
118   - subOrderPayment: '';
119   - unit: '';
120   - serialNumber: '';
121   - notes: '';
122   - },
123   - ];
124   - }>();
  90 + const [form] = Form.useForm();
125 91 const [accountOptions, setAccountOptions] = useState<any>([]);
126 92  
127 93 let copyData = cloneDeep(data);
... ... @@ -1279,30 +1245,46 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
1279 1245 <ProFormDependency name={['companyType']}>
1280 1246 {({ companyType }) => {
1281 1247 const renderInstitutionContactName = () => (
1282   - <ProFormSelect
1283   - key="institutionContactName"
1284   - width="md"
1285   - showSearch
1286   - name="institutionContactName"
1287   - rules={[{ required: true, message: '请输入课题组名称!' }]}
1288   - request={async (value) => {
1289   - const keywords = value?.keyWords || '';
1290   - const res = await postResearchGroupsNameSet({
1291   - data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
1292   - });
1293   - return res?.data?.map((c) => ({
1294   - label: c,
1295   - value: c,
1296   - key: c,
1297   - }));
1298   - }}
1299   - fieldProps={{ filterOption: () => true }}
1300   - debounceTime={1000}
1301   - label="课题组名称"
1302   - placeholder="请输入名称"
1303   - />
  1248 + <>
  1249 + <ProFormSelect
  1250 + key="institutionContactName"
  1251 + width="md"
  1252 + showSearch
  1253 + name="institutionContactName"
  1254 + rules={[{ required: true, message: '请输入课题组名称!' }]}
  1255 + request={async (value) => {
  1256 + const keywords = value?.keyWords || '';
  1257 + const res = await postResearchGroupsNameSet({
  1258 + data: { status: 'ADD_AUDIT_PASS', groupName: keywords },
  1259 + });
  1260 + return Object.entries(res?.data || {}).map(
  1261 + ([researchGroupsId, researchGroupsName]) => ({
  1262 + label: researchGroupsName,
  1263 + value: researchGroupsName, // 使用 researchGroupsId 作为 value
  1264 + key: researchGroupsId,
  1265 + id: researchGroupsId,
  1266 + }),
  1267 + );
  1268 + }}
  1269 + fieldProps={{
  1270 + filterOption: () => true,
  1271 + onChange: (_, option) => {
  1272 + form.setFieldsValue({
  1273 + researchGroupId: option?.id || '',
  1274 + });
  1275 + },
  1276 + }}
  1277 + debounceTime={1000}
  1278 + label="课题组名称"
  1279 + placeholder="请输入名称"
  1280 + />
  1281 + <ProFormText
  1282 + hidden={true}
  1283 + key="researchGroupId"
  1284 + name="researchGroupId"
  1285 + ></ProFormText>
  1286 + </>
1304 1287 );
1305   -
1306 1288 const renderPlatformType = (fieldKey) => (
1307 1289 <ProFormSelect
1308 1290 key={fieldKey}
... ... @@ -2114,11 +2096,59 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
2114 2096 rules={[{ required: true, message: '所属事业部必填' }]}
2115 2097 disabled={optType('after-sales-check')}
2116 2098 />,
  2099 + <Group key="selfDevelop">
  2100 + <ProFormRadio.Group
  2101 + key="selfDevelop"
  2102 + name="selfDevelop"
  2103 + label="是否自研"
  2104 + initialValue={false}
  2105 + options={[
  2106 + {
  2107 + label: '是',
  2108 + value: true,
  2109 + },
  2110 + {
  2111 + label: '否',
  2112 + value: false,
  2113 + },
  2114 + ]}
  2115 + />
  2116 + <ProFormDependency name={['selfDevelop']}>
  2117 + {({ selfDevelop }) => {
  2118 + if (selfDevelop) {
  2119 + return (
  2120 + <ProFormDatePicker
  2121 + name="deliveryDatetime"
  2122 + label="日期"
  2123 + />
  2124 + );
  2125 + }
  2126 + }}
  2127 + </ProFormDependency>
  2128 + </Group>,
2117 2129 <ProFormRadio.Group
2118 2130 key="proxy"
2119 2131 name="proxy"
2120 2132 label="是否代买代购"
2121   - initialValue={false}
  2133 + //hidden={true}
  2134 + initialValue={true}
  2135 + options={[
  2136 + {
  2137 + label: '是',
  2138 + value: true,
  2139 + },
  2140 + {
  2141 + label: '否',
  2142 + value: false,
  2143 + },
  2144 + ]}
  2145 + />,
  2146 + <ProFormRadio.Group
  2147 + key="discount"
  2148 + name="discount"
  2149 + label="是否竞标/打折"
  2150 + //hidden={true}
  2151 + initialValue={true}
2122 2152 options={[
2123 2153 {
2124 2154 label: '是',
... ... @@ -2130,6 +2160,7 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
2130 2160 },
2131 2161 ]}
2132 2162 />,
  2163 +
2133 2164 <ProFormSelect
2134 2165 key={'shippingWarehouse' + listMeta.index}
2135 2166 placeholder="请选择发货仓库"
... ...
src/pages/Order/OrderList/OrderList.tsx
  View file @eee7ccc
... ... @@ -11,6 +11,7 @@ import {
11 11 postServiceInvoiceCancelApply,
12 12 postServiceOrderCancelSend,
13 13 postServiceOrderConfirmInvoice,
  14 + postServiceOrderDeliverOrders,
14 15 postServiceOrderGetCurrentOptNode,
15 16 postServiceOrderNoNeedSend,
16 17 postServiceOrderOrderCancel,
... ... @@ -1232,6 +1233,15 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
1232 1233 </div>
1233 1234 )}
1234 1235  
  1236 + {/* 确认发票状态 */}
  1237 + {optRecord.deliveryStatusText !== null && (
  1238 + <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
  1239 + <Tag color={'success'} style={{ marginRight: '4px' }}>
  1240 + {optRecord.deliveryStatusText}
  1241 + </Tag>
  1242 + </div>
  1243 + )}
  1244 +
1235 1245 {/* 后置审核状态 */}
1236 1246 {optRecord.postAuditStatus !== null ? (
1237 1247 <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
... ... @@ -2158,6 +2168,25 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
2158 2168 ) : (
2159 2169 ''
2160 2170 )}
  2171 + {optRecord.paths?.includes('DELIVER_ORDER') ? (
  2172 + <ButtonConfirm
  2173 + className="p-0"
  2174 + title="确认交期？"
  2175 + text="交期"
  2176 + onConfirm={async () => {
  2177 + let body = { orderIds: [optRecord.id] };
  2178 + const data = await postServiceOrderDeliverOrders({
  2179 + data: body,
  2180 + });
  2181 + if (data.result === RESPONSE_CODE.SUCCESS) {
  2182 + message.success(data.message);
  2183 + refreshTable();
  2184 + }
  2185 + }}
  2186 + />
  2187 + ) : (
  2188 + ''
  2189 + )}
2161 2190 </Flex>
2162 2191 </Flex>
2163 2192  
... ... @@ -4583,6 +4612,7 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
4583 4612  
4584 4613 return toolBtns;
4585 4614 }
  4615 +
4586 4616 // 监听 params 变化并重新获取数据
4587 4617 useEffect(() => {
4588 4618 if (paramsNew) {
... ...
src/services/definition.ts
  View file @eee7ccc
... ... @@ -79,6 +79,7 @@ export type ProcureReturnBillDtoStatus =
79 79 | 'WAIT_SEND'
80 80 | 'SENDED'
81 81 | 'WAIT_AUDIT';
  82 +export type SubOrderDeliveryStatus = 'WAIT_DELIVER' | 'DELIVERED';
82 83 export type ProcureBillInfoAuditStatus =
83 84 | 'WAIT_AUDIT'
84 85 | 'AUDIT_PASS'
... ... @@ -87,7 +88,6 @@ export type ProductCollectBillAuditStatus =
87 88 | 'WAIT_AUDIT'
88 89 | 'AUDIT_PASS'
89 90 | 'AUDIT_FAIL';
90   -export type ProductCollectBillWarehouse = ProcureReturnBillDtoSendStore;
91 91 export interface AdminAuthRoleVO {
92 92 menuIds?: Array<number>;
93 93 /** @format int64 */
... ... @@ -1428,6 +1428,10 @@ export interface CustomerSaveReq {
1428 1428 taxpayerNo?: string;
1429 1429 }
1430 1430  
  1431 +export interface DeliverOrdersDto {
  1432 + orderIds?: Array<number>;
  1433 +}
  1434 +
1431 1435 export interface DictionaryQueryVO {
1432 1436 createByName?: string;
1433 1437 createByNameLike?: string;
... ... @@ -2702,11 +2706,13 @@ export interface OrderStagesFromDo {
2702 2706 /** @format date-time */
2703 2707 modifyTime?: string;
2704 2708 orderStagesDeviceDoList?: Array<OrderStagesDeviceDo>;
  2709 + payType?: string;
2705 2710 payWay?: string;
2706 2711 remark?: string;
2707 2712 terminal?: string;
2708 2713 /** @format double */
2709 2714 totalPrice?: number;
  2715 + userName?: string;
2710 2716 vendor?: string;
2711 2717 /** @format int32 */
2712 2718 version?: number;
... ... @@ -2746,6 +2752,7 @@ export interface OrderStagesSelDo {
2746 2752 id?: number;
2747 2753 /** @format int32 */
2748 2754 pageSize?: number;
  2755 + payType?: string;
2749 2756 status?: Array<number>;
2750 2757 statusText?: string;
2751 2758 terminal?: string;
... ... @@ -3472,6 +3479,12 @@ export interface QueryReportFormsDto {
3472 3479 maxAccount?: number;
3473 3480 /**
3474 3481 * @description
  3482 + * 月份
  3483 + * @format int32
  3484 + */
  3485 + month?: number;
  3486 + /**
  3487 + * @description
3475 3488 * 所属部门
3476 3489 */
3477 3490 productBelongBusiness?: string;
... ... @@ -3485,6 +3498,12 @@ export interface QueryReportFormsDto {
3485 3498 * 统计方式
3486 3499 */
3487 3500 statisticsMethod?: string;
  3501 + /**
  3502 + * @description
  3503 + * 年份
  3504 + * @format int32
  3505 + */
  3506 + year?: number;
3488 3507 }
3489 3508  
3490 3509 export interface QueryUseOldInvoicingDto {
... ... @@ -3737,6 +3756,7 @@ export interface ResearchGroupListRequest {
3737 3756 }
3738 3757  
3739 3758 export interface ResearchGroupMemberRequestAddRequest {
  3759 + accounts?: Array<ResearchGroupAccounts>;
3740 3760 /**
3741 3761 * @description
3742 3762 * 审核备注
... ... @@ -3800,6 +3820,7 @@ export interface ResearchGroupMemberRequestAddRequest {
3800 3820 * 申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
3801 3821 */
3802 3822 requestType?: string;
  3823 + requestTypeText?: string;
3803 3824 updateByName?: string;
3804 3825 /** @format date-time */
3805 3826 updateTime?: string;
... ... @@ -3876,6 +3897,7 @@ export interface ResearchGroupMemberRequestsRequest {
3876 3897 * 申请备注
3877 3898 */
3878 3899 requestNotes?: string;
  3900 + requestType?: string;
3879 3901 /** @format int32 */
3880 3902 start?: number;
3881 3903 /** @format int32 */
... ... @@ -3945,6 +3967,7 @@ export interface ResearchGroupRequestsDto {
3945 3967 * 申请类型：APPEND-新增 REMOVE-删除 MODIFY-修改
3946 3968 */
3947 3969 requestType?: string;
  3970 + requestTypeText?: string;
3948 3971 updateByName?: string;
3949 3972 /** @format date-time */
3950 3973 updateTime?: string;
... ... @@ -4065,6 +4088,10 @@ export interface SubOrder {
4065 4088 createTime?: string;
4066 4089 /** @format date-time */
4067 4090 deadline?: string;
  4091 + /** @format date-time */
  4092 + deliveryDatetime?: string;
  4093 + deliveryStatus?: SubOrderDeliveryStatus;
  4094 + discount?: boolean;
4068 4095 ext?: string;
4069 4096 extendField?: string;
4070 4097 feedbackRegistrationContent?: string;
... ... @@ -4146,6 +4173,7 @@ export interface SubOrder {
4146 4173 /** @format date-time */
4147 4174 productionStartTime?: string;
4148 4175 productionTimePushStatus?: string;
  4176 + proxy?: boolean;
4149 4177 purchaser?: string;
4150 4178 /** @format int32 */
4151 4179 quantity?: number;
... ... @@ -4153,6 +4181,7 @@ export interface SubOrder {
4153 4181 reissueNotes?: string;
4154 4182 /** @format int64 */
4155 4183 researchGroupId?: number;
  4184 + selfDevelop?: boolean;
4156 4185 serialNumber?: string;
4157 4186 shippingWarehouse?: string;
4158 4187 /** @format date-time */
... ... @@ -4867,7 +4896,7 @@ export interface InvoiceReissueRecord {
4867 4896 * @description
4868 4897 * 发票ID列表
4869 4898 */
4870   - invoiceIdIn?: Array<string>;
  4899 + invoiceIdIn?: Array<number>;
4871 4900 invoiceIds?: Array<number>;
4872 4901 /**
4873 4902 * @description
... ... @@ -4886,6 +4915,7 @@ export interface InvoiceReissueRecord {
4886 4915 pageSize?: number;
4887 4916 passed?: boolean;
4888 4917 paths?: Array<string>;
  4918 + payee?: string;
4889 4919 payees?: Array<string>;
4890 4920 recordIds?: Array<number>;
4891 4921 reissueStatus?: string;
... ... @@ -4948,6 +4978,7 @@ export interface ProcureBillInfo {
4948 4978 end?: number;
4949 4979 /** @format int64 */
4950 4980 id?: number;
  4981 + idIn?: Array<number>;
4951 4982 logicDelete?: boolean;
4952 4983 notes?: string;
4953 4984 notesLike?: string;
... ... @@ -4955,6 +4986,8 @@ export interface ProcureBillInfo {
4955 4986 pageSize?: number;
4956 4987 paths?: Array<string>;
4957 4988 procureBillDetailList?: Array<ProcureBillDetail>;
  4989 + productIdIn?: Array<number>;
  4990 + productNameLike?: string;
4958 4991 /** @format int32 */
4959 4992 start?: number;
4960 4993 /** @format int32 */
... ... @@ -4965,6 +4998,28 @@ export interface ProcureBillInfo {
4965 4998 updateTime?: string;
4966 4999 }
4967 5000  
  5001 +export interface ProductCollectBillDetail {
  5002 + createByName?: string;
  5003 + /** @format date-time */
  5004 + createTime?: string;
  5005 + /** @format int64 */
  5006 + id?: number;
  5007 + /** @format int64 */
  5008 + infoId?: number;
  5009 + logicDelete?: boolean;
  5010 + notes?: string;
  5011 + number?: number;
  5012 + paths?: Array<string>;
  5013 + /** @format int64 */
  5014 + productId?: number;
  5015 + productName?: string;
  5016 + productUnitName?: string;
  5017 + productUnitPrice?: number;
  5018 + updateByName?: string;
  5019 + /** @format date-time */
  5020 + updateTime?: string;
  5021 +}
  5022 +
4968 5023 /**
4969 5024 * @description
4970 5025 * 礼品申领单
... ... @@ -5006,15 +5061,18 @@ export interface ProductCollectBill {
5006 5061 createTimeLe?: string;
5007 5062 /** @format int32 */
5008 5063 current?: number;
  5064 + details?: Array<ProductCollectBillDetail>;
5009 5065 /** @format int32 */
5010 5066 end?: number;
5011 5067 /** @format int64 */
5012 5068 id?: number;
  5069 + idIn?: Array<number>;
5013 5070 logicDelete?: boolean;
5014 5071 /** @format int32 */
5015 5072 pageSize?: number;
5016 5073 passed?: boolean;
5017 5074 paths?: Array<string>;
  5075 + productIdIn?: Array<number>;
5018 5076 /**
5019 5077 * @description
5020 5078 * 商品名称
... ... @@ -5042,18 +5100,7 @@ export interface ProductCollectBill {
5042 5100 * @description
5043 5101 * 申领仓库
5044 5102 */
5045   - warehouse?: ProductCollectBillWarehouse;
5046   - /**
5047   - * @description
5048   - * 申领仓库
5049   - * @format int32
5050   - */
5051   - warehouseCode?: number;
5052   - /**
5053   - * @description
5054   - * 申领仓库
5055   - */
5056   - warehouseText?: string;
  5103 + warehouse?: string;
5057 5104 }
5058 5105  
5059 5106 export interface Product {
... ...
src/services/request.ts
  View file @eee7ccc
... ... @@ -50,6 +50,7 @@ import type {
50 50 CustomerDetailRes,
51 51 CustomerListRes,
52 52 CustomerSaveReq,
  53 + DeliverOrdersDto,
53 54 DictionaryQueryVO,
54 55 DictionaryVO,
55 56 DistrictDo,
... ... @@ -70,6 +71,7 @@ import type {
70 71 MeasureUnitListRes,
71 72 MergeIntegralDto,
72 73 MessageQueryDTO,
  74 + ModelAndView,
73 75 OrderAddVO,
74 76 OrderAuditLogQueryVO,
75 77 OrderBaseInfoQueryVO,
... ... @@ -3828,9 +3830,7 @@ export interface GetErrorResponse {
3828 3830 * @description
3829 3831 * OK
3830 3832 */
3831   - 200: {
3832   - [propertyName: string]: any;
3833   - };
  3833 + 200: ModelAndView;
3834 3834 /**
3835 3835 * @description
3836 3836 * Unauthorized
... ... @@ -3851,9 +3851,9 @@ export interface GetErrorResponse {
3851 3851 export type GetErrorResponseSuccess = GetErrorResponse[200];
3852 3852 /**
3853 3853 * @description
3854   - * error
  3854 + * errorHtml
3855 3855 * @tags basic-error-controller
3856   - * @produces *
  3856 + * @produces text/html
3857 3857 */
3858 3858 export const getError = /* #__PURE__ */ (() => {
3859 3859 const method = 'get';
... ... @@ -3877,9 +3877,7 @@ export interface PutErrorResponse {
3877 3877 * @description
3878 3878 * OK
3879 3879 */
3880   - 200: {
3881   - [propertyName: string]: any;
3882   - };
  3880 + 200: ModelAndView;
3883 3881 /**
3884 3882 * @description
3885 3883 * Created
... ... @@ -3905,9 +3903,9 @@ export interface PutErrorResponse {
3905 3903 export type PutErrorResponseSuccess = PutErrorResponse[200];
3906 3904 /**
3907 3905 * @description
3908   - * error
  3906 + * errorHtml
3909 3907 * @tags basic-error-controller
3910   - * @produces *
  3908 + * @produces text/html
3911 3909 * @consumes application/json
3912 3910 */
3913 3911 export const putError = /* #__PURE__ */ (() => {
... ... @@ -3932,9 +3930,7 @@ export interface PostErrorResponse {
3932 3930 * @description
3933 3931 * OK
3934 3932 */
3935   - 200: {
3936   - [propertyName: string]: any;
3937   - };
  3933 + 200: ModelAndView;
3938 3934 /**
3939 3935 * @description
3940 3936 * Created
... ... @@ -3960,9 +3956,9 @@ export interface PostErrorResponse {
3960 3956 export type PostErrorResponseSuccess = PostErrorResponse[200];
3961 3957 /**
3962 3958 * @description
3963   - * error
  3959 + * errorHtml
3964 3960 * @tags basic-error-controller
3965   - * @produces *
  3961 + * @produces text/html
3966 3962 * @consumes application/json
3967 3963 */
3968 3964 export const postError = /* #__PURE__ */ (() => {
... ... @@ -3987,9 +3983,7 @@ export interface DeleteErrorResponse {
3987 3983 * @description
3988 3984 * OK
3989 3985 */
3990   - 200: {
3991   - [propertyName: string]: any;
3992   - };
  3986 + 200: ModelAndView;
3993 3987 /**
3994 3988 * @description
3995 3989 * No Content
... ... @@ -4010,9 +4004,9 @@ export interface DeleteErrorResponse {
4010 4004 export type DeleteErrorResponseSuccess = DeleteErrorResponse[200];
4011 4005 /**
4012 4006 * @description
4013   - * error
  4007 + * errorHtml
4014 4008 * @tags basic-error-controller
4015   - * @produces *
  4009 + * @produces text/html
4016 4010 */
4017 4011 export const deleteError = /* #__PURE__ */ (() => {
4018 4012 const method = 'delete';
... ... @@ -4036,9 +4030,7 @@ export interface OptionsErrorResponse {
4036 4030 * @description
4037 4031 * OK
4038 4032 */
4039   - 200: {
4040   - [propertyName: string]: any;
4041   - };
  4033 + 200: ModelAndView;
4042 4034 /**
4043 4035 * @description
4044 4036 * No Content
... ... @@ -4059,9 +4051,9 @@ export interface OptionsErrorResponse {
4059 4051 export type OptionsErrorResponseSuccess = OptionsErrorResponse[200];
4060 4052 /**
4061 4053 * @description
4062   - * error
  4054 + * errorHtml
4063 4055 * @tags basic-error-controller
4064   - * @produces *
  4056 + * @produces text/html
4065 4057 * @consumes application/json
4066 4058 */
4067 4059 export const optionsError = /* #__PURE__ */ (() => {
... ... @@ -4086,9 +4078,7 @@ export interface HeadErrorResponse {
4086 4078 * @description
4087 4079 * OK
4088 4080 */
4089   - 200: {
4090   - [propertyName: string]: any;
4091   - };
  4081 + 200: ModelAndView;
4092 4082 /**
4093 4083 * @description
4094 4084 * No Content
... ... @@ -4109,9 +4099,9 @@ export interface HeadErrorResponse {
4109 4099 export type HeadErrorResponseSuccess = HeadErrorResponse[200];
4110 4100 /**
4111 4101 * @description
4112   - * error
  4102 + * errorHtml
4113 4103 * @tags basic-error-controller
4114   - * @produces *
  4104 + * @produces text/html
4115 4105 * @consumes application/json
4116 4106 */
4117 4107 export const headError = /* #__PURE__ */ (() => {
... ... @@ -4136,9 +4126,7 @@ export interface PatchErrorResponse {
4136 4126 * @description
4137 4127 * OK
4138 4128 */
4139   - 200: {
4140   - [propertyName: string]: any;
4141   - };
  4129 + 200: ModelAndView;
4142 4130 /**
4143 4131 * @description
4144 4132 * No Content
... ... @@ -4159,9 +4147,9 @@ export interface PatchErrorResponse {
4159 4147 export type PatchErrorResponseSuccess = PatchErrorResponse[200];
4160 4148 /**
4161 4149 * @description
4162   - * error
  4150 + * errorHtml
4163 4151 * @tags basic-error-controller
4164   - * @produces *
  4152 + * @produces text/html
4165 4153 * @consumes application/json
4166 4154 */
4167 4155 export const patchError = /* #__PURE__ */ (() => {
... ... @@ -20815,6 +20803,77 @@ export const postServiceOrderDeleteWarningUserWhiteList =
20815 20803 return request;
20816 20804 })();
20817 20805  
  20806 +/** @description request parameter type for postServiceOrderDeliverOrders */
  20807 +export interface PostServiceOrderDeliverOrdersOption {
  20808 + /**
  20809 + * @description
  20810 + * dto
  20811 + */
  20812 + body: {
  20813 + /**
  20814 + @description
  20815 + dto */
  20816 + dto: DeliverOrdersDto;
  20817 + };
  20818 +}
  20819 +
  20820 +/** @description response type for postServiceOrderDeliverOrders */
  20821 +export interface PostServiceOrderDeliverOrdersResponse {
  20822 + /**
  20823 + * @description
  20824 + * OK
  20825 + */
  20826 + 200: ServerResult;
  20827 + /**
  20828 + * @description
  20829 + * Created
  20830 + */
  20831 + 201: any;
  20832 + /**
  20833 + * @description
  20834 + * Unauthorized
  20835 + */
  20836 + 401: any;
  20837 + /**
  20838 + * @description
  20839 + * Forbidden
  20840 + */
  20841 + 403: any;
  20842 + /**
  20843 + * @description
  20844 + * Not Found
  20845 + */
  20846 + 404: any;
  20847 +}
  20848 +
  20849 +export type PostServiceOrderDeliverOrdersResponseSuccess =
  20850 + PostServiceOrderDeliverOrdersResponse[200];
  20851 +/**
  20852 + * @description
  20853 + * 交付订单
  20854 + * @tags 内部订单
  20855 + * @produces *
  20856 + * @consumes application/json
  20857 + */
  20858 +export const postServiceOrderDeliverOrders = /* #__PURE__ */ (() => {
  20859 + const method = 'post';
  20860 + const url = '/service/order/deliverOrders';
  20861 + function request(
  20862 + option: PostServiceOrderDeliverOrdersOption,
  20863 + ): Promise<PostServiceOrderDeliverOrdersResponseSuccess> {
  20864 + return requester(request.url, {
  20865 + method: request.method,
  20866 + ...option,
  20867 + }) as unknown as Promise<PostServiceOrderDeliverOrdersResponseSuccess>;
  20868 + }
  20869 +
  20870 + /** http method */
  20871 + request.method = method;
  20872 + /** request url */
  20873 + request.url = url;
  20874 + return request;
  20875 +})();
  20876 +
20818 20877 /** @description request parameter type for postServiceOrderEditOrder */
20819 20878 export interface PostServiceOrderEditOrderOption {
20820 20879 /**
... ...