fixing
This commit is contained in:
@ -14,11 +14,10 @@ import { FactoryToSupplierModel } from "../../model/factory_to_supplier";
|
||||
const log: Logger<ILogObj> = new Logger({ name: '[FactorytoSupplierController]', type: 'pretty' });
|
||||
|
||||
export class FactorytoSupplierController {
|
||||
static async listFactorybySupplier(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
|
||||
static async list(req: Request, res: Response, next: NextFunction): Promise<void | Response> {
|
||||
/*
|
||||
#swagger.tags = ['Pharmacy - FactoryToSupplier']
|
||||
#swagger.security = [{ "bearerAuth": [] }]
|
||||
#swagger.parameters['supplier_id'] = { in: 'query', required: true, type: 'string' }
|
||||
#swagger.parameters['filter'] = { description: '', in: 'query', type: 'string' }
|
||||
#swagger.parameters['limit'] = { in: 'query', required: true, type: 'number' }
|
||||
#swagger.parameters['page'] = { in: 'query', required: true, type: 'number' }
|
||||
@ -28,7 +27,6 @@ export class FactorytoSupplierController {
|
||||
*/
|
||||
try {
|
||||
const schema = Joi.object().keys({
|
||||
supplier_id: Joi.string().uuid().required().label("Supplier ID"),
|
||||
filter: Joi.string().allow("").optional().label("Filter"),
|
||||
page: Joi.number().required().min(1).label("Page"),
|
||||
limit: Joi.number().required().min(1).label("Limit"),
|
||||
@ -41,7 +39,7 @@ export class FactorytoSupplierController {
|
||||
|
||||
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
|
||||
|
||||
var query = await FactoryToSupplierModel.listFactorybySupplier(param.supplier_id, filter);
|
||||
var query = await FactoryToSupplierModel.list(filter);
|
||||
|
||||
const offset = (param.page - 1) * param.limit;
|
||||
let limit = param.limit;
|
||||
@ -76,7 +74,6 @@ export class FactorytoSupplierController {
|
||||
#swagger.security = [{
|
||||
"bearerAuth": []
|
||||
}]
|
||||
#swagger.parameters['supplier_id'] = { in: 'query', required: true, type: 'string' }
|
||||
#swagger.parameters['filter'] = {
|
||||
description: 'Filter with 2 format : <ul><li>Simple format use text plaint will filter eq:code or like %name%</li><li>Advance format using field existing {status:\'Y\', any:\'SAME AS PLAINT LOGIC\', etc...}</li></ul>',
|
||||
in: 'query',
|
||||
@ -102,7 +99,6 @@ export class FactorytoSupplierController {
|
||||
|
||||
try {
|
||||
const schema = Joi.object().keys({
|
||||
supplier_id: Joi.string().uuid().required().label("Supplier ID"),
|
||||
filter: Joi.string().allow('').optional().label('Filter'),
|
||||
order_field: Joi.string().required().label('Order Field'),
|
||||
order_direction: Joi.string().allow('asc', 'desc').required().label('Order Direction'),
|
||||
@ -112,7 +108,7 @@ export class FactorytoSupplierController {
|
||||
|
||||
let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
|
||||
|
||||
var query = await FactoryToSupplierModel.listFactorybySupplier(filter);
|
||||
var query = await FactoryToSupplierModel.list(filter);
|
||||
const data = await query.getMany();
|
||||
|
||||
const filename = "factory_to_supplier.csv";
|
||||
|
||||
@ -177,6 +177,7 @@ export class ItemMasterController {
|
||||
item_type_detail_id: Joi.string().uuid().required().label('Item Type Detail ID'),
|
||||
item_category_id: Joi.string().uuid().required().label('Item Category ID'),
|
||||
item_class_id: Joi.string().uuid().required().label('Item Class ID'),
|
||||
item_class_detail_id: Joi.string().uuid().required().label('Item Class Detail ID'),
|
||||
item_status_id: Joi.string().uuid().required().label('Item Status ID'),
|
||||
factory_id: Joi.string().uuid().required().label('Factory ID'),
|
||||
unit_id: Joi.string().uuid().required().label('Unit ID'),
|
||||
@ -195,6 +196,7 @@ export class ItemMasterController {
|
||||
data.type_detail = param.item_type_detail_id,
|
||||
data.category = param.item_category_id,
|
||||
data.item_class = param.item_class_id,
|
||||
data.item_class_detail = param.item_class_id,
|
||||
data.status = param.item_status_id,
|
||||
data.factory = param.factory_id,
|
||||
data.unit = param.unit_id,
|
||||
@ -249,6 +251,7 @@ export class ItemMasterController {
|
||||
item_type_detail_id: Joi.string().uuid().required().label('Item Type Detail ID'),
|
||||
item_category_id: Joi.string().uuid().required().label('Item Category ID'),
|
||||
item_class_id: Joi.string().uuid().required().label('Item Class ID'),
|
||||
item_class_detail_id: Joi.string().uuid().required().label('Item Class Detail ID'),
|
||||
item_status_id: Joi.string().uuid().required().label('Item Status ID'),
|
||||
factory_id: Joi.string().uuid().required().label('Factory ID'),
|
||||
unit_id: Joi.string().uuid().required().label('Unit ID'),
|
||||
@ -273,6 +276,7 @@ export class ItemMasterController {
|
||||
data.type_detail = param.item_type_detail_id,
|
||||
data.category = param.item_category_id,
|
||||
data.item_class = param.item_class_id,
|
||||
data.item_class_detail = param.item_class_id,
|
||||
data.status = param.item_status_id,
|
||||
data.factory = param.factory_id,
|
||||
data.unit = param.unit_id,
|
||||
|
||||
Reference in New Issue
Block a user