..

Web/src/api-services/api.ts

@@ -22,6 +22,7 @@ export * from './apis/invoice-api';
 export * from './apis/material-classify-api';
 export * from './apis/materials-api';
 export * from './apis/outbound-api';
+export * from './apis/package-info-api';
 export * from './apis/print-label-api';
 export * from './apis/product-bar-code-api';
 export * from './apis/product-code-configuration-api';

Web/src/api-services/apis/materials-api.ts

@@ -20,6 +20,7 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { AddMaterialsInput } from '../models';
 import { AdminResultInt64 } from '../models';
 import { AdminResultListMaterialsOutput } from '../models';
+import { AdminResultListPackageInfoOutput } from '../models';
 import { AdminResultMaterials } from '../models';
 import { AdminResultSqlSugarPagedListMaterialsOutput } from '../models';
 import { DeleteMaterialsInput } from '../models';
@@ -179,6 +180,55 @@ export const MaterialsApiAxiosParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 获取物料
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiMaterialsGetByIdMaterialsIdGet: async (materialsId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'materialsId' is not null or undefined
+            if (materialsId === null || materialsId === undefined) {
+                throw new RequiredError('materialsId','Required parameter materialsId was null or undefined when calling apiMaterialsGetByIdMaterialsIdGet.');
+            }
+            const localVarPath = `/api/materials/getById/{materialsId}`
+                .replace(`{${"materialsId"}}`, encodeURIComponent(String(materialsId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 获取物料列表
@@ -222,6 +272,55 @@ export const MaterialsApiAxiosParamCreator = function (configuration?: Configura
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiMaterialsPackageListMaterialsIdGet: async (materialsId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'materialsId' is not null or undefined
+            if (materialsId === null || materialsId === undefined) {
+                throw new RequiredError('materialsId','Required parameter materialsId was null or undefined when calling apiMaterialsPackageListMaterialsIdGet.');
+            }
+            const localVarPath = `/api/materials/packageList/{materialsId}`
+                .replace(`{${"materialsId"}}`, encodeURIComponent(String(materialsId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 分页查询物料
@@ -369,6 +468,20 @@ export const MaterialsApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 获取物料
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiMaterialsGetByIdMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultMaterials>>> {
+            const localVarAxiosArgs = await MaterialsApiAxiosParamCreator(configuration).apiMaterialsGetByIdMaterialsIdGet(materialsId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 获取物料列表
@@ -382,6 +495,20 @@ export const MaterialsApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiMaterialsPackageListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListPackageInfoOutput>>> {
+            const localVarAxiosArgs = await MaterialsApiAxiosParamCreator(configuration).apiMaterialsPackageListMaterialsIdGet(materialsId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 分页查询物料
@@ -449,6 +576,16 @@ export const MaterialsApiFactory = function (configuration?: Configuration, base
         async apiMaterialsDetailGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultMaterials>> {
             return MaterialsApiFp(configuration).apiMaterialsDetailGet(id, options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 获取物料
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiMaterialsGetByIdMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultMaterials>> {
+            return MaterialsApiFp(configuration).apiMaterialsGetByIdMaterialsIdGet(materialsId, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 获取物料列表
@@ -458,6 +595,16 @@ export const MaterialsApiFactory = function (configuration?: Configuration, base
         async apiMaterialsListGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListMaterialsOutput>> {
             return MaterialsApiFp(configuration).apiMaterialsListGet(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiMaterialsPackageListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListPackageInfoOutput>> {
+            return MaterialsApiFp(configuration).apiMaterialsPackageListMaterialsIdGet(materialsId, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 分页查询物料
@@ -521,6 +668,17 @@ export class MaterialsApi extends BaseAPI {
     public async apiMaterialsDetailGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultMaterials>> {
         return MaterialsApiFp(this.configuration).apiMaterialsDetailGet(id, options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 获取物料
+     * @param {number} materialsId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MaterialsApi
+     */
+    public async apiMaterialsGetByIdMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultMaterials>> {
+        return MaterialsApiFp(this.configuration).apiMaterialsGetByIdMaterialsIdGet(materialsId, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 获取物料列表
@@ -531,6 +689,17 @@ export class MaterialsApi extends BaseAPI {
     public async apiMaterialsListGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListMaterialsOutput>> {
         return MaterialsApiFp(this.configuration).apiMaterialsListGet(options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 获取包装关系列表
+     * @param {number} materialsId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof MaterialsApi
+     */
+    public async apiMaterialsPackageListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListPackageInfoOutput>> {
+        return MaterialsApiFp(this.configuration).apiMaterialsPackageListMaterialsIdGet(materialsId, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 分页查询物料

Web/src/api-services/apis/package-info-api.ts

@@ -0,0 +1,648 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import globalAxios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
+import { Configuration } from '../configuration';
+// Some imports not used depending on template conditions
+// @ts-ignore
+import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AddPackageInfoInput } from '../models';
+import { AdminResultInt64 } from '../models';
+import { AdminResultListPackageInfoOutput } from '../models';
+import { AdminResultPackageInfo } from '../models';
+import { AdminResultSqlSugarPagedListPackageInfoOutput } from '../models';
+import { DeletePackageInfoInput } from '../models';
+import { PackageInfoInput } from '../models';
+import { UpdatePackageInfoInput } from '../models';
+/**
+ * PackageInfoApi - axios parameter creator
+ * @export
+ */
+export const PackageInfoApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoAddEntityPost: async (body?: AddPackageInfoInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/packageInfo/addEntity`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoAddPost: async (body?: AddPackageInfoInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/packageInfo/add`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 删除包装关系
+         * @param {DeletePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoDeletePost: async (body?: DeletePackageInfoInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/packageInfo/delete`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取包装关系
+         * @param {number} id 主键Id
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoDetailGet: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            if (id === null || id === undefined) {
+                throw new RequiredError('id','Required parameter id was null or undefined when calling apiPackageInfoDetailGet.');
+            }
+            const localVarPath = `/api/packageInfo/detail`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            if (id !== undefined) {
+                localVarQueryParameter['Id'] = id;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoListMaterialsIdGet: async (materialsId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'materialsId' is not null or undefined
+            if (materialsId === null || materialsId === undefined) {
+                throw new RequiredError('materialsId','Required parameter materialsId was null or undefined when calling apiPackageInfoListMaterialsIdGet.');
+            }
+            const localVarPath = `/api/packageInfo/list/{materialsId}`
+                .replace(`{${"materialsId"}}`, encodeURIComponent(String(materialsId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 分页查询包装关系
+         * @param {PackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoPagePost: async (body?: PackageInfoInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/packageInfo/page`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 更新包装关系
+         * @param {UpdatePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPackageInfoUpdatePost: async (body?: UpdatePackageInfoInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/packageInfo/update`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
+            localVarRequestOptions.data =  needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+    }
+};
+
+/**
+ * PackageInfoApi - functional programming interface
+ * @export
+ */
+export const PackageInfoApiFp = function(configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoAddEntityPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultPackageInfo>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoAddEntityPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoAddPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt64>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoAddPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 删除包装关系
+         * @param {DeletePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoDeletePost(body?: DeletePackageInfoInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoDeletePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取包装关系
+         * @param {number} id 主键Id
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoDetailGet(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultPackageInfo>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoDetailGet(id, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListPackageInfoOutput>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoListMaterialsIdGet(materialsId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 分页查询包装关系
+         * @param {PackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoPagePost(body?: PackageInfoInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListPackageInfoOutput>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoPagePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 更新包装关系
+         * @param {UpdatePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoUpdatePost(body?: UpdatePackageInfoInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await PackageInfoApiAxiosParamCreator(configuration).apiPackageInfoUpdatePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+    }
+};
+
+/**
+ * PackageInfoApi - factory interface
+ * @export
+ */
+export const PackageInfoApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    return {
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoAddEntityPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultPackageInfo>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoAddEntityPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 增加包装关系
+         * @param {AddPackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoAddPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt64>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoAddPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 删除包装关系
+         * @param {DeletePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoDeletePost(body?: DeletePackageInfoInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoDeletePost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取包装关系
+         * @param {number} id 主键Id
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoDetailGet(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultPackageInfo>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoDetailGet(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取包装关系列表
+         * @param {number} materialsId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListPackageInfoOutput>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoListMaterialsIdGet(materialsId, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 分页查询包装关系
+         * @param {PackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoPagePost(body?: PackageInfoInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListPackageInfoOutput>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoPagePost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 更新包装关系
+         * @param {UpdatePackageInfoInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPackageInfoUpdatePost(body?: UpdatePackageInfoInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return PackageInfoApiFp(configuration).apiPackageInfoUpdatePost(body, options).then((request) => request(axios, basePath));
+        },
+    };
+};
+
+/**
+ * PackageInfoApi - object-oriented interface
+ * @export
+ * @class PackageInfoApi
+ * @extends {BaseAPI}
+ */
+export class PackageInfoApi extends BaseAPI {
+    /**
+     * 
+     * @summary 增加包装关系
+     * @param {AddPackageInfoInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoAddEntityPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultPackageInfo>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoAddEntityPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 增加包装关系
+     * @param {AddPackageInfoInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoAddPost(body?: AddPackageInfoInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt64>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoAddPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 删除包装关系
+     * @param {DeletePackageInfoInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoDeletePost(body?: DeletePackageInfoInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoDeletePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取包装关系
+     * @param {number} id 主键Id
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoDetailGet(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultPackageInfo>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoDetailGet(id, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取包装关系列表
+     * @param {number} materialsId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoListMaterialsIdGet(materialsId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListPackageInfoOutput>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoListMaterialsIdGet(materialsId, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 分页查询包装关系
+     * @param {PackageInfoInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoPagePost(body?: PackageInfoInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListPackageInfoOutput>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoPagePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 更新包装关系
+     * @param {UpdatePackageInfoInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PackageInfoApi
+     */
+    public async apiPackageInfoUpdatePost(body?: UpdatePackageInfoInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return PackageInfoApiFp(this.configuration).apiPackageInfoUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+}

Web/src/api-services/apis/sys-unit-api.ts

@@ -222,6 +222,55 @@ export const SysUnitApiAxiosParamCreator = function (configuration?: Configurati
                 options: localVarRequestOptions,
             };
         },
+        /**
+         * 
+         * @summary 获取单位列表
+         * @param {number} unitGroupId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiSysUnitListUnitGroupIdGet: async (unitGroupId: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'unitGroupId' is not null or undefined
+            if (unitGroupId === null || unitGroupId === undefined) {
+                throw new RequiredError('unitGroupId','Required parameter unitGroupId was null or undefined when calling apiSysUnitListUnitGroupIdGet.');
+            }
+            const localVarPath = `/api/sysUnit/list/{unitGroupId}`
+                .replace(`{${"unitGroupId"}}`, encodeURIComponent(String(unitGroupId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, 'https://example.com');
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+            const localVarRequestOptions :AxiosRequestConfig = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+            // authentication Bearer required
+            // http bearer authentication required
+            if (configuration && configuration.accessToken) {
+                const accessToken = typeof configuration.accessToken === 'function'
+                    ? await configuration.accessToken()
+                    : await configuration.accessToken;
+                localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
+            }
+
+            const query = new URLSearchParams(localVarUrlObj.search);
+            for (const key in localVarQueryParameter) {
+                query.set(key, localVarQueryParameter[key]);
+            }
+            for (const key in options.params) {
+                query.set(key, options.params[key]);
+            }
+            localVarUrlObj.search = (new URLSearchParams(query)).toString();
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary 分页查询单位
@@ -382,6 +431,20 @@ export const SysUnitApiFp = function(configuration?: Configuration) {
                 return axios.request(axiosRequestArgs);
             };
         },
+        /**
+         * 
+         * @summary 获取单位列表
+         * @param {number} unitGroupId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUnitListUnitGroupIdGet(unitGroupId: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListSysUnitOutput>>> {
+            const localVarAxiosArgs = await SysUnitApiAxiosParamCreator(configuration).apiSysUnitListUnitGroupIdGet(unitGroupId, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
         /**
          * 
          * @summary 分页查询单位
@@ -458,6 +521,16 @@ export const SysUnitApiFactory = function (configuration?: Configuration, basePa
         async apiSysUnitListGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysUnitOutput>> {
             return SysUnitApiFp(configuration).apiSysUnitListGet(options).then((request) => request(axios, basePath));
         },
+        /**
+         * 
+         * @summary 获取单位列表
+         * @param {number} unitGroupId 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiSysUnitListUnitGroupIdGet(unitGroupId: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListSysUnitOutput>> {
+            return SysUnitApiFp(configuration).apiSysUnitListUnitGroupIdGet(unitGroupId, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @summary 分页查询单位
@@ -531,6 +604,17 @@ export class SysUnitApi extends BaseAPI {
     public async apiSysUnitListGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysUnitOutput>> {
         return SysUnitApiFp(this.configuration).apiSysUnitListGet(options).then((request) => request(this.axios, this.basePath));
     }
+    /**
+     * 
+     * @summary 获取单位列表
+     * @param {number} unitGroupId 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof SysUnitApi
+     */
+    public async apiSysUnitListUnitGroupIdGet(unitGroupId: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListSysUnitOutput>> {
+        return SysUnitApiFp(this.configuration).apiSysUnitListUnitGroupIdGet(unitGroupId, options).then((request) => request(this.axios, this.basePath));
+    }
     /**
      * 
      * @summary 分页查询单位

Web/src/api-services/base.ts

@@ -46,6 +46,9 @@ export interface RequestArgs {
  * @class BaseAPI
  */
 export class BaseAPI {
+apiBrandListGet() {
+throw new Error('Method not implemented.');
+}
     protected configuration: Configuration | undefined;
 
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {

Web/src/api-services/models/add-materials-input.ts

@@ -60,6 +60,110 @@ export interface AddMaterialsInput {
      */
     specifications?: string | null;
 
+    /**
+     * 品牌
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    brand?: string | null;
+
+    /**
+     * 保质期
+     *
+     * @type {number}
+     * @memberof AddMaterialsInput
+     */
+    shelfLife?: number | null;
+
+    /**
+     * 保质期单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    shelfLifeUnit?: string | null;
+
+    /**
+     * 统一零售价
+     *
+     * @type {number}
+     * @memberof AddMaterialsInput
+     */
+    price?: number | null;
+
+    /**
+     * 条形码
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    barCode?: string | null;
+
+    /**
+     * 单位组ID
+     *
+     * @type {number}
+     * @memberof AddMaterialsInput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 基本单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    unit?: string | null;
+
+    /**
+     * 生产单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    productUnit?: string | null;
+
+    /**
+     * 采购单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    procureUnit?: string | null;
+
+    /**
+     * 库存单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    inventoryUnit?: string | null;
+
+    /**
+     * 销售单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    saleUnit?: string | null;
+
+    /**
+     * 分销单位
+     *
+     * @type {string}
+     * @memberof AddMaterialsInput
+     */
+    retailStoreUnit?: string | null;
+
+    /**
+     * 推广ID
+     *
+     * @type {number}
+     * @memberof AddMaterialsInput
+     */
+    promotionId?: number | null;
+
     /**
      * 备注
      *

Web/src/api-services/models/add-package-info-input.ts

@@ -0,0 +1,150 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系增加输入参数
+ *
+ * @export
+ * @interface AddPackageInfoInput
+ */
+export interface AddPackageInfoInput {
+
+    /**
+     * 条码类型编码
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    codeTypeNum?: string | null;
+
+    /**
+     * 条码类型
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    codeType?: string | null;
+
+    /**
+     * 包装关系名称
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    packageName?: string | null;
+
+    /**
+     * 单位Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    unitId?: number | null;
+
+    /**
+     * 单位组Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 产品数量
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    productCount?: string | null;
+
+    /**
+     * 租户Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    tenantId?: number | null;
+
+    /**
+     * 创建时间
+     *
+     * @type {Date}
+     * @memberof AddPackageInfoInput
+     */
+    createTime?: Date | null;
+
+    /**
+     * 更新时间
+     *
+     * @type {Date}
+     * @memberof AddPackageInfoInput
+     */
+    updateTime?: Date | null;
+
+    /**
+     * 创建者Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    createUserId?: number | null;
+
+    /**
+     * 创建者姓名
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    createUserName?: string | null;
+
+    /**
+     * 修改者Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    updateUserId?: number | null;
+
+    /**
+     * 修改者姓名
+     *
+     * @type {string}
+     * @memberof AddPackageInfoInput
+     */
+    updateUserName?: string | null;
+
+    /**
+     * 物料Id
+     *
+     * @type {number}
+     * @memberof AddPackageInfoInput
+     */
+    materialsId: number;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof AddPackageInfoInput
+     */
+    isEnable: boolean;
+
+    /**
+     * 软删除
+     *
+     * @type {boolean}
+     * @memberof AddPackageInfoInput
+     */
+    isDelete: boolean;
+}

Web/src/api-services/models/admin-result-list-package-info-output.ts

@@ -0,0 +1,71 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { PackageInfoOutput } from './package-info-output';
+ /**
+ * 全局返回结果
+ *
+ * @export
+ * @interface AdminResultListPackageInfoOutput
+ */
+export interface AdminResultListPackageInfoOutput {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    message?: string | null;
+
+    /**
+     * 数据
+     *
+     * @type {Array<PackageInfoOutput>}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    result?: Array<PackageInfoOutput> | null;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminResultListPackageInfoOutput
+     */
+    time?: Date;
+}

Web/src/api-services/models/admin-result-package-info.ts

@@ -0,0 +1,69 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { PackageInfo } from './package-info';
+ /**
+ * 全局返回结果
+ *
+ * @export
+ * @interface AdminResultPackageInfo
+ */
+export interface AdminResultPackageInfo {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminResultPackageInfo
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminResultPackageInfo
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminResultPackageInfo
+     */
+    message?: string | null;
+
+    /**
+     * @type {PackageInfo}
+     * @memberof AdminResultPackageInfo
+     */
+    result?: PackageInfo;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminResultPackageInfo
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminResultPackageInfo
+     */
+    time?: Date;
+}

Web/src/api-services/models/admin-result-sql-sugar-paged-list-package-info-output.ts

@@ -0,0 +1,69 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { SqlSugarPagedListPackageInfoOutput } from './sql-sugar-paged-list-package-info-output';
+ /**
+ * 全局返回结果
+ *
+ * @export
+ * @interface AdminResultSqlSugarPagedListPackageInfoOutput
+ */
+export interface AdminResultSqlSugarPagedListPackageInfoOutput {
+
+    /**
+     * 状态码
+     *
+     * @type {number}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    code?: number;
+
+    /**
+     * 类型success、warning、error
+     *
+     * @type {string}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    type?: string | null;
+
+    /**
+     * 错误信息
+     *
+     * @type {string}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    message?: string | null;
+
+    /**
+     * @type {SqlSugarPagedListPackageInfoOutput}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    result?: SqlSugarPagedListPackageInfoOutput;
+
+    /**
+     * 附加数据
+     *
+     * @type {any}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    extras?: any | null;
+
+    /**
+     * 时间
+     *
+     * @type {Date}
+     * @memberof AdminResultSqlSugarPagedListPackageInfoOutput
+     */
+    time?: Date;
+}

Web/src/api-services/models/delete-package-info-input.ts

@@ -0,0 +1,30 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系删除输入参数
+ *
+ * @export
+ * @interface DeletePackageInfoInput
+ */
+export interface DeletePackageInfoInput {
+
+    /**
+     * 主键Id
+     *
+     * @type {number}
+     * @memberof DeletePackageInfoInput
+     */
+    id: number;
+}

Web/src/api-services/models/index.ts

@@ -19,6 +19,7 @@ export * from './add-notice-input';
 export * from './add-open-access-input';
 export * from './add-org-input';
 export * from './add-outbound-input';
+export * from './add-package-info-input';
 export * from './add-plugin-input';
 export * from './add-pos-input';
 export * from './add-print-input';
@@ -72,6 +73,7 @@ export * from './admin-result-list-material-classify-output';
 export * from './admin-result-list-materials-output';
 export * from './admin-result-list-menu-output';
 export * from './admin-result-list-outbound-output';
+export * from './admin-result-list-package-info-output';
 export * from './admin-result-list-print-label-output';
 export * from './admin-result-list-product-bar-code-output';
 export * from './admin-result-list-product-code-configuration-output';
@@ -106,6 +108,7 @@ export * from './admin-result-material-classify';
 export * from './admin-result-materials';
 export * from './admin-result-object';
 export * from './admin-result-outbound';
+export * from './admin-result-package-info';
 export * from './admin-result-print-label';
 export * from './admin-result-product-bar-code';
 export * from './admin-result-product-code-configuration';
@@ -125,6 +128,7 @@ export * from './admin-result-sql-sugar-paged-list-material-classify-output';
 export * from './admin-result-sql-sugar-paged-list-materials-output';
 export * from './admin-result-sql-sugar-paged-list-open-access-output';
 export * from './admin-result-sql-sugar-paged-list-outbound-output';
+export * from './admin-result-sql-sugar-paged-list-package-info-output';
 export * from './admin-result-sql-sugar-paged-list-print-label-output';
 export * from './admin-result-sql-sugar-paged-list-product-bar-code-output';
 export * from './admin-result-sql-sugar-paged-list-product-code-configuration-output';
@@ -238,6 +242,7 @@ export * from './delete-notice-input';
 export * from './delete-open-access-input';
 export * from './delete-org-input';
 export * from './delete-outbound-input';
+export * from './delete-package-info-input';
 export * from './delete-plugin-input';
 export * from './delete-pos-input';
 export * from './delete-print-input';
@@ -300,6 +305,9 @@ export * from './open-access-output';
 export * from './outbound';
 export * from './outbound-input';
 export * from './outbound-output';
+export * from './package-info';
+export * from './package-info-input';
+export * from './package-info-output';
 export * from './page-config-input';
 export * from './page-dict-data-input';
 export * from './page-dict-type-input';
@@ -354,6 +362,7 @@ export * from './sql-sugar-paged-list-material-classify-output';
 export * from './sql-sugar-paged-list-materials-output';
 export * from './sql-sugar-paged-list-open-access-output';
 export * from './sql-sugar-paged-list-outbound-output';
+export * from './sql-sugar-paged-list-package-info-output';
 export * from './sql-sugar-paged-list-print-label-output';
 export * from './sql-sugar-paged-list-product-bar-code-output';
 export * from './sql-sugar-paged-list-product-code-configuration-output';
@@ -463,6 +472,7 @@ export * from './update-notice-input';
 export * from './update-open-access-input';
 export * from './update-org-input';
 export * from './update-outbound-input';
+export * from './update-package-info-input';
 export * from './update-plugin-input';
 export * from './update-pos-input';
 export * from './update-print-input';

Web/src/api-services/models/materials.ts

@@ -148,6 +148,118 @@ export interface Materials {
      */
     isEnable: boolean;
 
+    /**
+     * 品牌
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    brand?: string | null;
+
+    /**
+     * 保质期
+     *
+     * @type {number}
+     * @memberof Materials
+     */
+    shelfLife?: number | null;
+
+    /**
+     * 保质期单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    shelfLifeUnit?: string | null;
+
+    /**
+     * 统一零售价
+     *
+     * @type {number}
+     * @memberof Materials
+     */
+    price?: number | null;
+
+    /**
+     * 条形码
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    barCode?: string | null;
+
+    /**
+     * 单位组ID
+     *
+     * @type {number}
+     * @memberof Materials
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 基本单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    unit?: string | null;
+
+    /**
+     * 生产单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    productUnit?: string | null;
+
+    /**
+     * 采购单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    procureUnit?: string | null;
+
+    /**
+     * 库存单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    inventoryUnit?: string | null;
+
+    /**
+     * 销售单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    saleUnit?: string | null;
+
+    /**
+     * 分销单位
+     *
+     * @type {string}
+     * @memberof Materials
+     */
+    retailStoreUnit?: string | null;
+
+    /**
+     * 包装关系ID
+     *
+     * @type {number}
+     * @memberof Materials
+     */
+    packagId?: number | null;
+
+    /**
+     * 推广ID
+     *
+     * @type {number}
+     * @memberof Materials
+     */
+    promotionId?: number | null;
+
     /**
      * 备注
      *

Web/src/api-services/models/package-info-input.ts

@@ -0,0 +1,134 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系分页查询输入参数
+ *
+ * @export
+ * @interface PackageInfoInput
+ */
+export interface PackageInfoInput {
+
+    /**
+     * 当前页码
+     *
+     * @type {number}
+     * @memberof PackageInfoInput
+     */
+    page?: number;
+
+    /**
+     * 页码容量
+     *
+     * @type {number}
+     * @memberof PackageInfoInput
+     */
+    pageSize?: number;
+
+    /**
+     * 排序字段
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    field?: string | null;
+
+    /**
+     * 排序方向
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    order?: string | null;
+
+    /**
+     * 降序排序
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    descStr?: string | null;
+
+    /**
+     * 关键字查询
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    searchKey?: string | null;
+
+    /**
+     * 物料Id
+     *
+     * @type {number}
+     * @memberof PackageInfoInput
+     */
+    materialsId?: number | null;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof PackageInfoInput
+     */
+    isEnable?: boolean | null;
+
+    /**
+     * 条码类型编码
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    codeTypeNum?: string | null;
+
+    /**
+     * 条码类型
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    codeType?: string | null;
+
+    /**
+     * 包装关系名称
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    packageName?: string | null;
+
+    /**
+     * 单位Id
+     *
+     * @type {number}
+     * @memberof PackageInfoInput
+     */
+    unitId?: number | null;
+
+    /**
+     * 单位组Id
+     *
+     * @type {number}
+     * @memberof PackageInfoInput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 产品数量
+     *
+     * @type {string}
+     * @memberof PackageInfoInput
+     */
+    productCount?: string | null;
+}

Web/src/api-services/models/package-info-output.ts

@@ -0,0 +1,166 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系输出参数
+ *
+ * @export
+ * @interface PackageInfoOutput
+ */
+export interface PackageInfoOutput {
+
+    /**
+     * 主键Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    id?: number;
+
+    /**
+     * 物料Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    materialsId?: number;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof PackageInfoOutput
+     */
+    isEnable?: boolean;
+
+    /**
+     * 条码类型编码
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    codeTypeNum?: string | null;
+
+    /**
+     * 条码类型
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    codeType?: string | null;
+
+    /**
+     * 包装关系名称
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    packageName?: string | null;
+
+    /**
+     * 单位Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    unitId?: number | null;
+
+    /**
+     * 单位
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    unit?: string | null;
+
+    /**
+     * 单位组Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 产品数量
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    productCount?: string | null;
+
+    /**
+     * 租户Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    tenantId?: number | null;
+
+    /**
+     * 创建时间
+     *
+     * @type {Date}
+     * @memberof PackageInfoOutput
+     */
+    createTime?: Date | null;
+
+    /**
+     * 更新时间
+     *
+     * @type {Date}
+     * @memberof PackageInfoOutput
+     */
+    updateTime?: Date | null;
+
+    /**
+     * 创建者Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    createUserId?: number | null;
+
+    /**
+     * 创建者姓名
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    createUserName?: string | null;
+
+    /**
+     * 修改者Id
+     *
+     * @type {number}
+     * @memberof PackageInfoOutput
+     */
+    updateUserId?: number | null;
+
+    /**
+     * 修改者姓名
+     *
+     * @type {string}
+     * @memberof PackageInfoOutput
+     */
+    updateUserName?: string | null;
+
+    /**
+     * 软删除
+     *
+     * @type {boolean}
+     * @memberof PackageInfoOutput
+     */
+    isDelete?: boolean;
+}

Web/src/api-services/models/package-info.ts

@@ -0,0 +1,166 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系
+ *
+ * @export
+ * @interface PackageInfo
+ */
+export interface PackageInfo {
+
+    /**
+     * 雪花Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    id?: number;
+
+    /**
+     * 创建时间
+     *
+     * @type {Date}
+     * @memberof PackageInfo
+     */
+    createTime?: Date | null;
+
+    /**
+     * 更新时间
+     *
+     * @type {Date}
+     * @memberof PackageInfo
+     */
+    updateTime?: Date | null;
+
+    /**
+     * 创建者Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    createUserId?: number | null;
+
+    /**
+     * 创建者姓名
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    createUserName?: string | null;
+
+    /**
+     * 修改者Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    updateUserId?: number | null;
+
+    /**
+     * 修改者姓名
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    updateUserName?: string | null;
+
+    /**
+     * 软删除
+     *
+     * @type {boolean}
+     * @memberof PackageInfo
+     */
+    isDelete?: boolean;
+
+    /**
+     * 租户Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    tenantId?: number | null;
+
+    /**
+     * 物料Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    materialsId: number;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof PackageInfo
+     */
+    isEnable: boolean;
+
+    /**
+     * 条码类型编码
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    codeTypeNum?: string | null;
+
+    /**
+     * 条码类型
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    codeType?: string | null;
+
+    /**
+     * 包装关系名称
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    packageName?: string | null;
+
+    /**
+     * 单位Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    unitId?: number | null;
+
+    /**
+     * 单位
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    unit?: string | null;
+
+    /**
+     * 单位组Id
+     *
+     * @type {number}
+     * @memberof PackageInfo
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 产品数量
+     *
+     * @type {string}
+     * @memberof PackageInfo
+     */
+    productCount?: string | null;
+}

Web/src/api-services/models/sql-sugar-paged-list-package-info-output.ts

@@ -0,0 +1,79 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+import { PackageInfoOutput } from './package-info-output';
+ /**
+ * 分页泛型集合
+ *
+ * @export
+ * @interface SqlSugarPagedListPackageInfoOutput
+ */
+export interface SqlSugarPagedListPackageInfoOutput {
+
+    /**
+     * 页码
+     *
+     * @type {number}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    page?: number;
+
+    /**
+     * 页容量
+     *
+     * @type {number}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    pageSize?: number;
+
+    /**
+     * 总条数
+     *
+     * @type {number}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    total?: number;
+
+    /**
+     * 总页数
+     *
+     * @type {number}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    totalPages?: number;
+
+    /**
+     * 当前页集合
+     *
+     * @type {Array<PackageInfoOutput>}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    items?: Array<PackageInfoOutput> | null;
+
+    /**
+     * 是否有上一页
+     *
+     * @type {boolean}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    hasPrevPage?: boolean;
+
+    /**
+     * 是否有下一页
+     *
+     * @type {boolean}
+     * @memberof SqlSugarPagedListPackageInfoOutput
+     */
+    hasNextPage?: boolean;
+}

Web/src/api-services/models/update-materials-input.ts

@@ -76,6 +76,110 @@ export interface UpdateMaterialsInput {
      */
     isEnable?: boolean;
 
+    /**
+     * 品牌
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    brand?: string | null;
+
+    /**
+     * 保质期
+     *
+     * @type {number}
+     * @memberof UpdateMaterialsInput
+     */
+    shelfLife?: number | null;
+
+    /**
+     * 保质期单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    shelfLifeUnit?: string | null;
+
+    /**
+     * 统一零售价
+     *
+     * @type {number}
+     * @memberof UpdateMaterialsInput
+     */
+    price?: number | null;
+
+    /**
+     * 条形码
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    barCode?: string | null;
+
+    /**
+     * 单位组ID
+     *
+     * @type {number}
+     * @memberof UpdateMaterialsInput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 基本单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    unit?: string | null;
+
+    /**
+     * 生产单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    productUnit?: string | null;
+
+    /**
+     * 采购单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    procureUnit?: string | null;
+
+    /**
+     * 库存单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    inventoryUnit?: string | null;
+
+    /**
+     * 销售单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    saleUnit?: string | null;
+
+    /**
+     * 分销单位
+     *
+     * @type {string}
+     * @memberof UpdateMaterialsInput
+     */
+    retailStoreUnit?: string | null;
+
+    /**
+     * 推广ID
+     *
+     * @type {number}
+     * @memberof UpdateMaterialsInput
+     */
+    promotionId?: number | null;
+
     /**
      * 备注
      *

Web/src/api-services/models/update-package-info-input.ts

@@ -0,0 +1,158 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 所有接口
+ * 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。<br/><a href='https://gitee.com/zuohuaijun/Admin.NET/'>https://gitee.com/zuohuaijun/Admin.NET</a>
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+ /**
+ * 包装关系更新输入参数
+ *
+ * @export
+ * @interface UpdatePackageInfoInput
+ */
+export interface UpdatePackageInfoInput {
+
+    /**
+     * 物料Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    materialsId?: number;
+
+    /**
+     * 是否启用
+     *
+     * @type {boolean}
+     * @memberof UpdatePackageInfoInput
+     */
+    isEnable?: boolean;
+
+    /**
+     * 条码类型编码
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    codeTypeNum?: string | null;
+
+    /**
+     * 条码类型
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    codeType?: string | null;
+
+    /**
+     * 包装关系名称
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    packageName?: string | null;
+
+    /**
+     * 单位Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    unitId?: number | null;
+
+    /**
+     * 单位组Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    unitGroupId?: number | null;
+
+    /**
+     * 产品数量
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    productCount?: string | null;
+
+    /**
+     * 租户Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    tenantId?: number | null;
+
+    /**
+     * 创建时间
+     *
+     * @type {Date}
+     * @memberof UpdatePackageInfoInput
+     */
+    createTime?: Date | null;
+
+    /**
+     * 更新时间
+     *
+     * @type {Date}
+     * @memberof UpdatePackageInfoInput
+     */
+    updateTime?: Date | null;
+
+    /**
+     * 创建者Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    createUserId?: number | null;
+
+    /**
+     * 创建者姓名
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    createUserName?: string | null;
+
+    /**
+     * 修改者Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    updateUserId?: number | null;
+
+    /**
+     * 修改者姓名
+     *
+     * @type {string}
+     * @memberof UpdatePackageInfoInput
+     */
+    updateUserName?: string | null;
+
+    /**
+     * 软删除
+     *
+     * @type {boolean}
+     * @memberof UpdatePackageInfoInput
+     */
+    isDelete?: boolean;
+
+    /**
+     * 主键Id
+     *
+     * @type {number}
+     * @memberof UpdatePackageInfoInput
+     */
+    id: number;
+}

Web/src/views/basics-date/matter/index.vue

@@ -37,7 +37,8 @@
                     <el-col :span="8">
                         <el-form-item label="品牌">
                             <el-select v-model="formInline.brand" placeholder="请选择" clearable>
-                                <el-option label="海天" value="0" />
+                                <el-option :label="item.name" :value="item.id" v-for="item, index in brandDate"
+                                    :key="index" />
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -68,7 +69,6 @@
         <div class="main-table common-box">
             <div class="tab-hed">
                 <el-select v-model="formInline.classify" placeholder="分类" clearable style="width: 200px;">
-                    <el-option label="所有" value="0" />
                     <el-option :label="item.name" :value="item.id" v-for="item, index in fyListData" :key="index" />
                 </el-select>
                 <div>
@@ -99,7 +99,8 @@
                     <vxe-column field="name" sortable title="名称" width=""></vxe-column>
                     <vxe-column field="isEnable" sortable title="可用状态" width="">
                         <template #default="{ row }">
-                            <el-switch v-model="row.isEnable" inline-prompt active-text="启用" inactive-text="禁用" />
+                            <!-- <el-switch v-model="row.isEnable" inline-prompt active-text="启用" inactive-text="禁用" /> -->
+                            {{ row.isEnable ? '启用' : '禁用' }}
                         </template>
                     </vxe-column>
 
@@ -124,8 +125,8 @@
 
         </div>
 
-        <el-dialog v-model="dialogTableVisible" :title="mTitle" width="850">
+        <el-dialog v-model="dialogTableVisible" :title="mTitle" width="1000">
-            <el-form :inline="true" :model="matterFrom" class="demo-form-inline" label-width="70px">
+            <el-form :inline="true" :model="matterFrom" class="demo-form-inline" label-width="90px">
                 <el-row>
 
                     <el-col :span="8">
@@ -141,7 +142,6 @@
                     <el-col :span="8">
                         <el-form-item label="分类">
                             <el-select v-model="matterFrom.classify" placeholder="请选择" clearable>
-                                <el-option label="所有" value="0" />
                                 <el-option :label="item.name" :value="item.id" v-for="item, index in fyListData"
                                     :key="index" />
                             </el-select>
@@ -171,6 +171,146 @@
                         <el-switch v-model="matterFrom.isEnable" inline-prompt active-text="启用" inactive-text="禁用" />
                     </el-form-item>
                 </el-col>
+                <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick"  :key="key">
+                    <el-tab-pane label="基本信息" name="基本信息">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="品牌">
+                                    <el-select v-model="matterFrom.brand" placeholder="请选择" clearable>
+                                        <el-option :label="item.name" :value="item.id" v-for="item, index in brandDate"
+                                            :key="index" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="保质期">
+                                    <el-input v-model="matterFrom.shelfLife" placeholder="请输入保质期" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="保质期单位">
+                                    <el-input v-model="matterFrom.shelfLifeUnit" placeholder="请输入保质期单位" clearable />
+                                </el-form-item>
+                            </el-col>
+
+                        </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="商品条形码">
+                                    <el-input v-model="matterFrom.barCode" placeholder="请输入商品条形码" clearable />
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="统一零售价">
+                                    <el-input v-model="matterFrom.price" placeholder="请输入统一零售价" clearable />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-tab-pane>
+                    <el-tab-pane label="单位信息" name="单位信息">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="单位组">
+                                    <el-select v-model="matterFrom.brand" placeholder="请选择" clearable>
+                                        <el-option :label="item.name" :value="item.id" v-for="item, index in brandDate"
+                                            :key="index" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="基本单位">
+                                    <el-select v-model="matterFrom.unit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="生产单位">
+                                    <el-select v-model="matterFrom.productUnit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+
+                        </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="采购单位">
+                                    <el-select v-model="matterFrom.procureUnit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="库存单位">
+                                    <el-select v-model="matterFrom.inventoryUnit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="销售单位">
+                                    <el-select v-model="matterFrom.saleUnit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+
+                        </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="分销单位">
+                                    <el-select v-model="matterFrom.retailStoreUnit" placeholder="请选择" clearable>
+                                        <el-option label="袋" value="袋" />
+                                        <el-option label="箱" value="箱" />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-tab-pane>
+                    <el-tab-pane label="包装关系" name="包装关系" v-if="infoDate.length > 0">
+                        <vxe-table show-overflow height="100%" :data="infoDate" :border=true
+                            :tree-config="{ transform: true }" :scroll-y="{ gt: 20 }"
+                            :edit-config="{ trigger: 'click', mode: 'row' }">
+
+                            <vxe-column field="isEnable" sortable title="可用状态" width="" :edit-render="{}">
+                                <template #default="{ row }">
+                                    <span>{{ row.isEnable ? '启用' : '禁用' }}</span>
+                                </template>
+                                <template #edit="{ row }">
+                                    <el-switch v-model="row.isEnable" inline-prompt active-text="启用"
+                                        inactive-text="禁用" />
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="codeTypeNum" sortable title="条码类型编码" width=""
+                                :edit-render="{}"></vxe-column>
+                            <vxe-column field="codeType" sortable title="条码类型" width="" :edit-render="{}"></vxe-column>
+                            <vxe-column field="packageName" sortable title="包装关系名" width="" :edit-render="{}">
+                                <template #edit="{ row }">
+                                    <vxe-input v-model="row.packageName" type="text" placeholder="请输入单位"></vxe-input>
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="unit" sortable title="单位" width="" :edit-render="{}">
+                                <template #edit="{ row }">
+                                    <vxe-select v-model="row.unit" placeholder="请选择" clearable>
+                                        <vxe-option label="袋" value="袋" />
+                                        <vxe-option label="箱" value="箱" />
+                                    </vxe-select>
+                                </template>
+                            </vxe-column>
+                            <vxe-column field="productCount" title="产品数量" width="" :edit-render="{}">
+                                <template #edit="{ row }">
+                                    <vxe-input v-model="row.productCount" type="number" placeholder="请输入数值"></vxe-input>
+                                </template>
+                            </vxe-column>
+                        </vxe-table>
+                    </el-tab-pane>
+                </el-tabs>
             </el-form>
             <el-row style="display: flex; justify-content: space-around;">
                 <el-button style="width: 100px;" type="primary" @click="matterSubmit">提交</el-button>
@@ -181,11 +321,11 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue';
+import { onMounted, reactive, ref, watch } from 'vue';
 import { getAPI } from '/@/utils/axios-utils';
-import { MaterialClassifyApi, MaterialsApi } from '/@/api-services/api';
+import { BrandApi, MaterialClassifyApi, MaterialsApi, PackageInfoApi } from '/@/api-services/api';
-import { AddMaterialsInput, DeleteMaterialsInput, MaterialsOutput } from '/@/api-services/models';
+import { AddMaterialsInput, BrandOutput, DeleteMaterialsInput, MaterialsOutput, PackageInfoOutput } from '/@/api-services/models';
-import { ElMessage } from 'element-plus';
+import { ElMessage, TabsPaneContext } from 'element-plus';
 
 //获取物料分类
 
@@ -201,7 +341,8 @@ const fyListGet = async () => {
 
 onMounted(() => {
     fyListGet();
-    MaterialsPage();
+    MaterialsPage({});
+    getBrandList()
 })
 
 //获取物料列表数据
@@ -229,6 +370,43 @@ const onSubmit = () => {
     console.log('submit!')
 }
 
+//获取品牌数据
+
+let brandDate = ref([] as BrandOutput[]);
+
+const getBrandList = async () => {
+    let res = await getAPI(BrandApi).apiBrandListGet();
+    if (res.data.code === 200) {
+        brandDate.value = res.data.result!;
+    }
+}
+
+//获取包装关系
+
+let infoDate = reactive([] as PackageInfoOutput[])
+const getPackageInfoApi = async (id: number) => {
+    let res = await getAPI(PackageInfoApi).apiPackageInfoListMaterialsIdGet(id);
+    if (res.data.code === 200) {
+        infoDate = res.data.result!;
+    }
+}
+
+//批量更新包装关系
+const UpdateInfoApi = async (paramsList: any[]) => {
+    const requests = paramsList.map(params => getAPI(PackageInfoApi).apiPackageInfoUpdatePost(params));
+
+    // 使用 Promise.all 等待所有请求完成
+    Promise.all(requests)
+        .then(responses => {
+            // 所有请求都已完成，responses 是一个包含所有响应的数组
+            console.log('所有请求完成：', responses);
+        })
+        .catch(error => {
+            // 如果任何一个请求失败，则会进入这里
+            console.error('请求失败：', error);
+        });
+}
+
 //新增
 let mTitle = ref('新增');
 let dialogTableVisible = ref(false);
@@ -239,14 +417,42 @@ const add = () => {
     mTitle.value = '新增';
 }
 
+const activeName = ref('基本信息')
+
+const handleClick = (tab: TabsPaneContext, event: Event) => {
+    console.log(tab, event)
+}
+const clearFormValues = (formObject) => {
+    for (let key in formObject) {
+        if (formObject.hasOwnProperty(key)) {
+            formObject[key] = ''; // 或者 null
+        }
+    }
+};
+let key = ref(0)
+watch(dialogTableVisible, (newValue, oldValue) => {
+    if (!newValue) {
+        clearFormValues(matterFrom)
+        infoDate = [];
+        
+        activeName.value = '基本信息';
+    }else{
+        key.value = Math.random();
+    }
+})
+
+
 //提交
 const matterSubmit = async () => {
     let res;
     if (mTitle.value == '新增')
         res = await getAPI(MaterialsApi).apiMaterialsAddPost(matterFrom);
-    else
+    else {
-
         res = await getAPI(MaterialsApi).apiMaterialsUpdatePost(matterFrom);
+        await UpdateInfoApi(infoDate)
+    }
+
+
 
     if (res.data.code === 200) {
         dialogTableVisible.value = false;
@@ -256,7 +462,7 @@ const matterSubmit = async () => {
         })
     } else
         ElMessage.error(res.data.message!)
-    MaterialsPage()
+    MaterialsPage({})
 }
 
 //删除
@@ -267,18 +473,19 @@ const matterDelete = async (id: any) => {
             message: '成功',
             type: 'success',
         })
-        MaterialsPage()
+        MaterialsPage({})
     } else
         ElMessage.error(res.data.message!)
 }
 
 //编辑
 const editDelete = async (id) => {
+    getPackageInfoApi(id)
     let res = await getAPI(MaterialsApi).apiMaterialsDetailGet(id);
     if (res.data.code === 200) {
         dialogTableVisible.value = true;
         mTitle.value = '编辑';
-        Object.assign(matterFrom,res.data.result)
+        Object.assign(matterFrom, res.data.result)
     }
 }
 const pageVO1 = reactive({

Web/src/views/basics-date/unit/index.vue

@@ -31,7 +31,7 @@
                     </el-col>
                 </el-row>
                 <el-form-item>
-                    <el-button type="primary" @click="onSubmit">查询</el-button>
+                    <el-button type="primary" @click="unitPage">查询</el-button>
                     <el-button type="primary" @click="onSubmit">重置</el-button>
                     <el-button @click="onSubmit">保存</el-button>
                     <el-button type="primary" @click="onSubmit">新增</el-button>
@@ -74,7 +74,7 @@
                 </div>
                 <div style="height: 100%;">
                     <vxe-table show-overflow height="100%" :data="data.unitGroup" :border=true
-                        :tree-config="{ transform: true }" :scroll-y="{ gt: 20 }"  @radio-change="radioChangeEvent">
+                        :tree-config="{ transform: true }" :scroll-y="{ gt: 20 }" @radio-change="radioChangeEvent">
                         <vxe-column type="radio" title="单选" width="80" fixed="left">
                         </vxe-column>
 
@@ -130,7 +130,58 @@
             </div>
 
         </div>
+        <el-dialog v-model="dialogTableVisible" :title="mTitle" width="850">
+            <el-form :inline="true" :model="unitFrom" class="demo-form-inline" label-width="70px">
+                <el-row>
 
+                    <el-col :span="8">
+                        <el-form-item label="名称">
+                            <el-input v-model="unitFrom.name" placeholder="请输入名称" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="编码">
+                            <el-input v-model="unitFrom.codeNum" placeholder="请输入编码" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="单位组">
+                            <el-select v-model="unitFrom.groupUnitId" placeholder="请选择" clearable>
+                                <el-option :label="item.name" :value="item.id" v-for="item, index in data.unitGroup"
+                                    :key="index" />
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+
+                    <el-col :span="8">
+                        <el-form-item label="精度">
+                            <el-input v-model="unitFrom.accuracy" placeholder="请输入" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="外部编码">
+                            <el-input v-model="unitFrom.externalNumber" placeholder="请输入" clearable />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="备注">
+                            <el-input v-model="unitFrom.remarks" placeholder="请输入" clearable />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-col :span="8">
+                    <el-form-item label="是否启用">
+                        <el-switch v-model="unitFrom.isEnable" inline-prompt active-text="启用" inactive-text="禁用" />
+                    </el-form-item>
+                </el-col>
+            </el-form>
+            <el-row style="display: flex; justify-content: space-around;">
+                <el-button style="width: 100px;" type="primary" @click="unitSubmit">提交</el-button>
+                <el-button style="width: 100px;" @click="dialogTableVisible = false">取消</el-button>
+            </el-row>
+        </el-dialog>
     </div>
 </template>
 
@@ -138,7 +189,7 @@
 import { onMounted, reactive, ref } from 'vue'
 import { getAPI } from '/@/utils/axios-utils';
 import { SysUnitApi, SysUnitGroupApi } from '/@/api-services/api';
-import { SqlSugarPagedListSysUnitOutput, SysUnitGroupOutput } from '/@/api-services/models';
+import { AddSysUnitInput, SqlSugarPagedListSysUnitOutput, SysUnitGroupOutput, SysUnitInput } from '/@/api-services/models';
 
 let data = reactive({
     unit: [] as SqlSugarPagedListSysUnitOutput[],//单位数据
@@ -155,23 +206,27 @@ const unitGroup = async () => {
 //单选
 
 const radioChangeEvent = ({ row }) => {
-console.log("🚀 ~ clearRadioRowEevnt ~ id:", row.id)
+    unitPage({groupUnitId:row.id})
-
 }
-const formInline = reactive({
+const formInline = reactive({} as SysUnitInput)
-    name: '',//名称
-    isEnable: "",//可用状态
-    codeNum: '',//编码
-    brevityCode: '',//简码
-})
 
 //获取单位数据
-const unitPage = async () => {
+const unitPage = async (parameter = formInline) => {
-    let res = await getAPI(SysUnitApi).apiSysUnitPagePost({ page: 1, pageSize: 10 });
+    
+    let res = await getAPI(SysUnitApi).apiSysUnitPagePost({ page: 1, pageSize: 10, ...parameter,...formInline });
     data.unit = res.data.result?.items as any;
     pageVO1.total = res.data.result?.total!;
 }
 
+let mTitle = ref('新增');
+let dialogTableVisible = ref(false);
+
+let unitFrom = reactive({} as AddSysUnitInput)
+
+//提交
+let unitSubmit = async () => {
+    
+}
 const onSubmit = () => {
     console.log('submit!')
 }