From 5f31e562ebc970b389f108ab3c196cc9dc72894c Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 16 Apr 2026 11:46:43 +0700 Subject: [PATCH] update --- src/controllers/pharmacy/item_master.ts | 17 ++++++++++------- src/swagger/builder.js | 4 +++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index 888fb42..9f73d2a 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -209,7 +209,9 @@ export class ItemMasterController { 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'), + // unit_id: Joi.string().uuid().required().label('Unit ID'), + smallunit: Joi.string().required().label('Small Unit'), + largeunit: Joi.string().required().label('Large Unit'), pack_size: Joi.number().integer().min(0).required().label('Pack Size'), minimum_quantity: Joi.number().integer().min(0).required().label('Minimum Quantity'), minimum_sales_quantity: Joi.number().integer().min(0).required().label('Minimum Sales Quantity'), @@ -228,13 +230,14 @@ export class ItemMasterController { data.item_class_detail = param.item_class_detail_id, data.status = param.item_status_id, data.factory = param.factory_id, - data.unit = param.unit_id, + data.smallunit = param.smallunit, + data.largeunit = param.largeunit, 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 - data.created_by = req.auth.data.name; + data.created_by = req.auth?.data.name; await OrmHelper.DB.manager.save(data); @@ -308,13 +311,13 @@ export class ItemMasterController { data.item_class_detail = param.item_class_detail_id, data.status = param.item_status_id, data.factory = param.factory_id, - data.unit = param.unit_id, - data.pack_size = param.pack_size, + data.smallunit = param.smallunit, + data.largeunit = param.largeunit, 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 - data.updated_by = req.auth.data.name; + data.updated_by = req.auth?.data.name; await repo.save(data); @@ -361,7 +364,7 @@ export class ItemMasterController { const existData = await repo.findOne({ where: { id: param.id } }); if (existData && !param.hard) { - existData.deleted_by = req.auth.data.name; + existData.deleted_by = req.auth?.data.name; await OrmHelper.DB.manager.save(existData); } diff --git a/src/swagger/builder.js b/src/swagger/builder.js index 2d0087b..7f74bc7 100644 --- a/src/swagger/builder.js +++ b/src/swagger/builder.js @@ -306,7 +306,9 @@ const doc = { $item_class_detail_id: "Item class Detail ID (UUID)", $item_status_id: "Item status ID (UUID)", $factory_id: "Factory ID (UUID)", - $unit_id: "Unit ID (UUID)", + // $unit_id: "Unit ID (UUID)", + $smallunit:"string", + $largeunit:"string", $pack_size: "Pack size (integer, minimum 0)", $minimum_quantity: "Minimum quantity (integer, minimum 0)", $minimum_sales_quantity: "Minimum sales quantity (integer, minimum 0)",