20240120備份

YD-ERP-SYS/Module/SQL_財務系統管理.vb

@@ -4,20 +4,16 @@
         ConnOpen()
         SQL1 = "SELECT     銷售控制表.開單日期, 銷售控制表.單號, 客戶資料表.名稱, SUM(銷售明細表.售價 * 銷售明細表.數量) AS 簽單金額, 
                            WWW.收入1 AS 其他應收, QQQ.收入 AS 目前已收, QQQ.收入 AS 未收餘額
-                FROM       銷售控制表 LEFT OUTER JOIN
-                          (SELECT      單號, SUM(收入) AS 收入1
-                           FROM        銷售備註表
-                           WHERE      (收入 <> 0)
-                           GROUP BY    單號) AS WWW ON 銷售控制表.單號 = WWW.單號 LEFT OUTER JOIN
-                           客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 LEFT OUTER JOIN
-                           銷售明細表 ON 銷售控制表.單號 = 銷售明細表.單號 LEFT OUTER JOIN
-                          (SELECT      SUM(CAST(收入 AS decimal(18, 2))) AS 收入, LEFT(明細, 7) AS 單號1
-                           FROM        公帳流水帳
-                           WHERE      (CAST(收入 AS decimal(18, 2)) <> 0) AND (明細 NOT LIKE '') AND (PATINDEX('%[^0-9]%', 
-                                       RIGHT(LEFT(明細, 7), 4)) = 0)
-                           GROUP BY    LEFT(明細, 7)) AS QQQ ON LEFT(銷售控制表.單號, 7) = QQQ.單號1
+                FROM       銷售控制表 FULL OUTER JOIN
+                           銷售明細表 ON 銷售控制表.單號 = 銷售明細表.單號 FULL OUTER JOIN
+                           客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 FULL OUTER JOIN
+                          (SELECT  SUM(CAST(收入 AS decimal(18, 2))) AS 收入, LEFT(明細, 7) AS 單號1  FROM  公帳流水帳
+                           WHERE  (CAST(收入 AS decimal(18, 2)) <> 0) AND (明細 NOT LIKE '') AND (PATINDEX('%[^0-9]%', RIGHT(LEFT(明細, 7), 4)) = 0)
+                           GROUP BY    LEFT(明細, 7)) AS QQQ ON LEFT(銷售控制表.單號, 7) = QQQ.單號1 FULL OUTER JOIN
+                          (SELECT  單號, SUM(收入) AS 收入1  FROM  銷售備註表  WHERE  (收入 <> 0)  GROUP BY  單號) AS WWW ON 銷售控制表.單號 = WWW.單號
                 WHERE     (銷售控制表.開單日期 LIKE '" & PA & "')
                 GROUP BY   銷售控制表.開單日期, 銷售控制表.單號, 客戶資料表.名稱, QQQ.收入, WWW.收入1
+                HAVING    (SUM(銷售明細表.售價 * 銷售明細表.數量) > 0)
                 ORDER BY   CHARINDEX(LEFT(銷售控制表.單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 銷售控制表.單號 DESC"
         CmdSet_For_DGV()
     End Sub
@@ -40,6 +36,7 @@
                            GROUP BY    單號) AS WWW ON 銷售控制表.單號 = WWW.單號
                 WHERE     (銷售控制表.交貨日期 LIKE '" & PA & "') AND (倉儲明細表.採購單號 NOT LIKE '') AND (倉儲明細表.入庫 = 0)
                 GROUP BY   倉儲明細表.作業日期, 倉儲明細表.採購單號, 客戶資料表.名稱, WWW.收入1, QQQ.收入
+                HAVING    (SUM(銷售明細表.售價 * 銷售明細表.數量) > 0)
                 ORDER BY   CHARINDEX(LEFT(倉儲明細表.採購單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 單號 DESC"
         '倉儲明細表.作業日期 LIKE '" & PA & "'
         CmdSet_For_DGV()
@@ -48,19 +45,14 @@
         ConnOpen()
         SQL1 = "SELECT     銷售控制表.交貨日期 AS 作業日期, 銷售控制表.單號, 客戶資料表.名稱, SUM(銷售明細表.售價 * 銷售明細表.數量) 
                            AS 簽單金額, WWW.收入1 AS 其他應收, QQQ.收入 AS 目前已收, QQQ.收入 AS 未收餘額
-                FROM      (SELECT      SUM(CAST(收入 AS decimal(18, 2))) AS 收入, LEFT(明細, 7) AS 單號1
-                           FROM        公帳流水帳
-                           WHERE      (CAST(收入 AS decimal(18, 2)) <> 0) AND (明細 NOT LIKE '') AND (PATINDEX('%[^0-9]%', 
-                                       RIGHT(LEFT(明細, 7), 4)) = 0)
-                           GROUP BY    LEFT(明細, 7)) AS QQQ RIGHT OUTER JOIN
-                           銷售控制表 ON QQQ.單號1 = 銷售控制表.單號 LEFT OUTER JOIN
-                           銷售明細表 ON 銷售控制表.單號 = 銷售明細表.單號 LEFT OUTER JOIN
-                           客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 RIGHT OUTER JOIN
-                           倉儲明細表 ON 銷售控制表.單號 = 倉儲明細表.採購單號 LEFT OUTER JOIN
-                          (SELECT      單號, SUM(收入) AS 收入1
-                           FROM        銷售備註表
-                           WHERE      (收入 <> 0)
-                           GROUP BY    單號) AS WWW ON 銷售控制表.單號 = WWW.單號
+                FROM       銷售明細表 RIGHT OUTER JOIN
+                           銷售控制表 ON 銷售明細表.單號 = 銷售控制表.單號 LEFT OUTER JOIN
+                           客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 LEFT OUTER JOIN
+                          (SELECT  SUM(CAST(收入 AS decimal(18, 2))) AS 收入, LEFT(明細, 7) AS 單號1
+                           FROM    公帳流水帳  WHERE  (CAST(收入 AS decimal(18, 2)) <> 0) AND (明細 NOT LIKE '') AND (PATINDEX('%[^0-9]%', RIGHT(LEFT(明細, 7), 4)) = 0)
+                           GROUP BY  LEFT(明細, 7)) AS QQQ ON 銷售控制表.單號 = QQQ.單號1 FULL OUTER JOIN
+                          (SELECT  單號, SUM(收入) AS 收入1 FROM  銷售備註表  WHERE  (收入 <> 0)
+                           GROUP BY  單號) AS WWW ON 銷售控制表.單號 = WWW.單號
                 WHERE     (銷售控制表.交貨日期 LIKE '" & PA & "') AND (銷售控制表.轉高層 = 1)
                 GROUP BY   銷售控制表.交貨日期, 銷售控制表.單號, 客戶資料表.名稱, WWW.收入1, QQQ.收入
                 ORDER BY   CHARINDEX(LEFT(銷售控制表.單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 單號 DESC"

YD-ERP-SYS/Module/全域變數.vb

@@ -3,7 +3,7 @@
     Public g_conn_type, gUserName, 登入人職稱, 登入人級別, 登入人組別, 登入人IP, 版本號, Target, Target1, Target2, FTP帳號, FTP密碼, FTP物理位置, 業務號碼, AA(99), 類別 As String
     Public BB(99), CC(99), 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2023101901"
+    Public 版本 As String = "2024010401"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 列印用SQL, 列印用SQL2, 公司編號, 公司電話, 公司統編, 公司地址, 關鍵字編號, 進度條後墜 As String
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.CoreCompileInputs.cache

@@ -1 +1 @@
-30aed1c5849ea7dae6d3afeb5443eec9fc8fb4a5
+d624c26ef6caa544aa06d54964b0351b1dd191cc6bb3274423b8280281840f7a

YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.FileListAbsolute.txt

@@ -580,7 +580,4 @@ D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.業績結單控制表
 D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.營運日報表.resources
 D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD_ERP_SYS.高層客製報表.resources
 D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbproj.AssemblyReference.cache
-D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.vbproj.SuggestedBindingRedirects.cache
-D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\Telerik.WinControls.xml
-D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\bin\Debug\Telerik.WinControls.UI.xml
 D:\工巧明\YD\YD-ERP-SYS\YD-ERP-SYS\obj\Debug\YD-ERP-SYS.exe.licenses

YD-ERP-SYS/業務系統管理/銷售單申請.vb

@@ -1837,7 +1837,9 @@ Public Class 銷售單申請
         xlSheet.Cells(6, 5) = CInt(稅金_tb.Text) : xlSheet.Cells(6, 6) = "手續:" : xlSheet.Cells(6, 7) = 刷卡傭金_tb.Text : xlSheet.Cells(6, 8) = "總額:"
         xlSheet.Cells(6, 9) = 銷售合計_tb.Text : xlSheet.Cells(6, 10) = "餘額:" : xlSheet.Cells(6, 11) = N2 : xlSheet.Cells(8, 2) = "品號"
         xlSheet.Cells(8, 5) = "品名規格" : xlSheet.Cells(8, 8) = "數量" : xlSheet.Cells(8, 9) = "單價" : xlSheet.Cells(8, 11) = "金額" : xlSheet.Cells(8, 12) = "含管銷"
-        xlSheet.Cells(8, 13) = "成本價" : xlSheet.Cells(8, 14) = "廠商名稱" : xlSheet.Cells(7, 4) = "稅金2.5%:" : xlSheet.Cells(7, 5) = CInt(稅金25_tb.Text)
+        xlSheet.Cells(8, 13) = "成本價" : xlSheet.Cells(8, 14) = "廠商名稱"
+        If CInt(稅金25_tb.Text) = 0 Then : Else : xlSheet.Cells(7, 4) = "稅金2.5%:" : xlSheet.Cells(7, 5) = CInt(稅金25_tb.Text) : End If
+
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
             xlSheet.Cells(i + 9, 1) = 銷售明細_dgv.Rows(i).Cells("料號").Value
             xlSheet.Cells(i + 9, 3) = 銷售明細_dgv.Rows(i).Cells("品名").Value & " " & 銷售明細_dgv.Rows(i).Cells("備註").Value

YD-ERP-SYS/財務系統管理/業績獎金彙總表.vb

@@ -137,11 +137,11 @@ Public Class 業績獎金彙總表
                     獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value = 獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value + 彙總1_dgv.Rows(II).Cells("銷貨總額").Value
                 End If
             Next
-            'For II As Integer = 0 To 外車車資_dgv.Rows.Count - 1
-            '    If 外車車資_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
-            '        獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value = 獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value + 外車車資_dgv.Rows(II).Cells("外車_收").Value
-            '    End If
-            'Next
+            For II As Integer = 0 To 外車車資_dgv.Rows.Count - 1
+                If 外車車資_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
+                    獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value = 獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value + 外車車資_dgv.Rows(II).Cells("外車_收").Value
+                End If
+            Next
             '--------------成本---------------------------------------------------------------------------------------------------------------------------------------------
             For II As Integer = 0 To 彙總1_dgv.Rows.Count - 1
                 If 彙總1_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
@@ -161,14 +161,14 @@ Public Class 業績獎金彙總表
             Next
             For II As Integer = 0 To 外車車資_dgv.Rows.Count - 1
                 If 外車車資_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
-                    獎金明細表_dgv.Rows(I).Cells("運費").Value = 獎金明細表_dgv.Rows(I).Cells("運費").Value '+ 外車車資_dgv.Rows(II).Cells("外車_支").Value
+                    獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value = 獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value + 外車車資_dgv.Rows(II).Cells("外車_支").Value
+                End If
+            Next
+            For II As Integer = 0 To 備註運費_dgv.Rows.Count - 1
+                If 備註運費_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
+                    獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value = 獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value + 備註運費_dgv.Rows(II).Cells("備註車資").Value
                 End If
             Next
-            'For II As Integer = 0 To 備註運費_dgv.Rows.Count - 1
-            '    If 備註運費_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
-            '        獎金明細表_dgv.Rows(I).Cells("運費").Value = 獎金明細表_dgv.Rows(I).Cells("運費").Value + 備註運費_dgv.Rows(II).Cells("備註車資").Value
-            '    End If
-            'Next
             '--------------稅額(發票)---------------------------------------------------------------------------------------------------------------------------------------------
             For II As Integer = 0 To 彙總1_dgv.Rows.Count - 1
                 If 彙總1_dgv.Rows(II).Cells("單號").Value.ToString = 獎金明細表_dgv.Rows(I).Cells("編號").Value.ToString Then
@@ -519,7 +519,8 @@ Public Class 業績獎金彙總表
         If 獎金彙總_dgv.Visible = True Then
             xlSheet.Cells(1, 1) = "雅邸家居" : xlSheet.Cells(2, 1) = "業績獎金彙總表" : xlSheet.Cells(3, 1) = "日期區間:" & 開始日期_dtp.Value & " ~ " & 結束日期_dtp.Value
             xlSheet.Cells(4, 1) = "編號" : xlSheet.Cells(4, 2) = "業務姓名" : xlSheet.Cells(4, 3) = "銷貨總額" : xlSheet.Cells(4, 4) = "成本" : xlSheet.Cells(4, 6) = "運費"
-            xlSheet.Cells(4, 7) = "稅額(2.5%)" : xlSheet.Cells(4, 8) = "稅額(發票)" : xlSheet.Cells(4, 9) = "其他(傭金)" : xlSheet.Cells(4, 10) = "手續費(刷卡)" : xlSheet.Cells(4, 11) = "業績毛利"
+            xlSheet.Cells(4, 7) = "稅額(2.5%)"
+            xlSheet.Cells(4, 8) = "稅額(發票)" : xlSheet.Cells(4, 9) = "其他(傭金)" : xlSheet.Cells(4, 10) = "手續費(刷卡)" : xlSheet.Cells(4, 11) = "業績毛利"
             xlSheet.Cells(4, 12) = "獎金" : xlSheet.Cells(4, 5) = "管銷"
             For I As Integer = 0 To 獎金彙總_dgv.Rows.Count - 1
                 xlSheet.Cells(I + 5, 1) = 獎金彙總_dgv.Rows(I).Cells("編號").Value : xlSheet.Cells(I + 5, 2) = 獎金彙總_dgv.Rows(I).Cells("姓名").Value
@@ -533,7 +534,8 @@ Public Class 業績獎金彙總表
         Else
             xlSheet.Cells(1, 1) = "雅邸家居" : xlSheet.Cells(2, 1) = "業績明細表" : xlSheet.Cells(3, 1) = "日期區間:" & 開始日期_dtp.Value & " ~ " & 結束日期_dtp.Value
             xlSheet.Cells(4, 1) = "編號" : xlSheet.Cells(4, 2) = "客戶姓名" : xlSheet.Cells(4, 3) = "銷貨總額" : xlSheet.Cells(4, 4) = "成本" : xlSheet.Cells(4, 6) = "運費"
-            xlSheet.Cells(4, 7) = "稅額(2.5%)" : xlSheet.Cells(4, 8) = "稅額(發票)" : xlSheet.Cells(4, 9) = "其他(傭金)" : xlSheet.Cells(4, 10) = "手續費(刷卡)" : xlSheet.Cells(4, 11) = "業績毛利"
+            xlSheet.Cells(4, 7) = "稅額(2.5%)"
+            xlSheet.Cells(4, 8) = "稅額(發票)" : xlSheet.Cells(4, 9) = "其他(傭金)" : xlSheet.Cells(4, 10) = "手續費(刷卡)" : xlSheet.Cells(4, 11) = "業績毛利"
             xlSheet.Cells(4, 12) = "獎金" : xlSheet.Cells(4, 5) = "管銷"
             For I As Integer = 0 To 獎金明細表_dgv.Rows.Count - 1
                 xlSheet.Cells(I + 5, 1) = 獎金明細表_dgv.Rows(I).Cells("編號").Value : xlSheet.Cells(I + 5, 2) = 獎金明細表_dgv.Rows(I).Cells("名稱").Value

YD-ERP-SYS/資料庫系統管理/系統編碼規則.vb

@@ -387,6 +387,7 @@
         Set_主伺服器狀態() : Set_伺服器1清單()
     End Sub
     Private Sub LOG檔截斷3_bt_Click(sender As Object, e As EventArgs) Handles LOG檔截斷3_bt.Click
+
         For I As Integer = 0 To 資料庫清單1_dgv.Rows.Count - 1
             PA = 資料庫清單1_dgv(0, I).Value.ToString : SQL_主資料庫LOG檔案截斷()
         Next