From 3aed74c8acb0a4d4c17a4494d5180c3e3bb010f4 Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 16 Apr 2026 12:23:04 +0700 Subject: [PATCH 1/2] update --- src/model/item_master.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/model/item_master.ts b/src/model/item_master.ts index f76c3bb..b27d073 100644 --- a/src/model/item_master.ts +++ b/src/model/item_master.ts @@ -22,7 +22,7 @@ export class ItemMasterModel { .leftJoinAndSelect("item_master.item_class_detail", "item_class_detail") .leftJoinAndSelect("item_master.status", "status") .leftJoinAndSelect("item_master.factory", "factory") - .leftJoinAndSelect("item_master.unit", "unit") + // .leftJoinAndSelect("item_master.unit", "unit") if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); } From 560cec0d86f0c4655f46b744781fad7af77c70cb Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Thu, 16 Apr 2026 12:25:32 +0700 Subject: [PATCH 2/2] update --- src/controllers/pharmacy/item_master.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controllers/pharmacy/item_master.ts b/src/controllers/pharmacy/item_master.ts index 9f73d2a..d1afe92 100644 --- a/src/controllers/pharmacy/item_master.ts +++ b/src/controllers/pharmacy/item_master.ts @@ -286,7 +286,8 @@ 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'), + 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'),