- fix order-prod and order-stg if suppliers have same code product
This commit is contained in:
@@ -505,16 +505,14 @@ export class ProductService {
|
||||
async findOneActive(
|
||||
code: string,
|
||||
type: string,
|
||||
roles: string,
|
||||
supplierId: string,
|
||||
productId: string
|
||||
) {
|
||||
if (roles == 'Retail') {
|
||||
try {
|
||||
return await this.productRepository.findOneOrFail({
|
||||
relations: ['supplier'],
|
||||
where: {
|
||||
code: code,
|
||||
supplier: supplierId,
|
||||
id: productId
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
@@ -530,28 +528,7 @@ export class ProductService {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
return await this.productRepository.findOneOrFail({
|
||||
relations: ['supplier'],
|
||||
where: {
|
||||
code: code,
|
||||
},
|
||||
});
|
||||
} catch (e) {
|
||||
if (e instanceof EntityNotFoundError) {
|
||||
throw new HttpException(
|
||||
{
|
||||
statusCode: HttpStatus.NOT_FOUND,
|
||||
error: 'Product not found',
|
||||
},
|
||||
HttpStatus.NOT_FOUND,
|
||||
);
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async findOneById(id: string) {
|
||||
|
||||
Reference in New Issue
Block a user