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:
fazri.is
2026-04-16 12:26:00 +07:00
parent c1e217464c 560cec0d86
commit 7bca8e8c75
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,8 @@ export class ItemMasterController {
item_class_detail_id: Joi.string().uuid().required().label('Item Class Detail 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'), item_status_id: Joi.string().uuid().required().label('Item Status ID'),
factory_id: Joi.string().uuid().required().label('Factory 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'), pack_size: Joi.number().integer().min(0).required().label('Pack Size'),
minimum_quantity: Joi.number().integer().min(0).required().label('Minimum Quantity'), minimum_quantity: Joi.number().integer().min(0).required().label('Minimum Quantity'),
minimum_sales_quantity: Joi.number().integer().min(0).required().label('Minimum Sales Quantity'), minimum_sales_quantity: Joi.number().integer().min(0).required().label('Minimum Sales Quantity'),

2
src/model/item_master.ts
View File

@ -22,7 +22,7 @@ export class ItemMasterModel {
.leftJoinAndSelect("item_master.item_class_detail", "item_class_detail") .leftJoinAndSelect("item_master.item_class_detail", "item_class_detail")
.leftJoinAndSelect("item_master.status", "status") .leftJoinAndSelect("item_master.status", "status")
.leftJoinAndSelect("item_master.factory", "factory") .leftJoinAndSelect("item_master.factory", "factory")
.leftJoinAndSelect("item_master.unit", "unit") // .leftJoinAndSelect("item_master.unit", "unit")
if (whereAttr.length != 0) { if (whereAttr.length != 0) {
query = query.where(whereAttr.join(" and "), whereVal); query = query.where(whereAttr.join(" and "), whereVal);
} }