Merge branch 'main' of https://git.shiblysolution.id/SAUDE-TL/service-master-data
This commit is contained in:
@ -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'),
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user