Update 20260130
This commit is contained in:
@@ -330,6 +330,7 @@ namespace API_NetFramework.Controllers
|
||||
onbasedoc.attributes.Add(na);
|
||||
}
|
||||
onbasedoc.dokumentDatei = dok.dokument;
|
||||
|
||||
|
||||
if (pdfdoc != "")
|
||||
{
|
||||
@@ -712,6 +713,7 @@ namespace API_NetFramework.Controllers
|
||||
onbasedoc.dokumentDatum = db.dsdaten.Tables[0].Rows[0]["DokumentDatum"].ToString();
|
||||
onbasedoc.dokumentTyp = db.dsdaten.Tables[0].Rows[0]["dokumenttyp"].ToString();
|
||||
onbasedoc.dateiTyp = db.dsdaten.Tables[0].Rows[0]["dateityp"].ToString();
|
||||
|
||||
|
||||
onbasedoc.attributes = new List<Model.OnBaseDocUpload.attribute>();
|
||||
foreach (System.Data.DataRow rw in db.dsdaten.Tables[1].Rows)
|
||||
@@ -811,6 +813,8 @@ namespace API_NetFramework.Controllers
|
||||
oba.Returnaddress = versandpaket.GASAdresse;
|
||||
oba.O2ODochandle = "";
|
||||
oba.Status = "";
|
||||
oba.ReferenceId = versandpaket.ReferenceID;
|
||||
|
||||
//if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
||||
foreach (Versanddokument vd in versandpaket.Dokument)
|
||||
{
|
||||
@@ -828,7 +832,7 @@ namespace API_NetFramework.Controllers
|
||||
oba.Returnaddress = versandpaket.GASAdresse;
|
||||
oba.O2ODochandle = "";
|
||||
oba.Status = "";
|
||||
|
||||
oba.ReferenceId = versandpaket.ReferenceID;
|
||||
|
||||
foreach (Versanddokument vd in versandpaket.Dokument)
|
||||
{
|
||||
@@ -908,6 +912,7 @@ namespace API_NetFramework.Controllers
|
||||
onbasedoc.dokumentDatum = DateTime.Now.ToString("dd.MM.yyyy");
|
||||
onbasedoc.dokumentDatei = versandpaket.finaldoc;
|
||||
onbasedoc.dateiTyp = "PDF";
|
||||
onbasedoc.ReferenceId = versandpaket.ReferenceID;
|
||||
onbasedoc.attributes = new List<OnBaseDocUpload.attribute>();
|
||||
if (oba.GASCouvert == "") { oba.GASCouvert = "false"; } else { oba.GASCouvert = "true"; }
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -120,19 +120,10 @@ ELSE
|
||||
FileName = $"{dto.Key}.pdf"
|
||||
};
|
||||
response.Content.Headers.ContentLength = pdfBytes.Length;
|
||||
if (System.IO.File.Exists(@"x:\file.pdf")) { System.IO.File.Delete(@"x:\file.pdf"); }
|
||||
System.IO.FileStream stream =
|
||||
|
||||
new FileStream(@"x:\file.pdf", FileMode.CreateNew);
|
||||
System.IO.BinaryWriter writer =
|
||||
new BinaryWriter(stream);
|
||||
writer.Write(pdfBytes, 0, pdfBytes.Length);
|
||||
writer.Close();
|
||||
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
private async Task<byte[]> CallExternalPdfApi(string json)
|
||||
{
|
||||
@@ -148,6 +139,7 @@ ELSE
|
||||
var data = Encoding.UTF8.GetBytes(jsonstring);
|
||||
string OwnHost = System.Configuration.ConfigurationManager.AppSettings["OwnHost"].ToString();
|
||||
string uri = OwnHost + "/API/CreateCLM";
|
||||
uri = OwnHost + "/API/DokumentGenerator";
|
||||
request = WebRequest.Create(uri);
|
||||
request.ContentLength = data.Length;
|
||||
request.ContentType = "application/json";
|
||||
|
||||
@@ -140,7 +140,7 @@ namespace API_NetFramework.Controllers
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("API/GetUnterschriftAsBase64New")]
|
||||
[Route("API/GetUnterschriftAsBase64IL")]
|
||||
public IHttpActionResult GetUnterschriftAsBase64IL(string TGNummer, int ImageWidth = 0, int ImageHeight = 0)
|
||||
{
|
||||
|
||||
@@ -156,11 +156,13 @@ namespace API_NetFramework.Controllers
|
||||
apireturn.field = "";
|
||||
try
|
||||
{
|
||||
return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||
//return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||
}
|
||||
catch
|
||||
{
|
||||
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
|
||||
//return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
|
||||
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||
}
|
||||
finally { apireturn = null; };
|
||||
}
|
||||
@@ -187,11 +189,13 @@ namespace API_NetFramework.Controllers
|
||||
|
||||
try
|
||||
{
|
||||
return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||
//return BadRequest(Newtonsoft.Json.JsonConvert.SerializeObject(apireturn));
|
||||
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Content(HttpStatusCode.InternalServerError, "Unterschfit für TGNumemr " + TGNummer + " nicht vorhanden");
|
||||
//return Content(HttpStatusCode.InternalServerError, "Unterschfit für TGNumemr " + TGNummer + " nicht vorhanden");
|
||||
return Content(HttpStatusCode.BadRequest, apireturn);
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -242,11 +246,12 @@ namespace API_NetFramework.Controllers
|
||||
apiok.file=Convert.ToBase64String(imageBytes);
|
||||
try
|
||||
{
|
||||
return Ok(Newtonsoft.Json.JsonConvert.SerializeObject(apiok));
|
||||
return Ok(apiok);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
return Content(HttpStatusCode.InternalServerError, e.Message);
|
||||
//return Content(HttpStatusCode.InternalServerError, e.Message);
|
||||
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user