mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-11-14 20:17:14 +01:00
seriennummern datum, eingelagert
This commit is contained in:
parent
2ebf0a91c6
commit
ad37693818
@ -91422,6 +91422,17 @@
|
|||||||
"Privileges": "select,insert,update,references",
|
"Privileges": "select,insert,update,references",
|
||||||
"Comment": ""
|
"Comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Field": "datum",
|
||||||
|
"Type": "date",
|
||||||
|
"Collation": null,
|
||||||
|
"Null": "NO",
|
||||||
|
"Key": "",
|
||||||
|
"Default": "current_timestamp()",
|
||||||
|
"Extra": "",
|
||||||
|
"Privileges": "select,insert,update,references",
|
||||||
|
"Comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Field": "adresse",
|
"Field": "adresse",
|
||||||
"Type": "int(11)",
|
"Type": "int(11)",
|
||||||
@ -91455,6 +91466,17 @@
|
|||||||
"Privileges": "select,insert,update,references",
|
"Privileges": "select,insert,update,references",
|
||||||
"Comment": ""
|
"Comment": ""
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Field": "eingelagert",
|
||||||
|
"Type": "int(1)",
|
||||||
|
"Collation": null,
|
||||||
|
"Null": "NO",
|
||||||
|
"Key": "",
|
||||||
|
"Default": 0,
|
||||||
|
"Extra": "",
|
||||||
|
"Privileges": "select,insert,update,references",
|
||||||
|
"Comment": ""
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Field": "lieferung",
|
"Field": "lieferung",
|
||||||
"Type": "date",
|
"Type": "date",
|
||||||
|
@ -2826,6 +2826,11 @@ public function NavigationHooks(&$menu)
|
|||||||
$obj->seriennummern_check_and_message_stock_added($artikel_id);
|
$obj->seriennummern_check_and_message_stock_added($artikel_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function SeriennummernCheckLieferscheinWarnung($lieferschein_id) {
|
||||||
|
$obj = $this->LoadModul('seriennummern');
|
||||||
|
$obj->seriennummern_check_and_message_delivery_note_removed($lieferschein_id);
|
||||||
|
}
|
||||||
|
|
||||||
// @refactor in Lager Modul
|
// @refactor in Lager Modul
|
||||||
function ArtikelAnzahlLagerPlatzMitSperre($artikel,$lager_platz)
|
function ArtikelAnzahlLagerPlatzMitSperre($artikel,$lager_platz)
|
||||||
{
|
{
|
||||||
@ -3552,6 +3557,7 @@ function LieferscheinEinlagern($id,$grund="Lieferschein Einlagern", $lpiids = nu
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->RunHook('erpapi_lieferschein_auslagern', 1, $lieferschein);
|
$this->RunHook('erpapi_lieferschein_auslagern', 1, $lieferschein);
|
||||||
|
$this->SeriennummernCheckLieferscheinWarnung($lieferschein);
|
||||||
$this->LieferscheinProtokoll($lieferschein,"Lieferschein ausgelagert");
|
$this->LieferscheinProtokoll($lieferschein,"Lieferschein ausgelagert");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
167
www/pages/content/seriennummern_select.tpl
Normal file
167
www/pages/content/seriennummern_select.tpl
Normal file
@ -0,0 +1,167 @@
|
|||||||
|
<div id="tabs">
|
||||||
|
<ul>
|
||||||
|
<li><a href="#tabs-1"></a></li>
|
||||||
|
</ul>
|
||||||
|
<!-- Example for multiple tabs
|
||||||
|
<ul hidden">
|
||||||
|
<li><a href="#tabs-1">First Tab</a></li>
|
||||||
|
<li><a href="#tabs-2">Second Tab</a></li>
|
||||||
|
</ul>
|
||||||
|
-->
|
||||||
|
<div id="tabs-1">
|
||||||
|
[MESSAGE]
|
||||||
|
<form action="" method="post">
|
||||||
|
[FORMHANDLEREVENT]
|
||||||
|
<div class="row">
|
||||||
|
<div class="row-height">
|
||||||
|
<div class="col-xs-14 col-md-6 col-md-height">
|
||||||
|
<div class="inside inside-full-height">
|
||||||
|
<fieldset>
|
||||||
|
<legend>{|Seriennummern wählen Artikel [ARTIKELNUMMER] [ARTIKEL]|}</legend>
|
||||||
|
<table width="100%" border="0" class="mkTableFormular">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Lagermenge|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" value="[ANZLAGER]" size="40" disabled>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Seriennummern verfügbar|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" value="[ANZVORHANDEN]" size="40" disabled>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Seriennummern fehlen|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" value="[ANZFEHLT]" size="40" disabled>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Seriennummer scannen|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="eingabeneu" id="eingabeneu" value="[EINGABENEU]" size="40" autofocus>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-14 col-md-6 col-md-height">
|
||||||
|
<div class="inside inside-full-height">
|
||||||
|
<fieldset>
|
||||||
|
<legend>{|Seriennummernassistent|}</legend>
|
||||||
|
<table width="100%" border="0" class="mkTableFormular">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Letzte Seriennummer|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="muster" id="muster" value="[LETZTE]" size="40" disabled>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Präfix|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="praefix" id="praefix" value="[PRAEFIX]" size="40">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Start|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="number" name="start" id="start" value="[START]" size="40">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Postfix|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="text" name="postfix" id="postfix" value="[POSTFIX]" size="40">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Anzahl|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<input type="number" name="anzahl" id="anzahl" value="[ANZAHL]" size="40">
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-14 col-md-2 col-md-height">
|
||||||
|
<div class="inside inside-full-height">
|
||||||
|
<fieldset>
|
||||||
|
<legend>{|<!--Legend for this form area goes here>-->Aktionen|}</legend>
|
||||||
|
<table width="100%" border="0" class="mkTableFormular">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<button name="submit" value="hinzufuegen" class="ui-button-icon" style="width:100%;">Hinzufügen</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<button name="submit" value="assistent" class="ui-button-icon" style="width:100%;">Assistent ausführen</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<div class="row-height">
|
||||||
|
<div class="col-xs-14 col-md-12 col-md-height">
|
||||||
|
<div class="inside inside-full-height">
|
||||||
|
<fieldset>
|
||||||
|
<legend>{|Gewählte Seriennummern|}</legend>
|
||||||
|
<table width="100%" border="0" class="mkTableFormular">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
{|Seriennummern|}:
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<textarea name="seriennummern" id="seriennummern" rows="20" style="width:100%;">[SERIENNUMMERN]</textarea>
|
||||||
|
<i>Liste der Seriennummern, 1 pro Zeile</i>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-xs-14 col-md-2 col-md-height">
|
||||||
|
<div class="inside inside-full-height">
|
||||||
|
<fieldset>
|
||||||
|
<legend>{|<!--Legend for this form area goes here>-->Aktionen|}</legend>
|
||||||
|
<table width="100%" border="0" class="mkTableFormular">
|
||||||
|
<tr>
|
||||||
|
<td>
|
||||||
|
<button name="submit" value="speichern" class="ui-button-icon" style="width:100%;">Speichern</button>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</table>
|
||||||
|
</fieldset>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -17,7 +17,8 @@ class Seriennummern {
|
|||||||
|
|
||||||
$this->app->ActionHandlerInit($this);
|
$this->app->ActionHandlerInit($this);
|
||||||
$this->app->ActionHandler("list", "seriennummern_artikel_list");
|
$this->app->ActionHandler("list", "seriennummern_artikel_list");
|
||||||
$this->app->ActionHandler("nummern_list", "seriennummern_nummern_list");
|
$this->app->ActionHandler("nummern_list", "seriennummern_nummern_list");
|
||||||
|
$this->app->ActionHandler("lieferscheine_list", "seriennummern_lieferscheine_list");
|
||||||
$this->app->ActionHandler("enter", "seriennummern_enter");
|
$this->app->ActionHandler("enter", "seriennummern_enter");
|
||||||
$this->app->ActionHandler("delete", "seriennummern_delete");
|
$this->app->ActionHandler("delete", "seriennummern_delete");
|
||||||
$this->app->DefaultActionHandler("list");
|
$this->app->DefaultActionHandler("list");
|
||||||
@ -32,13 +33,13 @@ class Seriennummern {
|
|||||||
switch ($name) {
|
switch ($name) {
|
||||||
case "seriennummern_list":
|
case "seriennummern_list":
|
||||||
$allowed['seriennummern_list'] = array('list');
|
$allowed['seriennummern_list'] = array('list');
|
||||||
$heading = array('','','Nummer','Artikel', 'Seriennummer','Erfasst am','Adresse','Lieferschein','Lieferdatum', 'Menü');
|
$heading = array('','','Nummer','Artikel', 'Seriennummer','Erfasst am','Eingelagert','Adresse','Lieferschein','Lieferdatum', 'Menü');
|
||||||
$width = array('1%','1%','10%'); // Fill out manually later
|
$width = array('1%','1%','10%'); // Fill out manually later
|
||||||
|
|
||||||
// columns that are aligned right (numbers etc)
|
// columns that are aligned right (numbers etc)
|
||||||
// $alignright = array(4,5,6,7,8);
|
// $alignright = array(4,5,6,7,8);
|
||||||
|
|
||||||
$findcols = array('s.id','s.id', 'a.nummer', 'a.name_de', 's.seriennummer','s.logdatei','ad.name','l.belegnr','l.datum','s.id');
|
$findcols = array('s.id','s.id', 'a.nummer', 'a.name_de', 's.seriennummer','s.datum','s.eingelagert','ad.name','l.belegnr','l.datum','s.id');
|
||||||
$searchsql = array('a.nummer', 'a.name_de', 's.seriennummer');
|
$searchsql = array('a.nummer', 'a.name_de', 's.seriennummer');
|
||||||
|
|
||||||
$defaultorder = 1;
|
$defaultorder = 1;
|
||||||
@ -63,7 +64,8 @@ class Seriennummern {
|
|||||||
CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\">',a.nummer,'</a>') as nummer,
|
CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\">',a.nummer,'</a>') as nummer,
|
||||||
a.name_de,
|
a.name_de,
|
||||||
s.seriennummer,
|
s.seriennummer,
|
||||||
".$app->erp->FormatDateTime("s.logdatei").",
|
".$app->erp->FormatDate("s.datum").",
|
||||||
|
if(s.eingelagert,'Ja','Nein'),
|
||||||
ad.name,
|
ad.name,
|
||||||
l.belegnr,
|
l.belegnr,
|
||||||
".$app->erp->FormatDate("l.datum").",
|
".$app->erp->FormatDate("l.datum").",
|
||||||
@ -108,7 +110,7 @@ class Seriennummern {
|
|||||||
|
|
||||||
$more_data1 = $app->Secure->GetGET("more_data1");
|
$more_data1 = $app->Secure->GetGET("more_data1");
|
||||||
if ($more_data1 == 1) {
|
if ($more_data1 == 1) {
|
||||||
$where .= " AND s.lieferscheinpos = 0";
|
$where .= " AND s.eingelagert = 1";
|
||||||
} else {
|
} else {
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,13 +126,13 @@ class Seriennummern {
|
|||||||
break;
|
break;
|
||||||
case "seriennummern_artikel_list":
|
case "seriennummern_artikel_list":
|
||||||
$allowed['seriennummern_artikel_list'] = array('list');
|
$allowed['seriennummern_artikel_list'] = array('list');
|
||||||
$heading = array('','', 'Nummer', 'Artikel', 'Lagermenge', 'Nummern verfügbar', 'Nummern ausgeliefert', 'Nummern gesamt', 'Menü','');
|
$heading = array('','', 'Nummer', 'Artikel', 'Lagermenge', 'Nummern verfügbar', 'Nummern ausgeliefert', 'Nummern gesamt', 'Menü','');
|
||||||
$width = array('1%','1%','10%'); // Fill out manually later
|
$width = array('1%','1%','10%'); // Fill out manually later
|
||||||
|
|
||||||
// columns that are aligned right (numbers etc)
|
// columns that are aligned right (numbers etc)
|
||||||
// $alignright = array(4,5,6,7,8);
|
// $alignright = array(4,5,6,7,8);
|
||||||
|
|
||||||
$findcols = array('a.id','a.id', 'a.nummer', 'a.name_de' );
|
$findcols = array('a.id','a.id', 'a.nummer', 'a.name_de' , 'null', 'null', 'null', 'null', 'null', 'null');
|
||||||
$searchsql = array('a.name_de', 'a.nummer');
|
$searchsql = array('a.name_de', 'a.nummer');
|
||||||
|
|
||||||
$menucol = 1;
|
$menucol = 1;
|
||||||
@ -166,7 +168,7 @@ class Seriennummern {
|
|||||||
CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\">',a.nummer,'</a>') as nummer,
|
CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\">',a.nummer,'</a>') as nummer,
|
||||||
a.name_de,
|
a.name_de,
|
||||||
".$app->erp->FormatMenge('auf_lager.anzahl').",
|
".$app->erp->FormatMenge('auf_lager.anzahl').",
|
||||||
SUM(if(s.id IS NULL,0,1))-SUM(if(s.lieferscheinpos <> 0,1,0)),
|
SUM(if(s.eingelagert <> 0,1,0)),
|
||||||
SUM(if(s.lieferscheinpos <> 0,1,0)),
|
SUM(if(s.lieferscheinpos <> 0,1,0)),
|
||||||
SUM(if(s.id IS NULL,0,1)),
|
SUM(if(s.id IS NULL,0,1)),
|
||||||
".$app->erp->ConcatSQL($menu_link).",
|
".$app->erp->ConcatSQL($menu_link).",
|
||||||
@ -200,14 +202,14 @@ class Seriennummern {
|
|||||||
break;
|
break;
|
||||||
case "seriennummern_lieferscheine_list":
|
case "seriennummern_lieferscheine_list":
|
||||||
$allowed['seriennummern_artikel_list'] = array('list');
|
$allowed['seriennummern_artikel_list'] = array('list');
|
||||||
$heading = array('','', 'Nummer', 'Artikel', 'Lagermenge', 'Nummern verfügbar', 'Nummern ausgeliefert', 'Nummern gesamt', 'Menü');
|
$heading = array('','', 'Lieferschein', 'Vom', 'Adresse', 'Menge Artikel', 'Nummern zugeordnet', 'Nummern fehlen', 'Menü','');
|
||||||
$width = array('1%','1%','10%'); // Fill out manually later
|
$width = array('1%','1%','10%'); // Fill out manually later
|
||||||
|
|
||||||
// columns that are aligned right (numbers etc)
|
// columns that are aligned right (numbers etc)
|
||||||
// $alignright = array(4,5,6,7,8);
|
// $alignright = array(4,5,6,7,8);
|
||||||
|
|
||||||
$findcols = array('a.id','a.id', 'a.nummer', 'a.name_de' );
|
$findcols = array('l.id','l.id', 'l.belegnr', 'l.datum', 'adr.name', 'null', 'null', 'null', 'null', 'null');
|
||||||
$searchsql = array('a.name_de', 'a.nummer');
|
$searchsql = array('l.belegnr');
|
||||||
|
|
||||||
$defaultorder = 1;
|
$defaultorder = 1;
|
||||||
$defaultorderdesc = 0;
|
$defaultorderdesc = 0;
|
||||||
@ -216,49 +218,44 @@ class Seriennummern {
|
|||||||
$numbercols = array();
|
$numbercols = array();
|
||||||
$sumcol = array();
|
$sumcol = array();
|
||||||
|
|
||||||
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',a.id,'\" />') AS `auswahl`";
|
$dropnbox = "'<img src=./themes/new/images/details_open.png class=details>' AS `open`, CONCAT('<input type=\"checkbox\" name=\"auswahl[]\" value=\"',l.id,'\" />') AS `auswahl`";
|
||||||
|
|
||||||
// $moreinfo = true; // Allow drop down details
|
//$menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=seriennummern&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a> <a href=\"#\" onclick=DeleteDialog(\"index.php?module=seriennummern&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
|
||||||
// $moreinfoaction = "lieferschein"; // specify suffix for minidetail-URL to allow different minidetails
|
|
||||||
// $menucol = 11; // Set id col for moredata/menu
|
|
||||||
|
|
||||||
$menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=seriennummern&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a> <a href=\"#\" onclick=DeleteDialog(\"index.php?module=seriennummern&action=delete&id=%value%\");>" . "<img src=\"themes/{$app->Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\"></a>" . "</td></tr></table>";
|
$menu_link = array(
|
||||||
|
'<a href="index.php?module=seriennummern&action=enter&artikel=',
|
||||||
|
['sql' => 'a.id'],
|
||||||
|
'">',
|
||||||
|
'<img src="./themes/'.$app->Conf->WFconf['defaulttheme'].'/images/add.png" title="Seriennummern erfassen" border="0">',
|
||||||
|
'</a>',
|
||||||
|
);
|
||||||
|
|
||||||
$sql = "SELECT SQL_CALC_FOUND_ROWS
|
$sql = "SELECT SQL_CALC_FOUND_ROWS
|
||||||
a.id,
|
l.id,
|
||||||
$dropnbox,
|
$dropnbox,
|
||||||
CONCAT('<a href=\"index.php?module=artikel&action=edit&id=',a.id,'\">',a.nummer,'</a>') as nummer,
|
l.belegnr,
|
||||||
a.name_de,
|
".$app->erp->FormatDate("l.datum").",
|
||||||
".$app->erp->FormatMenge('auf_lager.anzahl').",
|
adr.name,
|
||||||
SUM(if(s.id IS NULL,0,1))-SUM(if(s.lieferscheinpos <> 0,1,0)),
|
".$app->erp->FormatMengeFuerFormular("SUM(menge)").",
|
||||||
SUM(if(s.lieferscheinpos <> 0,1,0)),
|
".$app->erp->FormatMengeFuerFormular("COUNT(s.id)").",
|
||||||
SUM(if(s.id IS NULL,0,1))
|
".$app->erp->FormatMengeFuerFormular("SUM(menge)-COUNT(s.id)").",
|
||||||
FROM
|
".$app->erp->ConcatSQL($menu_link).",
|
||||||
artikel a
|
l.id
|
||||||
LEFT JOIN
|
|
||||||
(
|
|
||||||
SELECT
|
|
||||||
a.id,
|
|
||||||
a.nummer,
|
|
||||||
a.name_de name,
|
|
||||||
SUM(lpi.menge) anzahl
|
|
||||||
FROM
|
FROM
|
||||||
artikel a
|
lieferschein_position lp
|
||||||
INNER JOIN lager_platz_inhalt lpi ON
|
INNER JOIN lieferschein l ON
|
||||||
a.id = lpi.artikel
|
l.id = lp.lieferschein
|
||||||
WHERE
|
INNER JOIN artikel a ON
|
||||||
a.seriennummern <> 'keine' AND a.seriennummern <> ''
|
a.id = lp.artikel
|
||||||
GROUP BY
|
INNER JOIN adresse adr ON
|
||||||
a.id
|
adr.id = l.adresse
|
||||||
) auf_lager ON auf_lager.id = a.id
|
LEFT JOIN seriennummern s ON
|
||||||
LEFT JOIN
|
lp.id = s.lieferscheinpos
|
||||||
seriennummern s ON s.artikel = a.id
|
|
||||||
";
|
";
|
||||||
|
|
||||||
$where = "a.seriennummern <> 'keine' AND a.seriennummern <> ''";
|
$where = "(a.seriennummern <> 'keine') AND (l.datum >= (SELECT MIN(datum) FROM seriennummern WHERE artikel = a.id))";
|
||||||
$count = "SELECT count(DISTINCT a.id) FROM artikel a WHERE $where";
|
$count = "";
|
||||||
$groupby = "GROUP BY a.id";
|
$groupby = "GROUP BY l.id";
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -275,6 +272,7 @@ class Seriennummern {
|
|||||||
function seriennummern_menu() {
|
function seriennummern_menu() {
|
||||||
$this->app->erp->MenuEintrag("index.php?module=seriennummern&action=list", "Übersicht");
|
$this->app->erp->MenuEintrag("index.php?module=seriennummern&action=list", "Übersicht");
|
||||||
$this->app->erp->MenuEintrag("index.php?module=seriennummern&action=nummern_list", "Seriennummern");
|
$this->app->erp->MenuEintrag("index.php?module=seriennummern&action=nummern_list", "Seriennummern");
|
||||||
|
$this->app->erp->MenuEintrag("index.php?module=seriennummern&action=lieferscheine_list", "Lieferscheine");
|
||||||
// $this->app->erp->MenuEintrag("index.php", "Zurück");
|
// $this->app->erp->MenuEintrag("index.php", "Zurück");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -359,6 +357,14 @@ class Seriennummern {
|
|||||||
$this->app->Tpl->Parse('PAGE', "seriennummern_list.tpl");
|
$this->app->Tpl->Parse('PAGE', "seriennummern_list.tpl");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function seriennummern_lieferscheine_list() {
|
||||||
|
$this->seriennummern_menu();
|
||||||
|
$this->seriennummern_check_and_message(null);
|
||||||
|
|
||||||
|
$this->app->YUI->TableSearch('TAB1', 'seriennummern_lieferscheine_list', "show", "", "", basename(__FILE__), __CLASS__);
|
||||||
|
|
||||||
|
$this->app->Tpl->Parse('PAGE', "seriennummern_list.tpl");
|
||||||
|
}
|
||||||
|
|
||||||
public function seriennummern_delete() {
|
public function seriennummern_delete() {
|
||||||
$id = (int) $this->app->Secure->GetGET('id');
|
$id = (int) $this->app->Secure->GetGET('id');
|
||||||
@ -405,7 +411,7 @@ class Seriennummern {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$sql = "INSERT INTO seriennummern (seriennummer, artikel, logdatei) VALUES ('".$this->app->DB->real_escape_string($seriennummer)."', '".$artikel_id."', CURRENT_TIMESTAMP)";
|
$sql = "INSERT INTO seriennummern (seriennummer, artikel, logdatei, eingelagert) VALUES ('".$this->app->DB->real_escape_string($seriennummer)."', '".$artikel_id."', CURRENT_TIMESTAMP, 1)";
|
||||||
try {
|
try {
|
||||||
$this->app->DB->Insert($sql);
|
$this->app->DB->Insert($sql);
|
||||||
} catch (mysqli_sql_exception $e) {
|
} catch (mysqli_sql_exception $e) {
|
||||||
@ -519,14 +525,41 @@ class Seriennummern {
|
|||||||
$result = $this->app->DB->SelectArr($sql);
|
$result = $this->app->DB->SelectArr($sql);
|
||||||
return(empty($result)?array():$result);
|
return(empty($result)?array():$result);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/*
|
||||||
* @param int $printerId
|
* Check if all delivery notes have serials
|
||||||
* @param string $filename
|
* Return array of delivery note positions and head information
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
protected function seriennummern_create_notification($artikel_id, $action, $title = 'Seriennummern', $message = 'Meldung', $button = 'Ok')
|
public function seriennummern_check_deliver_notes($lieferschein_id = null) : array {
|
||||||
|
$sql = "
|
||||||
|
SELECT
|
||||||
|
l.id lieferschein,
|
||||||
|
l.datum,
|
||||||
|
l.belegnr lieferschein_belegnr,
|
||||||
|
lp.id lieferschein_position,
|
||||||
|
a.nummer,
|
||||||
|
menge,
|
||||||
|
COUNT(s.id) anzahl_nummern,
|
||||||
|
GROUP_CONCAT(s.seriennummer)
|
||||||
|
FROM
|
||||||
|
lieferschein_position lp
|
||||||
|
INNER JOIN lieferschein l ON
|
||||||
|
l.id = lp.lieferschein
|
||||||
|
INNER JOIN artikel a ON
|
||||||
|
a.id = lp.artikel
|
||||||
|
LEFT JOIN seriennummern s ON
|
||||||
|
lp.id = s.lieferscheinpos
|
||||||
|
WHERE (l.id = '".$lieferschein_id."' OR '".$lieferschein_id."' = '')
|
||||||
|
GROUP BY
|
||||||
|
lp.id
|
||||||
|
HAVING menge > anzahl_nummern
|
||||||
|
";
|
||||||
|
|
||||||
|
$result = $this->app->DB->SelectArr($sql);
|
||||||
|
return(empty($result)?array():$result);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function seriennummern_create_notification_artikel($artikel_id, $action, $title = 'Seriennummern', $message = 'Meldung', $button = 'Ok')
|
||||||
{
|
{
|
||||||
// Notification erstellen
|
// Notification erstellen
|
||||||
$notification_message = new NotificationMessageData('default', $title);
|
$notification_message = new NotificationMessageData('default', $title);
|
||||||
@ -547,6 +580,28 @@ class Seriennummern {
|
|||||||
$notification = $this->app->Container->get('NotificationService');
|
$notification = $this->app->Container->get('NotificationService');
|
||||||
$notification->createFromData($this->app->User->GetID(), $notification_message);
|
$notification->createFromData($this->app->User->GetID(), $notification_message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function seriennummern_create_notification_lieferschein($lieferschein_id, $action, $title = 'Seriennummern', $message = 'Meldung', $button = 'Ok')
|
||||||
|
{
|
||||||
|
// Notification erstellen
|
||||||
|
$notification_message = new NotificationMessageData('default', $title);
|
||||||
|
$lieferschein = $this->app->DB->SelectRow("SELECT belegnr FROM lieferschein WHERE id = '".$lieferschein_id."' LIMIT 1");
|
||||||
|
$notification_message->setMessage($message.' Lieferschein '.$lieferschein['belegnr']);
|
||||||
|
$notification_message->addTags(['seriennummern']);
|
||||||
|
$notification_message->setPriority(true);
|
||||||
|
|
||||||
|
$messageButtons = [
|
||||||
|
[
|
||||||
|
'text' => $button,
|
||||||
|
'link' => sprintf('index.php?module=seriennummern&action='.$action.'&lieferschein=%s', $lieferschein_id),
|
||||||
|
]
|
||||||
|
];
|
||||||
|
$notification_message->setOption('buttons', $messageButtons);
|
||||||
|
|
||||||
|
/** @var NotificationService $notification */
|
||||||
|
$notification = $this->app->Container->get('NotificationService');
|
||||||
|
$notification->createFromData($this->app->User->GetID(), $notification_message);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if new numbers need to be entered, if yes, create notification
|
* Check if new numbers need to be entered, if yes, create notification
|
||||||
@ -554,17 +609,17 @@ class Seriennummern {
|
|||||||
public function seriennummern_check_and_message_stock_added(int $artikel_id) {
|
public function seriennummern_check_and_message_stock_added(int $artikel_id) {
|
||||||
$check_seriennummern = $this->seriennummern_check_serials($artikel_id);
|
$check_seriennummern = $this->seriennummern_check_serials($artikel_id);
|
||||||
if ($check_seriennummern[0]['menge_nummern'] < $check_seriennummern[0]['menge_auf_lager']) {
|
if ($check_seriennummern[0]['menge_nummern'] < $check_seriennummern[0]['menge_auf_lager']) {
|
||||||
$this->seriennummern_create_notification($artikel_id, 'enter', 'Seriennummern','Bitte Seriennummern für Einlagerung erfassen','Zur Eingabe');
|
$this->seriennummern_create_notification_artikel($artikel_id, 'enter', 'Seriennummern','Bitte Seriennummern für Einlagerung erfassen','Zur Eingabe');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if numbers need to be entered after stock removal, if yes, create notification
|
* Check if numbers need to be entered after stock removal, if yes, create notification
|
||||||
*/
|
*/
|
||||||
public function seriennummern_check_and_message_stock_removed(int $artikel_id) {
|
public function seriennummern_check_and_message_delivery_note_removed(int $lieferschein_id) {
|
||||||
$check_seriennummern = $this->seriennummern_check_serials($artikel_id);
|
$check_deliver_notes = $this->seriennummern_check_deliver_notes($lieferschein_id);
|
||||||
if ($check_seriennummern[0]['menge_nummern'] > $check_seriennummern[0]['menge_auf_lager']) {
|
if (!empty($check_deliver_notes)) {
|
||||||
$this->seriennummern_create_notification($artikel_id, 'enter', 'Seriennummern','Bitte Seriennummern für Auslagerung erfassen','Zur Eingabe');
|
$this->seriennummern_create_notification_lieferschein($lieferschein_id, 'enter', 'Seriennummern','Bitte Seriennummern für Lieferschein erfassen','Zur Eingabe');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user