s.probst/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2024-12-25 14:10:28 +01:00
Code Issues Projects Releases Wiki Activity

bugfix seriennummern sql condition

Browse Source
This commit is contained in:
OpenXE 2024-11-21 18:19:48 +01:00
parent 879815f8b0
commit c3ccdce4d3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
www/pages/seriennummern.php
View File

@ -10,6 +10,8 @@ use Xentral\Modules\SystemNotification\Service\NotificationService;
class Seriennummern { class Seriennummern {
const SQL_CONDITION_ACTIVE = "(a.seriennummern <> 'keine' AND a.seriennummern <> '')";
function __construct($app, $intern = false) { function __construct($app, $intern = false) {
$this->app = $app; $this->app = $app;
if ($intern) if ($intern)
@ -229,7 +231,7 @@ class Seriennummern {
INNER JOIN lager_platz_inhalt lpi ON INNER JOIN lager_platz_inhalt lpi ON
a.id = lpi.artikel a.id = lpi.artikel
WHERE WHERE
a.seriennummern <> 'keine' AND a.seriennummern <> '' ".self::SQL_CONDITION_ACTIVE."
GROUP BY GROUP BY
a.id a.id
) auf_lager ON auf_lager.id = a.id ) auf_lager ON auf_lager.id = a.id
@ -237,7 +239,7 @@ class Seriennummern {
seriennummern s ON s.artikel = a.id seriennummern s ON s.artikel = a.id
"; ";
$where = "a.seriennummern <> 'keine' AND a.seriennummern <> ''"; $where = self::SQL_CONDITION_ACTIVE;
$groupby = "GROUP BY a.id"; $groupby = "GROUP BY a.id";
$count = "SELECT count(DISTINCT a.id) FROM artikel a WHERE ".$where; $count = "SELECT count(DISTINCT a.id) FROM artikel a WHERE ".$where;
@ -314,7 +316,7 @@ class Seriennummern {
ON sbp.beleg_position = lp.id ON sbp.beleg_position = lp.id
"; ";
$where = "(a.seriennummern <> 'keine')"; $where = self::SQL_CONDITION_ACTIVE;
// Toggle filters // Toggle filters
$app->Tpl->Add('JQUERYREADY', "$('#altelieferscheine').click( function() { fnFilterColumn1( 0 ); } );"); $app->Tpl->Add('JQUERYREADY', "$('#altelieferscheine').click( function() { fnFilterColumn1( 0 ); } );");
@ -417,7 +419,7 @@ class Seriennummern {
ON sbp.beleg_position = pd.id ON sbp.beleg_position = pd.id
"; ";
$where = "(a.seriennummern <> 'keine')"; $where = self::SQL_CONDITION_ACTIVE;
// Toggle filters // Toggle filters
$app->Tpl->Add('JQUERYREADY', "$('#geschlossenewareneingaenge').click( function() { fnFilterColumn1( 0 ); } );"); $app->Tpl->Add('JQUERYREADY', "$('#geschlossenewareneingaenge').click( function() { fnFilterColumn1( 0 ); } );");
@ -514,7 +516,7 @@ class Seriennummern {
adr.id = l.adresse adr.id = l.adresse
"; ";
$where = "(a.seriennummern <> 'keine') AND (l.id = '".$lieferschein_id."')"; $where = self::SQL_CONDITION_ACTIVE." AND (l.id = '".$lieferschein_id."')";
$count = "SELECT COUNT(DISTINCT lp.lieferschein) FROM $count = "SELECT COUNT(DISTINCT lp.lieferschein) FROM
lieferschein_position lp lieferschein_position lp
LEFT JOIN seriennummern_beleg_position slp LEFT JOIN seriennummern_beleg_position slp
@ -590,7 +592,7 @@ class Seriennummern {
adr.id = pa.adresse adr.id = pa.adresse
"; ";
$where = "(a.seriennummern <> 'keine') AND (pa.id = '".$wareneingang_id."')"; $where = self::SQL_CONDITION_ACTIVE." AND (pa.id = '".$wareneingang_id."')";
$count = "SELECT COUNT(DISTINCT pd.id) FROM $count = "SELECT COUNT(DISTINCT pd.id) FROM
paketdistribution pd paketdistribution pd
LEFT JOIN seriennummern_beleg_position spd LEFT JOIN seriennummern_beleg_position spd
@ -1253,7 +1255,7 @@ class Seriennummern {
INNER JOIN lager_platz_inhalt lpi ON INNER JOIN lager_platz_inhalt lpi ON
a.id = lpi.artikel a.id = lpi.artikel
WHERE WHERE
a.seriennummern <> 'keine' AND a.seriennummern <> '' AND (a.id = '".$artikel_id."' OR '".$artikel_id."' = '') ".self::SQL_CONDITION_ACTIVE." AND (a.id = '".$artikel_id."' OR '".$artikel_id."' = '')
GROUP BY GROUP BY
a.id a.id
) auf_lager ) auf_lager
@ -1318,7 +1320,7 @@ class Seriennummern {
spd.beleg_position spd.beleg_position
) spd ON spd.beleg_position = pd.id ) spd ON spd.beleg_position = pd.id
WHERE WHERE
(a.seriennummern <> 'keine') ".self::SQL_CONDITION_ACTIVE."
AND pa.status <> 'abgeschlossen' AND pa.status <> 'abgeschlossen'
AND (pa.id = '".$wareneingang_id."' OR '".$wareneingang_id."' = '') AND (pa.id = '".$wareneingang_id."' OR '".$wareneingang_id."' = '')
GROUP BY GROUP BY
@ -1375,7 +1377,7 @@ class Seriennummern {
slp.beleg_position slp.beleg_position
) slp ON slp.beleg_position = lp.id ) slp ON slp.beleg_position = lp.id
WHERE WHERE
(a.seriennummern <> 'keine') ".self::SQL_CONDITION_ACTIVE."
AND ( AND (
l.datum >=( l.datum >=(
SELECT SELECT