gitea-admin/lti-api
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-api.git synced 2026-05-20 13:31:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust response detail recording

Browse Source
This commit is contained in:
giovanni
2026-04-07 10:59:59 +07:00
parent 23e49a00e4
commit 6342a28f09
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/modules/inventory/adjustments/dto/adjustment.dto.go
+8
View File
@@ -5,6 +5,7 @@ import (
entity "gitlab.com/mbugroup/lti-api.git/internal/entities" entity "gitlab.com/mbugroup/lti-api.git/internal/entities"
productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto" productCategoryDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/product-categories/dto"
uomDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/master/uoms/dto"
userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto" userDTO "gitlab.com/mbugroup/lti-api.git/internal/modules/users/dto"
) )
@@ -14,6 +15,7 @@ type ProductRelationDTO struct {
Id uint `json:"id"` Id uint `json:"id"`
Name string `json:"name"` Name string `json:"name"`
SKU string `json:"sku"` SKU string `json:"sku"`
Uom *uomDTO.UomRelationDTO `json:"uom,omitempty"`
ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"` ProductCategory *productCategoryDTO.ProductCategoryRelationDTO `json:"product_category,omitempty"`
} }
@@ -89,11 +91,17 @@ func ToProductRelationDTO(e *entity.Product) *ProductRelationDTO {
mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory) mapped := productCategoryDTO.ToProductCategoryRelationDTO(e.ProductCategory)
category = &mapped category = &mapped
} }
var uom *uomDTO.UomRelationDTO
if e.Uom.Id != 0 {
mapped := uomDTO.ToUomRelationDTO(e.Uom)
uom = &mapped
}
return &ProductRelationDTO{ return &ProductRelationDTO{
Id: e.Id, Id: e.Id,
Name: e.Name, Name: e.Name,
SKU: sku, SKU: sku,
Uom: uom,
ProductCategory: category, ProductCategory: category,
} }
} }
internal/modules/production/recordings/repositories/recording.repository.go
+3
View File
@@ -115,18 +115,21 @@ func (r *RecordingRepositoryImpl) WithRelations(db *gorm.DB) *gorm.DB {
Preload("Depletions"). Preload("Depletions").
Preload("Depletions.ProductWarehouse"). Preload("Depletions.ProductWarehouse").
Preload("Depletions.ProductWarehouse.Product"). Preload("Depletions.ProductWarehouse.Product").
Preload("Depletions.ProductWarehouse.Product.Uom").
Preload("Depletions.ProductWarehouse.Warehouse"). Preload("Depletions.ProductWarehouse.Warehouse").
Preload("Depletions.ProductWarehouse.Warehouse.Area"). Preload("Depletions.ProductWarehouse.Warehouse.Area").
Preload("Depletions.ProductWarehouse.Warehouse.Location"). Preload("Depletions.ProductWarehouse.Warehouse.Location").
Preload("Stocks"). Preload("Stocks").
Preload("Stocks.ProductWarehouse"). Preload("Stocks.ProductWarehouse").
Preload("Stocks.ProductWarehouse.Product"). Preload("Stocks.ProductWarehouse.Product").
Preload("Stocks.ProductWarehouse.Product.Uom").
Preload("Stocks.ProductWarehouse.Warehouse"). Preload("Stocks.ProductWarehouse.Warehouse").
Preload("Stocks.ProductWarehouse.Warehouse.Area"). Preload("Stocks.ProductWarehouse.Warehouse.Area").
Preload("Stocks.ProductWarehouse.Warehouse.Location"). Preload("Stocks.ProductWarehouse.Warehouse.Location").
Preload("Eggs"). Preload("Eggs").
Preload("Eggs.ProductWarehouse"). Preload("Eggs.ProductWarehouse").
Preload("Eggs.ProductWarehouse.Product"). Preload("Eggs.ProductWarehouse.Product").
Preload("Eggs.ProductWarehouse.Product.Uom").
Preload("Eggs.ProductWarehouse.Warehouse"). Preload("Eggs.ProductWarehouse.Warehouse").
Preload("Eggs.ProductWarehouse.Warehouse.Area"). Preload("Eggs.ProductWarehouse.Warehouse.Area").
Preload("Eggs.ProductWarehouse.Warehouse.Location") Preload("Eggs.ProductWarehouse.Warehouse.Location")