From 8acb138dadad75fd7d533319ce0a272d0f379e56 Mon Sep 17 00:00:00 2001 From: OpenXE <> Date: Fri, 31 Jan 2025 21:36:41 +0100 Subject: [PATCH] lageretiketten improvements --- www/lib/dokumente/class.etiketten.php | 32 ++++++---- www/pages/content/lager_etikettenlist.tpl | 32 ++++++++-- www/pages/lager.php | 78 +++++++++++++++++++++-- www/widgets/templates/_gen/etiketten.tpl | 4 +- 4 files changed, 122 insertions(+), 24 deletions(-) diff --git a/www/lib/dokumente/class.etiketten.php b/www/lib/dokumente/class.etiketten.php index 7078cb9a..c6b6927b 100644 --- a/www/lib/dokumente/class.etiketten.php +++ b/www/lib/dokumente/class.etiketten.php @@ -144,25 +144,29 @@ class EtikettenPDF extends SuperFPDF { break; case "barcode": - if((String)($items->attributes()->type)=="E30") { + + if ((String)($items->attributes()->type)=="E30") { $this->EAN13($items->attributes()->x,$items->attributes()->y, $items[0],$items->attributes()->size); } - else if((String)($items->attributes()->type)=="Code128" || (String)($items->attributes()->type)=="1") { + else if ((String)($items->attributes()->type)=="Code128" || (String)($items->attributes()->type)=="1") { $this->Code128($items->attributes()->x, $items->attributes()->y, $items[0], $items->attributes()->width, $items->attributes()->size); } - else if((String)($items->attributes()->type)=="GS1-128" || (String)($items->attributes()->type)=="1") { - //$items[0] = "!FNC1!0104012345012345!FNC1!081231!FNC1!1012345"; - - $tmp =explode("!FNC1!",$items[0]); - $codewithfnc1 = implode(chr(206),$tmp); - - //echo chr(206)."0104012345012345".chr(206)."081231".chr(206)."1012345"; - //$this->Code128($items->attributes()->x, $items->attributes()->y, chr(206)."0104012345012345".chr(206)."081231".chr(206)."1012345", $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 - $this->Code128($items->attributes()->x, $items->attributes()->y, $codewithfnc1, $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 - //$this->Code128($items->attributes()->x, $items->attributes()->y, chr(206).$items[0], $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 + else if ((String)($items->attributes()->type)=="GS1-128") { + //$items[0] = "!FNC1!0104012345012345!FNC1!081231!FNC1!1012345"; + $tmp =explode("!FNC1!",$items[0]); + $codewithfnc1 = implode(chr(206),$tmp); + //echo chr(206)."0104012345012345".chr(206)."081231".chr(206)."1012345"; + //$this->Code128($items->attributes()->x, $items->attributes()->y, chr(206)."0104012345012345".chr(206)."081231".chr(206)."1012345", $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 + $this->Code128($items->attributes()->x, $items->attributes()->y, $codewithfnc1, $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 + //$this->Code128($items->attributes()->x, $items->attributes()->y, chr(206).$items[0], $items->attributes()->width, $items->attributes()->size); // 206 = FNC1 } - else { // standard auf 2 bzw default - $this->Code39($items->attributes()->x,$items->attributes()->y, $items[0], 0.5, $items->attributes()->size);//, $printText=false) + else { // standard Type 2, Code39 + if (isset($items->attributes()->linewidth)) { + $baseline = $items->attributes()->linewidth; + } else { + $baseline = 0.5; + } + $this->Code39($items->attributes()->x,$items->attributes()->y, $items[0], $baseline, $items->attributes()->size);//, $printText=false) } break; diff --git a/www/pages/content/lager_etikettenlist.tpl b/www/pages/content/lager_etikettenlist.tpl index 8361fcef..d4a8fe65 100644 --- a/www/pages/content/lager_etikettenlist.tpl +++ b/www/pages/content/lager_etikettenlist.tpl @@ -9,6 +9,18 @@
[MESSAGE] [TAB1] +
+
+
+
+ {|Auswahl Lagerplätze|} +
+ [TABELLE] +
+  {|alle markieren|} +
+
+
@@ -17,7 +29,13 @@
{|Auswahl Etiketten|} - [FORMULAR] + + + + +
{|Etikett|}:
{|Drucker|}:
+ +
@@ -36,7 +54,7 @@
- + [TAB1NEXT] @@ -93,8 +111,12 @@ function Etikettendrucken(id, anzahl) { } } }); - - } - \ No newline at end of file +function alleauswaehlen() +{ + var wert = $('#auswahlalle').prop('checked'); + $('#lagerplatz_etiketten').find(':checkbox').prop('checked',wert); +} + + diff --git a/www/pages/lager.php b/www/pages/lager.php index bc0cce29..d863c1e6 100644 --- a/www/pages/lager.php +++ b/www/pages/lager.php @@ -1060,6 +1060,47 @@ class Lager extends GenLager { JOIN lager_platz lp2 ON lp2.id = vorschlag.storage_area_id"; break; + case 'lagerplatz_etiketten': + $allowed['lager'] = array('platz'); + + // headings + + $heading = array('','Lager', 'Bezeichnung', 'Nachschublager', 'Verbrauchslager','POS Lager', 'kein Auto-Versand','Volumen','Regalart','Kategorie','Kommissions- / Produktionslager','Menü'); + + $width = array('1%','15%','15%', '10%', '10%','5%','5%','10%','10%','5%','10%','8%','1%'); + $findcols = array('lp.id','l.bezeichnung','lp.kurzbezeichnung', "IF(lp.autolagersperre,'kein Versand aus diesem Lager','')", "IF(lp.verbrauchslager,'ja','')","IF(lp.poslager,'ja','')","IF(lp.sperrlager,'ja','')",'breite','regalart','abckategorie','a.name','id'); + $searchsql = array('lp.kurzbezeichnung','regalart','abckategorie','a.name'); + $defaultorder = 4; + $defaultorderdesc = 1; + $alignright = [10]; + + $menu = "
Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\">" +// . " Conf->WFconf['defaulttheme']}/images/delete.svg\" border=\"0\">" +// . " Conf->WFconf['defaulttheme']}/images/labelprinter.png\" border=\"0\">" + ."
"; + + $box = "CONCAT('') AS `auswahl`"; + + // SQL statement + $sql = "SELECT SQL_CALC_FOUND_ROWS + lp.id, + $box, + l.bezeichnung, + lp.kurzbezeichnung, if(lp.autolagersperre,'kein Versand aus diesem Lager','') as autolagersperre, + if(lp.verbrauchslager,'ja','') as verbrauchslager, + if(lp.poslager,'ja','') as poslager, + if(lp.sperrlager,'ja','') as sperrlager, + if(lp.laenge!=0.0,CONCAT(lp.laenge,'/',lp.breite,'/',lp.hoehe),'-') as volumen, + lp.regalart,lp.abckategorie, a.name, + lp.id as menu + FROM lager_platz lp + INNER JOIN lager l ON l.id = lp.lager + LEFT JOIN adresse a ON a.id=lp.adresse "; + + // fester filter + $where = " lp.geloescht=0 AND lp.id!=0"; + $count = "SELECT COUNT(id) FROM lager_platz WHERE geloescht=0"; + break; } $erg = []; @@ -4308,7 +4349,7 @@ $check_charge=="2" || $check_charge=="1" || $check_mhd=="1") public function LagerEtikettenlist() { $this->app->erp->Headlines('','Etiketten'); - +/* $this->app->YUI->AutoComplete('von','lagerplatz'); $this->app->YUI->AutoComplete('bis','lagerplatz'); @@ -4359,19 +4400,48 @@ $check_charge=="2" || $check_charge=="1" || $check_mhd=="1") echo json_encode(array('status'=>1)); $this->app->ExitXentral(); } + */ + + // Process multi action + $auswahl = $this->app->Secure->GetPOST('auswahl'); + $drucken = $this->app->Secure->GetPOST('drucken'); + $selectedIds = []; + if(!empty($auswahl)) { + foreach($auswahl as $selectedId) { + $selectedId = (int)$selectedId; + if ($selectedId > 0) { + $selectedIds[] = $selectedId; + } + } + } + + $etikettenauswahl = $this->app->Secure->GetPOST('etikettenauswahl'); + $etikettendrucker = $this->app->Secure->GetPOST('etikettendrucker'); + + if ($drucken) { + foreach ($selectedIds as $selectedId) { +// function EtikettenDrucker($kennung,$anzahl,$tabelle,$id,$variables="",$xml="",$druckercode="",$filenameprefix="",$xmlaspdf=false,$adresse=0,$verwendenals="") + $this->app->erp->EtikettenDrucker($etikettenauswahl,1,'lager_platz',$selectedId,'','',$etikettendrucker); + } + } + $this->LagerHauptmenu(); $etiketten = $this->app->erp->GetSelectEtiketten("lagerplatz_klein",$etikettenauswahl); if($etiketten=="") $etiketten=""; - + $this->app->Tpl->Set('ETIKETTENOPTIONS',$etiketten); + $drucker = $this->app->erp->GetSelectEtikettenDrucker($etikettendrucker); + $this->app->Tpl->Set('DRUCKEROPTIONS',$drucker); $druckbutton = ""; - $this->app->Tpl->Set('FORMULAR'," + /* $this->app->Tpl->Set('FORMULAR',"
{|Lagerplatz|} ({|von|}):
{|Lagerplatz|} ({|bis|}): $druckbutton
{|Etikett|}:
{|Drucker|}:
-

"); +

");*/ + + $this->app->YUI->TableSearch('TABELLE', 'lagerplatz_etiketten', 'show','','',basename(__FILE__), __CLASS__); $this->app->Tpl->Parse('PAGE', 'lager_etikettenlist.tpl'); } diff --git a/www/widgets/templates/_gen/etiketten.tpl b/www/widgets/templates/_gen/etiketten.tpl index ae5f4eaf..1aa929d3 100644 --- a/www/widgets/templates/_gen/etiketten.tpl +++ b/www/widgets/templates/_gen/etiketten.tpl @@ -35,7 +35,9 @@
- + + +
{|Textbaustein|}:<line x="5" y="1" size="3">Test</line>
{|Barcode|}:<barcode x="5" y="1" size="3" type="1">Test</barcode>
{|Barcode Code 39 (Standard)|}:<barcode x="5" y="1" linewidth="0.5" size="3" type="2">Test</barcode>
{|Barcode Code 128|}:<barcode x="5" y="1" size="3" type="1">Test</barcode>
{|Barcode Code GS1-128|}:<barcode x="5" y="1" size="3" type="GS1-128">Test</barcode>
{|QR-Code|}:<qrcode x="5" y="1" size="3" type="3">Test</qrcode>

{|Artikel klein|}: