Bug Fix

Sample Label Printing
C4J · Jun 13, 2024 · 8db1458 · 8db1458
1 parent 8bee3af
commit 8db1458
Show file tree

Hide file tree

Showing 14 changed files with 64 additions and 35 deletions.
diff --git a/b6/commander4j.jar b/b6/commander4j.jar
diff --git a/b6/src/com/commander4j/app/JInternalFrameQMSampleLabel.java b/b6/src/com/commander4j/app/JInternalFrameQMSampleLabel.java
@@ -165,7 +165,7 @@ private void printEnable()
 		Boolean ud2 = false;
 		Boolean ud3 = false;
 		Boolean ud4 = false;
-		
+
 		if (processOrderValid == true)
 		{
 			if (listActivities.getSelectedIndex() != -1)
@@ -195,7 +195,7 @@ private void printEnable()
 				{
 					ud2 = true;
 				}
-				
+
 				ud3 = false;
 				if (qmud3 == true)
 				{
@@ -208,8 +208,7 @@ private void printEnable()
 				{
 					ud3 = true;
 				}
-
-
+
 				ud4 = false;
 				if (qmud4 == true)
 				{
@@ -221,14 +220,13 @@ private void printEnable()
 				else
 				{
 					ud4 = true;
-				}				
-				
+				}
+
 				if (ud1 & ud2 & ud3 & ud4)
 				{
 					result = true;
 				}
-
-
+
 			}
 		}
 		btnPrint.setEnabled(result);
@@ -332,7 +330,7 @@ public void processOrderChanged(String processOrder)
 			{
 				textFieldUserData4.setText("");
 			}
-			
+
 			matCustData.setMaterial(po.getMaterial());
 			matCustData.setCustomerID(po.getCustomerID());
 			matCustData.setDataID("PRODUCT_GROUP");
@@ -752,18 +750,24 @@ public void keyReleased(KeyEvent e)
 		desktopPane.add(lblStatusBar);
 
 		sampleDateTime = new JDateControl();
-		sampleDateTime.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent e) {
-				Date selected = sampleDateTime.getDate();
-				Date current = JUtility.getSQLDateTime();
-				if (selected.after(current))
+		sampleDateTime.addChangeListener(new ChangeListener()
+		{
+			public void stateChanged(ChangeEvent e)
+			{
+
+				if (chckbxAutoTime.isSelected() == false)
 				{
-					sampleDateTime.setDate(current);
+					Date selected = sampleDateTime.getDate();
+					Date current = JUtility.getSQLDateTime();
+					if (selected.after(current))
+					{
+						sampleDateTime.setDate(current);
+					}
 				}
-				
+
 			}
 		});
-		
+
 		sampleDateTime.setEnabled(false);
 		sampleDateTime.setBounds(417, 8, 128, 25);
 		desktopPane.add(sampleDateTime);
@@ -855,7 +859,7 @@ public void actionPerformed(ActionEvent e)
 				setDefaultDPI(pq);
 			}
 		});
-		
+
 		{
 			jButtonLookup_Shift_Names = new JButton4j(Common.icon_lookup_16x16);
 			desktopPane.add(jButtonLookup_Shift_Names);
@@ -877,7 +881,7 @@ public void actionPerformed(ActionEvent evt)
 				}
 			});
 		}
-		
+
 		{
 			jButtonLookup_Packing_Line = new JButton4j(Common.icon_lookup_16x16);
 			desktopPane.add(jButtonLookup_Packing_Line);
@@ -912,8 +916,6 @@ public void run()
 			}
 		});
 
-
-
 		timer.start();
 
 	}