midsuit
/
wms-be
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add GetLinesByReceiptId method to InventoryReceiptController and service for retrieving receipt lines

This commit is contained in:
Habib Fatkhul Rohman 2025-11-28 11:27:33 +07:00
parent f6a7b5911a
commit dd7ea563a6
4 changed files with 120 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/inventory_receipt/controller/inventory_receipt_controller.go
View File

@ -19,6 +19,7 @@ type InventoryReceiptController interface {
Delete(ctx *gin.Context)
GetById(ctx *gin.Context)
GetAll(ctx *gin.Context)
GetLinesByReceiptId(ctx *gin.Context)
CreateLine(ctx *gin.Context)
UpdateLine(ctx *gin.Context)
DeleteLine(ctx *gin.Context)
@ -30,6 +31,19 @@ type inventoryReceiptController struct {
db *gorm.DB
}
// GetLines implements InventoryReceiptController.
func (c *inventoryReceiptController) GetLinesByReceiptId(ctx *gin.Context) {
id := ctx.Param("id")
lines, err := c.receiptService.GetLinesByReceiptId(ctx, id)
if err != nil {
res := utils.BuildResponseFailed(dto.MESSAGE_FAILED_GET_INVENTORY_RECEIPT_LINES, err.Error(), nil)
ctx.JSON(http.StatusInternalServerError, res)
return
}
res := utils.BuildResponseSuccess(dto.MESSAGE_SUCCESS_GET_INVENTORY_RECEIPT_LINES, lines)
ctx.JSON(http.StatusOK, res)
}
// OnComplete implements InventoryReceiptController.
func (c *inventoryReceiptController) OnComplete(ctx *gin.Context) {
id := ctx.Param("id")

40
modules/inventory_receipt/dto/inventory_receipt_dto.go
View File

@ -1,6 +1,10 @@
package dto
import pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
import (
"github.com/Caknoooo/go-gin-clean-starter/database/entities"
pkgdto "github.com/Caknoooo/go-gin-clean-starter/pkg/dto"
"github.com/google/uuid"
)
const (
MESSAGE_FAILED_CREATE_INVENTORY_RECEIPT = "failed create inventory receipt"
@ -20,6 +24,8 @@ const (
MESSAGE_FAILED_GET_DATA_FROM_BODY = "failed get data from body"
MESSAGE_SUCCESS_COMPLETE_INVENTORY_RECEIPT = "success complete inventory receipt"
MESSAGE_FAILED_COMPLETE_INVENTORY_RECEIPT = "failed complete inventory receipt"
MESSAGE_FAILED_GET_INVENTORY_RECEIPT_LINES = "failed get inventory receipt lines"
MESSAGE_SUCCESS_GET_INVENTORY_RECEIPT_LINES = "success get inventory receipt lines"
)
type InventoryReceiptCreateRequest struct {
@ -60,9 +66,9 @@ type InventoryReceiptResponse struct {
QrCodeFile string `json:"qr_code_file"`
Status string `json:"status"`
Client pkgdto.IdNameResponse `json:"client"`
ReceiptLines []InventoryReceiptLineResponse `json:"receipt_lines"`
LineCount int `json:"line_count"`
Assignment AssignmentResponse `json:"assignment,omitempty"`
// ReceiptLines []InventoryReceiptLineResponse `json:"receipt_lines"`
// LineCount int `json:"line_count"`
Assignment *AssignmentResponse `json:"assignment"`
}
type AssignmentResponse struct {
@ -109,3 +115,29 @@ type InventoryReceiptLineUpdateRequest struct {
RepackUomID *string `json:"repack_uom_id"`
ProductID *string `json:"product_id"`
}
func ToInventoryReceiptLineResponse(line entities.TInventoryReceiptLineEntity) InventoryReceiptLineResponse {
var repackUomID *string
if line.RepackUomID != nil {
tmp := line.RepackUomID.String()
repackUomID = &tmp
}
product := InventoryReceiptLineProductResponse{}
if line.Product.ID != uuid.Nil {
product = InventoryReceiptLineProductResponse{
ID: line.Product.ID.String(),
Name: line.Product.Name,
}
}
return InventoryReceiptLineResponse{
ID: line.ID.String(),
Quantity: line.Quantity,
BatchNumber: line.BatchNumber,
RepackingSuggestion: line.RepackingSuggestion,
RepackUomID: repackUomID,
Product: product,
ClientID: line.ClientID.String(),
}
}

1
modules/inventory_receipt/routes.go
View File

@ -20,6 +20,7 @@ func RegisterRoutes(server *gin.Engine, injector *do.Injector) {
receiptRoutes.PUT(":id", middlewares.Authenticate(jwtService), receiptController.Update)
receiptRoutes.DELETE(":id", middlewares.Authenticate(jwtService), receiptController.Delete)
receiptRoutes.GET("", middlewares.Authenticate(jwtService), receiptController.GetAll)
receiptRoutes.GET(":id/lines", middlewares.Authenticate(jwtService), receiptController.GetLinesByReceiptId)
receiptRoutes.POST(":id/lines", middlewares.Authenticate(jwtService), receiptController.CreateLine)
receiptRoutes.PUT("lines/:id", middlewares.Authenticate(jwtService), receiptController.UpdateLine)
receiptRoutes.DELETE("lines/:id", middlewares.Authenticate(jwtService), receiptController.DeleteLine)

102
modules/inventory_receipt/service/inventory_receipt_service.go
View File

@ -24,6 +24,7 @@ type InventoryReceiptService interface {
GetAll(ctx context.Context, filter query.InventoryReceiptFilter) ([]dtodomain.InventoryReceiptResponse, int64, error)
Update(ctx context.Context, req dtodomain.InventoryReceiptUpdateRequest, id string) (dtodomain.InventoryReceiptResponse, error)
Delete(ctx context.Context, id string) error
GetLinesByReceiptId(ctx context.Context, id string) ([]dtodomain.InventoryReceiptLineResponse, error)
CreateLine(ctx context.Context, receiptId string, req dtodomain.InventoryReceiptLineCreateRequest) (dtodomain.InventoryReceiptLineResponse, error)
UpdateLine(ctx context.Context, lineId string, req dtodomain.InventoryReceiptLineUpdateRequest) (dtodomain.InventoryReceiptLineResponse, error)
DeleteLine(ctx context.Context, lineId string) error
@ -39,6 +40,18 @@ type inventoryReceiptService struct {
invStorageRepository invstoragerepository.InventoryStorageRepository
}
func (s *inventoryReceiptService) GetLinesByReceiptId(ctx context.Context, id string) ([]dtodomain.InventoryReceiptLineResponse, error) {
lines, err := s.receiptLineRepo.GetAllByReceiptId(ctx, id)
if err != nil {
return nil, err
}
var responses []dtodomain.InventoryReceiptLineResponse
for _, line := range lines {
responses = append(responses, dtodomain.ToInventoryReceiptLineResponse(line))
}
return responses, nil
}
func (s *inventoryReceiptService) OnComplete(ctx context.Context, id string) (dtodomain.InventoryReceiptResponse, error) {
tx := s.db.Begin()
defer func() {
@ -186,6 +199,7 @@ func toAssignmentResponse(e entities.TAssignmentEntity) dtodomain.AssignmentResp
}
users = append(users, userResp)
}
return dtodomain.AssignmentResponse{
ID: e.ID.String(),
DocumentType: e.DocumentType,
@ -204,50 +218,52 @@ func toInventoryReceiptResponse(e entities.TInventoryReceiptEntity) dtodomain.In
}
}
lines := make([]dtodomain.InventoryReceiptLineResponse, 0)
for _, line := range e.ReceiptLines {
product := dtodomain.InventoryReceiptLineProductResponse{}
if line.Product.ID != uuid.Nil {
product = dtodomain.InventoryReceiptLineProductResponse{
ID: line.Product.ID.String(),
Name: line.Product.Name,
RefNumber: line.Product.RefNumber,
Uom: pkgdto.IdNameResponse{
ID: line.Product.Uom.ID.String(),
Name: line.Product.Uom.Name,
},
DimLength: line.Product.DimLength,
DimWidth: line.Product.DimWidth,
DimHeight: line.Product.DimHeight,
DimUom: pkgdto.IdNameResponse{
ID: line.Product.DimUom.ID.String(),
Name: line.Product.DimUom.Name,
},
}
}
// lines := make([]dtodomain.InventoryReceiptLineResponse, 0)
// for _, line := range e.ReceiptLines {
// product := dtodomain.InventoryReceiptLineProductResponse{}
// if line.Product.ID != uuid.Nil {
// product = dtodomain.InventoryReceiptLineProductResponse{
// ID: line.Product.ID.String(),
// Name: line.Product.Name,
// RefNumber: line.Product.RefNumber,
// Uom: pkgdto.IdNameResponse{
// ID: line.Product.Uom.ID.String(),
// Name: line.Product.Uom.Name,
// },
// DimLength: line.Product.DimLength,
// DimWidth: line.Product.DimWidth,
// DimHeight: line.Product.DimHeight,
// DimUom: pkgdto.IdNameResponse{
// ID: line.Product.DimUom.ID.String(),
// Name: line.Product.DimUom.Name,
// },
// }
// }
var repackUomID *string
if line.RepackUomID != nil {
tmp := line.RepackUomID.String()
repackUomID = &tmp
} else {
repackUomID = nil
}
// var repackUomID *string
// if line.RepackUomID != nil {
// tmp := line.RepackUomID.String()
// repackUomID = &tmp
// } else {
// repackUomID = nil
// }
lines = append(lines, dtodomain.InventoryReceiptLineResponse{
ID: line.ID.String(),
Quantity: line.Quantity,
BatchNumber: line.BatchNumber,
RepackingSuggestion: line.RepackingSuggestion,
RepackUomID: repackUomID,
Product: product,
ClientID: line.ClientID.String(),
})
}
assignment := dtodomain.AssignmentResponse{}
// lines = append(lines, dtodomain.InventoryReceiptLineResponse{
// ID: line.ID.String(),
// Quantity: line.Quantity,
// BatchNumber: line.BatchNumber,
// RepackingSuggestion: line.RepackingSuggestion,
// RepackUomID: repackUomID,
// Product: product,
// ClientID: line.ClientID.String(),
// })
// }
var assignment *dtodomain.AssignmentResponse
if e.Assignment.ID != uuid.Nil {
assignment = toAssignmentResponse(e.Assignment)
assignmentObj := toAssignmentResponse(e.Assignment)
assignment = &assignmentObj
} else {
assignment = nil
}
return dtodomain.InventoryReceiptResponse{
@ -260,8 +276,8 @@ func toInventoryReceiptResponse(e entities.TInventoryReceiptEntity) dtodomain.In
QrCodeFile: e.QrCodeFile,
// ClientID: e.ClientID.String(),
Client: client,
LineCount: len(lines),
ReceiptLines: lines,
// LineCount: len(lines),
// ReceiptLines: lines,
Assignment: assignment,
}
}