TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/service-master-data

Browse Source
This commit is contained in:
wayanrivan
2026-03-11 15:37:12 +07:00
parent 143c80ef52 a40161584e
commit 8ee9e6153f
5 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/pharmacy/factory_to_supplier.ts
View File

@ -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";

34
src/controllers/pharmacy/item_master.ts
View File

@ -198,6 +198,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'),
@ -212,6 +213,7 @@ export class ItemMasterController {
const data = new ItemMaster()
data.item_name = param.item_name,
// <<<<<<< HEAD
data.generic_name = param.generic_name_id,
data.type_detail = param.item_type_detail_id,
data.category = param.item_category_id,
@ -224,6 +226,21 @@ export class ItemMasterController {
data.minimum_sales_quantity = param.minimum_sales_quantity,
data.strength = param.strength,
data.active = param.active
// =======
// data.generic_name = param.generic_name_id,
// 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,
// data.pack_size = param.pack_size,
// data.minimum_quantity = param.minimum_quantity,
// data.minimum_sales_quantity = param.minimum_sales_quantity,
// data.strength = param.strength,
// data.active = param.active
// >>>>>>> a40161584e7b71336f26cb890ad62936f69cef3a
data.created_by = req.auth.data.name;
await OrmHelper.DB.manager.save(data);
@ -270,6 +287,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'),
@ -290,6 +308,7 @@ export class ItemMasterController {
if (data != null) {
data.item_name = param.item_name,
// <<<<<<< HEAD
data.generic_name = param.generic_name_id,
data.type_detail = param.item_type_detail_id,
data.category = param.item_category_id,
@ -302,6 +321,21 @@ export class ItemMasterController {
data.minimum_sales_quantity = param.minimum_sales_quantity,
data.strength = param.strength,
data.active = param.active
// =======
// data.generic_name = param.generic_name_id,
// 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,
// data.pack_size = param.pack_size,
// data.minimum_quantity = param.minimum_quantity,
// data.minimum_sales_quantity = param.minimum_sales_quantity,
// data.strength = param.strength,
// data.active = param.active
// >>>>>>> a40161584e7b71336f26cb890ad62936f69cef3a
data.updated_by = req.auth.data.name;
await repo.save(data);