版本號 : 2021041201

更新內容如下
1、修正力威訂單比對功能BUG
2、修正形體號對應訂單介面引為加入品牌轉換造成的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 = "2021040801"
+    Public 版本 As String = "2021041201"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

TENDEN-MES-SYS/obj/Debug/天盾系統.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-c10c37018f5fb0d761d88893e1d9d5fdc21e044a
+8261c6879be3422cac9d93fb4fc75ade5e7e9235

TENDEN-MES-SYS/obj/Debug/天盾系統.vbproj.FileListAbsolute.txt

@@ -578,3 +578,4 @@ D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\天盾系統.vbproj.CopyComplete
 D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.exe
 D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.xml
 D:\tenden-erp-sys-team\TENDEN-MES-SYS\obj\Debug\TENDEN-ERP-SYS.pdb
+D:\工巧明\TENDEN-MES-SYS\TENDEN-MES-SYS\obj\Debug\天盾國際管理系統.模具控制表.resources

TENDEN-MES-SYS/製鞋技術資料管理/TENDENZA_STYLE_資料管理_對應訂單.vb

@@ -60,11 +60,13 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
     Private  Sub DataGridView1_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles DataGridView1.CellClick
         If e.RowIndex = -1 Then : Else
             Set_DGV2載入前設定()
-            SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " &
-                   "" & 訂單資料表(1) & ".TVW AS 型體號, " &
-                   "" & 訂單資料表(5) & ".ItemNumber," & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription," & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 FROM " & 訂單資料表(1) & " LEFT OUTER JOIN " &
-                   "" & 訂單資料表(5) & " ON " & 訂單資料表(1) & ".形體號 =" & 訂單資料表(5) & ".ProductName AND " & 訂單資料表(1) & ".楦型 = " & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 " &
-                   "AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 " &
+            SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠, 
+                           " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " & 訂單資料表(1) & ".TVW AS 型體號, " & 訂單資料表(5) & ".ItemNumber,
+                           " & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription," & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, 
+                           " & 訂單資料表(1) & ".訂單數量 
+                    FROM   " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(5) & " ON " & 訂單資料表(1) & ".形體號 =" & 訂單資料表(5) & ".ProductName 
+                           AND " & 訂單資料表(1) & ".楦型 = " & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color 
+                           AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 " &
                    "WHERE (" & 訂單資料表(1) & ".形體號 LIKE '" & DataGridView1.Rows(e.RowIndex).Cells("ProductName").Value & "') AND (CXL = 0 OR CXL IS NULL) AND (訂單數量 - 出貨數量 <> 0) " &
                    "ORDER BY " & 訂單資料表(1) & ".客戶交期 DESC, VT#"
             Set_DGV2載入後設定() : Set_grid2()
@@ -147,12 +149,15 @@ Public Class TENDENZA_STYLE_資料管理_對應訂單
         Dim QQWEE As String
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             Set_DGV2載入前設定()
-            SQL1 = "SELECT TOP(1) " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠," & 訂單資料表(1) & ".訂單種類," & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " &
-                   "" & 訂單資料表(1) & ".TVW AS 型體號, " &
-                   "" & 訂單資料表(1) & ".ItemNumber, " & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量 FROM " & 訂單資料表(1) & " LEFT OUTER JOIN " &
-                   "" & 訂單資料表(1) & "ON" & 訂單資料表(1) & ".形體號 = " & 訂單資料表(5) & ".ProductName AND " & 訂單資料表(1) & ".楦型 =" & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 " &
-                   "AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 WHERE (" & 訂單資料表(1) & ".形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') " &
-                   "ORDER BY " & 訂單資料表(1) & ".客戶交期 DESC, VT#"
+            SQL1 = "SELECT TOP(1) " & 訂單資料表(1) & ".訂單流水號 AS VT#, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".生產工廠 AS 工廠,
+                                  " & 訂單資料表(1) & ".訂單種類," & 訂單資料表(1) & ".工廠回復交期 AS 訂單日期, " & 訂單資料表(1) & ".TVW AS 型體號, " & 訂單資料表(5) & ".ItemNumber, 
+                                  " & 訂單資料表(1) & ".形體號 AS ProductName, " & 訂單資料表(5) & ".ProductDescription, " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, 
+                                  " & 訂單資料表(1) & ".訂單數量 
+                    FROM          " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(5) & " ON " & 訂單資料表(1) & ".形體號 = " & 訂單資料表(5) & ".ProductName 
+                                  AND " & 訂單資料表(1) & ".楦型 =" & 訂單資料表(5) & ".DM AND " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(5) & ".Color 
+                                  AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(5) & ".天盾流水號 AND " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(5) & ".客戶訂單號 
+                    WHERE        (" & 訂單資料表(1) & ".形體號 LIKE '" & DataGridView1.Rows(i).Cells("ProductName").Value & "') " &
+                   "ORDER BY      " & 訂單資料表(1) & ".客戶交期 DESC, VT#"
             Set_DGV2載入後設定() : Set_grid2()
 
             QQWEE = DataGridView1(0, i).Value.ToString

TENDEN-MES-SYS/量產訂單管理/訂單資料比對與修改_力威.vb

@@ -1598,13 +1598,13 @@ Public Class 訂單資料比對與修改_力威
                             裝箱控制3_dgv.Rows(II).Cells("HS").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("HS").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value.ToString.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value.ToString Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value Then
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value.ToString Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value Then
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Black
@@ -1634,7 +1634,7 @@ Public Class 訂單資料比對與修改_力威
                             裝箱控制3_dgv.Rows(II).Cells("CtnNo").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value.ToString Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value Then
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Black