Versuch zur Beseitigung möglicher SQL Deadlock Quellen durch C# Code (kein Erfolg, also weiterhin kleine Änderungen!)
This commit is contained in:
ja
@@ -3,6 +3,8 @@
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
Imports System.Data
|
||||
Imports System.Data.SqlClient
|
||||
<head>
|
||||
<!-- Bootstrap -->
|
||||
<html lang="en">
|
||||
@@ -247,7 +249,7 @@
|
||||
}
|
||||
|
||||
tbody{
|
||||
font-size:18px;
|
||||
font-size:19.2px;
|
||||
height: auto;
|
||||
width: fit-content;
|
||||
overflow-y:auto;
|
||||
@@ -265,17 +267,16 @@
|
||||
background-color:#fff;
|
||||
}
|
||||
}
|
||||
|
||||
@media (min-width: 768px){
|
||||
#sidebar {
|
||||
margin-left: /*-250px*/-15.625rem;
|
||||
padding-top:0.5em;
|
||||
padding-top:0.6254886630179828vh;
|
||||
/* font-size:18px;*/
|
||||
font-size:1.563em;
|
||||
/*font-size:18px;*/
|
||||
font-size:1.2em;
|
||||
}
|
||||
#content{
|
||||
font-size: 17px;
|
||||
font-size: 1.2em;
|
||||
max-width:50%;
|
||||
min-width:50%;
|
||||
margin-left:0.25rem;
|
||||
@@ -325,8 +326,7 @@
|
||||
width: 2.604166666666667vw;
|
||||
height: 0.875em;
|
||||
height: 1.09375vh;
|
||||
}
|
||||
|
||||
}
|
||||
#pagecontent{
|
||||
font-size: 1.12em;
|
||||
/* font-size: 2.3333333333333335vw;*/
|
||||
@@ -340,8 +340,7 @@
|
||||
border-color: #043381;
|
||||
}
|
||||
table {
|
||||
font-size: 16px;
|
||||
font-size:1.150066666666665vw;
|
||||
font-size: 1.12em;
|
||||
}
|
||||
alert alert-success align-items-center{
|
||||
width: 7.813em;
|
||||
@@ -387,16 +386,15 @@
|
||||
</div>
|
||||
</a>-->
|
||||
|
||||
<div id="bodycontent" style="width:65%;" class="container-lg">
|
||||
<div id="bodycontent" style="width:68%;" class="container-lg">
|
||||
<!-- <div id="content"> -->
|
||||
<!-- <div id="nav-main">
|
||||
<div id="art-logo"></div>
|
||||
</div>
|
||||
<div id="main-menu">
|
||||
</div> -->
|
||||
<div class="container-align-center"> <!-- </div> -->
|
||||
<div id="main-page">
|
||||
|
||||
<div class="container" style:"align-items:center"> <!-- </div> -->
|
||||
<div id="main-page" style="margin-left:15px;margin-right:15px;justify-self:center">
|
||||
<%
|
||||
' Dim lan As String = Request.QueryString("lan")
|
||||
'If lan = "" Then lan = "de"
|
||||
@@ -443,26 +441,23 @@
|
||||
%>
|
||||
|
||||
<!-- Page Content -->
|
||||
<div class="container">
|
||||
<div class="container" style="margin-left:25px;margin-right:20px;justify-self:center">
|
||||
<div class="align-content-center" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw;">
|
||||
<div class="content">
|
||||
<div class="d-none d-md-block">
|
||||
<nav class="navbar navbar-expand-md navbar-light bg-light" style="background-color:#fff;">
|
||||
<div class="container">
|
||||
<a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
|
||||
|
||||
<a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Logo Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
|
||||
<%
|
||||
Dim curentMenuId As String = "1"
|
||||
If Not Request.QueryString("menuID") Is Nothing Then
|
||||
curentMenuId = Request.QueryString("menuID")
|
||||
End If
|
||||
%>
|
||||
|
||||
<div style="width:72%;display:flex;"></div>
|
||||
|
||||
%>
|
||||
<div style="width:72%;display:flex;"></div>
|
||||
<div class="me-auto">
|
||||
<div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;">
|
||||
<button class="dropbtn"> <center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:3.0145vw; justify-items:center;" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
|
||||
<button class="dropbtn"> <center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:3.0145vw; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
|
||||
<div class="dropdown-content">
|
||||
<% Dim stringDE = "  DE"
|
||||
Dim stringEN = "  EN"
|
||||
@@ -490,7 +485,6 @@
|
||||
<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff;color:#043381;"><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button>
|
||||
</nav>
|
||||
</div>
|
||||
|
||||
<div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
|
||||
<div class="offcanvas-header">
|
||||
<h5 class="offcanvas-title" id="offcanvasWithBothOptionsLabel">Sprachauswahl:</h5>
|
||||
@@ -563,6 +557,7 @@
|
||||
|
||||
<% '?key=hello%20world
|
||||
Try
|
||||
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW
|
||||
'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124)
|
||||
Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
|
||||
@@ -712,61 +707,61 @@
|
||||
|
||||
<div id="conovertab">
|
||||
<div class="container-flex" style="flex-flow:nowrap">
|
||||
<table class="tableStatus table-striped" id="tablemain" border="8" cellspacing="0" contenteditable="false">
|
||||
<table class="tableStatus table-striped" id="tablemain" border="1" cellspacing="0" contenteditable="false">
|
||||
<thead><tr><th ><%= LT.getTxt(20, lan, "Nr.") %></th><th ><%= LT.getTxt(21, lan, "Spedition/PosNr") %></th><th><%= LT.getTxt(22, lan, "Sendungsdaten") %></th><th><%= LT.getTxt(23, lan, "Absender") %></th><th><%= LT.getTxt(24, lan, "Empfänger") %></th><th> Status </th><th>Infos</th></tr> </thead>
|
||||
<%
|
||||
For Each s In SENDUNG_LIST
|
||||
Dim sndDat As String = "" '"<b>" & s.tblSnd_Abfertigungsart_ID & "</b>"
|
||||
sndDat &= "<div style=""text-align:right"">"
|
||||
If IsNumeric(s.tblSnd_Colli) Then sndDat &= "<b>" & s.tblSnd_Colli & "</b> Pk<br/>"
|
||||
If IsNumeric(s.tblSnd_Gewicht) Then sndDat &= "<b>" & s.tblSnd_Gewicht & "</b> kg"
|
||||
sndDat &= "</div>"
|
||||
'If s.tblSnd_Fremdspedition Then Return If(s.tblSnd_FremdspeditionText <> "", s.tblSnd_FremdspeditionText, "FREMD")
|
||||
'If s.tblSnd_Abfertigungsart_ID > 0 Then
|
||||
' Dim abfART = SQL.getValueTxtBySql("select isnull(Abfertigungsbezeichnung,'-') from Abfertigungsarten where Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
|
||||
'End If
|
||||
Dim trBg = ""
|
||||
Dim txtCluster = ""
|
||||
For Each s In SENDUNG_LIST
|
||||
Dim sndDat As String = "" '"<b>" & s.tblSnd_Abfertigungsart_ID & "</b>"
|
||||
sndDat &= "<div style=""text-align:right"">"
|
||||
If IsNumeric(s.tblSnd_Colli) Then sndDat &= "<b>" & s.tblSnd_Colli & "</b> Pk<br/>"
|
||||
If IsNumeric(s.tblSnd_Gewicht) Then sndDat &= "<b>" & s.tblSnd_Gewicht & "</b> kg"
|
||||
sndDat &= "</div>"
|
||||
'If s.tblSnd_Fremdspedition Then Return If(s.tblSnd_FremdspeditionText <> "", s.tblSnd_FremdspeditionText, "FREMD")
|
||||
'If s.tblSnd_Abfertigungsart_ID > 0 Then
|
||||
' Dim abfART = SQL.getValueTxtBySql("select isnull(Abfertigungsbezeichnung,'-') from Abfertigungsarten where Abfertigungsart='" & s.tblSnd_Abfertigungsart_ID & "'", "FMZOLL")
|
||||
'End If
|
||||
Dim trBg = ""
|
||||
Dim txtCluster = ""
|
||||
|
||||
If s.tblSnd_Fremdspedition Then
|
||||
txtCluster = "<i>" & s.tblSnd_FremdspeditionText & "</i>"
|
||||
trBg = " class=""fremdspedition"""
|
||||
Else
|
||||
If s.FilialenNr > 0 Then txtCluster = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(s.FilialenNr, False)
|
||||
If txtCluster <> "" Then
|
||||
txtCluster = "<b>" & txtCluster & "</b><br/>"
|
||||
txtCluster &= "<span>" & If(s.FilialenNr > 0, s.FilialenNr, "") & "/" & If(s.AbfertigungsNr > 0, s.AbfertigungsNr, "") & "</span>"
|
||||
End If
|
||||
End If
|
||||
If s.tblSnd_Fremdspedition Then
|
||||
txtCluster = "<i>" & s.tblSnd_FremdspeditionText & "</i>"
|
||||
trBg = " class=""fremdspedition"""
|
||||
Else
|
||||
If s.FilialenNr > 0 Then txtCluster = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(s.FilialenNr, False)
|
||||
If txtCluster <> "" Then
|
||||
txtCluster = "<b>" & txtCluster & "</b><br/>"
|
||||
txtCluster &= "<span>" & If(s.FilialenNr > 0, s.FilialenNr, "") & "/" & If(s.AbfertigungsNr > 0, s.AbfertigungsNr, "") & "</span>"
|
||||
End If
|
||||
End If
|
||||
|
||||
Dim statOK = "•••" '"···"
|
||||
Dim statOK_style = " class=""statusNONE"" "
|
||||
If AVISO.Status = 1 Or (s.tblSnd_Vorgeschrieben IsNot Nothing) Then 'IsNot Nothing And s.tblSnd_Vorbereitet IsNot Nothing) Then
|
||||
statOK = "OK" : statOK_style = " class=""statusOK"" "
|
||||
ElseIf s.tblSnd_Vorbereitet Is Nothing Then
|
||||
statOK_style = " class=""statusPROBLEM"" "
|
||||
statOK = "PROBLEM"
|
||||
End If
|
||||
If s.tblSnd_Fremdspedition Then
|
||||
statOK_style = " class=""statusUNDEF"" "
|
||||
statOK = "-"
|
||||
End If
|
||||
Dim statOK = "•••" '"···"
|
||||
Dim statOK_style = " class=""statusNONE"" "
|
||||
If AVISO.Status = 1 Or (s.tblSnd_Vorgeschrieben IsNot Nothing) Then 'IsNot Nothing And s.tblSnd_Vorbereitet IsNot Nothing) Then
|
||||
statOK = "OK" : statOK_style = " class=""statusOK"" "
|
||||
ElseIf s.tblSnd_Vorbereitet Is Nothing Then
|
||||
statOK_style = " class=""statusPROBLEM"" "
|
||||
statOK = "PROBLEM"
|
||||
End If
|
||||
If s.tblSnd_Fremdspedition Then
|
||||
statOK_style = " class=""statusUNDEF"" "
|
||||
statOK = "-"
|
||||
End If
|
||||
%>
|
||||
|
||||
<%
|
||||
Dim vermerkcount = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO").Rows
|
||||
Dim vermerkcount = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO").Rows
|
||||
|
||||
If vermerkcount.Count = 0 Then %>
|
||||
If vermerkcount.Count = 0 Then %>
|
||||
<tr <% Response.Write(trBg) %> style="color:#043381;" data-bs-toggle="tooltip" data-bs-placement="top" title="Keine zusätzlichen Infos zu Ihrem Auftrag vorhanden. Bitte wählen Sie einen anderen aus."> <td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td></td><!--</button>--></tr>
|
||||
<%
|
||||
Else
|
||||
%>
|
||||
<tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td></a><!--</button>--></tr>
|
||||
<% End If
|
||||
Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
|
||||
If VERMERKE IsNot Nothing Then
|
||||
<% End If
|
||||
Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
|
||||
If VERMERKE IsNot Nothing Then
|
||||
%>
|
||||
<tr id="demo<%=cnt %>" class="collapse"><td colspan="7"><table style="min-width:100%;border-spacing:0px;border-inline:hidden;">
|
||||
<tr id="demo<%=cnt %>" class="collapse"><td colspan="7"><table style="min-width:100%;border-spacing:0px;border-inline:hidden;border:none;margin-inline:0px 0px;margin:0px 0px 0px 0px">
|
||||
<%
|
||||
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
|
||||
For Each r In VERMERKE.Rows()%>
|
||||
@@ -777,7 +772,7 @@
|
||||
<i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i>
|
||||
</td>
|
||||
</tr> <% vermerkeUeberschrift = ""
|
||||
Next %>
|
||||
Next %>
|
||||
<%
|
||||
End If %>
|
||||
</table></td></tr>
|
||||
@@ -819,6 +814,7 @@
|
||||
</p>
|
||||
<%
|
||||
End If
|
||||
|
||||
Catch ex As Exception
|
||||
Response.Write(ex.Message & ex.StackTrace)
|
||||
End Try
|
||||
@@ -850,4 +846,4 @@
|
||||
<!-- jQuery Custom Scroller CDN -->
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.concat.min.js"></script>
|
||||
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
|
||||
</body>
|
||||
</body>
|
||||
Reference in New Issue
Block a user