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-04-14 16:51:27 +03:00
parent aec450c3cd
commit d8b6b7166c
1 changed files with 2 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
svc/routes/orderproductionitems.go
View File

@@ -191,22 +191,11 @@ func OrderProductionValidateRoute(mssql *sql.DB) http.Handler {
log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d total_ms=%d", log.Printf("[OrderProductionValidateRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d total_ms=%d",
rid, id, len(payload.Lines), len(missing), time.Since(stepStart).Milliseconds(), time.Since(start).Milliseconds()) rid, id, len(payload.Lines), len(missing), time.Since(stepStart).Milliseconds(), time.Since(start).Milliseconds())
targetVariants, err := buildTargetVariants(mssql, id, payload.Lines)
if err != nil {
writeDBError(w, http.StatusInternalServerError, "validate_barcode_targets", id, "", len(payload.Lines), err)
return
}
barcodeValidations, err := queries.ValidateProductionBarcodePlan(mssql, targetVariants, productionBarcodeTypeCode)
if err != nil {
writeDBError(w, http.StatusInternalServerError, "validate_barcodes", id, "", len(payload.Lines), err)
return
}
resp := map[string]any{ resp := map[string]any{
"missingCount": len(missing), "missingCount": len(missing),
"missing": missing, "missing": missing,
"barcodeValidationCount": len(barcodeValidations), "barcodeValidationCount": 0,
"barcodeValidations": barcodeValidations, "barcodeValidations": []models.OrderProductionBarcodeValidation{},
} }
if err := json.NewEncoder(w).Encode(resp); err != nil { if err := json.NewEncoder(w).Encode(resp); err != nil {
log.Printf("❌ encode error: %v", err) log.Printf("❌ encode error: %v", err)
@@ -253,12 +242,6 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d", log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s lineCount=%d missingCount=%d build_missing_ms=%d",
rid, id, len(payload.Lines), len(missing), time.Since(stepMissingStart).Milliseconds()) rid, id, len(payload.Lines), len(missing), time.Since(stepMissingStart).Milliseconds())
targetVariants, err := buildTargetVariants(mssql, id, payload.Lines)
if err != nil {
writeDBError(w, http.StatusInternalServerError, "apply_barcode_targets", id, "", len(payload.Lines), err)
return
}
if len(missing) > 0 && !payload.InsertMissing { if len(missing) > 0 && !payload.InsertMissing {
log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s early_exit=missing_variants total_ms=%d", log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s early_exit=missing_variants total_ms=%d",
rid, id, time.Since(start).Milliseconds()) rid, id, time.Since(start).Milliseconds())
@@ -309,24 +292,6 @@ func OrderProductionApplyRoute(mssql *sql.DB, ml *mailer.GraphMailer) http.Handl
rid, id, inserted, time.Since(stepInsertMissingStart).Milliseconds()) rid, id, inserted, time.Since(stepInsertMissingStart).Milliseconds())
} }
stepValidateBarcodeStart := time.Now()
barcodeValidations, err := queries.ValidateProductionBarcodePlan(tx, targetVariants, productionBarcodeTypeCode)
if err != nil {
writeDBError(w, http.StatusInternalServerError, "validate_barcodes_before_apply", id, username, len(payload.Lines), err)
return
}
if len(barcodeValidations) > 0 {
w.WriteHeader(http.StatusConflict)
_ = json.NewEncoder(w).Encode(map[string]any{
"message": "Barkod validasyonu basarisiz",
"barcodeValidationCount": len(barcodeValidations),
"barcodeValidations": barcodeValidations,
})
return
}
log.Printf("[OrderProductionApplyRoute] rid=%s orderHeaderID=%s step=validate_barcodes count=%d duration_ms=%d",
rid, id, len(barcodeValidations), time.Since(stepValidateBarcodeStart).Milliseconds())
stepValidateAttrStart := time.Now() stepValidateAttrStart := time.Now()
if err := validateProductAttributes(payload.ProductAttributes); err != nil { if err := validateProductAttributes(payload.ProductAttributes); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)