20220331備份

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

@@ -54,7 +54,7 @@
             SQL2 = " WHERE 單號 LIKE '" & PA19 & "%' AND 單位主管 LIKE '' "
         End If
         ConnOpen()
-        SQL1 = "SELECT 流水號, 單號, 開單日期, 客戶編號, 交貨日期, 含稅, 單位主管, 審核日期, 業務人員, 送貨地點, 運費, 稅金
+        SQL1 = "SELECT 流水號, 單號, 開單日期, 客戶編號, 交貨日期, 含稅, 單位主管, 審核日期, 業務人員, 送貨地點, 運費, 稅金, 已出貨 AS 出貨
                 FROM   銷售控制表 " & SQL2 & " ORDER BY   CHARINDEX(LEFT(單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 單號 DESC"
         CmdSet_For_DGV()
     End Sub
@@ -109,9 +109,10 @@
     Friend Sub SQL_銷售控制表_訂單控制表()
         ConnOpen()
         SQL1 = "SELECT      銷售控制表.流水號, 銷售控制表.單號, 客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
-                            銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額, 
+                            銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額 AS 未收額額, 
                             銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 客戶資料表.電話1, 客戶資料表.電話2, 
-                            客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編, 銷售控制表.稅金
+                            客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編, 銷售控制表.稅金, 銷售控制表.已出貨 AS 出貨, 
+                            銷售控制表.轉業績日期, 銷售控制表.已出貨 AS 已結單
                 FROM        銷售控制表 INNER JOIN
                             客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 INNER JOIN
                                 (SELECT          銷售明細表.單號
@@ -437,6 +438,11 @@
         SQL1 = "UPDATE  銷售收款事項 SET 收支單號 = N'" & PA & "', 轉財務 = 1 WHERE (資料流水號 LIKE '" & PA12 & "')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_應收帳款未收_轉財務_退回()
+        ConnOpen()
+        SQL1 = "UPDATE  銷售收款事項 SET 收支單號 = N'', 轉財務 = 0 WHERE (資料流水號 LIKE '" & PA12 & "')"
+        CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_銷售衍生運費_轉財務()
         ConnOpen()
         SQL1 = "UPDATE  銷售衍生運費 SET 收支單號 = N'" & PA & "', 轉財務 = 1 WHERE (資料流水號 LIKE '" & PA12 & "')"

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

@@ -236,6 +236,12 @@
                "VALUES (N'" & PA & "', N'" & gUserName & "', N'" & DTP4 & "', N'', N'', N'', N'', N'', N'', N'', N'雅邸家具')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_營運成本收支單申請_刪除公帳控制表_應收用()
+        ConnOpen() : SQL1 = "DELETE FROM 公帳控制表 WHERE (支付單號 LIKE '" & PA & "')" : CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_營運成本收支單申請_刪除公帳流水帳_應收用()
+        ConnOpen() : SQL1 = "DELETE FROM 公帳流水帳 WHERE (支付單號 LIKE '" & PA & "')" : CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_會計科目管理_開立零用金支付單()
         ConnOpen()
         SQL1 = "INSERT INTO 公帳流水帳 (流水號, 銀行, 日期, 類別, 收入, 支出, 明細, 人員, 支付單號, 項次, 會計, 出納, 現金, 備用金, 公帳, 支票, 

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

@@ -168,6 +168,10 @@
                                       物料狀態 = N'" & PA8 & "', 訂製狀態 = N'" & PA7 & "', 不含管銷 = N'" & BL6 & "' 
                 WHERE (資料流水號 LIKE N'" & PA11 & "')"
         CmdSet_For_dr()
+        ConnOpen()
+        SQL1 = "UPDATE 採購控制表 SET 物料狀態 = N'" & PA8 & "', 訂製狀態 = N'" & PA7 & "', 倉儲狀態 = N'" & PA9 & "', 備註 = N'" & PA10 & "', 成本 = '" & NU1 & "'
+                WHERE  銷售流水 LIKE '" & PA11 & "%'"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_銷售明細表_成本讀取()
         ConnOpen()
@@ -248,14 +252,37 @@
                             物料訂製狀態.訂製, 倉儲狀態.狀態, 銷售明細表.備註, 銷售明細表.數量, 銷售明細表.成本, 銷售明細表.售價 AS 單價, 
                             銷售明細表.含稅, 銷售明細表.售價, 銷售明細表.狀態 AS 倉儲情況, 銷售明細表.資料流水號 AS 倉儲流水號, 銷售明細表.倉儲狀態, 銷售明細表.訂製狀態, 
                             銷售明細表.物料狀態, 銷售明細表.不含管銷 AS 無管銷
-                FROM              銷售明細表 INNER JOIN
+                FROM        銷售明細表 INNER JOIN
                             倉儲狀態 ON 銷售明細表.物料狀態 = 倉儲狀態.編碼 INNER JOIN
                             倉儲分區控制表 ON 銷售明細表.倉儲狀態 = 倉儲分區控制表.倉名編號 LEFT OUTER JOIN
-                            採購控制表 ON 銷售明細表.資料流水號 = 採購控制表.銷售流水 LEFT OUTER JOIN
+                            採購控制表 ON 銷售明細表.料號 = 採購控制表.料號 AND 
+                            銷售明細表.資料流水號 = 採購控制表.銷售流水 LEFT OUTER JOIN
                             物料訂製狀態 ON 銷售明細表.訂製狀態 = 物料訂製狀態.編碼 LEFT OUTER JOIN
                             物料資料庫 ON 銷售明細表.料號 = 物料資料庫.料號
                 WHERE      (銷售明細表.單號 LIKE '" & PA2 & "')
-                ORDER BY   銷售明細表.排序 DESC, 銷售明細表.料號"
+                ORDER BY    銷售明細表.排序 DESC, 銷售明細表.料號"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_銷售明細表_轉採購_一般用()
+        ConnOpen()
+        SQL1 = "SELECT      銷售明細表.單號, 銷售明細表.資料流水號, 銷售明細表.資料流水號 AS 項次, 銷售明細表.料號, 物料資料庫.品名, 
+                            倉儲分區控制表.倉名, 物料訂製狀態.訂製, 倉儲狀態.狀態, 銷售明細表.備註, 銷售明細表.數量, 銷售明細表.成本, 
+                            銷售明細表.售價 AS 單價, 銷售明細表.含稅, 銷售明細表.售價 AS 金額, 銷售明細表.狀態 AS 倉儲情況, 
+                            銷售明細表.資料流水號 AS 倉儲流水號, 
+                            銷售明細表.倉儲狀態, 銷售明細表.訂製狀態,銷售明細表.物料狀態
+                FROM        銷售明細表 INNER JOIN
+                            倉儲狀態 ON 銷售明細表.物料狀態 = 倉儲狀態.編碼 INNER JOIN
+                            倉儲分區控制表 ON 銷售明細表.倉儲狀態 = 倉儲分區控制表.倉名編號 LEFT OUTER JOIN
+                            倉儲明細表 ON 銷售明細表.料號 = 倉儲明細表.料號 AND 銷售明細表.單號 = 倉儲明細表.採購單號 LEFT OUTER JOIN
+                            物料訂製狀態 ON 銷售明細表.訂製狀態 = 物料訂製狀態.編碼 LEFT OUTER JOIN
+                            物料資料庫 ON 銷售明細表.料號 = 物料資料庫.料號
+                WHERE      (銷售明細表.單號 LIKE '" & PA2 & "%') AND (銷售明細表.料號 NOT LIKE '1%') AND (銷售明細表.已出貨 <> 1) AND 
+                           (銷售明細表.料號 NOT LIKE 'Y199999')
+                GROUP BY    銷售明細表.資料流水號, 銷售明細表.資料流水號, 銷售明細表.料號, 物料資料庫.品名, 倉儲分區控制表.倉名, 
+                            物料訂製狀態.訂製, 倉儲狀態.狀態, 銷售明細表.備註, 銷售明細表.數量, 銷售明細表.成本, 銷售明細表.售價, 
+                            銷售明細表.含稅, 銷售明細表.售價, 銷售明細表.狀態, 銷售明細表.資料流水號, 銷售明細表.倉儲狀態, 
+                            銷售明細表.訂製狀態, 銷售明細表.物料狀態, 銷售明細表.單號
+                ORDER BY    銷售明細表.料號"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_銷售明細表_轉採購()
@@ -387,8 +414,8 @@
         ConnOpen()
         SQL1 = "SELECT      採購控制表.已過帳 AS 選擇, 採購控制表.資料流水號, 採購控制表.銷售單號, 採購控制表.供商編號, 供應商資料表.簡稱 AS 供應商, 採購控制表.料號, 物料資料庫.品名, 
                             採購控制表.倉儲狀態, 倉儲分區控制表.倉名 AS 倉名, 採購控制表.訂製狀態, 物料訂製狀態.訂製, 採購控制表.物料狀態, 倉儲狀態.狀態 AS 狀態, 採購控制表.備註, 
-                            採購控制表.訂製圖號, 採購控制表.數量, 採購控制表.成本, 採購控制表.採購總價 AS 金額, 採購控制表.申請人, 採購控制表.申請日期, 採購控制表.採購日期, 採購控制表.預計進廠日, 
-                            採購控制表.實際進廠日, 採購控制表.過帳日期, 採購控制表.已入庫, 採購控制表.已審核
+                            採購控制表.訂製圖號, 採購控制表.數量, 採購控制表.成本, 採購控制表.採購總價 AS 金額, 採購控制表.申請人, 採購控制表.申請日期, 採購控制表.採購日期, 
+                            採購控制表.預計進廠日, 採購控制表.實際進廠日, 採購控制表.過帳日期, 採購控制表.已入庫, 採購控制表.已審核, 採購控制表.銷售流水
                 FROM        採購控制表 INNER JOIN 供應商資料表 ON 採購控制表.供商編號 = 供應商資料表.編號 INNER JOIN 物料資料庫 ON 採購控制表.料號 = 物料資料庫.料號 INNER JOIN 倉儲狀態 ON 
                             採購控制表.物料狀態 = 倉儲狀態.編碼 INNER JOIN 物料訂製狀態 ON 採購控制表.訂製狀態 = 物料訂製狀態.編碼 INNER JOIN 倉儲分區控制表 ON 採購控制表.倉儲狀態 = 
                             倉儲分區控制表.倉名編號
@@ -402,7 +429,7 @@
         SQL1 = "SELECT      採購控制表.已過帳 AS 選擇, 採購控制表.資料流水號, 採購控制表.銷售單號, 採購控制表.供商編號, 供應商資料表.簡稱 AS 供應商, 採購控制表.料號, 物料資料庫.品名, 
                             採購控制表.倉儲狀態, 倉儲分區控制表.倉名 AS 倉名, 採購控制表.訂製狀態, 物料訂製狀態.訂製, 採購控制表.物料狀態, 倉儲狀態.狀態 AS 狀態, 採購控制表.備註, 
                             採購控制表.訂製圖號, 採購控制表.數量, 採購控制表.成本, 採購控制表.採購總價 AS 金額, 採購控制表.申請人, 採購控制表.申請日期, 採購控制表.採購日期, 採購控制表.預計進廠日, 
-                            採購控制表.實際進廠日, 採購控制表.過帳日期, 採購控制表.已入庫, 採購控制表.已審核
+                            採購控制表.實際進廠日, 採購控制表.過帳日期, 採購控制表.已入庫, 採購控制表.已審核, 採購控制表.銷售流水
                 FROM        採購控制表 INNER JOIN 供應商資料表 ON 採購控制表.供商編號 = 供應商資料表.編號 INNER JOIN 物料資料庫 ON 採購控制表.料號 = 物料資料庫.料號 INNER JOIN 倉儲狀態 ON 
                             採購控制表.物料狀態 = 倉儲狀態.編碼 INNER JOIN 物料訂製狀態 ON 採購控制表.訂製狀態 = 物料訂製狀態.編碼 INNER JOIN 倉儲分區控制表 ON 採購控制表.倉儲狀態 = 
                             倉儲分區控制表.倉名編號
@@ -441,6 +468,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 供應商, 採購控制表.料號, 物料資料庫.品名, 採購控制表.倉儲狀態, 
@@ -518,6 +561,10 @@
                                       成本 = '" & NU2 & "', 採購總價 = '" & NU3 & "', 採購日期 = N'" & PA5 & "', 預計進廠日 = N'" & PA6 & "', 實際進廠日 = N'" & PA7 & "'
                 WHERE 資料流水號 LIKE '" & PA & "%'"
         CmdSet_For_dr()
+        ConnOpen()
+        SQL1 = "UPDATE 銷售明細表 SET 成本 = N'" & NU2 & "',倉儲狀態 = N'" & PA3 & "', 物料狀態 = N'" & PA1 & "', 訂製狀態 = N'" & PA2 & "' 
+                WHERE (資料流水號 LIKE N'" & PA8 & "')"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_採購控制表_存檔1()
         ConnOpen()
@@ -526,10 +573,14 @@
     End Sub
     Friend Sub SQL_採購控制表_存檔2()
         ConnOpen()
-        SQL1 = "UPDATE 採購控制表 SET 物料狀態 = N'" & PA1 & "', 訂製狀態 = N'" & PA2 & "', 倉儲狀態 = N'" & PA3 & "', 備註 = N'" & PA4 & "', 數量 = '" & NU1 & "',過帳日期 = N'" & PA35 & "',
-                                      成本 = '" & NU2 & "', 採購總價 = '" & NU3 & "', 採購日期 = N'" & PA5 & "', 預計進廠日 = N'" & PA6 & "', 實際進廠日 = N'" & PA7 & "' 
+        SQL1 = "UPDATE 採購控制表 SET 物料狀態 = N'" & PA1 & "', 訂製狀態 = N'" & PA2 & "', 倉儲狀態 = N'" & PA3 & "', 備註 = N'" & PA4 & "', 數量 = '" & NU1 & "',
+                                      成本 = '" & NU2 & "', 採購總價 = '" & NU3 & "', 採購日期 = N'" & PA5 & "', 預計進廠日 = N'" & PA7 & "', 實際進廠日 = N'" & PA35 & "' 
                 WHERE 資料流水號 LIKE '" & PA & "%'"
         CmdSet_For_dr()
+        ConnOpen()
+        SQL1 = "UPDATE 銷售明細表 SET 成本 = N'" & NU2 & "',倉儲狀態 = N'" & PA3 & "', 物料狀態 = N'" & PA1 & "', 訂製狀態 = N'" & PA2 & "' 
+                WHERE (資料流水號 LIKE N'" & PA8 & "')"
+        CmdSet_For_dr()
     End Sub
     Friend Sub SQL_採購控制表_過帳()
         ConnOpen()

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

YD-ERP-SYS/倉儲系統管理/倉儲控制表.vb

@@ -432,6 +432,9 @@ Public Class 倉儲控制表
     Private Sub 倉儲狀態_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 倉儲狀態_cb.SelectedIndexChanged
         Set_清單()
     End Sub
+    Private Sub 料號2_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 料號2_tb.KeyPress
+        If e.KeyChar = Chr(13) Then : 查詢_bt.PerformClick() : End If
+    End Sub
     Private Sub 清空_bt_Click(sender As Object, e As EventArgs) Handles 清空_bt.Click
         指定倉庫_cb_下拉表單資料載入() : 倉儲狀態_cb_下拉表單資料載入() : Set_清單()
     End Sub

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

@@ -1,7 +1,9 @@
 Option Strict Off
 Public Class 一般申請_採購單
-    ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet
-    Dim 首次開啟 As Boolean = False : Dim NUM1 As Integer : Dim EDR As Integer = 0 : Dim ESTR As String : Dim 關鍵字 As Boolean
+    ReadOnly ds, ds1, ds2, ds3, ds4 As New DataSet
+    Dim NUM1, EDR As Integer
+    Dim ESTR As String
+    Dim 首次開啟, 關鍵字 As Boolean
     Private Sub Set_清單()
         Try
             物料清單_dgv.DataSource = Nothing : ds.Clear()
@@ -51,7 +53,8 @@ Public Class 一般申請_採購單
 
             If 關鍵字 = True Then : Else : PA = 供應商編碼1_cb.Text : End If
             PA20 = 業務1_cb.Text
-            SQL_採購控制表_一般採購_未出庫()
+            If 未核准_ch.Checked = True Then : SQL_採購控制表_一般採購_未出庫() : Else : SQL_採購控制表_一般採購_已出庫() : End If
+
             da.Fill(ds1) : 採購清單_dgv.DataSource = ds1.Tables(0) : conn.Close()
             Set_採購清單_dgv_下拉式清單1() : Set_採購清單_dgv_下拉式清單2() : Set_採購清單_dgv_下拉式清單3()
 
@@ -191,6 +194,48 @@ Public Class 一般申請_採購單
             MsgBox(ex.Message)
         End Try
     End Sub
+    Private Sub Set_清單4()
+        銷售明細_dgv.DataSource = Nothing : ds4.Clear()
+        銷售明細_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        銷售明細_dgv.ColumnHeadersHeight = 40
+        銷售明細_dgv.AllowUserToAddRows = False
+        銷售明細_dgv.RowTemplate.Height = 45
+
+        PA2 = 業務_cb.Text
+        SQL_銷售明細表_轉採購_一般用()
+        da.Fill(ds4) : 銷售明細_dgv.DataSource = ds4.Tables(0) : conn.Close()
+
+        銷售明細_dgv.Columns(0).FillWeight = 100 : 銷售明細_dgv.Columns(1).Visible = False : 銷售明細_dgv.Columns(2).Visible = False : 銷售明細_dgv.Columns(3).FillWeight = 100
+        銷售明細_dgv.Columns(4).FillWeight = 200 : 銷售明細_dgv.Columns(5).Visible = False : 銷售明細_dgv.Columns(6).Visible = False : 銷售明細_dgv.Columns(7).Visible = False
+        銷售明細_dgv.Columns(8).FillWeight = 200 : 銷售明細_dgv.Columns(9).FillWeight = 50 : 銷售明細_dgv.Columns(10).Visible = False : 銷售明細_dgv.Columns(11).Visible = False
+        銷售明細_dgv.Columns(12).Visible = False : 銷售明細_dgv.Columns(13).Visible = False : 銷售明細_dgv.Columns(14).Visible = False : 銷售明細_dgv.Columns(15).Visible = False
+        銷售明細_dgv.Columns(16).Visible = False : 銷售明細_dgv.Columns(17).Visible = False : 銷售明細_dgv.Columns(18).Visible = False
+        銷售明細_dgv.Columns(1).ReadOnly = True : 銷售明細_dgv.Columns(2).ReadOnly = True : 銷售明細_dgv.Columns(3).ReadOnly = True : 銷售明細_dgv.Columns(4).ReadOnly = True
+        銷售明細_dgv.Columns(5).ReadOnly = True : 銷售明細_dgv.Columns(6).ReadOnly = True : 銷售明細_dgv.Columns(8).ReadOnly = True : 銷售明細_dgv.Columns(12).ReadOnly = True
+        銷售明細_dgv.Columns(13).ReadOnly = True
+
+        銷售明細_dgv.Columns("數量").DefaultCellStyle.Format = "#,##0" : 銷售明細_dgv.Columns("成本").DefaultCellStyle.Format = "#,##0"
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Format = "#,##0.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
+        銷售明細_dgv.Columns("成本").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("單價").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("單價").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("金額").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("金額").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("項次").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("項次").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("倉儲情況").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("倉儲情況").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("料號").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+        銷售明細_dgv.Columns("料號").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+
+        For i As Integer = 0 To 銷售明細_dgv.Rows.Count - 1
+            銷售明細_dgv("金額", i).Value = 銷售明細_dgv("數量", i).Value * 銷售明細_dgv("成本", i).Value : 銷售明細_dgv("項次", i).Value = i + 1
+        Next
+        銷售明細_dgv.EditMode = DataGridViewEditMode.EditOnEnter
+    End Sub
     Private Sub Set_清單5()
         Try
             訂製圖檔_dgv.DataSource = Nothing : ds2.Clear()
@@ -246,8 +291,8 @@ Public Class 一般申請_採購單
         End Try
     End Sub
     Private Sub 業務_cb_下拉表單資料載入()
-        SQL_業務編號_下拉清單() : 業務1_cb.Items.Clear() : 業務1_cb.Items.Clear()
-        While (dr.Read()) : 業務1_cb.Items.Add(dr("業務號")) : End While : conn.Close()
+        SQL_業務編號_下拉清單() : 業務_cb.Items.Clear() : 業務1_cb.Items.Clear()
+        While (dr.Read()) : 業務_cb.Items.Add(dr("業務號")) : 業務1_cb.Items.Add(dr("業務號")) : End While : conn.Close()
     End Sub
     Private Sub 倉儲狀態_cb_下拉表單資料載入()
         SQL_倉儲狀態_下拉清單() : 倉儲狀態_cb.Items.Clear() : 儲態編號_cb.Items.Clear()
@@ -284,7 +329,7 @@ Public Class 一般申請_採購單
             '--------------------控件隱藏、操作許可設定與其他基本顯示設定------------------------------------------------------------
             料號_tb.Enabled = False : 中間距_ch.Checked = True
             指定倉庫_cb_下拉表單資料載入() : 訂製狀態_cb_下拉表單資料載入() : 倉儲狀態_cb_下拉表單資料載入() : 業務_cb_下拉表單資料載入()
-
+            Set_清單4()
             '--------------------資料讀取--------------------------------------------------------------------------------------------
             首次開啟 = False : Set_清單() : Set_清單1()
 
@@ -462,6 +507,17 @@ Public Class 一般申請_採購單
             End If
         End If
     End Sub
+    Private Sub 銷售明細_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 銷售明細_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            單號_tb.Text = 銷售明細_dgv("單號", e.RowIndex).Value.ToString : 供應商編碼_cb.Text = Strings.Left(銷售明細_dgv.Rows(e.RowIndex).Cells("料號").Value.ToString, 4)
+            料號_tb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("料號").Value.ToString : 儲態編號1_cb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("物料狀態").Value.ToString
+            訂製編碼1_cb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("訂製狀態").Value.ToString : 倉庫編號1_tb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("倉儲狀態").Value.ToString
+            備註1_tb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("備註").Value.ToString : 採購數量1_nud.Value = 銷售明細_dgv.Rows(e.RowIndex).Cells("數量").Value.ToString
+            採購單價1_nud.Value = 銷售明細_dgv.Rows(e.RowIndex).Cells("成本").Value.ToString : 流水號_tb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("資料流水號").Value.ToString
+            儲態編號2_cb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("狀態").Value.ToString : 倉庫編號2_tb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("倉名").Value.ToString
+            訂製編碼2_cb.Text = 銷售明細_dgv.Rows(e.RowIndex).Cells("訂製").Value.ToString
+        End If
+    End Sub
     Private Sub 物料清單_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 物料清單_dgv.RowPostPaint
         Dim linePen As New Pen(Color.Blue, 2)
         If e.RowIndex = 物料清單_dgv.Rows.Count - 1 Then : Exit Sub : Else
@@ -785,6 +841,35 @@ Public Class 一般申請_採購單
         區域庫存_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
         物料清單_dgv.RowsDefaultCellStyle.Font = New Font("微軟正黑體", 字體_NUD.Value)
     End Sub
+    Private Sub 轉採購_bt_Click(sender As Object, e As EventArgs) Handles 轉採購_bt.Click
+        If 單號_tb.Text = "" Then : MsgBox("請選擇單號!!") : Else
+            PA = 單號_tb.Text ': SQL_銷售控制表_轉採購修改()
+            SQL_採購控制表_最後一筆資料()
+            If dr.Read() Then : EDR = Double.Parse(Strings.Right(dr("資料流水號").ToString, 9)) : Else : EDR = 0 : End If
+            conn.Close() : EDR += 1
+            If EDR < 10 Then : ESTR = "PU" & "00000000" & EDR
+            ElseIf EDR > 9 And EDR < 100 Then : ESTR = "PU" & "0000000" & EDR
+            ElseIf EDR > 99 And EDR < 1000 Then : ESTR = "PU" & "000000" & EDR
+            ElseIf EDR > 999 And EDR < 10000 Then : ESTR = "PU" & "00000" & EDR
+            ElseIf EDR > 9999 And EDR < 100000 Then : ESTR = "PU" & "0000" & EDR
+            ElseIf EDR > 99999 And EDR < 100000 Then : ESTR = "PU" & "000" & EDR
+            ElseIf EDR > 999999 And EDR < 1000000 Then : ESTR = "PU" & "00" & EDR
+            ElseIf EDR > 9999999 And EDR < 10000000 Then : ESTR = "PU" & "0" & EDR
+            ElseIf EDR > 99999999 Then : ESTR = "PU" & EDR : End If
+
+            PA1 = ESTR : PA2 = 單號_tb.Text : PA3 = 供應商編碼_cb.Text : PA4 = 料號_tb.Text : PA5 = 儲態編號1_cb.Text : PA6 = 訂製編碼1_cb.Text
+            PA7 = 倉庫編號1_tb.Text : PA8 = 備註1_tb.Text : NU1 = 採購數量1_nud.Value : NU2 = 採購單價1_nud.Value : NU3 = NU1 * NU2 : PA9 = gUserName
+            PA10 = Strings.Format(Today(), "yyyy/MM/dd") : PA11 = Strings.Format(採購日期_dtp.Value, "yyyy/MM/dd") : PA13 = 流水號_tb.Text : BL1 = True
+            PA12 = Strings.Format(交貨日期_dtp.Value, "yyyy/MM/dd")
+            SQL_採購控制表_新增() : 未核准_ch.Checked = False : 已核准_ch.Checked = True : Set_清單1() : Set_清單4()
+        End If
+    End Sub
+    Private Sub 未核准_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 未核准_ch.Click
+        未核准_ch.Checked = True : 已核准_ch.Checked = False : Set_清單1()
+    End Sub
+    Private Sub 已核准_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 已核准_ch.Click
+        未核准_ch.Checked = False : 已核准_ch.Checked = True : Set_清單1()
+    End Sub
     Private Sub 供應商資料_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 供應商資料_ch.Click
         Set_供應商抬頭隱藏()
     End Sub
@@ -800,4 +885,7 @@ Public Class 一般申請_採購單
     Private Sub 銷售單號_ch_CheckedChanged(sender As Object, e As EventArgs) Handles 銷售單號_ch.Click
         Set_銷售單號隱藏()
     End Sub
+    Private Sub 業務_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 業務_cb.SelectedIndexChanged
+        Set_清單4()
+    End Sub
 End Class

YD-ERP-SYS/採購系統管理/採購單審核.Designer.vb

@@ -584,6 +584,7 @@ Partial Class 採購單審核
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.採購清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.採購清單_dgv.BackgroundColor = System.Drawing.Color.Silver
         Me.採購清單_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.採購清單_dgv.Location = New System.Drawing.Point(5, 108)
         Me.採購清單_dgv.Name = "採購清單_dgv"

YD-ERP-SYS/採購系統管理/採購單審核.vb

@@ -1,6 +1,6 @@
 Option Strict Off
 Public Class 採購單審核
-    ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet : ReadOnly ds3 As New DataSet : ReadOnly ds4 As New DataSet
+    ReadOnly ds, ds1, ds2, ds3, ds4 As New DataSet
     Dim EDR As Integer = 0 : Dim ESTR As String : Dim 關鍵字 As Boolean
     Private Sub Set_清單1()
         Try
@@ -448,7 +448,7 @@ Public Class 採購單審核
                 If gUserName <> 採購清單_dgv("申請人", i).Value And Val(登入人級別) >= 3 Then
                 Else
                     PA = 採購清單_dgv("資料流水號", i).Value : PA1 = 採購清單_dgv("物料狀態", i).Value : PA2 = 採購清單_dgv("訂製狀態", i).Value : PA3 = 採購清單_dgv("倉儲狀態", i).Value
-                    PA4 = 採購清單_dgv("備註", i).Value.ToString : PA5 = 採購清單_dgv("採購日期", i).Value.ToString : PA6 = 採購清單_dgv("預計進廠日", i).Value.ToString
+                    PA4 = 採購清單_dgv("備註", i).Value.ToString : PA5 = 採購清單_dgv("採購日期", i).Value.ToString : PA6 = 採購清單_dgv("預計進廠日", i).Value.ToString : PA7 = ""
                     NU1 = 採購清單_dgv("數量", i).Value : NU2 = 採購清單_dgv("成本", i).Value : NU3 = NU1 * NU2
                     SQL_採購控制表_存檔()
                 End If

YD-ERP-SYS/採購系統管理/採購對帳單.vb

@@ -47,9 +47,10 @@ Public Class 採購對帳單
             採購清單_dgv.Columns(16).FillWeight = 195 : 採購清單_dgv.Columns(17).Visible = False : 採購清單_dgv.Columns(18).FillWeight = 45 : 採購清單_dgv.Columns(19).FillWeight = 80
             採購清單_dgv.Columns(20).Visible = False : 採購清單_dgv.Columns(21).Visible = False : 採購清單_dgv.Columns(22).Visible = False : 採購清單_dgv.Columns(23).FillWeight = 80
             採購清單_dgv.Columns(24).FillWeight = 80 : 採購清單_dgv.Columns(25).FillWeight = 80 : 採購清單_dgv.Columns(26).FillWeight = 80 : 採購清單_dgv.Columns(27).FillWeight = 45
-            採購清單_dgv.Columns(28).FillWeight = 45
+            採購清單_dgv.Columns(28).FillWeight = 45 : 採購清單_dgv.Columns(29).Visible = False
 
-            採購清單_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
@@ -583,7 +584,8 @@ Public Class 採購對帳單
                 Else
                     PA = 採購清單_dgv("資料流水號", i).Value : PA1 = 採購清單_dgv("物料狀態", i).Value : PA2 = 採購清單_dgv("訂製狀態", i).Value : PA3 = 採購清單_dgv("倉儲狀態", i).Value
                     PA4 = 採購清單_dgv("備註", i).Value.ToString : PA5 = 採購清單_dgv("採購日期", i).Value.ToString : PA6 = 採購清單_dgv("預計進廠日", i).Value.ToString
-                    NU1 = 採購清單_dgv("數量", i).Value : NU2 = 採購清單_dgv("成本", i).Value : NU3 = NU1 * NU2
+                    NU1 = 採購清單_dgv("數量", i).Value : NU2 = 採購清單_dgv("成本", i).Value : NU3 = NU1 * NU2 : PA7 = 採購清單_dgv("實際進廠日", i).Value.ToString
+                    PA8 = 採購清單_dgv("銷售流水", i).Value.ToString
                     SQL_採購控制表_存檔()
                 End If
             Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0
@@ -601,7 +603,7 @@ Public Class 採購對帳單
                     PA = 採購清單_dgv("資料流水號", i).Value : PA1 = 採購清單_dgv("物料狀態", i).Value : PA2 = 採購清單_dgv("訂製狀態", i).Value : PA3 = 採購清單_dgv("倉儲狀態", i).Value
                     PA4 = 採購清單_dgv("備註", i).Value.ToString : PA5 = 採購清單_dgv("採購日期", i).Value.ToString : PA6 = 採購清單_dgv("預計進廠日", i).Value.ToString
                     NU1 = 採購清單_dgv("數量", i).Value : NU2 = 採購清單_dgv("成本", i).Value : NU3 = NU1 * NU2 : PA35 = 採購清單_dgv("實際進廠日", i).Value.ToString
-                    PA7 = 採購清單_dgv("預計進廠日", i).Value.ToString
+                    PA7 = 採購清單_dgv("預計進廠日", i).Value.ToString : PA8 = 採購清單_dgv("銷售流水", i).Value.ToString
                     SQL_採購控制表_存檔2()
                 End If
             Next : YD_ERP_SYS.ToolStripProgressBar1.Value = 0 : 最終數 = 0

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

@@ -562,7 +562,6 @@ Public Class 銷售申請_採購單
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try
-
     End Sub
     Private Sub 取消轉換_bt_Click(sender As Object, e As EventArgs) Handles 取消轉換_bt.Click
         轉採購_bt.Enabled = False : 銷售單顯示_ch.Checked = False : Me.TabControl1.SelectedTab = Me.TabPage1

YD-ERP-SYS/業務系統管理/應收帳款已收.Designer.vb

@@ -31,6 +31,7 @@ Partial Class 應收帳款已收
         Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.財務單據退回_bt = New System.Windows.Forms.Button()
         Me.衍生運費_dgv = New System.Windows.Forms.DataGridView()
         Me.其他費用_dgv = New System.Windows.Forms.DataGridView()
         Me.其他費用_bt = New System.Windows.Forms.Button()
@@ -104,6 +105,7 @@ Partial Class 應收帳款已收
         Me.人民幣匯率_tb = New System.Windows.Forms.TextBox()
         Me.項次3_tb = New System.Windows.Forms.TextBox()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.流水號2_bt = New System.Windows.Forms.TextBox()
         Me.Panel1.SuspendLayout()
         CType(Me.衍生運費_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.其他費用_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -118,6 +120,8 @@ Partial Class 應收帳款已收
         Me.Panel1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel1.Controls.Add(Me.流水號2_bt)
+        Me.Panel1.Controls.Add(Me.財務單據退回_bt)
         Me.Panel1.Controls.Add(Me.衍生運費_dgv)
         Me.Panel1.Controls.Add(Me.其他費用_dgv)
         Me.Panel1.Controls.Add(Me.其他費用_bt)
@@ -182,6 +186,19 @@ Partial Class 應收帳款已收
         Me.Panel1.Size = New System.Drawing.Size(1236, 624)
         Me.Panel1.TabIndex = 1
         '
+        '財務單據退回_bt
+        '
+        Me.財務單據退回_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.財務單據退回_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.財務單據退回_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+        Me.財務單據退回_bt.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.財務單據退回_bt.Location = New System.Drawing.Point(1096, 423)
+        Me.財務單據退回_bt.Name = "財務單據退回_bt"
+        Me.財務單據退回_bt.Size = New System.Drawing.Size(134, 25)
+        Me.財務單據退回_bt.TabIndex = 1555
+        Me.財務單據退回_bt.Text = "財務單據退回"
+        Me.財務單據退回_bt.UseVisualStyleBackColor = True
+        '
         '衍生運費_dgv
         '
         DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
@@ -1004,6 +1021,15 @@ Partial Class 應收帳款已收
         '
         Me.Timer1.Interval = 500
         '
+        '流水號2_bt
+        '
+        Me.流水號2_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.流水號2_bt.Enabled = False
+        Me.流水號2_bt.Location = New System.Drawing.Point(967, 425)
+        Me.流水號2_bt.Name = "流水號2_bt"
+        Me.流水號2_bt.Size = New System.Drawing.Size(120, 23)
+        Me.流水號2_bt.TabIndex = 1556
+        '
         '應收帳款已收
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -1102,4 +1128,6 @@ Partial Class 應收帳款已收
     Friend WithEvents 衍生運費_dgv As DataGridView
     Friend WithEvents 銷售備註流水號_tb As TextBox
     Friend WithEvents 運費資料流水號_tb As TextBox
+    Friend WithEvents 財務單據退回_bt As Button
+    Friend WithEvents 流水號2_bt As TextBox
 End Class

YD-ERP-SYS/業務系統管理/應收帳款已收.vb

@@ -52,7 +52,7 @@
             da.Fill(ds6) : 收款事項_dgv.DataSource = ds6.Tables(0) : conn.Close()
 
             收款事項_dgv.Columns(0).Visible = False : 收款事項_dgv.Columns(1).Visible = False : 收款事項_dgv.Columns(2).Visible = False : 收款事項_dgv.Columns(3).FillWeight = 120
-            收款事項_dgv.Columns(4).FillWeight = 960 : 收款事項_dgv.Columns(5).FillWeight = 180 : 收款事項_dgv.Columns(6).Visible = False : 收款事項_dgv.Columns(7).FillWeight = 50
+            收款事項_dgv.Columns(4).FillWeight = 960 : 收款事項_dgv.Columns(5).FillWeight = 180 : 收款事項_dgv.Columns(6).FillWeight = 250 : 收款事項_dgv.Columns(7).FillWeight = 50
             收款事項_dgv.Columns(8).FillWeight = 50
             收款事項_dgv.Columns(3).ReadOnly = True : 收款事項_dgv.Columns(7).ReadOnly = True
 
@@ -340,6 +340,7 @@
                 項次2_tb.Text = 收款事項_dgv("項次", e.RowIndex).Value.ToString
                 項次3_tb.Text = 收款事項_dgv("真項次", e.RowIndex).Value.ToString
                 營運成本收支單號_tb.Text = 收款事項_dgv("收支單號", e.RowIndex).Value.ToString
+                流水號2_bt.Text = 收款事項_dgv("資料流水號", e.RowIndex).Value.ToString
             End If
             For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
                 If 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
@@ -382,6 +383,7 @@
     Private Sub 衍生運費_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 衍生運費_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             運費資料流水號_tb.Text = 衍生運費_dgv("資料流水號", e.RowIndex).Value.ToString : 項次2_tb.Text = 衍生運費_dgv("項次", e.RowIndex).Value.ToString
+            流水號2_bt.Text = 收款事項_dgv("資料流水號", e.RowIndex).Value.ToString : 營運成本收支單號_tb.Text = 衍生運費_dgv("收支單號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub 其他費用_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 其他費用_dgv.CellClick
@@ -392,6 +394,7 @@
                 會科1_ch.SelectedIndex = 0 : ComboBox3.SelectedIndex = 3 : ComboBox1.SelectedIndex = 12
             End If
             銷售備註流水號_tb.Text = 其他費用_dgv("資料流水號", e.RowIndex).Value.ToString : 項次2_tb.Text = 其他費用_dgv("項次", e.RowIndex).Value.ToString
+            流水號2_bt.Text = 收款事項_dgv("資料流水號", e.RowIndex).Value.ToString : 營運成本收支單號_tb.Text = 其他費用_dgv("收支單號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub ComboBox5_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 會科1_ch.TextChanged
@@ -568,6 +571,19 @@
             MsgBox(ex.Message)
         End Try
     End Sub
+    Private Sub 財務單據退回_bt_Click(sender As Object, e As EventArgs) Handles 財務單據退回_bt.Click
+        Try
+            If 營運成本收支單號_tb.Text = "" Then
+                MsgBox("沒有選擇要退回的資料，無法操作")
+            Else
+                PA = 營運成本收支單號_tb.Text
+                SQL_營運成本收支單申請_刪除公帳控制表_應收用() : SQL_營運成本收支單申請_刪除公帳流水帳_應收用()
+                PA12 = 流水號2_bt.Text : SQL_應收帳款未收_轉財務_退回() : conn.Close() : Set_清單2() : Set_清單3() : Set_清單4()
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
     Private Sub 轉財務系統_bt_Click(sender As Object, e As EventArgs) Handles 轉財務系統_bt.Click
         Try
             If 銷售收款_bt.Enabled = False Then

YD-ERP-SYS/業務系統管理/應收帳款未收.Designer.vb

@@ -104,6 +104,8 @@ Partial Class 應收帳款未收
         Me.人民幣匯率_tb = New System.Windows.Forms.TextBox()
         Me.ComboBox6 = New System.Windows.Forms.ComboBox()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
+        Me.流水號2_bt = New System.Windows.Forms.TextBox()
+        Me.財務單據退回_bt = New System.Windows.Forms.Button()
         CType(Me.銷售單據_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.字體_NUD, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -127,6 +129,8 @@ Partial Class 應收帳款未收
         'Panel1
         '
         resources.ApplyResources(Me.Panel1, "Panel1")
+        Me.Panel1.Controls.Add(Me.流水號2_bt)
+        Me.Panel1.Controls.Add(Me.財務單據退回_bt)
         Me.Panel1.Controls.Add(Me.其他費用_bt)
         Me.Panel1.Controls.Add(Me.衍生運費_bt)
         Me.Panel1.Controls.Add(Me.銷售收款_bt)
@@ -647,6 +651,18 @@ Partial Class 應收帳款未收
         '
         Me.Timer1.Interval = 500
         '
+        '流水號2_bt
+        '
+        resources.ApplyResources(Me.流水號2_bt, "流水號2_bt")
+        Me.流水號2_bt.Name = "流水號2_bt"
+        '
+        '財務單據退回_bt
+        '
+        resources.ApplyResources(Me.財務單據退回_bt, "財務單據退回_bt")
+        Me.財務單據退回_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+        Me.財務單據退回_bt.Name = "財務單據退回_bt"
+        Me.財務單據退回_bt.UseVisualStyleBackColor = True
+        '
         '應收帳款未收
         '
         resources.ApplyResources(Me, "$this")
@@ -740,4 +756,6 @@ Partial Class 應收帳款未收
     Friend WithEvents 衍生運費_bt As Button
     Friend WithEvents 運費資料流水號_tb As TextBox
     Friend WithEvents 銷售備註流水號_tb As TextBox
+    Friend WithEvents 流水號2_bt As TextBox
+    Friend WithEvents 財務單據退回_bt As Button
 End Class

YD-ERP-SYS/業務系統管理/應收帳款未收.resx

@@ -145,11 +145,71 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;銷售單據_dgv.ZOrder" xml:space="preserve">
-    <value>58</value>
+    <value>60</value>
   </data>
   <data name="Panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
+  <data name="流水號2_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="流水號2_bt.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="流水號2_bt.Location" type="System.Drawing.Point, System.Drawing">
+    <value>967, 421</value>
+  </data>
+  <data name="流水號2_bt.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 23</value>
+  </data>
+  <data name="流水號2_bt.TabIndex" type="System.Int32, mscorlib">
+    <value>1558</value>
+  </data>
+  <data name="&gt;&gt;流水號2_bt.Name" xml:space="preserve">
+    <value>流水號2_bt</value>
+  </data>
+  <data name="&gt;&gt;流水號2_bt.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;流水號2_bt.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;流水號2_bt.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="財務單據退回_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
+  <data name="財務單據退回_bt.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微軟正黑體, 9pt</value>
+  </data>
+  <data name="財務單據退回_bt.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="財務單據退回_bt.Location" type="System.Drawing.Point, System.Drawing">
+    <value>1096, 419</value>
+  </data>
+  <data name="財務單據退回_bt.Size" type="System.Drawing.Size, System.Drawing">
+    <value>134, 25</value>
+  </data>
+  <data name="財務單據退回_bt.TabIndex" type="System.Int32, mscorlib">
+    <value>1557</value>
+  </data>
+  <data name="財務單據退回_bt.Text" xml:space="preserve">
+    <value>財務單據退回</value>
+  </data>
+  <data name="&gt;&gt;財務單據退回_bt.Name" xml:space="preserve">
+    <value>財務單據退回_bt</value>
+  </data>
+  <data name="&gt;&gt;財務單據退回_bt.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;財務單據退回_bt.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;財務單據退回_bt.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="其他費用_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
   </data>
@@ -181,7 +241,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;其他費用_bt.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="衍生運費_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -214,7 +274,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;衍生運費_bt.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>3</value>
   </data>
   <data name="銷售收款_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -247,7 +307,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;銷售收款_bt.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>4</value>
   </data>
   <data name="RadioButton3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -277,7 +337,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;RadioButton3.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>5</value>
   </data>
   <data name="RadioButton2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -307,7 +367,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;RadioButton2.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>6</value>
   </data>
   <data name="RadioButton1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -337,7 +397,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;RadioButton1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>7</value>
   </data>
   <data name="今天_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -373,7 +433,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;今天_bt.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>8</value>
   </data>
   <data name="申請日期_dtp.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -397,7 +457,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;申請日期_dtp.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>9</value>
   </data>
   <data name="Label18.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -427,7 +487,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label18.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>10</value>
   </data>
   <data name="申請人_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -460,7 +520,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;申請人_tb.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>11</value>
   </data>
   <data name="轉財務系統_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -493,7 +553,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;轉財務系統_bt.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="營運成本收支單號_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -520,7 +580,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;營運成本收支單號_tb.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>13</value>
   </data>
   <data name="Label16.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -553,7 +613,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label16.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>14</value>
   </data>
   <data name="關鍵字查詢會計科目_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -583,7 +643,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;關鍵字查詢會計科目_tb.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>15</value>
   </data>
   <data name="幣別_cb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -619,7 +679,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;幣別_cb.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>16</value>
   </data>
   <data name="ComboBox4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -643,7 +703,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;ComboBox4.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>17</value>
   </data>
   <data name="ComboBox3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -667,7 +727,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;ComboBox3.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>18</value>
   </data>
   <data name="會科碼1_ch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -691,7 +751,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;會科碼1_ch.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>19</value>
   </data>
   <data name="會科1_ch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -715,7 +775,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;會科1_ch.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>20</value>
   </data>
   <data name="ComboBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -742,7 +802,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>21</value>
   </data>
   <data name="Label2.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -772,7 +832,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>20</value>
+    <value>22</value>
   </data>
   <data name="銷售合計1_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -802,7 +862,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;銷售合計1_tb.ZOrder" xml:space="preserve">
-    <value>21</value>
+    <value>23</value>
   </data>
   <data name="Label34.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -832,7 +892,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label34.ZOrder" xml:space="preserve">
-    <value>22</value>
+    <value>24</value>
   </data>
   <data name="Label30.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Right</value>
@@ -865,7 +925,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label30.ZOrder" xml:space="preserve">
-    <value>23</value>
+    <value>25</value>
   </data>
   <data name="Label5.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -898,7 +958,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
-    <value>24</value>
+    <value>26</value>
   </data>
   <data name="Label1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -931,7 +991,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>25</value>
+    <value>27</value>
   </data>
   <data name="Label3.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -964,7 +1024,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
-    <value>26</value>
+    <value>28</value>
   </data>
   <data name="Label8.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -997,7 +1057,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label8.ZOrder" xml:space="preserve">
-    <value>27</value>
+    <value>29</value>
   </data>
   <data name="客戶_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1024,7 +1084,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;客戶_tb.ZOrder" xml:space="preserve">
-    <value>28</value>
+    <value>30</value>
   </data>
   <data name="電話1_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1051,7 +1111,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;電話1_tb.ZOrder" xml:space="preserve">
-    <value>29</value>
+    <value>31</value>
   </data>
   <data name="電話2_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1078,7 +1138,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;電話2_tb.ZOrder" xml:space="preserve">
-    <value>30</value>
+    <value>32</value>
   </data>
   <data name="Label10.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1111,7 +1171,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label10.ZOrder" xml:space="preserve">
-    <value>31</value>
+    <value>33</value>
   </data>
   <data name="含稅_ch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1147,7 +1207,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;含稅_ch.ZOrder" xml:space="preserve">
-    <value>32</value>
+    <value>34</value>
   </data>
   <data name="公司_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1174,7 +1234,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;公司_tb.ZOrder" xml:space="preserve">
-    <value>33</value>
+    <value>35</value>
   </data>
   <data name="交貨日期_dtp.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1201,7 +1261,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;交貨日期_dtp.ZOrder" xml:space="preserve">
-    <value>34</value>
+    <value>36</value>
   </data>
   <data name="統編_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1228,7 +1288,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;統編_tb.ZOrder" xml:space="preserve">
-    <value>35</value>
+    <value>37</value>
   </data>
   <data name="Label9.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1261,7 +1321,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label9.ZOrder" xml:space="preserve">
-    <value>36</value>
+    <value>38</value>
   </data>
   <data name="Label11.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1294,7 +1354,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label11.ZOrder" xml:space="preserve">
-    <value>37</value>
+    <value>39</value>
   </data>
   <data name="開單日期_dtp.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1321,7 +1381,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;開單日期_dtp.ZOrder" xml:space="preserve">
-    <value>38</value>
+    <value>40</value>
   </data>
   <data name="Label4.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1354,7 +1414,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
-    <value>39</value>
+    <value>41</value>
   </data>
   <data name="Label7.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1387,7 +1447,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label7.ZOrder" xml:space="preserve">
-    <value>40</value>
+    <value>42</value>
   </data>
   <data name="存檔_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1417,7 +1477,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;存檔_bt.ZOrder" xml:space="preserve">
-    <value>41</value>
+    <value>43</value>
   </data>
   <data name="字體大小調整_lb.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1450,7 +1510,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;字體大小調整_lb.ZOrder" xml:space="preserve">
-    <value>42</value>
+    <value>44</value>
   </data>
   <data name="字體_NUD.Location" type="System.Drawing.Point, System.Drawing">
     <value>635, 3</value>
@@ -1471,7 +1531,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;字體_NUD.ZOrder" xml:space="preserve">
-    <value>43</value>
+    <value>45</value>
   </data>
   <data name="未審核_lb.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1498,7 +1558,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;未審核_lb.ZOrder" xml:space="preserve">
-    <value>44</value>
+    <value>46</value>
   </data>
   <data name="客戶1_tb.Location" type="System.Drawing.Point, System.Drawing">
     <value>173, 4</value>
@@ -1519,7 +1579,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;客戶1_tb.ZOrder" xml:space="preserve">
-    <value>45</value>
+    <value>47</value>
   </data>
   <data name="Label12.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1549,7 +1609,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label12.ZOrder" xml:space="preserve">
-    <value>46</value>
+    <value>48</value>
   </data>
   <data name="單號_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1576,7 +1636,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;單號_tb.ZOrder" xml:space="preserve">
-    <value>47</value>
+    <value>49</value>
   </data>
   <data name="業務_cb.Items" xml:space="preserve">
     <value />
@@ -1645,7 +1705,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;業務_cb.ZOrder" xml:space="preserve">
-    <value>48</value>
+    <value>50</value>
   </data>
   <data name="Label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1675,7 +1735,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label13.ZOrder" xml:space="preserve">
-    <value>49</value>
+    <value>51</value>
   </data>
   <data name="刪除收款事項上點選的資料_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1705,7 +1765,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;刪除收款事項上點選的資料_bt.ZOrder" xml:space="preserve">
-    <value>50</value>
+    <value>52</value>
   </data>
   <data name="新增一筆收款事項_bt.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1735,7 +1795,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;新增一筆收款事項_bt.ZOrder" xml:space="preserve">
-    <value>51</value>
+    <value>53</value>
   </data>
   <data name="項次2_tb.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1762,7 +1822,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;項次2_tb.ZOrder" xml:space="preserve">
-    <value>52</value>
+    <value>54</value>
   </data>
   <data name="Label14.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1792,7 +1852,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label14.ZOrder" xml:space="preserve">
-    <value>53</value>
+    <value>55</value>
   </data>
   <data name="Label17.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left</value>
@@ -1822,7 +1882,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label17.ZOrder" xml:space="preserve">
-    <value>54</value>
+    <value>56</value>
   </data>
   <data name="衍生運費_dgv.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left, Right</value>
@@ -1849,7 +1909,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;衍生運費_dgv.ZOrder" xml:space="preserve">
-    <value>55</value>
+    <value>57</value>
   </data>
   <data name="收款事項_dgv.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left, Right</value>
@@ -1876,7 +1936,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;收款事項_dgv.ZOrder" xml:space="preserve">
-    <value>56</value>
+    <value>58</value>
   </data>
   <data name="其他費用_dgv.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Left, Right</value>
@@ -1903,7 +1963,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;其他費用_dgv.ZOrder" xml:space="preserve">
-    <value>57</value>
+    <value>59</value>
   </data>
   <data name="銷售備註流水號_tb.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -2215,7 +2275,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Panel2.ZOrder" xml:space="preserve">
-    <value>59</value>
+    <value>61</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
     <value>2, 3</value>

YD-ERP-SYS/業務系統管理/應收帳款未收.vb

@@ -341,6 +341,7 @@
                 項次2_tb.Text = 收款事項_dgv("項次", e.RowIndex).Value.ToString
                 項次3_tb.Text = 收款事項_dgv("真項次", e.RowIndex).Value.ToString
                 營運成本收支單號_tb.Text = 收款事項_dgv("收支單號", e.RowIndex).Value.ToString
+                流水號2_bt.Text = 收款事項_dgv("資料流水號", e.RowIndex).Value.ToString
             End If
             For i As Integer = 0 To 收款事項_dgv.Rows.Count - 1
                 If 收款事項_dgv("內容", i).Value.ToString = "未收餘額" Then
@@ -380,6 +381,7 @@
     Private Sub 衍生運費_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 衍生運費_dgv.CellClick
         If e.RowIndex = -1 Then : Else
             運費資料流水號_tb.Text = 衍生運費_dgv("資料流水號", e.RowIndex).Value.ToString : 項次2_tb.Text = 衍生運費_dgv("項次", e.RowIndex).Value.ToString
+            流水號2_bt.Text = 衍生運費_dgv("資料流水號", e.RowIndex).Value.ToString : 營運成本收支單號_tb.Text = 衍生運費_dgv("收支單號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub 其他費用_dgv_CellClick(ByVal sender As System.Object, ByVal e As DataGridViewCellEventArgs) Handles 其他費用_dgv.CellClick
@@ -390,6 +392,7 @@
                 會科1_ch.SelectedIndex = 0 : ComboBox3.SelectedIndex = 3 : ComboBox1.SelectedIndex = 12
             End If
             銷售備註流水號_tb.Text = 其他費用_dgv("資料流水號", e.RowIndex).Value.ToString : 項次2_tb.Text = 其他費用_dgv("項次", e.RowIndex).Value.ToString
+            流水號2_bt.Text = 收款事項_dgv("資料流水號", e.RowIndex).Value.ToString : 營運成本收支單號_tb.Text = 其他費用_dgv("收支單號", e.RowIndex).Value.ToString
         End If
     End Sub
     Private Sub ComboBox5_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 會科1_ch.TextChanged
@@ -567,6 +570,19 @@
             MsgBox(ex.Message)
         End Try
     End Sub
+    Private Sub 財務單據退回_bt_Click(sender As Object, e As EventArgs) Handles 財務單據退回_bt.Click
+        Try
+            If 營運成本收支單號_tb.Text = "" Then
+                MsgBox("沒有選擇要退回的資料，無法操作")
+            Else
+                PA = 營運成本收支單號_tb.Text
+                SQL_營運成本收支單申請_刪除公帳控制表_應收用() : SQL_營運成本收支單申請_刪除公帳流水帳_應收用()
+                PA12 = 流水號2_bt.Text : SQL_應收帳款未收_轉財務_退回() : conn.Close() : Set_清單2() : Set_清單3() : Set_清單4()
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message)
+        End Try
+    End Sub
     Private Sub 轉財務系統_bt_Click(sender As Object, e As EventArgs) Handles 轉財務系統_bt.Click
         Try
             If 銷售收款_bt.Enabled = False Then

YD-ERP-SYS/業務系統管理/訂單控制表.vb

@@ -14,15 +14,20 @@ Public Class 訂單控制表
             SQL_銷售控制表_訂單控制表()
             da.Fill(ds1) : 銷售單據_dgv.DataSource = ds1.Tables(0) : conn.Close()
 
-            銷售單據_dgv.Columns(0).Visible = False : 銷售單據_dgv.Columns(1).FillWeight = 85 : 銷售單據_dgv.Columns(2).FillWeight = 100 : 銷售單據_dgv.Columns(3).FillWeight = 110
-            銷售單據_dgv.Columns(4).FillWeight = 110 : 銷售單據_dgv.Columns(5).FillWeight = 50 : 銷售單據_dgv.Columns(6).Visible = False : 銷售單據_dgv.Columns(7).FillWeight = 110
-            銷售單據_dgv.Columns(8).FillWeight = 85 : 銷售單據_dgv.Columns(9).FillWeight = 100 : 銷售單據_dgv.Columns(10).Visible = False : 銷售單據_dgv.Columns(11).Visible = False
+            銷售單據_dgv.Columns(0).Visible = False : 銷售單據_dgv.Columns(1).FillWeight = 85 : 銷售單據_dgv.Columns(2).FillWeight = 100 : 銷售單據_dgv.Columns(3).FillWeight = 100
+            銷售單據_dgv.Columns(4).FillWeight = 100 : 銷售單據_dgv.Columns(5).FillWeight = 65 : 銷售單據_dgv.Columns(6).Visible = False : 銷售單據_dgv.Columns(7).Visible = False
+            銷售單據_dgv.Columns(8).Visible = False : 銷售單據_dgv.Columns(9).FillWeight = 100 : 銷售單據_dgv.Columns(10).Visible = False : 銷售單據_dgv.Columns(11).Visible = False
             銷售單據_dgv.Columns(12).Visible = False : 銷售單據_dgv.Columns(13).Visible = False : 銷售單據_dgv.Columns(14).Visible = False : 銷售單據_dgv.Columns(15).Visible = False
-            銷售單據_dgv.Columns(16).Visible = False : 銷售單據_dgv.Columns(17).Visible = False : 銷售單據_dgv.Columns(18).Visible = False
-
-            銷售單據_dgv.Columns("金額").DefaultCellStyle.Format = "#,##0"
-            銷售單據_dgv.Columns("金額").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
-            銷售單據_dgv.Columns("金額").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+            銷售單據_dgv.Columns(16).Visible = False : 銷售單據_dgv.Columns(17).Visible = False : 銷售單據_dgv.Columns(18).Visible = False : 銷售單據_dgv.Columns(19).FillWeight = 65
+            銷售單據_dgv.Columns(20).Visible = False : 銷售單據_dgv.Columns(21).FillWeight = 65
+            銷售單據_dgv.Columns("未收額額").DefaultCellStyle.Format = "#,##0"
+            銷售單據_dgv.Columns("未收額額").DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter
+            銷售單據_dgv.Columns("未收額額").HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleCenter
+            For i As Integer = 0 To 銷售單據_dgv.Rows.Count - 1
+                If IsDBNull(銷售單據_dgv("轉業績日期", i).Value) Then : 銷售單據_dgv("轉業績日期", i).Value = "" : End If
+                If IsDBNull(銷售單據_dgv("已結單", i).Value) Then : 銷售單據_dgv("已結單", i).Value = False : Else : 銷售單據_dgv("已結單", i).Value = False : End If
+                If 銷售單據_dgv("轉業績日期", i).Value.ToString <> "" Then : 銷售單據_dgv("已結單", i).Value = True : End If
+            Next
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try

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

@@ -62,6 +62,7 @@ Public Class 銷售單申請
             銷售單據_dgv.Columns(0).Visible = False : 銷售單據_dgv.Columns(1).FillWeight = 100 : 銷售單據_dgv.Columns(2).Visible = False : 銷售單據_dgv.Columns(3).Visible = False
             銷售單據_dgv.Columns(4).Visible = False : 銷售單據_dgv.Columns(5).Visible = False : 銷售單據_dgv.Columns(6).Visible = False : 銷售單據_dgv.Columns(7).Visible = False
             銷售單據_dgv.Columns(8).Visible = False : 銷售單據_dgv.Columns(9).Visible = False : 銷售單據_dgv.Columns(10).Visible = False : 銷售單據_dgv.Columns(11).Visible = False
+            銷售單據_dgv.Columns(12).FillWeight = 45
         Catch ex As Exception
             MsgBox(ex.Message)
         End Try

YD-ERP-SYS/財務系統管理/業績結單控制表.vb

@@ -116,6 +116,9 @@
             MsgBox(ex.Message)
         End Try
     End Sub
+    Private Sub 查詢單號_tb_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles 查詢單號_tb.KeyPress
+        If e.KeyChar = Chr(13) Then : 查詢_bt.PerformClick() : End If
+    End Sub
     Private Sub 不可完單_bt_Click(sender As Object, e As EventArgs) Handles 不可完單_bt.Click
         已完單_bt.Enabled = True : 未完單_bt.Enabled = True : 不可完單_bt.Enabled = False : 存檔_bt.Enabled = False : 開始日期_dtp.Value = Today() : Set_清單1()
     End Sub

YD-ERP-SYS/財務系統管理/財務_收支單申請.vb

@@ -457,11 +457,15 @@ Public Class 財務_收支單申請
             Dim aa As MsgBoxResult
             aa = MsgBox("確定要刪除該筆資料?", MsgBoxStyle.OkCancel)
             If aa = MsgBoxResult.Ok Then
-                SQL_營運成本收支單申請_刪除公帳控制表() : conn.Close()
-                SQL_營運成本收支單申請_刪除公帳流水帳() : conn.Close()
-                營運成本收支單號_tb.Text = "" : 申請人_tb.Text = "" : 選擇項次_tb.Text = ""
-                明細表_dgv.DataSource = Nothing : ds.Clear()
-                Set_清單1()
+                Dim SSA As String
+                SSA = InputBox("確定刪除資料請輸入 [YES] !")
+                If SSA = "YES" Then
+                    SQL_營運成本收支單申請_刪除公帳控制表() : conn.Close()
+                    SQL_營運成本收支單申請_刪除公帳流水帳() : conn.Close()
+                    營運成本收支單號_tb.Text = "" : 申請人_tb.Text = "" : 選擇項次_tb.Text = ""
+                    明細表_dgv.DataSource = Nothing : ds.Clear()
+                    Set_清單1()
+                End If
             End If
         Catch ex As Exception
             MsgBox(ex.Message)