mirror of
https://gitlab.com/mbugroup/lti-api.git
synced 2026-05-24 07:15:43 +00:00
dev: initiate adjustment recording and trf to laying
This commit is contained in:
@@ -14,10 +14,12 @@ import (
|
||||
// === DTO Structs ===
|
||||
|
||||
type TransferLayingRelationDTO struct {
|
||||
Id uint `json:"id"`
|
||||
TransferNumber string `json:"transfer_number"`
|
||||
TransferDate time.Time `json:"transfer_date"`
|
||||
Notes string `json:"notes"`
|
||||
Id uint `json:"id"`
|
||||
TransferNumber string `json:"transfer_number"`
|
||||
TransferDate time.Time `json:"transfer_date"`
|
||||
EffectiveMoveDate *time.Time `json:"effective_move_date,omitempty"`
|
||||
ExecutedAt *time.Time `json:"executed_at,omitempty"`
|
||||
Notes string `json:"notes"`
|
||||
}
|
||||
|
||||
type ProjectFlockKandangWithKandangDTO struct {
|
||||
@@ -47,6 +49,8 @@ type TransferLayingListDTO struct {
|
||||
ToProjectFlock *projectFlockDTO.ProjectFlockRelationDTO `json:"to_project_flock,omitempty"`
|
||||
CreatedBy uint `json:"created_by"`
|
||||
CreatedUser *userDTO.UserRelationDTO `json:"created_user,omitempty"`
|
||||
ExecutedBy *uint `json:"executed_by,omitempty"`
|
||||
ExecutedUser *userDTO.UserRelationDTO `json:"executed_user,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
Approval *approvalDTO.ApprovalRelationDTO `json:"approval,omitempty"`
|
||||
}
|
||||
@@ -88,10 +92,12 @@ type MaxTargetQtyForTransferDTO struct {
|
||||
|
||||
func ToTransferLayingRelationDTO(e entity.LayingTransfer) TransferLayingRelationDTO {
|
||||
return TransferLayingRelationDTO{
|
||||
Id: e.Id,
|
||||
TransferNumber: e.TransferNumber,
|
||||
TransferDate: e.TransferDate,
|
||||
Notes: e.Notes,
|
||||
Id: e.Id,
|
||||
TransferNumber: e.TransferNumber,
|
||||
TransferDate: e.TransferDate,
|
||||
EffectiveMoveDate: e.EffectiveMoveDate,
|
||||
ExecutedAt: e.ExecutedAt,
|
||||
Notes: e.Notes,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -190,6 +196,12 @@ func ToTransferLayingListDTO(e entity.LayingTransfer) TransferLayingListDTO {
|
||||
createdUser = &mapped
|
||||
}
|
||||
|
||||
var executedUser *userDTO.UserRelationDTO
|
||||
if e.ExecutedUser != nil && e.ExecutedUser.Id != 0 {
|
||||
mapped := userDTO.ToUserRelationDTO(*e.ExecutedUser)
|
||||
executedUser = &mapped
|
||||
}
|
||||
|
||||
var approval *approvalDTO.ApprovalRelationDTO
|
||||
if e.LatestApproval != nil {
|
||||
mapped := approvalDTO.ToApprovalDTO(*e.LatestApproval)
|
||||
@@ -219,6 +231,8 @@ func ToTransferLayingListDTO(e entity.LayingTransfer) TransferLayingListDTO {
|
||||
ToProjectFlock: toProjectFlock,
|
||||
CreatedBy: e.CreatedBy,
|
||||
CreatedUser: createdUser,
|
||||
ExecutedBy: e.ExecutedBy,
|
||||
ExecutedUser: executedUser,
|
||||
CreatedAt: e.CreatedAt,
|
||||
Approval: approval,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user