Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -239,6 +239,13 @@ func s64(v sql.NullString) string {
|
|||||||
return v.String
|
return v.String
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func sOrEmpty(v sql.NullString) string {
|
||||||
|
if !v.Valid {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
return strings.TrimSpace(v.String)
|
||||||
|
}
|
||||||
|
|
||||||
func normalizeBedenLabelGo(v string) string {
|
func normalizeBedenLabelGo(v string) string {
|
||||||
// 1️⃣ NULL / boş / whitespace → " " (aksbir null kolonu)
|
// 1️⃣ NULL / boş / whitespace → " " (aksbir null kolonu)
|
||||||
s := strings.TrimSpace(v)
|
s := strings.TrimSpace(v)
|
||||||
@@ -389,24 +396,36 @@ func getOrderHeaderFromDB(db *sql.DB, orderID string) (*OrderHeader, error) {
|
|||||||
|
|
||||||
var h OrderHeader
|
var h OrderHeader
|
||||||
var orderDate sql.NullTime
|
var orderDate sql.NullTime
|
||||||
|
var orderNumber, currAccCode, currAccName, docCurrency sql.NullString
|
||||||
|
var description, internalDesc, officeCode, createdUser, customerRep sql.NullString
|
||||||
|
|
||||||
err := row.Scan(
|
err := row.Scan(
|
||||||
&h.OrderHeaderID,
|
&h.OrderHeaderID,
|
||||||
&h.OrderNumber,
|
&orderNumber,
|
||||||
&h.CurrAccCode,
|
&currAccCode,
|
||||||
&h.CurrAccName,
|
&currAccName,
|
||||||
&h.DocCurrency,
|
&docCurrency,
|
||||||
&orderDate,
|
&orderDate,
|
||||||
&h.Description,
|
&description,
|
||||||
&h.InternalDesc,
|
&internalDesc,
|
||||||
&h.OfficeCode,
|
&officeCode,
|
||||||
&h.CreatedUser,
|
&createdUser,
|
||||||
&h.CustomerRep, // 🆕 buradan geliyor
|
&customerRep, // 🆕 buradan geliyor
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
h.OrderNumber = sOrEmpty(orderNumber)
|
||||||
|
h.CurrAccCode = sOrEmpty(currAccCode)
|
||||||
|
h.CurrAccName = sOrEmpty(currAccName)
|
||||||
|
h.DocCurrency = sOrEmpty(docCurrency)
|
||||||
|
h.Description = sOrEmpty(description)
|
||||||
|
h.InternalDesc = sOrEmpty(internalDesc)
|
||||||
|
h.OfficeCode = sOrEmpty(officeCode)
|
||||||
|
h.CreatedUser = sOrEmpty(createdUser)
|
||||||
|
h.CustomerRep = sOrEmpty(customerRep)
|
||||||
|
|
||||||
if orderDate.Valid {
|
if orderDate.Valid {
|
||||||
h.OrderDate = orderDate.Time
|
h.OrderDate = orderDate.Time
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user