20201014備份

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 = "2020092901"
+    Public 版本 As String = "2020100801"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public SQL1 As String
     Public 匯率 As Double

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

@@ -122,18 +122,18 @@ Public Class 中文樣品單
         DataGridView4.AllowUserToAddRows = False
         If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
     End Sub
-    Private  Sub Set_DGV4載入後設定()
+    Private Sub Set_DGV4載入後設定()
         cmd.Connection = conn : cmd.CommandText = SQL1 : da.SelectCommand = cmd : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds3) : DataGridView4.DataSource = ds3.Tables(0) : conn.Close()
     End Sub
     Private  Sub Set_顏色清單()
         Set_DGV4載入前設定()
         If 暫存模式 = False Then
-            SQL1 = "SELECT 樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, Approved_Date, " &
+            SQL1 = "SELECT 樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1 AS 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, Approved_Date, " &
                    "Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments FROM 確認樣品單控制表 " &
                    "WHERE (樣品流水號 LIKE '" & TextBox3.Text & "') ORDER BY   顏色, 訂單顏色"
         Else
-            SQL1 = "SELECT 樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, Approved_Date, " &
+            SQL1 = "SELECT 樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1 AS 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, Approved_Date, " &
                    "Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments FROM 確認樣品單控制表暫存檔 " &
                    "WHERE (樣品流水號 LIKE '" & TextBox3.Text & "') ORDER BY   顏色, 訂單顏色"
@@ -266,6 +266,10 @@ Public Class 中文樣品單
         DataGridView4.Columns(42).Visible = False
         DataGridView4.Columns(43).FillWeight = 160
         DataGridView4.EditMode = DataGridViewEditMode.EditOnEnter
+
+        DataGridView4.Columns(5).DefaultCellStyle.Format = "#,##0.0"
+        DataGridView4.Columns(5).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        DataGridView4.Columns(5).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
     End Sub
     Private  Sub Set_grid4()
         DataGridView5.Columns(0).FillWeight = 150 : DataGridView5.Columns(5).FillWeight = 934
@@ -1085,7 +1089,7 @@ Public Class 中文樣品單
             For i As Integer = 1 To PA
                 Set_樣品單流水編號設定2_1()
                 If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
-                SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+                SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                        "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                        "VALUES ('" & 樣品單流水號變數1 & "','" & 樣品單流水號變數2 & "','','','','" & 樣品單流水號變數2 & "1" & "','" & 樣品單流水號變數2 & "2" & "','" & 樣品單流水號變數2 & "3" &
@@ -1105,7 +1109,7 @@ Public Class 中文樣品單
                 For i As Integer = 0 To DataGridView4.Rows.Count - 1
                     Set_樣品單流水編號設定2_1()
                     If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
-                    SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+                    SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                            "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                            "VALUES ('" & 樣品單流水號變數1 & "','" & 樣品單流水號變數2 & "',N'" & DataGridView4.Rows(i).Cells("顏色").Value & "','" & DataGridView4.Rows(i).Cells("訂單顏色").Value &
@@ -1439,7 +1443,7 @@ Public Class 中文樣品單
         For i = 0 To DataGridView4.Rows.Count - 1
             If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
             SQL1 = "UPDATE 確認樣品單控制表暫存檔 SET 顏色 = N'" & DataGridView4.Rows(i).Cells("顏色").Value & "', 訂單顏色 = '" & DataGridView4.Rows(i).Cells("Color_Code").Value & "', " &
-                   "數量 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
+                   "數量1 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
                    "底部 = '" & DataGridView4.Rows(i).Cells("底部").Value & "', 飾物 = '" & DataGridView4.Rows(i).Cells("飾物").Value & "', 備註 = N'" & DataGridView4.Rows(i).Cells("備註").Value & "', " &
                    "FINISH = N'" & DataGridView4.Rows(i).Cells("FINISH").Value & "', 掛牌Date = '" & DataGridView4.Rows(i).Cells("掛牌Date").Value & "', " &
                    "掛牌Color = '" & DataGridView4.Rows(i).Cells("掛牌Color").Value & "', Material_Article = '" & DataGridView4.Rows(i).Cells("Material_Article").Value & "', " &
@@ -1577,7 +1581,7 @@ Public Class 中文樣品單
         cmd.Connection = conn : cmd.CommandText = SQL1 : cmd.ExecuteNonQuery() : conn.Close()
         For i As Integer = 0 To DataGridView4.Rows.Count - 1
             If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
-            SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+            SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                    "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                    "VALUES ('" & DataGridView4.Rows(i).Cells("樣品流水號").Value &
@@ -1698,7 +1702,7 @@ Public Class 中文樣品單
             For i = 0 To DataGridView4.Rows.Count - 1
                 If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
                 SQL1 = "UPDATE 確認樣品單控制表 SET 顏色 = N'" & DataGridView4.Rows(i).Cells("顏色").Value & "', 訂單顏色 = '" & DataGridView4.Rows(i).Cells("Color_Code").Value & "', " &
-                       "數量 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
+                       "數量1 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
                        "底部 = '" & DataGridView4.Rows(i).Cells("底部").Value & "', 飾物 = '" & DataGridView4.Rows(i).Cells("飾物").Value & "', 備註 = N'" & DataGridView4.Rows(i).Cells("備註").Value & "', " &
                        "FINISH = N'" & DataGridView4.Rows(i).Cells("FINISH").Value & "', 掛牌Date = '" & DataGridView4.Rows(i).Cells("掛牌Date").Value & "', " &
                        "掛牌Color = '" & DataGridView4.Rows(i).Cells("掛牌Color").Value & "', Material_Article = '" & DataGridView4.Rows(i).Cells("Material_Article").Value & "', " &
@@ -1811,7 +1815,7 @@ Public Class 中文樣品單
             For i As Integer = 1 To PA
                 Set_樣品單流水編號設定2_2()
                 If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
-                SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+                SQL1 = "INSERT INTO 確認樣品單控制表 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                        "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                        "VALUES ('" & TextBox3.Text & "','" & 樣品單流水號變數2 & "','','','','" & 樣品單流水號變數2 & "1" & "','" & 樣品單流水號變數2 & "2" & "','" & 樣品單流水號變數2 & "3" &
@@ -1900,7 +1904,7 @@ Public Class 中文樣品單
             For i As Integer = 1 To PA
                 Set_樣品單流水編號設定2_1()
                 If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
-                SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
+                SQL1 = "INSERT INTO 確認樣品單控制表暫存檔 (樣品流水號, 樣品流水號一, 顏色, 訂單顏色, 數量1, 面料, 內裏, 底部, 飾物, 備註, FINISH, Upper_Material, CFM_SPEC, ETD, Ship_Date, AWB, " &
                        "Approved_Date, Comments, 一ST_XFD, PO, Column1, Column2, DATE, SIZE, FROMS, FACTORY, 確認結果1, 確認結果2, 確認結果3, 注意, 確認通知單鞋圖, 掛牌Date, 掛牌Color, Material_Article, " &
                    "Construc_Name, Insole, Footbed, 掛牌Size, Gender, Width, D_C_S, Stage, 掛牌Comments) " &
                        "VALUES ('" & 樣品單流水號變數1 & "','" & 樣品單流水號變數2 & "','','','','" & 樣品單流水號變數2 & "1" & "','" & 樣品單流水號變數2 & "2" & "','" & 樣品單流水號變數2 & "3" &
@@ -1990,7 +1994,7 @@ Public Class 中文樣品單
             For i = 0 To DataGridView4.Rows.Count - 1
                 If conn.State = ConnectionState.Closed Then : conn.ConnectionString = ConString : conn.Open() : End If
                 SQL1 = "UPDATE 確認樣品單控制表 SET 顏色 = N'" & DataGridView4.Rows(i).Cells("顏色").Value & "', 訂單顏色 = '" & DataGridView4.Rows(i).Cells("Color_Code").Value & "', " &
-                           "數量 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
+                           "數量1 = '" & DataGridView4.Rows(i).Cells("數量").Value & "', 面料 = '" & DataGridView4.Rows(i).Cells("面料").Value & "', 內裏 = '" & DataGridView4.Rows(i).Cells("內裏").Value & "', " &
                            "底部 = '" & DataGridView4.Rows(i).Cells("底部").Value & "', 飾物 = '" & DataGridView4.Rows(i).Cells("飾物").Value & "', 備註 = N'" & DataGridView4.Rows(i).Cells("備註").Value & "', " &
                            "FINISH = N'" & DataGridView4.Rows(i).Cells("FINISH").Value & "', 掛牌Date = '" & DataGridView4.Rows(i).Cells("掛牌Date").Value & "', " &
                            "掛牌Color = '" & DataGridView4.Rows(i).Cells("掛牌Color").Value & "', Material_Article = '" & DataGridView4.Rows(i).Cells("Material_Article").Value & "', " &