20201001備份

Signed-off-by: B70340 <b70340@gmail.com>

TENDEN-MES-SYS/Module/Module1.vb

@@ -4,7 +4,7 @@
     Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public 登入人IP As String
     Public CC(99) As Boolean : Public AA(99) As String : Public 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2020092501"
+    Public 版本 As String = "2020092901"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public SQL1 As String
     Public 匯率 As Double

TENDEN-MES-SYS/樣品訂單管理/中文樣品單階段.vb

@@ -40,7 +40,7 @@
         End If
     End Sub
     Private Sub CheckBox5_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox5.Click
-        If CheckBox4.Checked = True Then
+        If CheckBox5.Checked = True Then
             CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = True : Button11.Enabled = True
             QA = "Proto"
         Else

TENDEN-MES-SYS/樣品訂單管理/列印_中文樣品單.vb

@@ -692,7 +692,13 @@ Public Class 列印_中文樣品單
             Clipboard.SetDataObject(PictureBox1.Image)
             xlSheet.Range("D4").Select()
             myExcel.ActiveSheet.Pictures.Paste.Select
-            myExcel.Selection.ShapeRange.Width = 290
+            Dim A As Integer = PictureBox1.Image.Width.ToString()
+            Dim B As Integer = PictureBox1.Image.Height.ToString()
+            If A / B > 3 Then
+                myExcel.Selection.ShapeRange.Width = 290
+            Else
+                myExcel.Selection.ShapeRange.Height = 100
+            End If
             myExcel.Selection.ShapeRange.IncrementLeft(9.75)
             myExcel.Selection.ShapeRange.IncrementTop(1.5)
         End If