Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
Update JasperReports Library to 7.0.1
  • Loading branch information
C4J committed Oct 12, 2024
1 parent 6ed42f6 commit dfb5a2b
Show file tree
Hide file tree
Showing 109 changed files with 565 additions and 88 deletions.
66 changes: 33 additions & 33 deletions b6/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -75,39 +75,39 @@
<classpathentry kind="lib" path="lib/jakarta.transaction-api-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/jakarta.xml.bind-api-4.0.0.jar"/>
<classpathentry kind="lib" path="lib/jandex-3.1.2.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-annotation-processors-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-ant-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-barbecue-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-barcode4j-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-castor-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chart-customizers-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-charts-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chart-themes-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chrome-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-data-adapters-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-data-adapters-http-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-ejbql-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-excel-poi-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-fastexcel-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-fonts-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-functions-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-google-maps-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-groovy-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-hibernate-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-interactivity-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-javascript-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-jaxen-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-jdt-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-json-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-metadata-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-olap-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-pdf-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-servlets-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-sort-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-spring-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-velocity-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-xalan-7.0.0.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-annotation-processors-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-ant-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-barbecue-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-barcode4j-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-castor-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chart-customizers-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-charts-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chart-themes-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-chrome-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-data-adapters-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-data-adapters-http-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-ejbql-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-excel-poi-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-fastexcel-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-fonts-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-functions-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-google-maps-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-groovy-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-hibernate-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-interactivity-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-javascript-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-jaxen-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-jdt-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-json-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-metadata-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-olap-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-pdf-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-servlets-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-sort-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-spring-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-velocity-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/jasperreports-xalan-7.0.1.jar"/>
<classpathentry kind="lib" path="lib/javacup-0.10k.jar"/>
<classpathentry kind="lib" path="lib/javassist-3.24.1-GA.jar"/>
<classpathentry kind="lib" path="lib/javax.inject-1.jar"/>
Expand Down
66 changes: 33 additions & 33 deletions b6/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -84,39 +84,39 @@ Class-Path: lib/SparseBitSet-1.2.jar
lib/jakarta.transaction-api-2.0.1.jar
lib/jakarta.xml.bind-api-4.0.0.jar
lib/jandex-3.1.2.jar
lib/jasperreports-7.0.0.jar
lib/jasperreports-annotation-processors-7.0.0.jar
lib/jasperreports-ant-7.0.0.jar
lib/jasperreports-barbecue-7.0.0.jar
lib/jasperreports-barcode4j-7.0.0.jar
lib/jasperreports-castor-7.0.0.jar
lib/jasperreports-chart-customizers-7.0.0.jar
lib/jasperreports-chart-themes-7.0.0.jar
lib/jasperreports-charts-7.0.0.jar
lib/jasperreports-chrome-7.0.0.jar
lib/jasperreports-data-adapters-7.0.0.jar
lib/jasperreports-data-adapters-http-7.0.0.jar
lib/jasperreports-ejbql-7.0.0.jar
lib/jasperreports-excel-poi-7.0.0.jar
lib/jasperreports-fastexcel-7.0.0.jar
lib/jasperreports-fonts-7.0.0.jar
lib/jasperreports-functions-7.0.0.jar
lib/jasperreports-google-maps-7.0.0.jar
lib/jasperreports-groovy-7.0.0.jar
lib/jasperreports-hibernate-7.0.0.jar
lib/jasperreports-interactivity-7.0.0.jar
lib/jasperreports-javascript-7.0.0.jar
lib/jasperreports-jaxen-7.0.0.jar
lib/jasperreports-jdt-7.0.0.jar
lib/jasperreports-json-7.0.0.jar
lib/jasperreports-metadata-7.0.0.jar
lib/jasperreports-olap-7.0.0.jar
lib/jasperreports-pdf-7.0.0.jar
lib/jasperreports-servlets-7.0.0.jar
lib/jasperreports-sort-7.0.0.jar
lib/jasperreports-spring-7.0.0.jar
lib/jasperreports-velocity-7.0.0.jar
lib/jasperreports-xalan-7.0.0.jar
lib/jasperreports-7.0.1.jar
lib/jasperreports-annotation-processors-7.0.1.jar
lib/jasperreports-ant-7.0.1.jar
lib/jasperreports-barbecue-7.0.1.jar
lib/jasperreports-barcode4j-7.0.1.jar
lib/jasperreports-castor-7.0.1.jar
lib/jasperreports-chart-customizers-7.0.1.jar
lib/jasperreports-chart-themes-7.0.1.jar
lib/jasperreports-charts-7.0.1.jar
lib/jasperreports-chrome-7.0.1.jar
lib/jasperreports-data-adapters-7.0.1.jar
lib/jasperreports-data-adapters-http-7.0.1.jar
lib/jasperreports-ejbql-7.0.1.jar
lib/jasperreports-excel-poi-7.0.1.jar
lib/jasperreports-fastexcel-7.0.1.jar
lib/jasperreports-fonts-7.0.1.jar
lib/jasperreports-functions-7.0.1.jar
lib/jasperreports-google-maps-7.0.1.jar
lib/jasperreports-groovy-7.0.1.jar
lib/jasperreports-hibernate-7.0.1.jar
lib/jasperreports-interactivity-7.0.1.jar
lib/jasperreports-javascript-7.0.1.jar
lib/jasperreports-jaxen-7.0.1.jar
lib/jasperreports-jdt-7.0.1.jar
lib/jasperreports-json-7.0.1.jar
lib/jasperreports-metadata-7.0.1.jar
lib/jasperreports-olap-7.0.1.jar
lib/jasperreports-pdf-7.0.1.jar
lib/jasperreports-servlets-7.0.1.jar
lib/jasperreports-sort-7.0.1.jar
lib/jasperreports-spring-7.0.1.jar
lib/jasperreports-velocity-7.0.1.jar
lib/jasperreports-xalan-7.0.1.jar
lib/javacup-0.10k.jar
lib/javassist-3.24.1-GA.jar
lib/javax.inject-1.jar
Expand Down
2 changes: 1 addition & 1 deletion b6/b6_pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<version>1.0.0</version>
<packaging>pom</packaging>
<properties>
<revision>7.0.0</revision>
<revision>7.0.1</revision>
</properties>
<dependencies>

Expand Down
6 changes: 3 additions & 3 deletions b6/commander4j.install4j
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="10.0.8" transformSequenceNumber="10">
<install4j version="10.0.9" transformSequenceNumber="10">
<directoryPresets config="./images/icons/CMD4j_Icons" />
<application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="11.04" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
<application name="Commander4j" applicationId="6923-0356-2321-8111" mediaDir="../../../Distribution/java17/b6Commander4j" shrinkRuntime="false" shortName="Commander4j" publisher="David Garratt" publisherWeb="http://www.commander4j.com" version="11.07" allPathsRelative="true" macVolumeId="2fff9a9d0dc659ac" javaMinVersion="17" javaMaxVersion="17">
<languages skipLanguageSelection="true">
<additionalLanguages>
<language id="nl" />
Expand All @@ -13,7 +13,7 @@
<language id="es" />
</additionalLanguages>
</languages>
<jreBundles jdkProviderId="Zulu" release="17/17.0.12" />
<jreBundles jdkProviderId="Zulu" release="17/17.0.11" />
</application>
<files keepModificationTimes="true" missingFilesStrategy="error" globalExcludeSuffixes="dirClean.ok,.DS_Store">
<mountPoints>
Expand Down
Binary file modified b6/commander4j.jar
Binary file not shown.
Binary file modified b6/lib/devonly/i4jruntime.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-annotation-processors-7.0.0.jar
Binary file not shown.
Binary file not shown.
Binary file removed b6/lib/jasperreports-ant-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-ant-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-barbecue-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-barbecue-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-barcode4j-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-barcode4j-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-castor-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-castor-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-chart-customizers-7.0.0.jar
Binary file not shown.
Binary file not shown.
Binary file removed b6/lib/jasperreports-chart-themes-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-chart-themes-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-charts-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-charts-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-chrome-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-chrome-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-data-adapters-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-data-adapters-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-data-adapters-http-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-data-adapters-http-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-ejbql-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-ejbql-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-excel-poi-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-excel-poi-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-fastexcel-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-fastexcel-7.0.1.jar
Binary file not shown.
Binary file not shown.
Binary file removed b6/lib/jasperreports-functions-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-functions-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-google-maps-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-google-maps-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-groovy-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-groovy-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-hibernate-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-hibernate-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-interactivity-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-interactivity-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-javascript-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-javascript-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-jaxen-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-jaxen-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-jdt-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-jdt-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-json-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-json-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-metadata-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-metadata-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-olap-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-olap-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-pdf-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-pdf-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-servlets-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-servlets-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-sort-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-sort-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-spring-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-spring-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-velocity-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-velocity-7.0.1.jar
Binary file not shown.
Binary file removed b6/lib/jasperreports-xalan-7.0.0.jar
Binary file not shown.
Binary file added b6/lib/jasperreports-xalan-7.0.1.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion b6/lib/license/LicenceInfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@

<library>
<description>Jasper Reports Library</description>
<version>7.0.0</version>
<version>7.0.1</version>
<type>Jasper Reports License</type>
</library>

Expand Down
16 changes: 15 additions & 1 deletion b6/src/com/commander4j/app/JInternalFramePackLabelPrint.java
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ public class JInternalFramePackLabelPrint extends JInternalFrame
private JLabel4j_std jLabelDueDate;
private JTextField4j jTextFieldRecipe;
private JLabel4j_std jLabelRecipe;
private JTextField4j jTextFieldRecipeVersion;
private JTextField4j jTextFieldShelfLifeRoundingRule;
private JLabel4j_std jLabelRounding;
private JTextField4j jTextFieldProcessOrderDescription;
Expand Down Expand Up @@ -259,6 +260,12 @@ public void run()
textField4jCustomer.setEditable(false);
textField4jCustomer.setBounds(587, 79, 148, 21);
jPanelProcessOrder.add(textField4jCustomer);

JLabel4j_std jLabelRecipeVersion = new JLabel4j_std();
jLabelRecipeVersion.setText("/");
jLabelRecipeVersion.setHorizontalAlignment(SwingConstants.CENTER);
jLabelRecipeVersion.setBounds(280, 77, 21, 21);
jPanelProcessOrder.add(jLabelRecipeVersion);

}
});
Expand Down Expand Up @@ -327,6 +334,7 @@ public void processOrderChanged(String po)

jTextFieldProcessOrderStatus.setText(processorder.getStatus());
jTextFieldRecipe.setText(processorder.getRecipe());
jTextFieldRecipeVersion.setText(processorder.getRecipeVersion());
jTextFieldLocation.setText(processorder.getLocation());

try
Expand Down Expand Up @@ -430,6 +438,7 @@ private void clearFields()
jTextFieldProcessOrderDescription.setText("");
jTextFieldProcessOrderStatus.setText("");
jTextFieldRecipe.setText("");
jTextFieldRecipeVersion.setText("");
jTextFieldLocation.setText("");
jTextFieldMaterial.setText("");
jTextFieldMaterialDescription.setText("");
Expand Down Expand Up @@ -757,9 +766,14 @@ public void keyReleased(KeyEvent evt)
jTextFieldProcessOrderStatus.setEnabled(false);
jTextFieldRecipe = new JTextField4j();
jPanelProcessOrder.add(jTextFieldRecipe);
jTextFieldRecipe.setBounds(161, 77, 139, 21);
jTextFieldRecipe.setBounds(161, 77, 119, 21);
jTextFieldRecipe.setEditable(false);
jTextFieldRecipe.setEnabled(false);
jTextFieldRecipeVersion = new JTextField4j();
jPanelProcessOrder.add(jTextFieldRecipeVersion);
jTextFieldRecipeVersion.setBounds(300, 77, 58, 21);
jTextFieldRecipeVersion.setEditable(false);
jTextFieldRecipeVersion.setEnabled(false);
jLabelRecipe = new JLabel4j_std();
jPanelProcessOrder.add(jLabelRecipe);
jLabelRecipe.setText(lang.get("lbl_Process_Order_Recipe"));
Expand Down
24 changes: 19 additions & 5 deletions b6/src/com/commander4j/app/JInternalFrameProcessOrderAdmin.java
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ public class JInternalFrameProcessOrderAdmin extends JInternalFrame
private JDateControl dueDateFrom;
private JLabel4j_std jLabel6;
private JTextField4j jTextFieldRecipe;
private JTextField4j jTextFieldRecipeVersion;
private JTextField4j jTextFieldLocation;
private JLabel4j_std jLabel5;
private JTextField4j jTextFieldProcessOrder;
Expand Down Expand Up @@ -321,6 +322,7 @@ private void clearFilter()
jComboBoxStatus.setSelectedItem("");
jTextFieldLocation.setText("");
jTextFieldRecipe.setText("");
jTextFieldRecipeVersion.setText("");
jTextFieldCustomer.setText("");
jTextFieldInspectionID.setText("");
jTextFieldRequiredResource.setText("");
Expand Down Expand Up @@ -593,6 +595,7 @@ private PreparedStatement buildSQLr()
query.addParamtoSQL("status=", jComboBoxStatus.getSelectedItem());
query.addParamtoSQL("location_id=", jTextFieldLocation.getText());
query.addParamtoSQL("recipe_id=", jTextFieldRecipe.getText());
query.addParamtoSQL("recipe_version=", jTextFieldRecipeVersion.getText());
query.addParamtoSQL("description like ", "%" + jTextFieldDescription.getText() + "%");
query.addParamtoSQL("required_resource = ", jTextFieldRequiredResource.getText());
query.addParamtoSQL("customer_id=", jTextFieldCustomer.getText());
Expand Down Expand Up @@ -1350,14 +1353,14 @@ public void actionPerformed(ActionEvent evt)
}
{
jLabel3 = new JLabel4j_std();
jLabel3.setBounds(521, 12, 98, 21);
jLabel3.setBounds(493, 12, 87, 21);
jDesktopPane1.add(jLabel3);
jLabel3.setText(lang.get("lbl_Description"));
jLabel3.setHorizontalAlignment(SwingConstants.TRAILING);
}
{
jTextFieldDescription = new JTextField4j(JDBProcessOrder.field_description);
jTextFieldDescription.setBounds(629, 12, 354, 22);
jTextFieldDescription.setBounds(593, 12, 390, 22);
jDesktopPane1.add(jTextFieldDescription);
}
{
Expand All @@ -1379,7 +1382,7 @@ public void actionPerformed(ActionEvent evt)
}
{
jLabel2 = new JLabel4j_std();
jLabel2.setBounds(758, 46, 89, 21);
jLabel2.setBounds(768, 46, 79, 21);
jDesktopPane1.add(jLabel2);
jLabel2.setText(lang.get("lbl_Location_ID"));
jLabel2.setHorizontalAlignment(SwingConstants.TRAILING);
Expand Down Expand Up @@ -1410,9 +1413,14 @@ public void actionPerformed(ActionEvent evt)
}
{
jTextFieldRecipe = new JTextField4j(JDBProcessOrder.field_recipe_id);
jTextFieldRecipe.setBounds(629, 46, 125, 22);
jTextFieldRecipe.setBounds(589, 46, 119, 22);
jDesktopPane1.add(jTextFieldRecipe);
}
{
jTextFieldRecipeVersion = new JTextField4j(JDBProcessOrder.field_recipe_id);
jTextFieldRecipeVersion.setBounds(726, 46, 41, 22);
jDesktopPane1.add(jTextFieldRecipeVersion);
}
{
jLabel6 = new JLabel4j_std();
jLabel6.setBounds(510, 110, 109, 21);
Expand Down Expand Up @@ -1505,7 +1513,7 @@ public void actionPerformed(ActionEvent evt)
}
{
jLabel8 = new JLabel4j_std();
jLabel8.setBounds(524, 46, 95, 21);
jLabel8.setBounds(493, 47, 87, 21);
jDesktopPane1.add(jLabel8);
jLabel8.setText(lang.get("lbl_Process_Order_Recipe"));
jLabel8.setHorizontalAlignment(SwingConstants.TRAILING);
Expand Down Expand Up @@ -1796,6 +1804,12 @@ public void actionPerformed(ActionEvent e)
btnLookupResource.setBounds(253, 110, 22, 21);
jDesktopPane1.add(btnLookupResource);
}

JLabel4j_std jLabelRecipeVersion = new JLabel4j_std();
jLabelRecipeVersion.setText("/");
jLabelRecipeVersion.setHorizontalAlignment(SwingConstants.CENTER);
jLabelRecipeVersion.setBounds(706, 47, 21, 21);
jDesktopPane1.add(jLabelRecipeVersion);
}
}
catch (Exception e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,14 @@ public class JInternalFrameProcessOrderProperties extends JInternalFrame {
private JComboBox4j<String> jComboBoxStatus;
private JComboBox4j<String> jComboBoxPalletStatus = new JComboBox4j<String>();
private JLabel4j_std jLabelBatchStatus;
private JLabel4j_std jLabelRecipeVersion;
private JTextField4j jTextFieldLocation;
private JTextField4j jTextFieldCustomer;
private JLabel4j_std jLabelLocation;
private JDateControl jSpinnerDueDate;
private JLabel4j_std jLabelDueDate;
private JTextField4j jTextFieldRecipeID;
private JTextField4j jTextFieldRecipeVersion;
private JTextField4j jTextFieldRequiredResource;
private JLabel4j_std jLabel1Recipe;
private JTextField4j jTextFieldDescription;
Expand Down Expand Up @@ -163,6 +165,7 @@ public void setProcessOrderNo(String po)
jTextFieldMaterial.setText(processorder.getMaterial());
jTextFieldDescription.setText(processorder.getDescription());
jTextFieldRecipeID.setText(processorder.getRecipe());
jTextFieldRecipeVersion.setText(processorder.getRecipeVersion());
jTextFieldLocation.setText(processorder.getLocation());
jTextFieldCustomer.setText(processorder.getCustomerID());
jTextFieldInspectionID.setText(processorder.getInspectionID());
Expand Down Expand Up @@ -336,6 +339,13 @@ public void keyTyped(KeyEvent evt)
jLabel1Recipe.setHorizontalAlignment(SwingConstants.TRAILING);
jLabel1Recipe.setBounds(12, 136, 144, 21);
}
{
jLabelRecipeVersion = new JLabel4j_std();
jDesktopPane1.add(jLabelRecipeVersion);
jLabelRecipeVersion.setText("/");
jLabelRecipeVersion.setHorizontalAlignment(SwingConstants.CENTER);
jLabelRecipeVersion.setBounds(288, 136, 21, 21);
}
{
lblInspectionID = new JLabel4j_std();
lblInspectionID.setText(lang.get("lbl_Inspection_ID"));
Expand All @@ -355,6 +365,18 @@ public void keyTyped(KeyEvent evt)
}
});
}
{
jTextFieldRecipeVersion = new JTextField4j(JDBProcessOrder.field_recipe_version);
jDesktopPane1.add(jTextFieldRecipeVersion);
jTextFieldRecipeVersion.setBounds(310, 136, 66, 21);
jTextFieldRecipeVersion.addKeyListener(new KeyAdapter()
{
public void keyTyped(KeyEvent evt)
{
jButtonSave.setEnabled(true);
}
});
}
{
jTextFieldRequiredResource = new JTextField4j(JDBProcessOrder.field_required_resource);
jDesktopPane1.add(jTextFieldRequiredResource);
Expand Down Expand Up @@ -709,6 +731,7 @@ private void save()
{
processorder.setDescription(jTextFieldDescription.getText());
processorder.setRecipe(jTextFieldRecipeID.getText());
processorder.setRecipeVersion(jTextFieldRecipeVersion.getText());
processorder.setLocation(jTextFieldLocation.getText());
processorder.setCustomerID(jTextFieldCustomer.getText());
processorder.setInspectionID(jTextFieldInspectionID.getText());
Expand Down
Loading

0 comments on commit dfb5a2b

Please sign in to comment.