B70340 2 роки тому
джерело
коміт
45b8819196

BIN
.vs/YD-ERP-SYS/FileContentIndex/75af0310-9ba2-4d18-a5a9-c99161794013.vsidx Переглянути файл


BIN
.vs/YD-ERP-SYS/FileContentIndex/cfae0794-6e93-4b2b-a231-9e653d22dd4b.vsidx Переглянути файл


BIN
.vs/YD-ERP-SYS/v17/.suo Переглянути файл


+ 33
- 9
YD-ERP-SYS/LoginForm1.vb Переглянути файл

@@ -10,6 +10,7 @@ Public Class LoginForm1
10 10
     ' 接著,My.User 便會傳回封裝在 CustomPrincipal 物件中的識別資訊,
11 11
     ' 例如使用者名稱、顯示名稱等。
12 12
     ReadOnly ds2 As New DataSet
13
+    Dim Str As String = Application.StartupPath
13 14
     Dim MACKK As String 'MAC碼
14 15
     Dim diskId As String '數字ID
15 16
     Dim diskSerialNumber As String '硬碟序列
@@ -42,9 +43,33 @@ Public Class LoginForm1
42 43
     End Sub
43 44
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
44 45
         '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
45
-        Dim Str As String = Application.StartupPath
46
-        If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
47
-        Timer1.Enabled = False
46
+        Dim 已開啟 As Boolean = False
47
+        Dim Strs As String = Application.StartupPath
48
+        If File.Exists(My.Computer.FileSystem.SpecialDirectories.Desktop & "\SYS-UPDATE.exe") Then
49
+            Dim pro() As Process = System.Diagnostics.Process.GetProcesses()
50
+            ' 判斷是否有符合的Process
51
+            For Each process As Process In pro
52
+                If ("SYS-UPDATE").Equals(process.ProcessName) Then
53
+                    已開啟 = True
54
+                End If
55
+            Next
56
+            If 已開啟 = False Then
57
+                Timer1.Enabled = False
58
+                If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
59
+            End If
60
+        ElseIf File.Exists(Strs & "\SYS-UPDATE.exe") Then
61
+            Dim pro() As Process = System.Diagnostics.Process.GetProcesses()
62
+            ' 判斷是否有符合的Process
63
+            For Each process As Process In pro
64
+                If ("SYS-UPDATE").Equals(process.ProcessName) Then
65
+                    已開啟 = True
66
+                End If
67
+            Next
68
+            If 已開啟 = False Then
69
+                Timer1.Enabled = False
70
+                If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
71
+            End If
72
+        End If
48 73
     End Sub
49 74
     Private Sub LoginForm1_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
50 75
         '-----------------------伺服器登入選擇-----------------------------------------------------------------------------------------------------------------------------------------------
@@ -118,13 +143,12 @@ Public Class LoginForm1
118 143
         登入程序()
119 144
     End Sub
120 145
     Private Sub 自動更新2()
121
-        Dim aa1 As MsgBoxResult
122
-        aa1 = MsgBox("系統版本號 與 資料庫版本號 對應不上,請下載最新的執行檔。", MsgBoxStyle.OkCancel)
123
-        If aa1 = MsgBoxResult.Ok Then
124
-            Dim Str As String = Application.StartupPath
146
+        Dim Str As String = Application.StartupPath
147
+        If File.Exists(Str + "\NOTAUTO.txt") Then
148
+            If 使用者帳號_cb.Text = "b70340" Or 使用者帳號_cb.Text = "B70340" Then : Else : End If
149
+        Else
125 150
             My.Computer.Network.DownloadFile(Target & AA(0) & "/" & "SYS-UPDATE.exe", Str + "\SYS-UPDATE.exe")
126
-            Shell(Str + "\SYS-UPDATE.exe", vbNormalFocus)
127
-            Me.Close()
151
+            Shell(Str + "\SYS-UPDATE.exe", vbNormalFocus) : Me.Close()
128 152
         End If
129 153
     End Sub
130 154
     Private Sub 登入第一層()

+ 26
- 0
YD-ERP-SYS/Module/SQL_業務系統管理.vb Переглянути файл

@@ -132,6 +132,32 @@
132 132
                 ORDER BY   CHARINDEX(LEFT(銷售控制表.單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 銷售控制表.單號 DESC"
133 133
         CmdSet_For_DGV()
134 134
     End Sub
135
+    Friend Sub SQL_銷售控制表_訂單控制表1()
136
+        ConnOpen()
137
+        SQL1 = "SELECT      銷售控制表.流水號, 銷售控制表.單號, 客戶資料表.名稱, 銷售控制表.開單日期, 銷售控制表.交貨日期, 
138
+                            銷售控制表.含稅, 銷售控制表.單位主管, 銷售控制表.審核日期, 銷售收款事項.內容, 銷售收款事項.金額 AS 未收額額, 
139
+                            銷售控制表.送貨地點, 銷售控制表.運費, 銷售控制表.客戶編號, 客戶資料表.電話1, 客戶資料表.電話2, 
140
+                            客戶資料表.地址, 客戶資料表.公司名稱, 客戶資料表.統編, 銷售控制表.稅金, 銷售控制表.已出貨 AS 出貨, 
141
+                            銷售控制表.轉業績日期, 銷售控制表.已出貨 AS 已結單, 銷售控制表.銷貨總額
142
+                FROM        銷售控制表 INNER JOIN
143
+                            客戶資料表 ON 銷售控制表.客戶編號 = 客戶資料表.舊編 INNER JOIN
144
+                                (SELECT          銷售明細表.單號
145
+                                  FROM               銷售明細表 INNER JOIN
146
+                                                              物料資料庫 ON 銷售明細表.料號 = 物料資料庫.料號
147
+                                  WHERE           (銷售明細表.料號 LIKE N'%" & PA21 & "%') OR
148
+                                                              (銷售明細表.備註 LIKE N'%" & PA21 & "%') OR
149
+                                                              (物料資料庫.品名 LIKE N'%" & PA21 & "%')
150
+                                  GROUP BY    銷售明細表.單號) AS QQQ ON 銷售控制表.單號 = QQQ.單號 LEFT OUTER JOIN
151
+                            銷售收款事項 ON 銷售控制表.單號 = 銷售收款事項.單號
152
+                WHERE      (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.名稱 LIKE N'%" & PA20 & "%') OR
153
+                           (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.電話1 LIKE N'%" & PA20 & "%') OR
154
+                           (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.電話2 LIKE N'%" & PA20 & "%') OR
155
+                           (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.地址 LIKE N'%" & PA20 & "%') OR
156
+                           (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.公司名稱 LIKE N'%" & PA20 & "%') OR
157
+                           (銷售收款事項.內容 LIKE '%" & PA22 & "%') AND (客戶資料表.統編 LIKE N'%" & PA20 & "%')
158
+                ORDER BY   CHARINDEX(LEFT(銷售控制表.單號, 1), '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'), 銷售控制表.單號 DESC"
159
+        CmdSet_For_DGV()
160
+    End Sub
135 161
     '---------------------銷售分析表-----------------------------------------------------------------------------------------------------------------
136 162
     Friend Sub SQL_銷售分析表_物料明細()
137 163
         If 銷售分析表.依開單日期_ch.Checked = False Then

+ 1
- 1
YD-ERP-SYS/Module/全域變數.vb Переглянути файл

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

+ 0
- 0
YD-ERP-SYS/bin/Debug/NOTAUTO.txt Переглянути файл


BIN
YD-ERP-SYS/bin/Debug/YD-ERP-SYS.exe Переглянути файл


BIN
YD-ERP-SYS/bin/Debug/YD-ERP-SYS.pdb Переглянути файл


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.exe Переглянути файл


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.pdb Переглянути файл


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.AssemblyReference.cache Переглянути файл


BIN
YD-ERP-SYS/obj/Debug/YD-ERP-SYS.vbproj.GenerateResource.cache Переглянути файл


+ 93
- 56
YD-ERP-SYS/業務系統管理/訂單控制表.Designer.vb Переглянути файл

@@ -23,18 +23,18 @@ Partial Class 訂單控制表
23 23
     <System.Diagnostics.DebuggerStepThrough()>
24 24
     Private Sub InitializeComponent()
25 25
         Me.components = New System.ComponentModel.Container()
26
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
27
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
28
-        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
29
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
30
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
31
-        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
32
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
33
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
34
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
35
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
36
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
37
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
26
+        Dim DataGridViewCellStyle13 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
27
+        Dim DataGridViewCellStyle14 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
28
+        Dim DataGridViewCellStyle15 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
29
+        Dim DataGridViewCellStyle16 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
30
+        Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
31
+        Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
32
+        Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
33
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
34
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
35
+        Dim DataGridViewCellStyle22 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
36
+        Dim DataGridViewCellStyle23 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
37
+        Dim DataGridViewCellStyle24 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
38 38
         Me.業務_cb = New System.Windows.Forms.ComboBox()
39 39
         Me.銷售單據_dgv = New System.Windows.Forms.DataGridView()
40 40
         Me.未審核_lb = New System.Windows.Forms.Label()
@@ -138,6 +138,7 @@ Partial Class 訂單控制表
138 138
         Me.重新整理_tsm = New System.Windows.Forms.ToolStripMenuItem()
139 139
         Me.Label13 = New System.Windows.Forms.Label()
140 140
         Me.Panel2 = New System.Windows.Forms.Panel()
141
+        Me.批量刷銷售_bt = New System.Windows.Forms.Button()
141 142
         Me.查詢_bt = New System.Windows.Forms.Button()
142 143
         Me.物料關鍵字_tb = New System.Windows.Forms.TextBox()
143 144
         Me.Label15 = New System.Windows.Forms.Label()
@@ -146,7 +147,9 @@ Partial Class 訂單控制表
146 147
         Me.字體_NUD = New System.Windows.Forms.NumericUpDown()
147 148
         Me.顯示_bt = New System.Windows.Forms.Button()
148 149
         Me.隱藏_bt = New System.Windows.Forms.Button()
149
-        Me.批量刷銷售_bt = New System.Windows.Forms.Button()
150
+        Me.查詢1_bt = New System.Windows.Forms.Button()
151
+        Me.帳務關鍵字_tb = New System.Windows.Forms.TextBox()
152
+        Me.Label16 = New System.Windows.Forms.Label()
150 153
         CType(Me.銷售單據_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
151 154
         Me.Panel1.SuspendLayout()
152 155
         CType(Me.銷售衍生運費_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -173,20 +176,20 @@ Partial Class 訂單控制表
173 176
         '
174 177
         '銷售單據_dgv
175 178
         '
176
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
177
-        Me.銷售單據_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
179
+        DataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
180
+        Me.銷售單據_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle13
178 181
         Me.銷售單據_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
179 182
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
180 183
         Me.銷售單據_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
181 184
         Me.銷售單據_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
182
-        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 52)
185
+        Me.銷售單據_dgv.Location = New System.Drawing.Point(3, 77)
183 186
         Me.銷售單據_dgv.Name = "銷售單據_dgv"
184 187
         Me.銷售單據_dgv.RowHeadersWidth = 5
185
-        DataGridViewCellStyle2.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
186
-        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
187
-        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
188
+        DataGridViewCellStyle14.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
189
+        DataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
190
+        Me.銷售單據_dgv.RowsDefaultCellStyle = DataGridViewCellStyle14
188 191
         Me.銷售單據_dgv.RowTemplate.Height = 24
189
-        Me.銷售單據_dgv.Size = New System.Drawing.Size(548, 661)
192
+        Me.銷售單據_dgv.Size = New System.Drawing.Size(548, 636)
190 193
         Me.銷售單據_dgv.TabIndex = 1256
191 194
         '
192 195
         '未審核_lb
@@ -462,8 +465,8 @@ Partial Class 訂單控制表
462 465
         '
463 466
         '銷售衍生運費_dgv
464 467
         '
465
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
466
-        Me.銷售衍生運費_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
468
+        DataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
469
+        Me.銷售衍生運費_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle15
467 470
         Me.銷售衍生運費_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
468 471
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
469 472
         Me.銷售衍生運費_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -471,9 +474,9 @@ Partial Class 訂單控制表
471 474
         Me.銷售衍生運費_dgv.Location = New System.Drawing.Point(3, 540)
472 475
         Me.銷售衍生運費_dgv.Name = "銷售衍生運費_dgv"
473 476
         Me.銷售衍生運費_dgv.RowHeadersWidth = 5
474
-        DataGridViewCellStyle4.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
475
-        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
476
-        Me.銷售衍生運費_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
477
+        DataGridViewCellStyle16.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
478
+        DataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
479
+        Me.銷售衍生運費_dgv.RowsDefaultCellStyle = DataGridViewCellStyle16
477 480
         Me.銷售衍生運費_dgv.RowTemplate.Height = 24
478 481
         Me.銷售衍生運費_dgv.Size = New System.Drawing.Size(574, 102)
479 482
         Me.銷售衍生運費_dgv.TabIndex = 1350
@@ -909,17 +912,17 @@ Partial Class 訂單控制表
909 912
         '
910 913
         '客戶資料_dgv
911 914
         '
912
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
913
-        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
915
+        DataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
916
+        Me.客戶資料_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle17
914 917
         Me.客戶資料_dgv.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
915 918
         Me.客戶資料_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
916 919
         Me.客戶資料_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
917
-        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 12298)
920
+        Me.客戶資料_dgv.Location = New System.Drawing.Point(17, 12531)
918 921
         Me.客戶資料_dgv.Name = "客戶資料_dgv"
919 922
         Me.客戶資料_dgv.RowHeadersWidth = 5
920
-        DataGridViewCellStyle6.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
921
-        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
922
-        Me.客戶資料_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
923
+        DataGridViewCellStyle18.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
924
+        DataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
925
+        Me.客戶資料_dgv.RowsDefaultCellStyle = DataGridViewCellStyle18
923 926
         Me.客戶資料_dgv.RowTemplate.Height = 24
924 927
         Me.客戶資料_dgv.Size = New System.Drawing.Size(191, 92)
925 928
         Me.客戶資料_dgv.TabIndex = 1254
@@ -1009,8 +1012,8 @@ Partial Class 訂單控制表
1009 1012
         '
1010 1013
         '銷售備註_dgv
1011 1014
         '
1012
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1013
-        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
1015
+        DataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1016
+        Me.銷售備註_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle19
1014 1017
         Me.銷售備註_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
1015 1018
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1016 1019
         Me.銷售備註_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1018,17 +1021,17 @@ Partial Class 訂單控制表
1018 1021
         Me.銷售備註_dgv.Location = New System.Drawing.Point(3, 411)
1019 1022
         Me.銷售備註_dgv.Name = "銷售備註_dgv"
1020 1023
         Me.銷售備註_dgv.RowHeadersWidth = 5
1021
-        DataGridViewCellStyle8.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1022
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1023
-        Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
1024
+        DataGridViewCellStyle20.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1025
+        DataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1026
+        Me.銷售備註_dgv.RowsDefaultCellStyle = DataGridViewCellStyle20
1024 1027
         Me.銷售備註_dgv.RowTemplate.Height = 24
1025 1028
         Me.銷售備註_dgv.Size = New System.Drawing.Size(571, 102)
1026 1029
         Me.銷售備註_dgv.TabIndex = 1250
1027 1030
         '
1028 1031
         '收款事項_dgv
1029 1032
         '
1030
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1031
-        Me.收款事項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
1033
+        DataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1034
+        Me.收款事項_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle21
1032 1035
         Me.收款事項_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
1033 1036
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1034 1037
         Me.收款事項_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1036,9 +1039,9 @@ Partial Class 訂單控制表
1036 1039
         Me.收款事項_dgv.Location = New System.Drawing.Point(3, 668)
1037 1040
         Me.收款事項_dgv.Name = "收款事項_dgv"
1038 1041
         Me.收款事項_dgv.RowHeadersWidth = 5
1039
-        DataGridViewCellStyle10.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1040
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1041
-        Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
1042
+        DataGridViewCellStyle22.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1043
+        DataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1044
+        Me.收款事項_dgv.RowsDefaultCellStyle = DataGridViewCellStyle22
1042 1045
         Me.收款事項_dgv.RowTemplate.Height = 24
1043 1046
         Me.收款事項_dgv.Size = New System.Drawing.Size(574, 102)
1044 1047
         Me.收款事項_dgv.TabIndex = 1282
@@ -1075,8 +1078,8 @@ Partial Class 訂單控制表
1075 1078
         '
1076 1079
         '銷售明細_dgv
1077 1080
         '
1078
-        DataGridViewCellStyle11.BackColor = System.Drawing.Color.White
1079
-        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
1081
+        DataGridViewCellStyle23.BackColor = System.Drawing.Color.White
1082
+        Me.銷售明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle23
1080 1083
         Me.銷售明細_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
1081 1084
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1082 1085
         Me.銷售明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1084,9 +1087,9 @@ Partial Class 訂單控制表
1084 1087
         Me.銷售明細_dgv.Location = New System.Drawing.Point(3, 29)
1085 1088
         Me.銷售明細_dgv.Name = "銷售明細_dgv"
1086 1089
         Me.銷售明細_dgv.RowHeadersWidth = 5
1087
-        DataGridViewCellStyle12.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1088
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1089
-        Me.銷售明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
1090
+        DataGridViewCellStyle24.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
1091
+        DataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
1092
+        Me.銷售明細_dgv.RowsDefaultCellStyle = DataGridViewCellStyle24
1090 1093
         Me.銷售明細_dgv.RowTemplate.Height = 24
1091 1094
         Me.銷售明細_dgv.Size = New System.Drawing.Size(760, 355)
1092 1095
         Me.銷售明細_dgv.TabIndex = 1199
@@ -1297,6 +1300,9 @@ Partial Class 訂單控制表
1297 1300
         Me.Panel2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
1298 1301
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
1299 1302
         Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
1303
+        Me.Panel2.Controls.Add(Me.查詢1_bt)
1304
+        Me.Panel2.Controls.Add(Me.帳務關鍵字_tb)
1305
+        Me.Panel2.Controls.Add(Me.Label16)
1300 1306
         Me.Panel2.Controls.Add(Me.批量刷銷售_bt)
1301 1307
         Me.Panel2.Controls.Add(Me.查詢_bt)
1302 1308
         Me.Panel2.Controls.Add(Me.物料關鍵字_tb)
@@ -1322,9 +1328,18 @@ Partial Class 訂單控制表
1322 1328
         Me.Panel2.Size = New System.Drawing.Size(556, 719)
1323 1329
         Me.Panel2.TabIndex = 1339
1324 1330
         '
1331
+        '批量刷銷售_bt
1332
+        '
1333
+        Me.批量刷銷售_bt.Location = New System.Drawing.Point(473, 26)
1334
+        Me.批量刷銷售_bt.Name = "批量刷銷售_bt"
1335
+        Me.批量刷銷售_bt.Size = New System.Drawing.Size(81, 25)
1336
+        Me.批量刷銷售_bt.TabIndex = 1342
1337
+        Me.批量刷銷售_bt.Text = "批量刷銷售"
1338
+        Me.批量刷銷售_bt.UseVisualStyleBackColor = True
1339
+        '
1325 1340
         '查詢_bt
1326 1341
         '
1327
-        Me.查詢_bt.Location = New System.Drawing.Point(291, 26)
1342
+        Me.查詢_bt.Location = New System.Drawing.Point(365, 26)
1328 1343
         Me.查詢_bt.Name = "查詢_bt"
1329 1344
         Me.查詢_bt.Size = New System.Drawing.Size(81, 25)
1330 1345
         Me.查詢_bt.TabIndex = 1341
@@ -1334,9 +1349,9 @@ Partial Class 訂單控制表
1334 1349
         '物料關鍵字_tb
1335 1350
         '
1336 1351
         Me.物料關鍵字_tb.ForeColor = System.Drawing.Color.Black
1337
-        Me.物料關鍵字_tb.Location = New System.Drawing.Point(67, 27)
1352
+        Me.物料關鍵字_tb.Location = New System.Drawing.Point(70, 27)
1338 1353
         Me.物料關鍵字_tb.Name = "物料關鍵字_tb"
1339
-        Me.物料關鍵字_tb.Size = New System.Drawing.Size(221, 23)
1354
+        Me.物料關鍵字_tb.Size = New System.Drawing.Size(292, 23)
1340 1355
         Me.物料關鍵字_tb.TabIndex = 1340
1341 1356
         '
1342 1357
         'Label15
@@ -1431,14 +1446,33 @@ Partial Class 訂單控制表
1431 1446
         Me.隱藏_bt.Text = "隱藏" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "控件"
1432 1447
         Me.隱藏_bt.UseVisualStyleBackColor = True
1433 1448
         '
1434
-        '批量刷銷售_bt
1449
+        '查詢1_bt
1435 1450
         '
1436
-        Me.批量刷銷售_bt.Location = New System.Drawing.Point(473, 26)
1437
-        Me.批量刷銷售_bt.Name = "批量刷銷售_bt"
1438
-        Me.批量刷銷售_bt.Size = New System.Drawing.Size(81, 25)
1439
-        Me.批量刷銷售_bt.TabIndex = 1342
1440
-        Me.批量刷銷售_bt.Text = "批量刷銷售"
1441
-        Me.批量刷銷售_bt.UseVisualStyleBackColor = True
1451
+        Me.查詢1_bt.Location = New System.Drawing.Point(365, 51)
1452
+        Me.查詢1_bt.Name = "查詢1_bt"
1453
+        Me.查詢1_bt.Size = New System.Drawing.Size(81, 25)
1454
+        Me.查詢1_bt.TabIndex = 1345
1455
+        Me.查詢1_bt.Text = "查詢"
1456
+        Me.查詢1_bt.UseVisualStyleBackColor = True
1457
+        '
1458
+        '帳務關鍵字_tb
1459
+        '
1460
+        Me.帳務關鍵字_tb.ForeColor = System.Drawing.Color.Black
1461
+        Me.帳務關鍵字_tb.Location = New System.Drawing.Point(70, 52)
1462
+        Me.帳務關鍵字_tb.Name = "帳務關鍵字_tb"
1463
+        Me.帳務關鍵字_tb.Size = New System.Drawing.Size(292, 23)
1464
+        Me.帳務關鍵字_tb.TabIndex = 1344
1465
+        '
1466
+        'Label16
1467
+        '
1468
+        Me.Label16.AutoSize = True
1469
+        Me.Label16.ForeColor = System.Drawing.Color.Black
1470
+        Me.Label16.ImeMode = System.Windows.Forms.ImeMode.NoControl
1471
+        Me.Label16.Location = New System.Drawing.Point(0, 56)
1472
+        Me.Label16.Name = "Label16"
1473
+        Me.Label16.Size = New System.Drawing.Size(67, 16)
1474
+        Me.Label16.TabIndex = 1343
1475
+        Me.Label16.Text = "帳務關鍵字"
1442 1476
         '
1443 1477
         '訂單控制表
1444 1478
         '
@@ -1582,4 +1616,7 @@ Partial Class 訂單控制表
1582 1616
     Friend WithEvents Label15 As Label
1583 1617
     Friend WithEvents 查詢_bt As Button
1584 1618
     Friend WithEvents 批量刷銷售_bt As Button
1619
+    Friend WithEvents 查詢1_bt As Button
1620
+    Friend WithEvents 帳務關鍵字_tb As TextBox
1621
+    Friend WithEvents Label16 As Label
1585 1622
 End Class

+ 7
- 3
YD-ERP-SYS/業務系統管理/訂單控制表.vb Переглянути файл

@@ -10,8 +10,9 @@ Public Class 訂單控制表
10 10
             銷售單據_dgv.AllowUserToAddRows = False
11 11
             銷售單據_dgv.RowTemplate.Height = 35
12 12
 
13
-            PA19 = 業務_cb.Text : PA20 = 客戶1_tb.Text : PA21 = 物料關鍵字_tb.Text
14
-            SQL_銷售控制表_訂單控制表()
13
+            PA19 = 業務_cb.Text : PA20 = 客戶1_tb.Text : PA21 = 物料關鍵字_tb.Text : PA22 = 帳務關鍵字_tb.Text
14
+            If 帳務關鍵字_tb.Text = "" Then : SQL_銷售控制表_訂單控制表() : Else : SQL_銷售控制表_訂單控制表1() : End If
15
+
15 16
             da.Fill(ds1) : 銷售單據_dgv.DataSource = ds1.Tables(0) : conn.Close()
16 17
 
17 18
             銷售單據_dgv.Columns(0).Visible = False : 銷售單據_dgv.Columns(1).FillWeight = 85 : 銷售單據_dgv.Columns(2).FillWeight = 100 : 銷售單據_dgv.Columns(3).FillWeight = 100
@@ -651,6 +652,9 @@ Public Class 訂單控制表
651 652
         Panel3.Size = New Size(NU1, NU2)
652 653
     End Sub
653 654
     Private Sub 查詢_bt_Click(sender As Object, e As EventArgs) Handles 查詢_bt.Click
654
-        Set_清單1()
655
+        Set_清單1() : 帳務關鍵字_tb.Text = ""
656
+    End Sub
657
+    Private Sub 查詢1_bt_Click(sender As Object, e As EventArgs) Handles 查詢1_bt.Click
658
+        Set_清單1() : 帳務關鍵字_tb.Text = ""
655 659
     End Sub
656 660
 End Class

+ 9
- 5
YD-ERP-SYS/資料庫系統管理/系統執行檔版本管理.Designer.vb Переглянути файл

@@ -43,7 +43,7 @@ Partial Class 系統執行檔版本管理
43 43
         Me.Label1.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
44 44
         Me.Label1.Location = New System.Drawing.Point(696, 303)
45 45
         Me.Label1.Name = "Label1"
46
-        Me.Label1.Size = New System.Drawing.Size(80, 16)
46
+        Me.Label1.Size = New System.Drawing.Size(79, 16)
47 47
         Me.Label1.TabIndex = 649
48 48
         Me.Label1.Text = "原代碼存放取"
49 49
         '
@@ -64,7 +64,7 @@ Partial Class 系統執行檔版本管理
64 64
         Me.資料庫版本號_lb.BackColor = System.Drawing.SystemColors.Control
65 65
         Me.資料庫版本號_lb.Location = New System.Drawing.Point(431, 6)
66 66
         Me.資料庫版本號_lb.Name = "資料庫版本號_lb"
67
-        Me.資料庫版本號_lb.Size = New System.Drawing.Size(159, 16)
67
+        Me.資料庫版本號_lb.Size = New System.Drawing.Size(158, 16)
68 68
         Me.資料庫版本號_lb.TabIndex = 647
69 69
         Me.資料庫版本號_lb.Text = "資料庫版本號 : 2018110801"
70 70
         '
@@ -74,7 +74,7 @@ Partial Class 系統執行檔版本管理
74 74
         Me.Label12.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
75 75
         Me.Label12.Location = New System.Drawing.Point(693, 5)
76 76
         Me.Label12.Name = "Label12"
77
-        Me.Label12.Size = New System.Drawing.Size(92, 16)
77
+        Me.Label12.Size = New System.Drawing.Size(91, 16)
78 78
         Me.Label12.TabIndex = 646
79 79
         Me.Label12.Text = "執行檔案更新區"
80 80
         '
@@ -84,7 +84,7 @@ Partial Class 系統執行檔版本管理
84 84
         Me.Label13.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
85 85
         Me.Label13.Location = New System.Drawing.Point(5, 7)
86 86
         Me.Label13.Name = "Label13"
87
-        Me.Label13.Size = New System.Drawing.Size(56, 16)
87
+        Me.Label13.Size = New System.Drawing.Size(55, 16)
88 88
         Me.Label13.TabIndex = 645
89 89
         Me.Label13.Text = "我的電腦"
90 90
         '
@@ -137,7 +137,7 @@ Partial Class 系統執行檔版本管理
137 137
         Me.Label3.BackColor = System.Drawing.SystemColors.Control
138 138
         Me.Label3.Location = New System.Drawing.Point(170, 7)
139 139
         Me.Label3.Name = "Label3"
140
-        Me.Label3.Size = New System.Drawing.Size(44, 16)
140
+        Me.Label3.Size = New System.Drawing.Size(43, 16)
141 141
         Me.Label3.TabIndex = 640
142 142
         Me.Label3.Text = "版本號"
143 143
         '
@@ -150,6 +150,10 @@ Partial Class 系統執行檔版本管理
150 150
         Me.版本號_tb.Size = New System.Drawing.Size(101, 23)
151 151
         Me.版本號_tb.TabIndex = 639
152 152
         '
153
+        'FolderBrowserDialog1
154
+        '
155
+        Me.FolderBrowserDialog1.RootFolder = System.Environment.SpecialFolder.MyComputer
156
+        '
153 157
         '系統執行檔版本管理
154 158
         '
155 159
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)

Завантаження…
Відмінити
Зберегти