gc-server3 2 өдөр өмнө
parent
commit
6427d252ea

+ 4 - 2
app/docuware_search.py

@@ -95,7 +95,7 @@ def search_files(
         json.dump(res, fwh, indent=2)
         json.dump(res, fwh, indent=2)
 
 
 
 
-def get_invoice_pdf_by_document_no(client_db: str, document_no: str) -> str:
+def get_invoice_pdf_by_document_no(client_db: str, document_no: str) -> bytes:
     search_condition = {}
     search_condition = {}
     search_condition["BELEGNUMMER"] = document_no
     search_condition["BELEGNUMMER"] = document_no
 
 
@@ -103,7 +103,9 @@ def get_invoice_pdf_by_document_no(client_db: str, document_no: str) -> str:
     dlg = fc.search_dialog()
     dlg = fc.search_dialog()
 
 
     for doc in dlg.search(search_condition):
     for doc in dlg.search(search_condition):
-        return os.getenv("DW_URL").strip("/") + doc.document.endpoints["content"]
+        # return os.getenv("DW_URL").strip("/") + doc.document.endpoints["content"]
+        data, content_type, filename = doc.download(keep_annotations=True)
+        return data
     raise ValueError(f"Document with document_no {document_no} not found in client_db {client_db}")
     raise ValueError(f"Document with document_no {document_no} not found in client_db {client_db}")
 
 
 
 

+ 3 - 2
app/routes.py

@@ -400,10 +400,11 @@ def get_files2(request: Request):
 def forderungen_files(request: Request, primary_key: str, db: Session = Depends(get_session)):
 def forderungen_files(request: Request, primary_key: str, db: Session = Depends(get_session)):
     pkey = convert_primary_key("forderungen", primary_key)
     pkey = convert_primary_key("forderungen", primary_key)
     try:
     try:
-        filename = get_invoice_pdf_by_document_no(client_db=pkey["Client_DB"], document_no=pkey["Beleg_Nr"])
+        filestream = get_invoice_pdf_by_document_no(client_db=pkey["Client_DB"], document_no=pkey["Beleg_Nr"])
         # filename = "http://localhost:8093/static/assets/pdf/invoice.pdf"
         # filename = "http://localhost:8093/static/assets/pdf/invoice.pdf"
+        # filestream = requests.get(filename, stream=True).raw,
         return StreamingResponse(
         return StreamingResponse(
-            requests.get(filename, stream=True).raw,
+            filestream,
             media_type="application/pdf",
             media_type="application/pdf",
         )
         )
     except ValueError as e:
     except ValueError as e: