20240302備份

Calculator-Backend-SYS/SQL_語法_1.vb

@@ -492,30 +492,51 @@
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未請款1()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (預付款 <> 0 OR 預付款 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  
+                WHERE  (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (作廢 = 0) AND (第一期比例 <> 0) AND (預付款 <> 0 OR 預付款 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未請款2()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (到貨款 <> 0 OR 到貨款 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  
+                WHERE  (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (作廢 = 0) AND (第二期比例 <> 0) AND (到貨款 <> 0 OR 到貨款 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未請款3()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (施工款 <> 0 OR 施工款 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  
+                WHERE  (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (作廢 = 0) AND (第三期比例 <> 0) AND (施工款 <> 0 OR 施工款 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未請款4()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (驗收款 <> 0 OR 驗收款 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  
+                WHERE  (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (作廢 = 0) AND (第四期比例 <> 0) AND (驗收款 <> 0 OR 驗收款 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未請款5()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (保留款 <> 0 OR 保留款 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  
+                WHERE  (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (作廢 = 0) AND (第五期比例 <> 0) AND (保留款 <> 0 OR 保留款 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未驗收()
-        ConnOpen() : SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表  WHERE  (作廢 = 0) AND (合約停止 = 0) AND (驗收結果 = 0 OR 驗收結果 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT  合約編號, 工程主管, 工程名稱_中, 工程名稱_英  FROM  合約控制表 
+                WHERE  (作廢 = 0) AND (報價放行 = 1) AND (合約停止 = 0 OR 合約停止 IS NULL) AND (驗收結果 = 0 OR 驗收結果 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約未指定主管()
-        ConnOpen() : SQL1 = "SELECT 合約編號, 工程主管, 工程名稱_中, 工程名稱_英 FROM 合約控制表 WHERE (作廢 = 0) AND (合約停止 = 0) AND (工程主管 IS NULL)" : CmdSet_For_DGV()
+        ConnOpen()
+        SQL1 = "SELECT 合約編號, 工程主管, 工程名稱_中, 工程名稱_英 FROM 合約控制表 
+                WHERE (作廢 = 0) AND (報價放行 = 1) AND (合約停止 = 0 OR 合約停止 IS NULL) AND (工程主管 LIKE '' OR 工程主管 IS NULL)"
+        CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約保固未簽()
         ConnOpen()
         SQL1 = "SELECT 合約編號, 工程主管, 工程名稱_中, 工程名稱_英 FROM 合約控制表  
-                WHERE (作廢 = 0) AND (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (保固簽回 = 0 OR 保固簽回 IS NULL)"
+                WHERE (作廢 = 0) AND (合約停止 = 0 OR 合約停止 IS NULL) AND (報價放行 = 1) AND (驗收結果 = 1) AND (保固簽回 = 0 OR 保固簽回 IS NULL)"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_合約驗收單未簽回()

Calculator-Backend-SYS/obj/Debug/Calculator-Backend-SYS.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-d144a86b3ad243fb58574b38bbf8a20105a0dbe3
+7ec645808e7f9e68c3ec943d286fc92343daf9d4894855e5a91a3b53fd1dd9f4

Calculator-Backend-SYS/obj/Debug/Calculator-Backend-SYS.vbproj.FileListAbsolute.txt

@@ -3,7 +3,6 @@ D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\bin\Debug\Calc
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\bin\Debug\Calculator-Backend-SYS.pdb
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\bin\Debug\Calculator-Backend-SYS.xml
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\obj\Debug\Calculator-Backend-SYS.vbproj.AssemblyReference.cache
-D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\obj\Debug\Calculator-Backend-SYS.vbproj.SuggestedBindingRedirects.cache
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\obj\Debug\Calculator_Backend_SYS.Calculator_Backend_SYS.resources
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\obj\Debug\Calculator_Backend_SYS.Resources.resources
 D:\工巧明\HX-PGS\Calculator-Backend-SYS\Calculator-Backend-SYS\obj\Debug\Calculator-Backend-SYS.vbproj.GenerateResource.cache

Calculator-Backend-SYS/人員薪資/人員薪資_實際.vb

@@ -66,7 +66,9 @@ Public Class 人員薪資_實際
         清單1_dgv.Columns(4).FillWeight = 25
         合計_dgv.Columns("Save.").FillWeight = 40 : 合計_dgv.Columns(12).Visible = True : 合計_dgv.Columns(50).Visible = False : 合計_dgv.Columns(0).FillWeight = 120
         合計_dgv.Columns(4).FillWeight = 25
-
+        For i As Integer = 0 To 清單1_dgv.Rows.Count - 1
+            If 清單1_dgv.Rows(i).Cells(12).Value.ToString = "" Then : 清單1_dgv.Rows(i).Cells(12).Value = 0 : End If
+        Next
         For i As Integer = 2 To 14 : 清單1_dgv.Columns(i).Visible = False : Next : For i As Integer = 29 To 48 : 清單1_dgv.Columns(i).Visible = False : Next
         For i As Integer = 15 To 28 : 清單1_dgv.Columns(i).FillWeight = 60 : Next : For i As Integer = 29 To 34 : 清單1_dgv.Columns(i).FillWeight = 60 : Next
         For i As Integer = 35 To 48 : 清單1_dgv.Columns(i).FillWeight = 40 : Next : 清單1_dgv.Columns(12).Visible = True : 清單1_dgv.Columns(4).Visible = True

Calculator-Backend-SYS/人員薪資/人員薪資_沖帳.vb

@@ -65,7 +65,9 @@ Public Class 人員薪資_沖帳
         清單1_dgv.Columns(4).FillWeight = 25
         合計_dgv.Columns("Save.").FillWeight = 40 : 合計_dgv.Columns(12).Visible = True : 合計_dgv.Columns(50).Visible = False : 合計_dgv.Columns(0).FillWeight = 120
         合計_dgv.Columns(4).FillWeight = 25
-
+        For i As Integer = 0 To 清單1_dgv.Rows.Count - 1
+            If 清單1_dgv.Rows(i).Cells(12).Value.ToString = "" Then : 清單1_dgv.Rows(i).Cells(12).Value = 0 : End If
+        Next
         For i As Integer = 2 To 14 : 清單1_dgv.Columns(i).Visible = False : Next : For i As Integer = 29 To 48 : 清單1_dgv.Columns(i).Visible = False : Next
         For i As Integer = 15 To 28 : 清單1_dgv.Columns(i).FillWeight = 60 : Next : For i As Integer = 29 To 34 : 清單1_dgv.Columns(i).FillWeight = 60 : Next
         For i As Integer = 35 To 48 : 清單1_dgv.Columns(i).FillWeight = 40 : Next : 清單1_dgv.Columns(12).Visible = True : 清單1_dgv.Columns(4).Visible = True