fix: rename ReceiptDate to DocumentDate in inventory receipt entities and DTOs
This commit is contained in:
parent
9447a3fd88
commit
ca2795a493
|
|
@ -13,7 +13,7 @@ type TInventoryReceiptEntity struct {
|
||||||
ID uuid.UUID `gorm:"primaryKey;type:uuid;default:uuid_generate_v4()" json:"id"`
|
ID uuid.UUID `gorm:"primaryKey;type:uuid;default:uuid_generate_v4()" json:"id"`
|
||||||
ReferenceNumber string `gorm:"type:varchar(100);" json:"reference_number"`
|
ReferenceNumber string `gorm:"type:varchar(100);" json:"reference_number"`
|
||||||
DocumentNumber string `gorm:"type:varchar(100);" json:"document_number"`
|
DocumentNumber string `gorm:"type:varchar(100);" json:"document_number"`
|
||||||
ReceiptDate time.Time `gorm:"type:timestamp;" json:"receipt_date"`
|
DocumentDate time.Time `gorm:"type:timestamp;" json:"document_date"`
|
||||||
Source string `gorm:"type:varchar(50);" json:"source"`
|
Source string `gorm:"type:varchar(50);" json:"source"`
|
||||||
QrCodeFile string `gorm:"type:text;" json:"qr_code_file"`
|
QrCodeFile string `gorm:"type:text;" json:"qr_code_file"`
|
||||||
Status string `gorm:"type:varchar(50);default:'draft';" json:"status"`
|
Status string `gorm:"type:varchar(50);default:'draft';" json:"status"`
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ type TInventoryRequestEntity struct {
|
||||||
ID uuid.UUID `gorm:"primaryKey;type:uuid;default:uuid_generate_v4()" json:"id"`
|
ID uuid.UUID `gorm:"primaryKey;type:uuid;default:uuid_generate_v4()" json:"id"`
|
||||||
ReferenceNumber string `gorm:"type:varchar(100);" json:"reference_number"`
|
ReferenceNumber string `gorm:"type:varchar(100);" json:"reference_number"`
|
||||||
DocumentNumber string `gorm:"type:varchar(100);" json:"document_number"`
|
DocumentNumber string `gorm:"type:varchar(100);" json:"document_number"`
|
||||||
|
DocumentDate time.Time `gorm:"type:timestamp;" json:"document_date"`
|
||||||
DueDate time.Time `gorm:"type:timestamp;" json:"due_date"`
|
DueDate time.Time `gorm:"type:timestamp;" json:"due_date"`
|
||||||
RequestType string `gorm:"type:varchar(50);" json:"request_type"`
|
RequestType string `gorm:"type:varchar(50);" json:"request_type"`
|
||||||
Note string `gorm:"type:text;" json:"note"`
|
Note string `gorm:"type:text;" json:"note"`
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ const (
|
||||||
|
|
||||||
type InventoryReceiptCreateRequest struct {
|
type InventoryReceiptCreateRequest struct {
|
||||||
ReferenceNumber string `json:"reference_number"`
|
ReferenceNumber string `json:"reference_number"`
|
||||||
ReceiptDate string `json:"receipt_date"`
|
DocumentDate string `json:"document_date"`
|
||||||
Source string `json:"source"`
|
Source string `json:"source"`
|
||||||
QrCodeFile string `json:"qr_code_file"`
|
QrCodeFile string `json:"qr_code_file"`
|
||||||
ClientID string `json:"client_id" binding:"required"`
|
ClientID string `json:"client_id" binding:"required"`
|
||||||
|
|
@ -41,7 +41,7 @@ type InventoryReceiptLineCreateRequest struct {
|
||||||
|
|
||||||
type InventoryReceiptUpdateRequest struct {
|
type InventoryReceiptUpdateRequest struct {
|
||||||
ReferenceNumber string `json:"reference_number"`
|
ReferenceNumber string `json:"reference_number"`
|
||||||
ReceiptDate string `json:"receipt_date"`
|
DocumentDate string `json:"document_date"`
|
||||||
Source string `json:"source"`
|
Source string `json:"source"`
|
||||||
QrCodeFile string `json:"qr_code_file"`
|
QrCodeFile string `json:"qr_code_file"`
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
@ -51,7 +51,7 @@ type InventoryReceiptResponse struct {
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
ReferenceNumber string `json:"reference_number"`
|
ReferenceNumber string `json:"reference_number"`
|
||||||
DocumentNumber string `json:"document_number"`
|
DocumentNumber string `json:"document_number"`
|
||||||
ReceiptDate string `json:"receipt_date"`
|
DocumentDate string `json:"document_date"`
|
||||||
Source string `json:"source"`
|
Source string `json:"source"`
|
||||||
QrCodeFile string `json:"qr_code_file"`
|
QrCodeFile string `json:"qr_code_file"`
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
|
|
|
||||||
|
|
@ -187,7 +187,7 @@ func toInventoryReceiptResponse(e entities.TInventoryReceiptEntity) dtodomain.In
|
||||||
ReferenceNumber: e.ReferenceNumber,
|
ReferenceNumber: e.ReferenceNumber,
|
||||||
DocumentNumber: e.DocumentNumber,
|
DocumentNumber: e.DocumentNumber,
|
||||||
Status: e.Status,
|
Status: e.Status,
|
||||||
ReceiptDate: utils.DateTimeToString(e.ReceiptDate),
|
DocumentDate: utils.DateTimeToString(e.DocumentDate),
|
||||||
Source: e.Source,
|
Source: e.Source,
|
||||||
QrCodeFile: e.QrCodeFile,
|
QrCodeFile: e.QrCodeFile,
|
||||||
// ClientID: e.ClientID.String(),
|
// ClientID: e.ClientID.String(),
|
||||||
|
|
@ -218,7 +218,7 @@ func (s *inventoryReceiptService) Create(ctx context.Context, req dtodomain.Inve
|
||||||
receipt := entities.TInventoryReceiptEntity{
|
receipt := entities.TInventoryReceiptEntity{
|
||||||
ReferenceNumber: req.ReferenceNumber,
|
ReferenceNumber: req.ReferenceNumber,
|
||||||
DocumentNumber: docNum,
|
DocumentNumber: docNum,
|
||||||
ReceiptDate: utils.StringToDateTime(req.ReceiptDate),
|
DocumentDate: utils.StringToDateTime(req.DocumentDate),
|
||||||
Source: req.Source,
|
Source: req.Source,
|
||||||
QrCodeFile: req.QrCodeFile,
|
QrCodeFile: req.QrCodeFile,
|
||||||
ClientID: clientUUID,
|
ClientID: clientUUID,
|
||||||
|
|
@ -321,7 +321,7 @@ func (s *inventoryReceiptService) Update(ctx context.Context, req dtodomain.Inve
|
||||||
if req.ReferenceNumber != "" {
|
if req.ReferenceNumber != "" {
|
||||||
receipt.ReferenceNumber = req.ReferenceNumber
|
receipt.ReferenceNumber = req.ReferenceNumber
|
||||||
}
|
}
|
||||||
receipt.ReceiptDate = utils.StringToDateTime(req.ReceiptDate)
|
receipt.DocumentDate = utils.StringToDateTime(req.DocumentDate)
|
||||||
receipt.Source = req.Source
|
receipt.Source = req.Source
|
||||||
receipt.QrCodeFile = req.QrCodeFile
|
receipt.QrCodeFile = req.QrCodeFile
|
||||||
receipt.Status = req.Status
|
receipt.Status = req.Status
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue