From df8806a5fb7ab0afa9dd11d76ecb7edfa6eb5926 Mon Sep 17 00:00:00 2001 From: louis <869322496@qq.com> Date: Tue, 5 Mar 2024 13:57:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/constants/error-code.constant.ts | 5 ++- src/modules/company/company.dto.ts | 14 +++++++- src/modules/company/company.entity.ts | 7 +++- .../in_out/materials_in_out.controller.ts | 26 +++++++------- .../materials_inventory.entity.ts | 2 +- .../materials_inventory.module.ts | 12 +++++-- src/modules/product/product.dto.ts | 13 +++++-- src/modules/product/product.entity.ts | 12 +++++-- src/modules/product/product.service.ts | 34 ++++++++++++++----- 9 files changed, 92 insertions(+), 33 deletions(-) diff --git a/src/constants/error-code.constant.ts b/src/constants/error-code.constant.ts index 3b381c2..8c187a6 100644 --- a/src/constants/error-code.constant.ts +++ b/src/constants/error-code.constant.ts @@ -49,5 +49,8 @@ export enum ErrorEnum { // Storage相关 STORAGE_NOT_FOUND = '1404:文件不存在,请重试', - STORAGE_REFRENCE_EXISTS = '1405:文件存在关联,无法删除,请先找到该文件关联的业务解除关联。' + STORAGE_REFRENCE_EXISTS = '1405:文件存在关联,无法删除,请先找到该文件关联的业务解除关联。', + + // Product + PRODUCT_EXIST = '1406:产品已存在' } diff --git a/src/modules/company/company.dto.ts b/src/modules/company/company.dto.ts index d388b4d..6b39ea5 100644 --- a/src/modules/company/company.dto.ts +++ b/src/modules/company/company.dto.ts @@ -33,7 +33,19 @@ export class CompanyUpdateDto extends PartialType(CompanyDto) { fileIds: number[]; } +export class ComapnyCreateDto extends PartialType(CompanyDto) { + @ApiProperty({ description: '附件' }) + @IsOptional() + @IsArray() + fileIds: number[]; +} + export class CompanyQueryDto extends IntersectionType( PagerDto, PartialType(CompanyDto) -) {} +) { + @ApiProperty({ description: '公司名称' }) + @IsOptional() + @IsString() + name: string; +} diff --git a/src/modules/company/company.entity.ts b/src/modules/company/company.entity.ts index 38d7428..6608cbc 100644 --- a/src/modules/company/company.entity.ts +++ b/src/modules/company/company.entity.ts @@ -1,7 +1,8 @@ import { ApiHideProperty, ApiProperty } from '@nestjs/swagger'; -import { Column, Entity, JoinTable, ManyToMany, Relation } from 'typeorm'; +import { Column, Entity, JoinTable, ManyToMany, OneToMany, Relation } from 'typeorm'; import { CommonEntity } from '~/common/entity/common.entity'; import { Storage } from '../tools/storage/storage.entity'; +import { ProductEntity } from '../product/product.entity'; @Entity({ name: 'company' }) export class CompanyEntity extends CommonEntity { @@ -19,6 +20,10 @@ export class CompanyEntity extends CommonEntity { @ApiProperty({ description: '删除状态：0未删除，1已删除' }) isDelete: number; + @ApiHideProperty() + @OneToMany(() => ProductEntity, product => product.company) + products: Relation; + @ManyToMany(() => Storage, storage => storage.companys) @JoinTable({ name: 'company_storage', diff --git a/src/modules/materials_inventory/in_out/materials_in_out.controller.ts b/src/modules/materials_inventory/in_out/materials_in_out.controller.ts index b7144e0..406a3e5 100644 --- a/src/modules/materials_inventory/in_out/materials_in_out.controller.ts +++ b/src/modules/materials_inventory/in_out/materials_in_out.controller.ts @@ -16,46 +16,46 @@ export const permissions = definePermission('materials_inventory:history_in_out' DELETE: 'delete' } as const); -@ApiTags('Materials In Out History - 原材料出入库管理') +@ApiTags('Materials In Out History - 原材料出入库记录') @ApiSecurityAuth() @Controller('materials-in-out') export class MaterialsInOutController { - constructor(private miService: MaterialsInOutService) {} + constructor(private materialsInOutService: MaterialsInOutService) {} @Get() - @ApiOperation({ summary: '获取原材料盘点列表' }) + @ApiOperation({ summary: '获取原材料出入库记录列表' }) @ApiResult({ type: [MaterialsInOutEntity], isPage: true }) @Perm(permissions.LIST) async list(@Query() dto: MaterialsInOutQueryDto) { - return this.miService.findAll(dto); + return this.materialsInOutService.findAll(dto); } @Get(':id') - @ApiOperation({ summary: '获取原材料盘点信息' }) + @ApiOperation({ summary: '获取原材料出入库记录信息' }) @ApiResult({ type: MaterialsInOutDto }) @Perm(permissions.READ) async info(@IdParam() id: number) { - return this.miService.info(id); + return this.materialsInOutService.info(id); } @Post() - @ApiOperation({ summary: '新增原材料盘点' }) + @ApiOperation({ summary: '新增原材料出入库记录' }) @Perm(permissions.CREATE) async create(@Body() dto: MaterialsInOutDto): Promise { - await this.miService.create(dto); + await this.materialsInOutService.create(dto); } @Put(':id') - @ApiOperation({ summary: '更新原材料盘点' }) + @ApiOperation({ summary: '更新原材料出入库记录' }) @Perm(permissions.UPDATE) async update(@IdParam() id: number, @Body() dto: MaterialsInOutUpdateDto): Promise { - await this.miService.update(id, dto); + await this.materialsInOutService.update(id, dto); } @Delete(':id') - @ApiOperation({ summary: '删除原材料盘点' }) + @ApiOperation({ summary: '删除原材料出入库记录' }) @Perm(permissions.DELETE) async delete(@IdParam() id: number): Promise { - await this.miService.delete(id); + await this.materialsInOutService.delete(id); } @Put('unlink-attachments/:id') @@ -65,6 +65,6 @@ export class MaterialsInOutController { @IdParam() id: number, @Body() { fileIds }: MaterialsInOutUpdateDto ): Promise { - await this.miService.unlinkAttachments(id, fileIds); + await this.materialsInOutService.unlinkAttachments(id, fileIds); } } diff --git a/src/modules/materials_inventory/materials_inventory.entity.ts b/src/modules/materials_inventory/materials_inventory.entity.ts index e80b830..3023003 100644 --- a/src/modules/materials_inventory/materials_inventory.entity.ts +++ b/src/modules/materials_inventory/materials_inventory.entity.ts @@ -83,7 +83,7 @@ export class MaterialsInventoryEntity extends CommonEntity { comment: '入库单价' }) @ApiProperty({ description: '入库单价' }) - inventoryUnitPrice: number; + inventoryUnitPrice: number; @Column({ name: 'inventory_amount', diff --git a/src/modules/materials_inventory/materials_inventory.module.ts b/src/modules/materials_inventory/materials_inventory.module.ts index b376835..a834aa5 100644 --- a/src/modules/materials_inventory/materials_inventory.module.ts +++ b/src/modules/materials_inventory/materials_inventory.module.ts @@ -4,10 +4,16 @@ import { MaterialsInventoryService } from './materials_inventory.service'; import { TypeOrmModule } from '@nestjs/typeorm'; import { MaterialsInventoryEntity } from './materials_inventory.entity'; import { StorageModule } from '../tools/storage/storage.module'; +import { MaterialsInOutController } from './in_out/materials_in_out.controller'; +import { MaterialsInOutService } from './in_out/materials_in_out.service'; +import { MaterialsInOutEntity } from './in_out/materials_in_out.entity'; @Module({ - imports: [TypeOrmModule.forFeature([MaterialsInventoryEntity]), StorageModule], - controllers: [MaterialsInventoryController], - providers: [MaterialsInventoryService] + imports: [ + TypeOrmModule.forFeature([MaterialsInventoryEntity, MaterialsInOutEntity]), + StorageModule + ], + controllers: [MaterialsInventoryController, MaterialsInOutController], + providers: [MaterialsInventoryService, MaterialsInOutService] }) export class MaterialsInventoryModule {} diff --git a/src/modules/product/product.dto.ts b/src/modules/product/product.dto.ts index 60414bd..70ab764 100644 --- a/src/modules/product/product.dto.ts +++ b/src/modules/product/product.dto.ts @@ -18,10 +18,14 @@ import { ProductEntity } from './product.entity'; export class ProductDto { @ApiProperty({ description: '产品名称' }) - @IsUnique(ProductEntity, { message: '已存在同名产品' }) @IsString() name: string; + @ApiProperty({ description: '所属公司' }) + @IsOptional() + @IsNumber() + companyId: number; + @ApiProperty({ description: '附件' }) files: Storage[]; } @@ -36,4 +40,9 @@ export class ProductUpdateDto extends PartialType(ProductDto) { export class ProductQueryDto extends IntersectionType( PagerDto, PartialType(ProductDto) -) {} +) { + @ApiProperty({ description: '所属公司名称' }) + @IsOptional() + @IsString() + company: string; +} diff --git a/src/modules/product/product.entity.ts b/src/modules/product/product.entity.ts index c68bace..9049e60 100644 --- a/src/modules/product/product.entity.ts +++ b/src/modules/product/product.entity.ts @@ -1,14 +1,14 @@ import { ApiHideProperty, ApiProperty } from '@nestjs/swagger'; -import { Column, Entity, JoinTable, ManyToMany, Relation } from 'typeorm'; +import { Column, Entity, JoinColumn, JoinTable, ManyToMany, ManyToOne, Relation } from 'typeorm'; import { CommonEntity } from '~/common/entity/common.entity'; import { Storage } from '../tools/storage/storage.entity'; +import { CompanyEntity } from '../company/company.entity'; @Entity({ name: 'product' }) export class ProductEntity extends CommonEntity { @Column({ name: 'name', type: 'varchar', - unique: true, length: 255, comment: '产品名称' }) @@ -19,6 +19,14 @@ export class ProductEntity extends CommonEntity { @ApiProperty({ description: '删除状态：0未删除，1已删除' }) isDelete: number; + @Column({ name: 'company_id', type: 'int', comment: '所属公司', nullable: true }) + @ApiProperty({ description: '所属公司' }) + companyId: number; + + @ManyToOne(() => CompanyEntity /* , { onDelete: 'CASCADE' } */) + @JoinColumn({ name: 'company_id' }) + company: CompanyEntity; + @ManyToMany(() => Storage, storage => storage.products) @JoinTable({ name: 'product_storage', diff --git a/src/modules/product/product.service.ts b/src/modules/product/product.service.ts index df0589f..257a91d 100644 --- a/src/modules/product/product.service.ts +++ b/src/modules/product/product.service.ts @@ -28,14 +28,22 @@ export class ProductService { pageSize, ...fields }: ProductQueryDto): Promise> { - const queryBuilder = this.productRepository + const { company: companyName,...ext } = fields; + const sqb = this.productRepository .createQueryBuilder('product') .leftJoin('product.files', 'files') - .addSelect(['files.id', 'files.path']) - .where(fieldSearch(fields)) - .andWhere('product.isDelete = 0'); - - return paginate(queryBuilder, { + .leftJoin('product.company', 'company') + .addSelect(['files.id', 'files.path', 'company.name', 'company.id']) + .where(fieldSearch(ext)) + .where('product.isDelete = 0'); + if (companyName) { + sqb.andWhere({ + company: { + name: Like(`%${companyName}%`) + } + }); + } + return paginate(sqb, { page, pageSize }); @@ -45,6 +53,13 @@ export class ProductService { * 新增 */ async create(dto: ProductDto): Promise { + const { name, companyId } = dto; + const isExsit = await this.productRepository.findOne({ + where: { name, company: { id: companyId } } + }); + if (isExsit) { + throw new BusinessException(ErrorEnum.PRODUCT_EXIST); + } await this.productRepository.insert(dto); } @@ -83,16 +98,17 @@ export class ProductService { * 删除 */ async delete(id: number): Promise { - // 合同比较重要，做逻辑删除 await this.productRepository.update(id, { isDelete: 1 }); } /** - * 获取单个合同信息 + * 获取单个产品信息 */ async info(id: number) { const info = await this.productRepository .createQueryBuilder('product') + .leftJoin('product.company', 'company') + .addSelect(['company.name', 'company.id']) .where({ id }) @@ -103,7 +119,7 @@ export class ProductService { /** * 解除附件关联 - * @param id 合同ID + * @param id 产品ID * @param fileIds 附件ID */ async unlinkAttachments(id: number, fileIds: number[]) {