diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..5d3e10e --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,14 @@ +# Changelog of ProductCatalog-BAPI-JavaApp + +## 0.0.2 (2017-09-04) + - Projektdokumentation unter docs/ hinzugefügt. (7bda5d3a9a4892f296fc85fb6f232d7f4044ffaf) + - Einrückung im Code etwas aufgeräumt. (254a40d8b8a3ef93aa4218d9425337a1b017e84a) + +## 0.0.1 (2017-04-17) + - Grundsätzliche Funktionalität: + - Kataloge anzeigen + - Katalogvarianten zum ausgewählten Katalog anzeigen + - Items einer ausgewählten Variante anzeigen + - Titel und Name zu einem ausgewählten Item anzeigen + - Diese Version wurde zur Benotung abgegeben. + diff --git a/docs/ERP_Projekt_ProductCatalog_17.pdf b/docs/ERP_Projekt_ProductCatalog_17.pdf new file mode 100644 index 0000000..8b77d60 Binary files /dev/null and b/docs/ERP_Projekt_ProductCatalog_17.pdf differ diff --git a/src/Main.java b/src/Main.java index 69d6d74..af501b7 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,3 +1,13 @@ +/* + * @class Main + * @authors Tamino, Salvatore, Andreas (ADV Boeblingen, I32-2016/17) + * @license ISC License (ISC) + * @since 2017-03-29 + * + * Diese Klasse dient zur initialisierung der Anwendung. + * + */ + import backend.ProductCatalog; import frontend.MainWindowController; import javafx.application.Application; @@ -8,15 +18,6 @@ import javafx.stage.Stage; import model.CatalogList; -/* - * @class Main - * @authors Tamino, Salvatore, Andreas (ADV Boeblingen, I32-2016/17) - * @license ISC License (ISC) - * @since 2017-03-29 - * - * Diese Klasse dient zur initialisierung der Anwendung. - * - */ public class Main extends Application{ private SAPVerbindung verbindung; diff --git a/src/SAPVerbindung.java b/src/SAPVerbindung.java index 86a73f5..12e79ab 100644 --- a/src/SAPVerbindung.java +++ b/src/SAPVerbindung.java @@ -26,12 +26,14 @@ public SAPVerbindung(Config einstellungen) { this.einstellungen = einstellungen; // Verbindungsobjekt (JCO.Client) mit Zugangsdaten befuellen - this.mConnection = JCO.createClient(this.einstellungen.getClientSAP(), - this.einstellungen.getLogin(), - this.einstellungen.getPasswort(), - this.einstellungen.getLanguage(), - this.einstellungen.getServer(), - this.einstellungen.getSystemNumber()); + this.mConnection = JCO.createClient( + this.einstellungen.getClientSAP(), + this.einstellungen.getLogin(), + this.einstellungen.getPasswort(), + this.einstellungen.getLanguage(), + this.einstellungen.getServer(), + this.einstellungen.getSystemNumber() + ); } /* diff --git a/src/backend/ProductCatalog.java b/src/backend/ProductCatalog.java index 6b11a25..fbbdde0 100644 --- a/src/backend/ProductCatalog.java +++ b/src/backend/ProductCatalog.java @@ -1,3 +1,13 @@ +/* + * @class backend.ProductCatalog + * @authors Tamino, Salvatore, Andreas (ADV Boeblingen, I32-2016/17) + * @license ISC License (ISC) + * @since 2017-03-29 + * + * Diese Klasse implementiert die Schnittstelle zur SAP. + * + */ + package backend; import java.util.ArrayList; @@ -10,176 +20,130 @@ import model.CatalogItem; -public class ProductCatalog -{ - JCO.Client mConnection; - - public ProductCatalog(JCO.Client mConnection) - { - this.mConnection = mConnection; -// connectionAttributes(); - } - - public void connectionAttributes()//<---das ist eine Entwickler-Test-Methode - { - System.out.println(mConnection.getAttributes()); - - System.out.println("\n\nGET LIST"); - Vector v_ProductCatalogs = getList(); - for (int i=0; i v_Variants = getVariants("PUMPS4SALE"); - for (int i=0; i l_Items = getItems("PUMPS4SALE", "001"); - for (int i=0; i getList() - { - Repository mRepository = new JCO.Repository("MyRepository", mConnection); - JCO.Function function = this.createFunction( mRepository, "BAPI_ADV_MED_GET_LIST"); - mConnection.execute( function); - JCO.Table tbl_ProductCatalogs = function.getTableParameterList().getTable("CATALOGS"); - - - Vector v_ProductCatalogs = new Vector(tbl_ProductCatalogs.getNumRows(), 1); - for (int i=0; i getVariants(String s_catalog) - { - Repository mRepository = new JCO.Repository("MyRepository", mConnection); - JCO.Function function = this.createFunction( mRepository, "BAPI_ADV_MED_GET_VARIANT_LIST"); - function.getImportParameterList().setValue(s_catalog, "CATALOG"); - mConnection.execute( function); - JCO.Table tbl_Variants = function.getTableParameterList().getTable("VARIANTS"); - - Vector v_Variants = new Vector(tbl_Variants.getNumRows(), 1); - for (int i=0; i getItems(String s_catalog, String s_variant) - { - Repository mRepository = new JCO.Repository("MyRepository", mConnection); - JCO.Function function = this.createFunction( mRepository, "BAPI_ADV_MED_GET_ITEMS"); - function.getImportParameterList().setValue(s_catalog, "CATALOG"); - function.getImportParameterList().setValue(s_variant, "VARIANT"); - mConnection.execute(function); - JCO.Table tbl_Items = function.getTableParameterList().getTable("ITEMS"); - - List al_CatalogItems = new ArrayList(); - // Vector v_Items = new Vector(tbl_Items.getNumRows(), 1); - for (int i=0; i v_ProductCatalogs = + * getList(); for (int i=0; i v_Variants = + * getVariants("PUMPS4SALE"); for (int i=0; i l_Items = + * getItems("PUMPS4SALE", "001"); for (int i=0; i getList() { + Repository mRepository = new JCO.Repository("MyRepository", mConnection); + JCO.Function function = this.createFunction(mRepository, "BAPI_ADV_MED_GET_LIST"); + mConnection.execute(function); + JCO.Table tbl_ProductCatalogs = function.getTableParameterList().getTable("CATALOGS"); + + Vector v_ProductCatalogs = new Vector(tbl_ProductCatalogs.getNumRows(), 1); + for (int i = 0; i < tbl_ProductCatalogs.getNumRows(); i++) { + tbl_ProductCatalogs.setRow(i); + v_ProductCatalogs.add(tbl_ProductCatalogs.getString("PRODCAT")); + } + return v_ProductCatalogs; + } + + public Vector getVariants(String s_catalog) { + Repository mRepository = new JCO.Repository("MyRepository", mConnection); + JCO.Function function = this.createFunction(mRepository, "BAPI_ADV_MED_GET_VARIANT_LIST"); + function.getImportParameterList().setValue(s_catalog, "CATALOG"); + mConnection.execute(function); + JCO.Table tbl_Variants = function.getTableParameterList().getTable("VARIANTS"); + + Vector v_Variants = new Vector(tbl_Variants.getNumRows(), 1); + for (int i = 0; i < tbl_Variants.getNumRows(); i++) { + tbl_Variants.setRow(i); + v_Variants.add(tbl_Variants.getString("VARIANT")); + } + return v_Variants; + } + + public List getItems(String s_catalog, String s_variant) { + Repository mRepository = new JCO.Repository("MyRepository", mConnection); + JCO.Function function = this.createFunction(mRepository, "BAPI_ADV_MED_GET_ITEMS"); + function.getImportParameterList().setValue(s_catalog, "CATALOG"); + function.getImportParameterList().setValue(s_variant, "VARIANT"); + mConnection.execute(function); + JCO.Table tbl_Items = function.getTableParameterList().getTable("ITEMS"); + + List al_CatalogItems = new ArrayList(); + for (int i = 0; i < tbl_Items.getNumRows(); i++) { + tbl_Items.setRow(i); + al_CatalogItems.add( + new CatalogItem( + tbl_Items.getString("MATERIAL"), + null, + null, + tbl_Items.getString("AREA"), + tbl_Items.getString("ITEM") + ) + ); + } + return al_CatalogItems; + } + + public CatalogItem getItem(String s_catalog, String s_variant, String s_area, String s_item) { + Repository mRepository = new JCO.Repository("MyRepository", mConnection); + JCO.Function function = this.createFunction(mRepository, "BAPI_PRODCAT_GETITEM"); + function.getImportParameterList().setValue(s_catalog, "CATALOG"); + function.getImportParameterList().setValue(s_variant, "VARIANT"); + function.getImportParameterList().setValue(s_area, "AREA"); + function.getImportParameterList().setValue(s_item, "ITEM"); + mConnection.execute(function); + JCO.Table tbl_Itemtexts = function.getTableParameterList().getTable("ITEMTEXTS"); + JCO.Structure tbl_Itemdetails = function.getExportParameterList().getStructure("ITEMDETAIL"); + + return new CatalogItem( + tbl_Itemdetails.getString("MATERIAL"), + tbl_Itemtexts.getString("NAME"), + tbl_Itemtexts.getString("TITLE"), + s_area, + s_item + ); + } + + public void openConnectionToSAP(String clientSAP, String login, String passwort, String language, String server, String systemNumber) { + // Verbindungsdaten + System.out.print("Verbinde mich mit SAP ... "); + mConnection = JCO.createClient(clientSAP, login, passwort, language, server, systemNumber); + // Verbindung herstellen + mConnection.connect(); + System.out.println("verbunden"); + System.out.println("-------------------------------------------"); + } + + public void closeConnectionToSAP() { + mConnection.disconnect(); + } + + private JCO.Function createFunction(IRepository mRepository, String name) { + try { + return mRepository.getFunctionTemplate(name.toUpperCase()).getFunction(); + } catch (Exception ex) { + /* ok */} + return null; + } + +}// Ende der Klasse diff --git a/src/frontend/AboutWindowController.java b/src/frontend/AboutWindowController.java index ded7b90..0c9854c 100644 --- a/src/frontend/AboutWindowController.java +++ b/src/frontend/AboutWindowController.java @@ -1,3 +1,13 @@ +/* + * @class frontend.AboutWindowController + * @authors Tamino, Salvatore, Andreas (ADV Boeblingen, I32-2016/17) + * @license ISC License (ISC) + * @since 2017-03-29 + * + * Controller des About Fensters. + * + */ + package frontend; import javafx.fxml.FXML; diff --git a/src/frontend/MainWindow.fxml b/src/frontend/MainWindow.fxml index 1a5b65b..ef3c9ac 100644 --- a/src/frontend/MainWindow.fxml +++ b/src/frontend/MainWindow.fxml @@ -68,8 +68,8 @@ - - + +