版本號 : 2021042001

更新內容
1、訂單控制表列印新增inco terms資料列。
2、力威訂單SIZE RUN比對BUG更正。

TENDEN-MES-SYS/Module/全域變數.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 = "2021041801"
+    Public 版本 As String = "2021042001"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 
@@ -12,7 +12,7 @@
     Public 財務列印(3) As Boolean : Public 修改清單(16) As Boolean : Public 中文樣品單開啟修改 As Boolean : Public 量產樣品匯入列表開啟 As Boolean
 
     Public PA As String = "" : Public PA1 As String = "" : Public PA2 As String = "" : Public PA3 As String = "" : Public PA4 As String = "" : Public PA5 As String = ""
-    Public PA6 As String = ""
+    Public PA6 As String = "" : Public PA7 As String = ""
     Public QA As String = "" : Public PP1 As String = "" : Public PP2 As String = "" : Public PP3 As String = ""
     Public 訂單資料表(10) As String : Public OD(42) As String : Public 列印用SQL As String = "" : Public 驗貨報告 As String = "" : Public 訂單紀錄流水號 As String
     Public Class MyModule

TENDEN-MES-SYS/彙總報表管理/訂單分析報表八.vb

@@ -58,17 +58,21 @@ Public Class 訂單分析報表八
                     PA4 = xlSheet.Cells(i, 1).value
                     PA5 = xlSheet.Cells(i, 3).value
                     PA6 = xlSheet.Cells(i, 5).value
+                    PA7 = xlSheet.Cells(i, 7).value
                     ConnOpen()
-                    SQL1 = "SELECT   訂單明細表.[" & PA3 & "] AS 數量
-                            FROM     訂單明細表 INNER JOIN 訂單控制表 ON 訂單明細表.天盾流水號 = 訂單控制表.訂單流水號 AND 
-                                     訂單明細表.客戶訂單號 = 訂單控制表.客戶訂單號 AND 訂單明細表.Color = 訂單控制表.顏色 AND 
-                                     訂單明細表.DM = 訂單控制表.楦型
-                            WHERE  ((訂單明細表.客戶訂單號 LIKE '" & PA4 & "') AND (訂單明細表.ProductName LIKE '" & PA1 & "') AND (LEFT(訂單明細表.DM,1) LIKE '" & PA5 & "')) OR
-                                   ((訂單明細表.ProductName LIKE '" & PA1 & "') AND (LEFT(訂單明細表.DM,1) LIKE '" & PA5 & "') AND (訂單控制表.力威訂單號 LIKE '" & PA4 & "'))"
+                    SQL1 = "SELECT   訂單裝箱明細表.[" & PA3 & "] AS 數量
+                            FROM     訂單裝箱明細表 INNER JOIN 訂單控制表 ON 訂單裝箱明細表.天盾流水號 = 訂單控制表.訂單流水號 AND 
+                                     訂單裝箱明細表.客戶訂單號 = 訂單控制表.客戶訂單號 AND 訂單裝箱明細表.DM = 訂單控制表.楦型
+                            WHERE   (訂單裝箱明細表.客戶訂單號 LIKE '" & PA4 & "') AND (LEFT(訂單裝箱明細表.DM, 1) LIKE '" & PA5 & "') AND (訂單控制表.形體號 LIKE '" & PA1 & "') AND 
+                                    (訂單裝箱明細表.Item LIKE '" & PA7 & "') OR
+                                    (LEFT(訂單裝箱明細表.DM, 1) LIKE '" & PA5 & "') AND (訂單裝箱明細表.力威訂單號 LIKE '" & PA4 & "') AND (訂單控制表.形體號 LIKE '" & PA1 & "') AND 
+                                    (訂單裝箱明細表.Item LIKE '" & PA7 & "')"
                     CmdSet_For_dr()
                     If dr.Read() Then
                         If PA6 = dr("數量").ToString Then : Else : CC(xlApp, xlSheet) : End If
-                    Else : CC(xlApp, xlSheet) : End If
+                    Else
+                        DD(xlApp, xlSheet)
+                    End If
                     conn.Close()
                 End If
             Next

TENDEN-MES-SYS/量產訂單管理/訂單列印選擇.Designer.vb

@@ -167,6 +167,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox58 = New System.Windows.Forms.CheckBox()
         Me.CheckBox59 = New System.Windows.Forms.CheckBox()
         Me.CheckBox60 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox61 = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.月份選擇_gb.SuspendLayout()
         Me.週數選擇_gb.SuspendLayout()
@@ -1551,6 +1552,16 @@ Partial Class 訂單列印選擇
         Me.CheckBox60.Text = "C_Code"
         Me.CheckBox60.UseVisualStyleBackColor = True
         '
+        'CheckBox61
+        '
+        Me.CheckBox61.AutoSize = True
+        Me.CheckBox61.Location = New System.Drawing.Point(547, 89)
+        Me.CheckBox61.Name = "CheckBox61"
+        Me.CheckBox61.Size = New System.Drawing.Size(88, 20)
+        Me.CheckBox61.TabIndex = 445
+        Me.CheckBox61.Text = "Inco Terms"
+        Me.CheckBox61.UseVisualStyleBackColor = True
+        '
         '訂單列印選擇
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -1674,6 +1685,7 @@ Partial Class 訂單列印選擇
         Me.Controls.Add(Me.DataGridView1)
         Me.Controls.Add(Me.Button11)
         Me.Controls.Add(Me.CheckBox57)
+        Me.Controls.Add(Me.CheckBox61)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "訂單列印選擇"
@@ -1833,5 +1845,6 @@ Partial Class 訂單列印選擇
     Friend WithEvents CheckBox58 As CheckBox
     Friend WithEvents CheckBox59 As CheckBox
     Friend WithEvents CheckBox60 As CheckBox
+    Friend WithEvents CheckBox61 As CheckBox
 End Class
 

TENDEN-MES-SYS/量產訂單管理/訂單列印選擇.vb

@@ -34,7 +34,7 @@ Public Class 訂單列印選擇
                                            " & 訂單資料表(1) & ".成型時間 AS 成型, " & 訂單資料表(1) & ".驗貨時間 AS 驗貨, " & 訂單資料表(1) & ".工廠進度表備註1, " & 訂單資料表(1) & ".工廠進度表備註2, 
                                            " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
                                            " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, " & 訂單資料表(1) & ".力威訂單號, 
-                                           " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS, " & 訂單資料表(0) & ".CustomerName
+                                           " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".DeliveryTerms
                                      FROM  " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(0) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(0) & ".天盾流水號 LEFT OUTER JOIN
                                            " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
                                            " & 訂單資料表(1) & ".ProductID = " & 訂單資料表(2) & ".ProductID AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(2) & ".天盾流水號 AND 
@@ -57,7 +57,7 @@ Public Class 訂單列印選擇
                                              " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
                                              " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, 
                                              " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS, 
-                                             " & 訂單資料表(0) & ".CustomerName
+                                             " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".DeliveryTerms
                                     ORDER BY SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
     Private Sub Set_DGV1載入前設定()
         DataGridView1.DataSource = Nothing : ds.Clear()
@@ -147,6 +147,7 @@ Public Class 訂單列印選擇
         If CheckBox58.Checked = True Then : xlSheet.Cells(3, W) = "UoM" : Q = W : W += 1 : End If
         If CheckBox59.Checked = True Then : xlSheet.Cells(3, W) = "HS#" : Q = W : W += 1 : End If
         If CheckBox60.Checked = True Then : xlSheet.Cells(3, W) = "Company Code" : Q = W : W += 1 : End If
+        If CheckBox61.Checked = True Then : xlSheet.Cells(3, W) = "Inco Terms" : Q = W : W += 1 : End If
         If CheckBox49.Checked = True Then : xlSheet.Cells(3, W) = "東莞業務備註" : Q = W : W += 1 : End If
         Set_訂單清單()
 
@@ -210,7 +211,8 @@ Public Class 訂單列印選擇
             If CheckBox57.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("ProductID").Value : W += 1 : End If
             If CheckBox58.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("UoM").Value : W += 1 : End If
             If CheckBox59.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("HS").Value : W += 1 : End If
-            If CheckBox59.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("CustomerName").Value : W += 1 : End If
+            If CheckBox60.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("CustomerName").Value : W += 1 : End If
+            If CheckBox61.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("DeliveryTerms").Value : W += 1 : End If
             If CheckBox49.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("東莞業務備註").Value : W += 1 : End If
             With xlApp.Selection
                 .Font.Bold = True
@@ -751,8 +753,8 @@ Public Class 訂單列印選擇
         myExcel.Selection.Font.Size = 14
 
         ' 儲存格設置格式 (數值 千分位符號)
-        xlSheet.Range("D4:G1000").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ "
-        xlSheet.Range("K4:N1000").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ "
+        xlSheet.Range("D4:G10000").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ "
+        xlSheet.Range("K4:N10000").Select() : myExcel.Selection.NumberFormatLocal = "#,##0_ "
 
         ' 儲存格顏色設定
         xlSheet.Range("B3:G3").Select()

TENDEN-MES-SYS/量產訂單管理/訂單控制表.Designer.vb

@@ -132,6 +132,7 @@ Partial Class 訂單控制表
         Me.Button15 = New System.Windows.Forms.Button()
         Me.TextBox12 = New System.Windows.Forms.TextBox()
         Me.Button27 = New System.Windows.Forms.Button()
+        Me.Label50 = New System.Windows.Forms.Label()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
         Me.第六頁_bt = New System.Windows.Forms.Button()
         Me.第五頁_bt = New System.Windows.Forms.Button()
@@ -245,7 +246,6 @@ Partial Class 訂單控制表
         Me.訂單明細_bt = New System.Windows.Forms.Button()
         Me.裝箱明細_bt = New System.Windows.Forms.Button()
         Me.裝箱資訊_bt = New System.Windows.Forms.Button()
-        Me.Label50 = New System.Windows.Forms.Label()
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
         Me.清單全選_bt = New System.Windows.Forms.Button()
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -1238,6 +1238,16 @@ Partial Class 訂單控制表
         Me.Button27.Text = "清空"
         Me.Button27.UseVisualStyleBackColor = True
         '
+        'Label50
+        '
+        Me.Label50.AutoSize = True
+        Me.Label50.ForeColor = System.Drawing.Color.Red
+        Me.Label50.Location = New System.Drawing.Point(5, 14)
+        Me.Label50.Name = "Label50"
+        Me.Label50.Size = New System.Drawing.Size(338, 15)
+        Me.Label50.TabIndex = 348
+        Me.Label50.Text = "注意 : 先打勾 [啟用量出貨] 按鈕在選資料，系統讀取速度會比較快。"
+        '
         'GroupBox2
         '
         Me.GroupBox2.Controls.Add(Me.CheckBox24)
@@ -2344,16 +2354,6 @@ Partial Class 訂單控制表
         Me.裝箱資訊_bt.Text = "裝箱資訊"
         Me.裝箱資訊_bt.UseVisualStyleBackColor = True
         '
-        'Label50
-        '
-        Me.Label50.AutoSize = True
-        Me.Label50.ForeColor = System.Drawing.Color.Red
-        Me.Label50.Location = New System.Drawing.Point(5, 14)
-        Me.Label50.Name = "Label50"
-        Me.Label50.Size = New System.Drawing.Size(338, 15)
-        Me.Label50.TabIndex = 348
-        Me.Label50.Text = "注意 : 先打勾 [啟用量出貨] 按鈕在選資料，系統讀取速度會比較快。"
-        '
         'ProgressBar1
         '
         Me.ProgressBar1.Location = New System.Drawing.Point(1109, 149)