M_Kececi/bssapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
M_Kececi
2026-05-21 10:55:20 +03:00
parent 9d69a79689
commit f930412413
18 changed files with 1041 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
svc/routes/production_product_costing_pdf.go
View File

@@ -7,6 +7,7 @@ import (
"fmt"
"net/http"
"sort"
"strconv"
"strings"
"time"
@@ -265,8 +266,9 @@ func (c *costingPDF) drawHeaderFull() {
firmaLabel = fmt.Sprintf("%s - %s", firmaLabel, strings.TrimSpace(c.header.UretimiYapanFirma))
}
line3 := fmt.Sprintf(
"Firma: %s | Kaydeden: %s | Son Guncelleme: %s (%s)",
"Firma: %s | 2.Firma: %s | Kaydeden: %s | Son Guncelleme: %s (%s)",
firmaLabel,
strings.TrimSpace(c.header.SonIsEmriVeren),
strings.TrimSpace(c.header.SKullaniciAdi),
formatDateTRDot(c.header.DteGuncellemeTarihi),
strings.TrimSpace(c.header.SGuncellemeKullaniciAdi),
@@ -509,7 +511,17 @@ func (c *costingPDF) drawGroup(g models.ProductionHasCostDetailGroup, firstGroup
wn := []float64{8, 20, 22, 32, 70, 14, 14, 10, 16, 16, 16, 16} // sum = 250
c.drawTableHeader(cols, wn)
for i, it := range g.Items {
// PDF-specific ordering: by hammadde turu no, then code.
items := append([]models.ProductionHasCostDetailGroupItem(nil), g.Items...)
sort.Slice(items, func(i, j int) bool {
ai, _ := strconv.Atoi(strings.TrimSpace(items[i].NHammaddeTuruNo))
aj, _ := strconv.Atoi(strings.TrimSpace(items[j].NHammaddeTuruNo))
if ai != aj {
return ai < aj
}
return strings.TrimSpace(items[i].SKodu) < strings.TrimSpace(items[j].SKodu)
})
for i, it := range items {
c.drawRowWithGroup(it, wn, cols, g, i)
}
pdf.Ln(2)