diff --git a/src/dto/stock.dto.ts b/src/dto/stock.dto.ts index 6d3bd4d..24cfdd8 100644 --- a/src/dto/stock.dto.ts +++ b/src/dto/stock.dto.ts @@ -51,6 +51,18 @@ export class QueryStockRecordDTO { @ApiProperty() @Rule(RuleType.string()) productName: string; + + @ApiProperty() + @Rule(RuleType.string()) + operationType: string; + + @ApiProperty() + @Rule(RuleType.date()) + startDate: Date; + + @ApiProperty() + @Rule(RuleType.date()) + endDate: Date; } export class QueryPurchaseOrderDTO { @ApiProperty({ example: '1', description: '页码' }) diff --git a/src/service/stock.service.ts b/src/service/stock.service.ts index 2895286..0333605 100644 --- a/src/service/stock.service.ts +++ b/src/service/stock.service.ts @@ -1,5 +1,5 @@ import { Provide } from '@midwayjs/core'; -import { Between, Like, Repository } from 'typeorm'; +import { Between, Like, Repository, LessThan, MoreThan } from 'typeorm'; import { Stock } from '../entity/stock.entity'; import { StockRecord } from '../entity/stock_record.entity'; import { paginate } from '../utils/paginate.util'; @@ -350,11 +350,18 @@ export class StockService { stockPointId, productSku, productName, + operationType, + startDate, + endDate, } = query; const where: any = {}; if (stockPointId) where.stockPointId = stockPointId; if (productSku) where.productSku = productSku; + if (operationType) where.operationType = operationType; + if (startDate) where.createdAt = MoreThan(startDate); + if (endDate) where.createdAt = LessThan(endDate); + if (startDate && endDate) where.createdAt = Between(startDate, endDate); const queryBuilder = this.stockRecordModel .createQueryBuilder('stock_record') .leftJoin(Product, 'product', 'product.sku = stock_record.productSku') diff --git a/src/service/wp.service.ts b/src/service/wp.service.ts index 1862f3b..0befa32 100644 --- a/src/service/wp.service.ts +++ b/src/service/wp.service.ts @@ -240,7 +240,6 @@ export class WPService { manage_stock: false, // 为true的时候,用quantity控制库存,为false时,直接用stock_status控制 stock_status, }); - console.log('res', res); return res; }