20220325備份

YD-ERP-SYS/Module/SQL_倉儲系統管理.vb

@@ -265,6 +265,9 @@
                             銷售收款事項 ON 銷售控制表.單號 = 銷售收款事項.單號
                 WHERE      (銷售控制表.單號 LIKE '" & PA19 & "%') AND (客戶資料表.名稱 LIKE N'%" & PA20 & "%') AND ( 單位主管 NOT LIKE '作廢%') AND ( 單位主管 NOT LIKE '') AND
                            (銷售控制表.已出貨 IS NULL OR 銷售控制表.已出貨 = 0) AND (銷售收款事項.內容 LIKE '未收餘額')
+                GROUP BY   銷售控制表.流水號, 銷售控制表.單號, 客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
+                           銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額, 
+                           銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 銷售控制表.轉採購, QQ.已審核, QQ.已審核
                 ORDER BY   CHARINDEX(LEFT(銷售控制表.單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 銷售控制表.單號 DESC"
         CmdSet_For_DGV()
     End Sub
@@ -275,34 +278,38 @@
                             銷售明細表.含稅, 銷售明細表.售價, 銷售明細表.狀態 AS 倉儲情況, 倉儲明細表_1.資料流水號 AS 倉儲流水號, 
                             銷售明細表.倉儲狀態, 銷售明細表.訂製狀態, 銷售明細表.物料狀態, QQQ.庫存 AS 有單庫存, QQQ.採購流水, 
                             WWW.庫存 AS 無單庫存, WWW.庫存, 銷售明細表.已出貨 AS 準備出貨, 倉儲分區控制表.倉級
-                FROM        銷售明細表 INNER JOIN
-                            倉儲狀態 ON 銷售明細表.物料狀態 = 倉儲狀態.編碼 INNER JOIN
+                FROM       (SELECT      倉儲明細表_2.料號, SUM(倉儲明細表_2.入庫) - SUM(倉儲明細表_2.出庫) AS 庫存, 
+                                        倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 倉儲明細表_2.倉名編號, 銷售明細表_1.資料流水號, 
+                                        倉儲明細表_2.採購流水
+                            FROM        銷售明細表 AS 銷售明細表_1 RIGHT OUTER JOIN 採購控制表 AS 採購控制表_2 ON 
+                                        銷售明細表_1.資料流水號 = 採購控制表_2.銷售流水 RIGHT OUTER JOIN
+                                        倉儲明細表 AS 倉儲明細表_2 ON 採購控制表_2.資料流水號 = 倉儲明細表_2.採購流水
+                            WHERE      (倉儲明細表_2.倉庫作業 NOT LIKE '作廢%') OR (倉儲明細表_2.倉庫作業 NOT LIKE '')
+                            GROUP BY    倉儲明細表_2.料號, 倉儲明細表_2.倉名編號, 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 
+                                        銷售明細表_1.資料流水號, 倉儲明細表_2.採購流水) AS QQQ RIGHT OUTER JOIN
+                            銷售明細表 LEFT OUTER JOIN
                             倉儲分區控制表 ON 銷售明細表.倉儲狀態 = 倉儲分區控制表.倉名編號 LEFT OUTER JOIN
-                                (SELECT          倉儲明細表_2.料號, SUM(倉儲明細表_2.入庫) - SUM(倉儲明細表_2.出庫) AS 庫存, 
-                                                 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 倉儲明細表_2.倉名編號 
-                                 FROM            銷售明細表 AS 銷售明細表_1 RIGHT OUTER JOIN 採購控制表 AS 採購控制表_2 ON 
-                                                 銷售明細表_1.資料流水號 = 採購控制表_2.銷售流水 RIGHT OUTER JOIN
-                                                 倉儲明細表 AS 倉儲明細表_2 ON 採購控制表_2.資料流水號 = 倉儲明細表_2.採購流水
-                                  WHERE         (倉儲明細表_2.倉庫作業 NOT LIKE '作廢%') OR (倉儲明細表_2.倉庫作業 NOT LIKE '')
-                                  GROUP BY       倉儲明細表_2.料號, 倉儲明細表_2.倉名編號, 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態) AS 
-                            WWW ON 銷售明細表.料號 = WWW.料號 AND
-                            銷售明細表.訂製狀態 = WWW.訂製狀態 AND 銷售明細表.物料狀態 = WWW.物料狀態 AND 
-                            銷售明細表.倉儲狀態 = WWW.倉名編號 LEFT OUTER JOIN
-                                (SELECT          倉儲明細表_2.料號, SUM(倉儲明細表_2.入庫) - SUM(倉儲明細表_2.出庫) AS 庫存, 
-                                                 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 倉儲明細表_2.倉名編號, 
-                                                 銷售明細表_1.資料流水號, 倉儲明細表_2.採購流水
-                                 FROM            銷售明細表 AS 銷售明細表_1 RIGHT OUTER JOIN 採購控制表 AS 採購控制表_2 ON 
-                                                 銷售明細表_1.資料流水號 = 採購控制表_2.銷售流水 RIGHT OUTER JOIN
-                                                 倉儲明細表 AS 倉儲明細表_2 ON 採購控制表_2.資料流水號 = 倉儲明細表_2.採購流水
-                                  WHERE         (倉儲明細表_2.倉庫作業 NOT LIKE '作廢%') OR (倉儲明細表_2.倉庫作業 NOT LIKE '')
-                                  GROUP BY       倉儲明細表_2.料號, 倉儲明細表_2.倉名編號, 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 
-                                                 銷售明細表_1.資料流水號, 倉儲明細表_2.採購流水) AS QQQ ON 
-                            銷售明細表.資料流水號 = QQQ.資料流水號 LEFT OUTER JOIN
-                            採購控制表 AS 採購控制表_1 ON 銷售明細表.資料流水號 = 採購控制表_1.銷售流水 LEFT OUTER JOIN
-                            倉儲明細表 AS 倉儲明細表_1 ON 採購控制表_1.資料流水號 = 倉儲明細表_1.採購流水 LEFT OUTER JOIN
+                            倉儲狀態 ON 銷售明細表.物料狀態 = 倉儲狀態.編碼 ON QQQ.料號 = 銷售明細表.料號 AND 
+                            QQQ.物料狀態 = 銷售明細表.物料狀態 AND QQQ.訂製狀態 = 銷售明細表.訂製狀態 AND 
+                            QQQ.倉名編號 = 銷售明細表.倉儲狀態 AND QQQ.資料流水號 = 銷售明細表.資料流水號 LEFT OUTER JOIN
+                            倉儲明細表 AS 倉儲明細表_1 RIGHT OUTER JOIN
+                            採購控制表 AS 採購控制表_1 ON 倉儲明細表_1.採購單號 = 採購控制表_1.銷售單號 AND 
+                            倉儲明細表_1.料號 = 採購控制表_1.料號 AND 倉儲明細表_1.採購流水 = 採購控制表_1.資料流水號 ON 
+                            銷售明細表.料號 = 採購控制表_1.料號 AND 銷售明細表.單號 = 採購控制表_1.銷售單號 AND 
+                            銷售明細表.資料流水號 = 採購控制表_1.銷售流水 LEFT OUTER JOIN
+                           (SELECT      倉儲明細表_2.料號, SUM(倉儲明細表_2.入庫) - SUM(倉儲明細表_2.出庫) AS 庫存, 
+                                        倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態, 倉儲明細表_2.倉名編號
+                            FROM        銷售明細表 AS 銷售明細表_1 RIGHT OUTER JOIN 採購控制表 AS 採購控制表_2 ON 
+                                        銷售明細表_1.資料流水號 = 採購控制表_2.銷售流水 RIGHT OUTER JOIN
+                                        倉儲明細表 AS 倉儲明細表_2 ON 採購控制表_2.資料流水號 = 倉儲明細表_2.採購流水
+                            WHERE      (倉儲明細表_2.倉庫作業 NOT LIKE '作廢%') OR (倉儲明細表_2.倉庫作業 NOT LIKE '')
+                            GROUP BY    倉儲明細表_2.料號, 倉儲明細表_2.倉名編號, 倉儲明細表_2.物料狀態, 倉儲明細表_2.訂製狀態) 
+                            AS WWW ON 銷售明細表.料號 = WWW.料號 AND 銷售明細表.訂製狀態 = WWW.訂製狀態 AND 
+                            銷售明細表.物料狀態 = WWW.物料狀態 AND 銷售明細表.倉儲狀態 = WWW.倉名編號 LEFT OUTER JOIN
                             物料訂製狀態 ON 銷售明細表.訂製狀態 = 物料訂製狀態.編碼 LEFT OUTER JOIN
                             物料資料庫 ON 銷售明細表.料號 = 物料資料庫.料號
-                WHERE      (銷售明細表.單號 LIKE '" & PA2 & "') AND (銷售明細表.料號 NOT LIKE '1001%') AND (銷售明細表.已出貨 IS NULL OR 銷售明細表.已出貨 = 0)
+                WHERE      (銷售明細表.單號 LIKE '" & PA2 & "') AND (銷售明細表.料號 NOT LIKE '1001%') AND (銷售明細表.已出貨 IS NULL OR
+                            銷售明細表.已出貨 = 0)
                 ORDER BY    銷售明細表.排序 DESC, 銷售明細表.料號"
         CmdSet_For_DGV()
     End Sub

YD-ERP-SYS/Module/SQL_業績計算系統.vb

@@ -29,7 +29,7 @@
     End Sub
     Friend Sub SQL_業績主表2()
         ConnOpen()
-        SQL1 = "SELECT      銷售控制表.單號 AS 編號, QQ.姓名, SUM(銷售控制表.運費) AS 銷貨總額, SUM(銷售控制表.運費) AS 成本, 
+        SQL1 = "SELECT     銷售控制表.單號 AS 編號, QQ.姓名, SUM(銷售控制表.運費) AS 銷貨總額, SUM(銷售控制表.運費) AS 成本, 管銷費用, 
                            SUM(銷售控制表.運費) AS 運費, SUM(銷售控制表.運費) AS [稅額(發票)], SUM(銷售控制表.運費) AS [其他(傭金)], 
                            SUM(銷售控制表.運費) AS [手續費(刷卡)], SUM(銷售控制表.運費) AS 毛利, SUM(銷售控制表.運費) AS 獎金, 
                            銷售控制表.獎金基礎, 客戶資料表.名稱, 客戶資料表.地址
@@ -43,7 +43,7 @@
                           (銷售控制表.轉業績日期 IS NOT NULL OR 銷售控制表.轉業績日期 NOT LIKE '') AND
                           (銷售控制表.轉業績日期 BETWEEN '" & Strings.Format(業績獎金彙總表.開始日期_dtp.Value, "yyyy/MM/dd") & "' AND 
                                                          '" & Strings.Format(業績獎金彙總表.結束日期_dtp.Value, "yyyy/MM/dd") & "')
-                GROUP BY   銷售控制表.單號, QQ.姓名, 銷售控制表.獎金基礎, 客戶資料表.名稱, 客戶資料表.地址
+                GROUP BY   銷售控制表.單號, QQ.姓名, 銷售控制表.獎金基礎, 客戶資料表.名稱, 客戶資料表.地址, 管銷費用
                 ORDER BY   編號"
         CmdSet_For_DGV()
     End Sub
@@ -67,8 +67,8 @@
     End Sub
     Friend Sub SQL_業績彙總1()
         ConnOpen()
-        SQL1 = "SELECT     銷售控制表.單號, SUM(銷售明細表.售價 * 銷售明細表.數量) AS 銷貨總額, SUM(銷售明細表.成本 * 銷售明細表.數量) 
-                           AS 成本, 銷售控制表.運費, 銷售控制表.稅金, 銷售控制表.刷卡費用
+        SQL1 = "SELECT     銷售控制表.單號, 銷貨總額, SUM(銷售明細表.成本 * 銷售明細表.數量) 
+                           AS 成本, 銷售控制表.運費, 銷售控制表.稅金, 銷售控制表.刷卡費用, 管銷費用
                 FROM       銷售控制表 LEFT OUTER JOIN
                            銷售明細表 ON 銷售控制表.單號 = 銷售明細表.單號 LEFT OUTER JOIN
                            銷售收款事項 ON 銷售控制表.單號 = 銷售收款事項.單號
@@ -76,7 +76,7 @@
                           (銷售控制表.轉業績日期 IS NOT NULL OR 銷售控制表.轉業績日期 NOT LIKE '') AND (銷售明細表.料號 NOT LIKE '1001%') AND
                           (銷售控制表.轉業績日期 BETWEEN '" & Strings.Format(業績獎金彙總表.開始日期_dtp.Value, "yyyy/MM/dd") & "' AND 
                                                        '" & Strings.Format(業績獎金彙總表.結束日期_dtp.Value, "yyyy/MM/dd") & "')
-                GROUP BY   銷售控制表.單號, 銷售控制表.運費, 銷售控制表.稅金, 銷售控制表.刷卡費用
+                GROUP BY   銷售控制表.單號, 銷售控制表.運費, 銷售控制表.稅金, 銷售控制表.刷卡費用, 銷貨總額, 管銷費用
                 ORDER BY   銷售控制表.單號"
         CmdSet_For_DGV()
     End Sub

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

@@ -38,7 +38,7 @@
                            FROM        銷售備註表
                            WHERE      (收入 <> 0)
                            GROUP BY    單號) AS WWW ON 銷售控制表.單號 = WWW.單號
-                WHERE     (倉儲明細表.作業日期 LIKE '" & PA & "') AND (倉儲明細表.採購單號 NOT LIKE '')
+                WHERE     (倉儲明細表.作業日期 LIKE '" & PA & "') AND (倉儲明細表.採購單號 NOT LIKE '') AND (倉儲明細表.入庫 = 0)
                 GROUP BY   倉儲明細表.作業日期, 倉儲明細表.採購單號, 客戶資料表.名稱, WWW.收入1, QQQ.收入
                 ORDER BY   CHARINDEX(LEFT(倉儲明細表.採購單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 單號 DESC"
         CmdSet_For_DGV()

YD-ERP-SYS/Module/SQL_跨介面共用.vb

@@ -224,7 +224,7 @@
     Friend Sub SQL_銷售控制表_修改()
         ConnOpen()
         SQL1 = "UPDATE 銷售控制表 SET 單號 = N'" & PA2 & "', 開單日期 = N'" & DTP & "', 客戶編號 = N'" & PA3 & "', 交貨日期 = '" & DTP1 & "', 含稅 = '" & BL1 & "', 送貨地點 = N'" & PA5 & "', 
-                       運費 = N'" & NU1 & "', 管銷費用 = N'" & NU2 & "' , 稅金 = N'" & NU3 & "', 刷卡費用 = N'" & NU4 & "'
+                       運費 = N'" & NU1 & "', 管銷費用 = N'" & NU2 & "' , 稅金 = N'" & NU3 & "', 刷卡費用 = N'" & NU4 & "', 銷貨總額 = N'" & NU5 & "'
                 WHERE 流水號 LIKE '" & PA1 & "%'"
         CmdSet_For_dr()
     End Sub
@@ -425,6 +425,22 @@
                 ORDER BY    採購控制表.供商編號, 採購控制表.料號"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_採購控制表_一般採購_未出庫()
+        ConnOpen()
+        SQL1 = "SELECT      採購控制表.資料流水號, 採購控制表.銷售單號, 採購控制表.供商編號, 供應商資料表.簡稱 AS 供應商, 採購控制表.料號, 物料資料庫.品名, 採購控制表.倉儲狀態, 
+                            倉儲分區控制表.倉名 AS 倉名, 採購控制表.訂製狀態, 物料訂製狀態.訂製, 採購控制表.物料狀態, 倉儲狀態.狀態 AS 狀態, 採購控制表.備註, 
+                            採購控制表.訂製圖號, 採購控制表.數量, 採購控制表.成本, 採購控制表.採購總價 AS 金額, 採購控制表.申請人, 採購控制表.申請日期, 採購控制表.採購日期, 採購控制表.預計進廠日, 
+                            採購控制表.實際進廠日, 採購控制表.已入庫, 採購控制表.已審核
+                FROM        採購控制表 INNER JOIN 供應商資料表 ON 採購控制表.供商編號 = 供應商資料表.編號 INNER JOIN 物料資料庫 ON 採購控制表.料號 = 物料資料庫.料號 INNER JOIN 倉儲狀態 ON 
+                            採購控制表.物料狀態 = 倉儲狀態.編碼 INNER JOIN 物料訂製狀態 ON 採購控制表.訂製狀態 = 物料訂製狀態.編碼 INNER JOIN 倉儲分區控制表 ON 採購控制表.倉儲狀態 = 
+                            倉儲分區控制表.倉名編號
+                WHERE      ((採購控制表.已入庫 IS NULL) OR (採購控制表.已入庫 = 0)) AND 
+                           (採購控制表.供商編號 LIKE N'%" & PA & "%' OR 供應商資料表.簡稱 LIKE N'%" & PA & "%' OR 
+                            物料資料庫.品名 LIKE N'%" & PA & "%' OR 採購控制表.料號  LIKE N'%" & PA & "%') AND 
+                           (採購控制表.銷售單號 LIKE N'" & PA20 & "%') AND (採購控制表.已審核 <> 1)
+                ORDER BY    採購控制表.供商編號, 採購控制表.料號"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_採購控制表_驗證()
         ConnOpen()
         SQL1 = "SELECT      採購控制表.資料流水號, 採購控制表.銷售單號, 採購控制表.供商編號, 供應商資料表.簡稱 AS 供應商, 採購控制表.料號, 物料資料庫.品名, 採購控制表.倉儲狀態, 

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 = "2022032202"
+    Public 版本 As String = "2022032502"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 列印用SQL, 列印用SQL2, 公司編號, 公司電話, 公司統編, 公司地址, 關鍵字編號, 進度條後墜 As String
     '----系統閒置-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

YD-ERP-SYS/採購系統管理/一般申請_採購單.Designer.vb

@@ -590,7 +590,6 @@ Partial Class 一般申請_採購單
         '
         '供應商編碼_cb
         '
-        Me.供應商編碼_cb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.供應商編碼_cb.FormattingEnabled = True
         Me.供應商編碼_cb.Location = New System.Drawing.Point(173, 4)
         Me.供應商編碼_cb.Name = "供應商編碼_cb"

YD-ERP-SYS/採購系統管理/一般申請_採購單.vb

@@ -51,7 +51,7 @@ Public Class 一般申請_採購單
 
             If 關鍵字 = True Then : Else : PA = 供應商編碼1_cb.Text : End If
             PA20 = 業務1_cb.Text
-            SQL_採購控制表_未出庫()
+            SQL_採購控制表_一般採購_未出庫()
             da.Fill(ds1) : 採購清單_dgv.DataSource = ds1.Tables(0) : conn.Close()
             Set_採購清單_dgv_下拉式清單1() : Set_採購清單_dgv_下拉式清單2() : Set_採購清單_dgv_下拉式清單3()
 
@@ -63,7 +63,8 @@ Public Class 一般申請_採購單
             採購清單_dgv.Columns(20).FillWeight = 60 : 採購清單_dgv.Columns(21).FillWeight = 70 : 採購清單_dgv.Columns(22).FillWeight = 70 : 採購清單_dgv.Columns(23).FillWeight = 70
             採購清單_dgv.Columns(24).Visible = False : 採購清單_dgv.Columns(25).Visible = False : 採購清單_dgv.Columns(26).FillWeight = 45
 
-            採購清單_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 採購清單_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0" : 採購清單_dgv.Columns("金額").DefaultCellStyle.Format = "#,##0"
+            採購清單_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 採購清單_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
+            採購清單_dgv.Columns("金額").DefaultCellStyle.Format = "#,##0"
             採購清單_dgv.Columns("數量").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
             採購清單_dgv.Columns("數量").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
             採購清單_dgv.Columns("成本").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
@@ -434,7 +435,7 @@ Public Class 一般申請_採購單
             If e.RowIndex = -1 Then : Else
                 料號_tb.Text = 物料清單_dgv("料號", e.RowIndex).Value.ToString : 供應商編碼_tb.Text = 物料清單_dgv("供應商", e.RowIndex).Value.ToString
                 品名_tb.Text = 物料清單_dgv("品名", e.RowIndex).Value.ToString : 最大庫存量_tb.Text = 物料清單_dgv("最低庫存量", e.RowIndex).Value.ToString
-                庫存量_tb.Text = Val(物料清單_dgv("庫存", e.RowIndex).Value.ToString)
+                庫存量_tb.Text = Val(物料清單_dgv("庫存", e.RowIndex).Value.ToString) : 供應商編碼_cb.Text = Strings.Left(物料清單_dgv("料號", e.RowIndex).Value.ToString, 4)
                 可申請_tb.Text = Val(物料清單_dgv("庫存", e.RowIndex).Value.ToString) - Val(物料清單_dgv("未出庫", e.RowIndex).Value.ToString)
 
                 物料圖_pb.Image = Nothing : PA1 = 料號_tb.Text : SQL_物料檔案_是否有圖()
@@ -570,7 +571,7 @@ Public Class 一般申請_採購單
     Private Sub 查詢1_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 查詢1_tb.KeyPress
         If e.KeyChar = Chr(13) Then
             供應商1_cb.Items.Clear() : 供應商編碼1_cb.Items.Clear()
-            關鍵字 = True : PA = 查詢1_tb.Text : Set_清單() : 地區1_cb.Text = ""
+            關鍵字 = True : PA = 查詢1_tb.Text : Set_清單1() : 地區1_cb.Text = ""
         End If
     End Sub
     Private Sub 清空_bt_Click(sender As Object, e As EventArgs) Handles 清空_bt.Click

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

@@ -828,7 +828,7 @@ Public Class 銷售單審核
 
                     DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                     PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                     SQL_銷售控制表_修改() '--------------------資料修改
 
                     For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -928,7 +928,7 @@ Public Class 銷售單審核
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -978,7 +978,7 @@ Public Class 銷售單審核
 
                 DTP = Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                 PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                 SQL_銷售控制表_修改() '--------------------資料修改
 
                 For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1

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

@@ -946,7 +946,7 @@ Public Class 銷售單申請
 
                     DTP = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                     PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                     SQL_銷售控制表_修改() '--------------------資料修改
 
                     For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -1046,7 +1046,7 @@ Public Class 銷售單申請
 
                     DTP = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                     PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                     SQL_銷售控制表_修改() '--------------------資料修改
 
                     For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -1100,7 +1100,7 @@ Public Class 銷售單申請
 
                     DTP = Strings.Format(開單日期_dtp.Value, "yyyy/MM/dd") : DTP1 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd") : BL1 = 含稅_ch.Checked : 運費 = 司機運費_tb.Text
                     PA1 = 流水號_tb.Text : PA2 = 單號_tb.Text : PA3 = 客戶編號_tb.Text : PA4 = 流水號_tb.Text : PA5 = 送貨地點_cb.Text : NU1 = 司機運費_tb.Text : NU2 = 管銷費用_tb.Text
-                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text
+                    NU3 = 稅金_tb.Text : NU4 = 刷卡傭金_tb.Text : NU5 = 銷售合計_tb.Text
                     SQL_銷售控制表_修改() '--------------------資料修改
 
                     For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
@@ -1814,12 +1814,13 @@ Public Class 銷售單申請
             xlSheet.Cells(5, 13) = "0" : xlSheet.Cells(6, 1) = "業務員:" : xlSheet.Cells(6, 2) = 業務_cb.Text : xlSheet.Cells(6, 4) = "稅金:"
             xlSheet.Cells(6, 5) = CInt(稅金_tb.Text) + 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, 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) = "廠商名稱"
             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
                 xlSheet.Cells(i + 9, 8) = 銷售明細_dgv.Rows(i).Cells("數量").Value : xlSheet.Cells(i + 9, 9) = 銷售明細_dgv.Rows(i).Cells("單價").Value
                 xlSheet.Cells(i + 9, 11) = 銷售明細_dgv.Rows(i).Cells("售價").Value : xlSheet.Cells(i + 9, 13) = 銷售明細_dgv.Rows(i).Cells("成本").Value
+                xlSheet.Cells(i + 9, 12) = 銷售明細_dgv.Rows(i).Cells("成本").Value * 1.06
                 PA30 = Strings.Left(銷售明細_dgv.Rows(i).Cells("料號").Value.ToString, 4) : Set_料號轉簡稱() : xlSheet.Cells(i + 9, 14) = 轉換_tb.Text
                 With xlApp.Selection
                     .Font.Bold = True
@@ -1827,7 +1828,7 @@ Public Class 銷售單申請
                 N1 = i + 9
             Next
             xlSheet.Cells(N1 + 3, 1) = "銷貨總額:" : xlSheet.Cells(N1 + 3, 2) = 銷售合計_tb.Text : xlSheet.Cells(N1 + 3, 4) = "成本:" : xlSheet.Cells(N1 + 3, 5) = 物料成本_tb.Text
-            xlSheet.Cells(N1 + 3, 7) = "運費:" : xlSheet.Cells(N1 + 3, 8) = 司機運費_tb.Text : xlSheet.Cells(N1 + 3, 10) = "管銷費用:" : xlSheet.Cells(N1 + 3, 11) = 管銷費用_tb.Text
+            xlSheet.Cells(N1 + 3, 7) = "運費:" : xlSheet.Cells(N1 + 3, 8) = 司機運費_tb.Text : xlSheet.Cells(N1 + 3, 9) = "管銷費用:" : xlSheet.Cells(N1 + 3, 10) = 管銷費用_tb.Text
             xlSheet.Cells(N1 + 3, 13) = "毛利:" : xlSheet.Cells(N1 + 3, 14) = 預估利潤_tb.Text
             BB(xlApp, xlSheet)
             xlApp.Cells.Select()
@@ -1849,18 +1850,21 @@ Public Class 銷售單申請
         End With
         '-------------------------------------------------------------------------------------------------------------------
         myExcel.Selection.ColumnWidth = 12.5
-
-        xlSheet.Columns("B:B").Select : myExcel.Selection.ColumnWidth = 12
-        xlSheet.Columns("D:D").Select : myExcel.Selection.ColumnWidth = 11.75
+        xlSheet.Columns("A:A").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("B:B").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("D:D").Select : myExcel.Selection.ColumnWidth = 11
+        xlSheet.Columns("F:F").Select : myExcel.Selection.ColumnWidth = 11
         xlSheet.Columns("G:G").Select : myExcel.Selection.ColumnWidth = 10.75
         xlSheet.Columns("I:I").Select : myExcel.Selection.ColumnWidth = 10.88
+        xlSheet.Columns("K:K").Select : myExcel.Selection.ColumnWidth = 11
         xlSheet.Columns("N:N").Select : myExcel.Selection.ColumnWidth = 30.63
         xlSheet.Columns("C:C").Select : myExcel.Selection.ColumnWidth = 5
         xlSheet.Columns("E:F").Select : myExcel.Selection.ColumnWidth = 10
-        xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 7
+        xlSheet.Columns("L:L").Select : myExcel.Selection.ColumnWidth = 12.5
         '---------調數字
         xlSheet.Columns("I:I").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
         xlSheet.Columns("K:K").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
+        xlSheet.Columns("L:L").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
         xlSheet.Columns("M:M").Select : myExcel.Selection.NumberFormatLocal = "#,##0_ ;[紅色]-#,##0 "
         '---------------------------------------------------------------------------------------------------------------------
         xlSheet.Range("A8:N8").Select()                                      '畫線
@@ -1954,6 +1958,9 @@ Public Class 銷售單申請
         xlSheet.Range("N8").Select()
         With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
+        xlSheet.Range("L8").Select()
+        With myExcel.Selection : .HorizontalAlignment = xlRight : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
         '---------------------------------------------------------------------------------------------------------------------------
         For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
             xlSheet.Range("A" & i + 9 & ":B" & i + 9 & "").Select()  '迴圈合併儲存格

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

@@ -126,12 +126,13 @@ Public Class 業績獎金彙總表
 
             SQL_業績主表2()
             da.Fill(ds7) : 獎金明細表_dgv.DataSource = ds7.Tables(0) : conn.Close()
-            獎金明細表_dgv.Columns(9).Visible = False : 獎金明細表_dgv.Columns(12).FillWeight = 300
+            獎金明細表_dgv.Columns(10).Visible = False : 獎金明細表_dgv.Columns(13).FillWeight = 300
 
             獎金明細表_dgv.Columns(2).DefaultCellStyle.Format = "#,##0" : 獎金明細表_dgv.Columns(3).DefaultCellStyle.Format = "#,##0"
             獎金明細表_dgv.Columns(4).DefaultCellStyle.Format = "#,##0" : 獎金明細表_dgv.Columns(5).DefaultCellStyle.Format = "#,##0"
             獎金明細表_dgv.Columns(6).DefaultCellStyle.Format = "#,##0" : 獎金明細表_dgv.Columns(7).DefaultCellStyle.Format = "#,##0"
             獎金明細表_dgv.Columns(8).DefaultCellStyle.Format = "#,##0" : 獎金明細表_dgv.Columns(9).DefaultCellStyle.Format = "#,##0"
+
             獎金明細表_dgv.Columns(2).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
             獎金明細表_dgv.Columns(3).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
             獎金明細表_dgv.Columns(4).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight
@@ -149,6 +150,7 @@ Public Class 業績獎金彙總表
             獎金明細表_dgv.Columns(7).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
             獎金明細表_dgv.Columns(8).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
             獎金明細表_dgv.Columns(9).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
+
             For I As Integer = 0 To 獎金明細表_dgv.Rows.Count - 1
                 獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value = "0" : 獎金明細表_dgv.Rows(I).Cells("成本").Value = "0" : 獎金明細表_dgv.Rows(I).Cells("運費").Value = "0"
                 獎金明細表_dgv.Rows(I).Cells("稅額(發票)").Value = "0" : 獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value = "0" : 獎金明細表_dgv.Rows(I).Cells("手續費(刷卡)").Value = "0"
@@ -218,7 +220,8 @@ Public Class 業績獎金彙總表
                 獎金明細表_dgv.Rows(I).Cells("毛利").Value = "0" : 獎金明細表_dgv.Rows(I).Cells("獎金").Value = "0"
                 獎金明細表_dgv.Rows(I).Cells("毛利").Value = 獎金明細表_dgv.Rows(I).Cells("銷貨總額").Value - 獎金明細表_dgv.Rows(I).Cells("成本").Value -
                                                              獎金明細表_dgv.Rows(I).Cells("運費").Value - 獎金明細表_dgv.Rows(I).Cells("稅額(發票)").Value -
-                                                             獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value - 獎金明細表_dgv.Rows(I).Cells("手續費(刷卡)").Value
+                                                             獎金明細表_dgv.Rows(I).Cells("其他(傭金)").Value - 獎金明細表_dgv.Rows(I).Cells("手續費(刷卡)").Value -
+                                                             獎金明細表_dgv.Rows(I).Cells("管銷費用").Value
             Next
         Catch ex As Exception
             MsgBox(ex.Message)

YD-ERP-SYS/財務系統管理/財務_收支單一覽表.Designer.vb

@@ -617,8 +617,8 @@ Partial Class 財務_收支單一覽表
         DataGridViewCellStyle1.BackColor = System.Drawing.Color.White
         DataGridViewCellStyle1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         DataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black
-        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.White
-        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black
+        DataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White
         DataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.[False]
         Me.明細_dgv.DefaultCellStyle = DataGridViewCellStyle1
         Me.明細_dgv.Location = New System.Drawing.Point(112, 78)

YD-ERP-SYS/財務系統管理/財務_收支單一覽表.vb

@@ -321,6 +321,9 @@ Public Class 財務_收支單一覽表
                     結束日期_dtp.Value = 日期彙總_dgv(0, e.RowIndex).Value.ToString
                 End If
                 申請日期_dtp.Value = 日期彙總_dgv(0, e.RowIndex).Value.ToString : Set_費用清單() : Set_清單3() : Set_清單2()
+                If 單據彙總_dgv.Rows.Count > 0 Then
+                    圖片編碼_tb.Text = 單據彙總_dgv(5, 0).Value.ToString
+                End If
             End If
         Catch ex As Exception
             MsgBox(ex.Message)
@@ -555,12 +558,12 @@ Public Class 財務_收支單一覽表
 
                 AA(xlApp, xlSheet) : BB(xlApp, xlSheet)
             ElseIf 明細_rb.Checked = False And 彙總_rb.Checked = True Then
-                xlSheet.Cells(1, 3) = "雅邸家居-營運費用收支彙總簡表"
+                xlSheet.Cells(1, 3) = "雅邸家居-營運費用收支彙總簡表 - " & Strings.Format(開始日期_dtp.Value, "yyyy/MM/dd") & " 到 " & Strings.Format(結束日期_dtp.Value, "yyyy/MM/dd")
                 xlSheet.Cells(2, 1) = "日期" : xlSheet.Cells(2, 2) = "主項" : xlSheet.Cells(2, 3) = "子項" : xlSheet.Cells(2, 4) = "子細項" : xlSheet.Cells(2, 5) = "零用金"
                 xlSheet.Cells(2, 6) = "支票" : xlSheet.Cells(2, 7) = "收入" : xlSheet.Cells(2, 8) = "支出" : xlSheet.Cells(2, 9) = "現金餘額"
 
                 For i As Integer = 0 To 財務彙總_dgv.Rows.Count - 1
-                    xlSheet.Cells(i + 3, 1) = 財務彙總_dgv.Rows(i).Cells("日期").Value
+                    xlSheet.Cells(i + 3, 1) = Strings.Left(Strings.Format(結束日期_dtp.Value, "yyyy/MM/dd"), 7)
                     xlSheet.Cells(i + 3, 2) = 財務彙總_dgv.Rows(i).Cells("主項").Value
                     xlSheet.Cells(i + 3, 3) = 財務彙總_dgv.Rows(i).Cells("子項").Value
                     xlSheet.Cells(i + 3, 4) = 財務彙總_dgv.Rows(i).Cells("子細項").Value
@@ -590,8 +593,8 @@ Public Class 財務_收支單一覽表
             xlSheet.Range("B1").Select()
             xlApp.Application.WindowState = xlMinimized
             xlSheet.Cells.Select()
-            xlApp.ActiveSheet.Protect(DrawingObjects:=True, Contents:=True, Scenarios:=True, Password:="0911274990")
-            xlApp.ActiveSheet.EnableSelection = 1
+            'xlApp.ActiveSheet.Protect(DrawingObjects:=True, Contents:=True, Scenarios:=True, Password:="0911274990")
+            'xlApp.ActiveSheet.EnableSelection = 1
             MsgBox("列印完成。")
         Catch ex As Exception
             MsgBox(ex.Message)
@@ -656,6 +659,9 @@ Public Class 財務_收支單一覽表
         With myExcel.Selection.Font : .Name = "微軟正黑體" : .Size = 14 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
             .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone
         End With
+        xlSheet.Columns("A:A").EntireColumn.AutoFit
+        xlSheet.Columns("B:B").EntireColumn.AutoFit
+        xlSheet.Columns("C:C").EntireColumn.AutoFit
     End Sub
     Private Sub BB(ByVal myExcel As Application, ByVal xlSheet As Worksheet)
         Clipboard.SetDataObject(簽名圖_pb.Image)
@@ -714,8 +720,9 @@ Public Class 財務_收支單一覽表
 
         xlSheet.Columns("E:I").Select : myExcel.Selection.NumberFormatLocal = "#,##0;[紅色]-#,##0"
         myExcel.ActiveWindow.DisplayGridlines = False
+        xlSheet.Columns("B:B").EntireColumn.AutoFit
+        xlSheet.Columns("D:D").EntireColumn.AutoFit
     End Sub
-
     '----------------------滑鼠右鍵--------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Private Sub 重新讀取ToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles 重新讀取ToolStripMenuItem.Click
         Set_清單1() : Set_清單() : Set_清單2() : 彙總計算()