mirror of
https://github.com/serty2005/rmser.git
synced 2026-02-05 03:12:34 -06:00
пофиксил неправильный пересчет фасовок в накладной
This commit is contained in:
@@ -253,49 +253,28 @@ type DraftListItemDTO struct {
|
||||
TotalSum float64 `json:"total_sum"`
|
||||
StoreName string `json:"store_name"`
|
||||
CreatedAt string `json:"created_at"`
|
||||
IsAppCreated bool `json:"is_app_created"`
|
||||
}
|
||||
|
||||
func (h *DraftsHandler) GetDrafts(c *gin.Context) {
|
||||
userID := c.MustGet("userID").(uuid.UUID)
|
||||
list, err := h.service.GetActiveDrafts(userID)
|
||||
|
||||
// Читаем параметры периода из Query (default: 30 days)
|
||||
fromStr := c.DefaultQuery("from", time.Now().AddDate(0, 0, -30).Format("2006-01-02"))
|
||||
toStr := c.DefaultQuery("to", time.Now().Format("2006-01-02"))
|
||||
|
||||
from, _ := time.Parse("2006-01-02", fromStr)
|
||||
to, _ := time.Parse("2006-01-02", toStr)
|
||||
// Устанавливаем конец дня для 'to'
|
||||
to = to.Add(23*time.Hour + 59*time.Minute + 59*time.Second)
|
||||
|
||||
list, err := h.service.GetUnifiedList(userID, from, to)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
response := make([]DraftListItemDTO, 0, len(list))
|
||||
for _, d := range list {
|
||||
var totalSum decimal.Decimal
|
||||
for _, item := range d.Items {
|
||||
if !item.Sum.IsZero() {
|
||||
totalSum = totalSum.Add(item.Sum)
|
||||
} else {
|
||||
totalSum = totalSum.Add(item.Quantity.Mul(item.Price))
|
||||
}
|
||||
}
|
||||
sumFloat, _ := totalSum.Float64()
|
||||
|
||||
dateStr := ""
|
||||
if d.DateIncoming != nil {
|
||||
dateStr = d.DateIncoming.Format("2006-01-02")
|
||||
}
|
||||
storeName := ""
|
||||
if d.Store != nil {
|
||||
storeName = d.Store.Name
|
||||
}
|
||||
|
||||
response = append(response, DraftListItemDTO{
|
||||
ID: d.ID.String(),
|
||||
DocumentNumber: d.DocumentNumber,
|
||||
DateIncoming: dateStr,
|
||||
Status: d.Status,
|
||||
ItemsCount: len(d.Items),
|
||||
TotalSum: sumFloat,
|
||||
StoreName: storeName,
|
||||
CreatedAt: d.CreatedAt.Format(time.RFC3339),
|
||||
})
|
||||
}
|
||||
c.JSON(http.StatusOK, response)
|
||||
c.JSON(http.StatusOK, list)
|
||||
}
|
||||
|
||||
func (h *DraftsHandler) DeleteDraft(c *gin.Context) {
|
||||
|
||||
Reference in New Issue
Block a user