mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-23 14:55:42 +00:00
FIX[BE]: fixing wrong index data on adjustment. change get from stocklogs to adjustment table
This commit is contained in:
@@ -100,38 +100,42 @@ func ToProductWarehouseDTO(e *entity.ProductWarehouse) *ProductWarehouseDTO {
|
||||
}
|
||||
}
|
||||
|
||||
func ToAdjustmentRelationDTO(e *entity.StockLog) AdjustmentRelationDTO {
|
||||
func ToAdjustmentRelationDTO(e *entity.AdjustmentStock) AdjustmentRelationDTO {
|
||||
return AdjustmentRelationDTO{
|
||||
Id: e.Id,
|
||||
Note: e.Notes,
|
||||
Increase: e.Increase,
|
||||
Decrease: e.Decrease,
|
||||
Note: e.StockLog.Notes,
|
||||
Increase: e.TotalQty,
|
||||
Decrease: e.UsageQty,
|
||||
ProductWarehouseId: e.ProductWarehouseId,
|
||||
ProductWarehouse: ToProductWarehouseDTO(e.ProductWarehouse),
|
||||
}
|
||||
}
|
||||
|
||||
func ToAdjustmentListDTO(e *entity.StockLog) AdjustmentListDTO {
|
||||
func ToAdjustmentListDTO(e *entity.AdjustmentStock) AdjustmentListDTO {
|
||||
var createdUser *userDTO.UserRelationDTO
|
||||
if e.CreatedUser != nil {
|
||||
if e.StockLog != nil && e.StockLog.CreatedUser != nil {
|
||||
createdUser = &userDTO.UserRelationDTO{
|
||||
Id: e.CreatedUser.Id,
|
||||
IdUser: e.CreatedUser.IdUser,
|
||||
Email: e.CreatedUser.Email,
|
||||
Name: e.CreatedUser.Name,
|
||||
Id: e.StockLog.CreatedUser.Id,
|
||||
IdUser: e.StockLog.CreatedUser.IdUser,
|
||||
Email: e.StockLog.CreatedUser.Email,
|
||||
Name: e.StockLog.CreatedUser.Name,
|
||||
}
|
||||
}
|
||||
|
||||
createdAt := time.Time{}
|
||||
if e.StockLog != nil {
|
||||
createdAt = e.StockLog.CreatedAt
|
||||
}
|
||||
|
||||
return AdjustmentListDTO{
|
||||
AdjustmentRelationDTO: ToAdjustmentRelationDTO(e),
|
||||
CreatedUser: createdUser,
|
||||
CreatedAt: e.CreatedAt,
|
||||
CreatedAt: createdAt,
|
||||
}
|
||||
}
|
||||
|
||||
func ToAdjustmentDetailDTO(e *entity.StockLog) AdjustmentDetailDTO {
|
||||
func ToAdjustmentDetailDTO(e *entity.AdjustmentStock) AdjustmentDetailDTO {
|
||||
return AdjustmentDetailDTO{
|
||||
AdjustmentListDTO: ToAdjustmentListDTO(e),
|
||||
// UpdatedAt: e.UpdatedAt,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user