B70340 3 gadus atpakaļ
vecāks
revīzija
d8d08258c4

Binārs
.vs/TENDEN-MES-SYS/v16/.suo Parādīt failu


+ 7
- 0
TENDEN-MES-SYS/LoginForm1vb.Designer.vb Parādīt failu

@@ -30,6 +30,7 @@ Partial Class LoginForm1vb
30 30
     '請勿使用程式碼編輯器進行修改。
31 31
     <System.Diagnostics.DebuggerStepThrough()>
32 32
     Private Sub InitializeComponent()
33
+        Me.components = New System.ComponentModel.Container()
33 34
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
34 35
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(LoginForm1vb))
35 36
         Me.LogoPictureBox = New System.Windows.Forms.PictureBox()
@@ -53,6 +54,7 @@ Partial Class LoginForm1vb
53 54
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
54 55
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
55 56
         Me.UPDATE_bt = New System.Windows.Forms.Button()
57
+        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
56 58
         CType(Me.LogoPictureBox, System.ComponentModel.ISupportInitialize).BeginInit()
57 59
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
58 60
         Me.SuspendLayout()
@@ -265,6 +267,10 @@ Partial Class LoginForm1vb
265 267
         Me.UPDATE_bt.TabIndex = 637
266 268
         Me.UPDATE_bt.Text = "UPDATE"
267 269
         '
270
+        'Timer1
271
+        '
272
+        Me.Timer1.Interval = 3000
273
+        '
268 274
         'LoginForm1vb
269 275
         '
270 276
         Me.AcceptButton = Me.OK
@@ -320,4 +326,5 @@ Partial Class LoginForm1vb
320 326
     Friend WithEvents DataGridView1 As DataGridView
321 327
     Friend WithEvents SaveFileDialog1 As SaveFileDialog
322 328
     Friend WithEvents UPDATE_bt As Button
329
+    Friend WithEvents Timer1 As Timer
323 330
 End Class

+ 3
- 0
TENDEN-MES-SYS/LoginForm1vb.resx Parādīt failu

@@ -120,6 +120,9 @@
120 120
   <metadata name="SaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121 121
     <value>17, 17</value>
122 122
   </metadata>
123
+  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
124
+    <value>161, 17</value>
125
+  </metadata>
123 126
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
124 127
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
125 128
     <value>

+ 6
- 2
TENDEN-MES-SYS/LoginForm1vb.vb Parādīt failu

@@ -23,11 +23,14 @@ Public Class LoginForm1vb
23 23
 
24 24
         da.Fill(ds2) : DataGridView1.DataSource = ds2.Tables(0) : conn.Close()
25 25
     End Sub
26
-    Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
26
+    Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles Timer1.Tick
27 27
         '-----------------------刪除自動更新項目-----------------------------------------------------------------------------------------------------------------------------------------------
28 28
         Dim Str As String = Application.StartupPath
29 29
         If File.Exists(Str + "\SYS-UPDATE.exe") Then : File.Delete(Str + "\SYS-UPDATE.exe") : End If
30 30
         If File.Exists(Str + "\LIVE.txt") Then : File.Delete(Str + "\LIVE.txt") : End If
31
+        Timer1.Enabled = False
32
+    End Sub
33
+    Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
31 34
         '-----------------------控件基本設定-----------------------------------------------------------------------------------------------------------------------------------------------
32 35
         CheckBox1.Enabled = False : CheckBox1.Enabled = False : TextBox4.Text = "1" : Label1.Text = "執行檔版本號 : " & 版本 : UsernameTextBox.ImeMode = 3
33 36
         網段.ShowDialog()
@@ -46,6 +49,7 @@ Public Class LoginForm1vb
46 49
         ElseIf screenWidth = 1280 And screenHeight = 1024 Then : Me.Location = New Point(405, 368)
47 50
         ElseIf screenWidth = 1600 And screenHeight = 900 Then : Me.Location = New Point(565, 306)
48 51
         End If
52
+        Timer1.Enabled = True
49 53
     End Sub
50 54
     Private Sub 登入()
51 55
         '-----------------------寫入連線字串-----------------------------------------------------------------------------------------------------------------------------------------------
@@ -97,7 +101,7 @@ Public Class LoginForm1vb
97 101
             登入()
98 102
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
99 103
         ElseIf ComboBox1.Text = "雲端伺服器" Then
100
-            登入人IP = "106.1.50.79"
104
+            登入人IP = "106.1.48.106,4567"
101 105
             登入()
102 106
             OK.Enabled = True : Cancel.Enabled = True : CheckBox1.Checked = True
103 107
         End If

+ 3
- 3
TENDEN-MES-SYS/Module/全域變數.vb Parādīt failu

@@ -4,7 +4,7 @@
4 4
     Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public 登入人IP As String
5 5
     Public CC(99) As Boolean : Public AA(99) As String : Public 登入判斷 As Boolean
6 6
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
7
-    Public 版本 As String = "2021092901"
7
+    Public 版本 As String = "2021110101"
8 8
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
9 9
     Public 匯率 As Double
10 10
 
@@ -12,10 +12,10 @@
12 12
     Public 財務列印(3) As Boolean : Public 修改清單(16) As Boolean : Public 中文樣品單開啟修改 As Boolean : Public 量產樣品匯入列表開啟 As Boolean
13 13
 
14 14
     Public PA As String = "" : Public PA1 As String = "" : Public PA2 As String = "" : Public PA3 As String = "" : Public PA4 As String = "" : Public PA5 As String = ""
15
-    Public PA6 As String = "" : Public PA7 As String = ""
15
+    Public PA6 As String = "" : Public PA7 As String = "" : Public PA8 As String = "" : Public PA9 As String = ""
16 16
     Public QA As String = "" : Public PP1 As String = "" : Public PP2 As String = "" : Public PP3 As String = ""
17 17
     Public 訂單資料表(10) As String : Public OD(42) As String : Public 列印用SQL As String = "" : Public 驗貨報告 As String = "" : Public 訂單紀錄流水號 As String
18
-
18
+    Public PB(60) As String : Public BL(1) As Boolean : Public DN(3) As Double
19 19
     Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
20 20
     Public Class MyModule1
21 21
         Friend Shared Sub 進度條()

Binārs
TENDEN-MES-SYS/bin/Debug/TENDEN-ERP-SYS.exe Parādīt failu


Binārs
TENDEN-MES-SYS/bin/Debug/TENDEN-ERP-SYS.pdb Parādīt failu


Binārs
TENDEN-MES-SYS/obj/Debug/TENDEN-ERP-SYS.exe Parādīt failu


Binārs
TENDEN-MES-SYS/obj/Debug/TENDEN-ERP-SYS.pdb Parādīt failu


Binārs
TENDEN-MES-SYS/obj/Debug/天盾系統.vbproj.GenerateResource.cache Parādīt failu


Binārs
TENDEN-MES-SYS/obj/Debug/天盾系統.vbprojAssemblyReference.cache Parādīt failu


+ 16
- 5
TENDEN-MES-SYS/彙總報表管理/特殊工具/力威發票明細轉換工具.vb Parādīt failu

@@ -108,11 +108,13 @@ Public Class 力威發票明細轉換工具
108 108
         ConnOpen() : SQL1 = "SELECT 編號 FROM 文件轉換用1 WHERE 編號 LIKE N'B%' ORDER BY 編號 DESC" : CmdSet_For_dr()
109 109
         If dr.Read() Then : GP = Double.Parse(dr("編號").ToString) : Else : GP = 0 : End If : conn.Close() : GP += 1 : 資料數 = 轉換前_dgv.Rows.Count * 5
110 110
         For I As Integer = 0 To 轉換前_dgv.Rows.Count - 1
111
-            進度條()
111
+            '進度條()
112 112
             For II As Integer = 0 To 100
113
-                進度條()
113
+                '進度條()
114 114
                 If 轉換前_dgv.Rows(I).Cells("文字2").Value <> "" Then
115
-                    If Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = "," Then
115
+                    If Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = "," Or
116
+                        Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = "." Or
117
+                        Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = " " Then
116 118
                         轉換前_dgv.Rows(I).Cells("文字2").Value = Strings.Mid(轉換前_dgv.Rows(I).Cells("文字2").Value, 2, 500)
117 119
                     Else
118 120
                         If GP < 10 Then : GPP = "B" & "00000" & GP
@@ -121,12 +123,21 @@ Public Class 力威發票明細轉換工具
121 123
                         ElseIf GP > 999 And GP < 10000 Then : GPP = "B" & "00" & GP
122 124
                         ElseIf GP > 9999 And GP < 100000 Then : GPP = "B" & "0" & GP
123 125
                         ElseIf GP > 999999 Then : GPP = "B" & GP : End If : 流水帳_tb.Text = GPP
124
-                        PA = Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value.ToString, NUD1.Value)
126
+                        PA = ""
127
+                        For III As Integer = 0 To 20
128
+                            If Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = "," Or
129
+                            Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = "." Or
130
+                            Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value, 1) = " " Then
131
+                                Exit For
132
+                            Else
133
+                                PA = PA + Strings.Left(轉換前_dgv.Rows(I).Cells("文字2").Value.ToString, 1)
134
+                                轉換前_dgv.Rows(I).Cells("文字2").Value = Strings.Mid(轉換前_dgv.Rows(I).Cells("文字2").Value, 2, 500)
135
+                            End If
136
+                        Next
125 137
                         ConnOpen()
126 138
                         SQL1 = "INSERT INTO 文件轉換用1 (編號, 文字1, 文字2) 
127 139
                                 VALUES (N'" & 流水帳_tb.Text & "', N'" & 轉換前_dgv.Rows(I).Cells("文字1").Value.ToString & "', N'" & PA & "')"
128 140
                         CmdSet_For_dr() : conn.Close() : GP += 1
129
-                        轉換前_dgv.Rows(I).Cells("文字2").Value = Strings.Mid(轉換前_dgv.Rows(I).Cells("文字2").Value, NUD1.Value.ToString + 2, 500)
130 141
                     End If
131 142
                 Else
132 143
                     Exit For

+ 2
- 2
TENDEN-MES-SYS/彙總報表管理/特殊工具/訂單交期批量修改工具.vb Parādīt failu

@@ -18,7 +18,7 @@
18 18
         For i As Integer = 1 To N3
19 19
             進度條()
20 20
             PA = xlSheet.Cells(i, 1).value : PA1 = Strings.Format(xlSheet.Cells(i, 2).value, "yyyy/MM/dd")
21
-            If PA <> "" Then
21
+            If PA <> "" And PA1 <> "yyyy/MM/dd" Then
22 22
                 ConnOpen() : SQL1 = "SELECT 力威訂單號 FROM 訂單控制表 WHERE (力威訂單號 LIKE N'" & PA & "')" : CmdSet_For_dr()
23 23
                 If dr.Read() Then
24 24
                     ConnOpen()
@@ -55,7 +55,7 @@
55 55
                     End If
56 56
                 End If
57 57
             Else
58
-                Exit For
58
+                MsgBox("你的導入資料有誤,會導致資料庫資料損毀,請不要亂搞......!!!") : Exit For
59 59
             End If
60 60
         Next : ProgressBar1.Value = 0 : 最終數 = 0
61 61
     End Sub

+ 8
- 8
TENDEN-MES-SYS/量產訂單管理/量產管理報表/周進度表.Designer.vb Parādīt failu

@@ -29,7 +29,7 @@ Partial Class 周進度表
29 29
         Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
30 30
         Me.生產工廠_tb = New System.Windows.Forms.TextBox()
31 31
         Me.接單日期_tb = New System.Windows.Forms.TextBox()
32
-        Me.形體號_tb = New System.Windows.Forms.TextBox()
32
+        Me.Requested_XF_tb = New System.Windows.Forms.TextBox()
33 33
         Me.顏色_tb = New System.Windows.Forms.TextBox()
34 34
         Me.Revised_XF_tb = New System.Windows.Forms.TextBox()
35 35
         Me.楦型_tb = New System.Windows.Forms.TextBox()
@@ -117,12 +117,12 @@ Partial Class 周進度表
117 117
         Me.接單日期_tb.Size = New System.Drawing.Size(84, 23)
118 118
         Me.接單日期_tb.TabIndex = 328
119 119
         '
120
-        '形體號_tb
120
+        'Requested_XF_tb
121 121
         '
122
-        Me.形體號_tb.Location = New System.Drawing.Point(442, 27)
123
-        Me.形體號_tb.Name = "形體號_tb"
124
-        Me.形體號_tb.Size = New System.Drawing.Size(84, 23)
125
-        Me.形體號_tb.TabIndex = 329
122
+        Me.Requested_XF_tb.Location = New System.Drawing.Point(442, 27)
123
+        Me.Requested_XF_tb.Name = "Requested_XF_tb"
124
+        Me.Requested_XF_tb.Size = New System.Drawing.Size(84, 23)
125
+        Me.Requested_XF_tb.TabIndex = 329
126 126
         '
127 127
         '顏色_tb
128 128
         '
@@ -425,7 +425,7 @@ Partial Class 周進度表
425 425
         Me.Controls.Add(Me.楦型_tb)
426 426
         Me.Controls.Add(Me.Revised_XF_tb)
427 427
         Me.Controls.Add(Me.顏色_tb)
428
-        Me.Controls.Add(Me.形體號_tb)
428
+        Me.Controls.Add(Me.Requested_XF_tb)
429 429
         Me.Controls.Add(Me.接單日期_tb)
430 430
         Me.Controls.Add(Me.生產工廠_tb)
431 431
         Me.Controls.Add(Me.導入Excel_bt)
@@ -450,7 +450,7 @@ Partial Class 周進度表
450 450
     Friend WithEvents OpenFileDialog1 As OpenFileDialog
451 451
     Friend WithEvents 生產工廠_tb As TextBox
452 452
     Friend WithEvents 接單日期_tb As TextBox
453
-    Friend WithEvents 形體號_tb As TextBox
453
+    Friend WithEvents Requested_XF_tb As TextBox
454 454
     Friend WithEvents 顏色_tb As TextBox
455 455
     Friend WithEvents Revised_XF_tb As TextBox
456 456
     Friend WithEvents 楦型_tb As TextBox

+ 3
- 3
TENDEN-MES-SYS/量產訂單管理/量產管理報表/周進度表.vb Parādīt failu

@@ -61,13 +61,13 @@ Public Class 周進度表
61 61
         For i As Integer = 4 To 99999
62 62
             生產工廠_tb.Text = xlSheet.Cells(i, 4).value
63 63
             接單日期_tb.Text = xlSheet.Cells(i, 2).value : If 接單日期_tb.Text = "" Then : Else : 接單日期_tb.Text = Format(xlSheet.Cells(i, 2).value, "yyyy/MM/dd") : End If
64
-            形體號_tb.Text = xlSheet.Cells(i, 9).value : If 形體號_tb.Text = "" Then : Else : 形體號_tb.Text = Format(xlSheet.Cells(i, 9).value, "yyyy/MM/dd") : End If
64
+            Requested_XF_tb.Text = xlSheet.Cells(i, 9).value : If Requested_XF_tb.Text = "" Then : Else : Requested_XF_tb.Text = Format(xlSheet.Cells(i, 9).value, "yyyy/MM/dd") : End If
65 65
             顏色_tb.Text = xlSheet.Cells(i, 10).value : If 顏色_tb.Text = "" Then : Else : 顏色_tb.Text = Format(xlSheet.Cells(i, 10).value, "yyyy/MM/dd") : End If
66 66
             Revised_XF_tb.Text = xlSheet.Cells(i, 11).value : If Revised_XF_tb.Text = "" Then : Else : Revised_XF_tb.Text = Format(xlSheet.Cells(i, 11).value, "yyyy/MM/dd") : End If
67 67
             If 生產工廠_tb.Text <> "" Then
68 68
                 If gUserName = "李協叡" Then
69 69
                     ConnOpen()
70
-                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET PO_S_Date = '" & 接單日期_tb.Text & "', Requested_XF = '" & 形體號_tb.Text & "', Confirm_XF = '" & 顏色_tb.Text & "', 
70
+                    SQL1 = "UPDATE " & 訂單資料表(1) & " SET PO_S_Date = '" & 接單日期_tb.Text & "', Requested_XF = '" & Requested_XF_tb.Text & "', Confirm_XF = '" & 顏色_tb.Text & "', 
71 71
                                                              Revised_XF = '" & Revised_XF_tb.Text & "', 裁斷時間 = '" & xlSheet.Cells(i, 12).value & "', 
72 72
                                                              針車時間 = '" & xlSheet.Cells(i, 13).value & "', 成型時間 = '" & xlSheet.Cells(i, 14).value & "', 
73 73
                                                              Special_Packaging = '" & xlSheet.Cells(i, 15).value & "', Remarks = '" & xlSheet.Cells(i, 16).value & "' 
@@ -93,7 +93,7 @@ Public Class 周進度表
93 93
         Me.MdiParent = TENDEN_MES_SYS : Me.WindowState = 2 : Me.AutoScroll = True
94 94
         訂單資料庫選擇.ShowDialog()
95 95
 
96
-        生產工廠_tb.Enabled = False : 接單日期_tb.Enabled = False : 形體號_tb.Enabled = False : 顏色_tb.Enabled = False : Revised_XF_tb.Enabled = False : 楦型_tb.Enabled = False
96
+        生產工廠_tb.Enabled = False : 接單日期_tb.Enabled = False : Requested_XF_tb.Enabled = False : 顏色_tb.Enabled = False : Revised_XF_tb.Enabled = False : 楦型_tb.Enabled = False
97 97
         日期1_dtp.Visible = False : 日期2_dtp.Visible = False : 日期3_dtp.Visible = False : 日期4_dtp.Visible = False
98 98
         日期存檔_bt.Enabled = False : 存檔_bt.Enabled = False
99 99
         If CC(36) = True Then : 導入Excel_bt.Enabled = True : Else : 導入Excel_bt.Enabled = False : End If

+ 54
- 41
TENDEN-MES-SYS/量產訂單管理/量產訂單系統/訂單控制表.Designer.vb Parādīt failu

@@ -22,13 +22,13 @@ Partial Class 訂單控制表
22 22
     '請勿使用程式碼編輯器進行修改。
23 23
     <System.Diagnostics.DebuggerStepThrough()>
24 24
     Private  Sub InitializeComponent()
25
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
26
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
25
+        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
26
+        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
27 27
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(訂單控制表))
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 DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
31
-        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
28
+        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
29
+        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
30
+        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
31
+        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
32 32
         Me.控制表_dgv = New System.Windows.Forms.DataGridView()
33 33
         Me.Label5 = New System.Windows.Forms.Label()
34 34
         Me.客戶訂單號_tb = New System.Windows.Forms.TextBox()
@@ -188,6 +188,7 @@ Partial Class 訂單控制表
188 188
         Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
189 189
         Me.除錯_dgv = New System.Windows.Forms.DataGridView()
190 190
         Me.裝箱控制表_dgv = New System.Windows.Forms.DataGridView()
191
+        Me.裝箱明細_dgv = New System.Windows.Forms.DataGridView()
191 192
         Me.資訊_gb = New System.Windows.Forms.GroupBox()
192 193
         Me.TT23_lb = New System.Windows.Forms.TextBox()
193 194
         Me.Label49 = New System.Windows.Forms.Label()
@@ -242,12 +243,12 @@ Partial Class 訂單控制表
242 243
         Me.BB05_lb = New System.Windows.Forms.Label()
243 244
         Me.BB04_lb = New System.Windows.Forms.Label()
244 245
         Me.明細表_dgv = New System.Windows.Forms.DataGridView()
245
-        Me.裝箱明細_dgv = New System.Windows.Forms.DataGridView()
246 246
         Me.訂單明細_bt = New System.Windows.Forms.Button()
247 247
         Me.裝箱明細_bt = New System.Windows.Forms.Button()
248 248
         Me.裝箱資訊_bt = New System.Windows.Forms.Button()
249 249
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
250 250
         Me.清單全選_bt = New System.Windows.Forms.Button()
251
+        Me.指定拆單_bt = New System.Windows.Forms.Button()
251 252
         CType(Me.控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
252 253
         Me.GroupBox1.SuspendLayout()
253 254
         Me.GroupBox2.SuspendLayout()
@@ -260,15 +261,15 @@ Partial Class 訂單控制表
260 261
         Me.SplitContainer1.SuspendLayout()
261 262
         CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
262 263
         CType(Me.裝箱控制表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
264
+        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
263 265
         Me.資訊_gb.SuspendLayout()
264 266
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
265
-        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
266 267
         Me.SuspendLayout()
267 268
         '
268 269
         '控制表_dgv
269 270
         '
270
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
271
-        Me.控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
271
+        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
272
+        Me.控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
272 273
         Me.控制表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
273 274
             Or System.Windows.Forms.AnchorStyles.Left) _
274 275
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -1283,8 +1284,8 @@ Partial Class 訂單控制表
1283 1284
         '
1284 1285
         'DataGridView2
1285 1286
         '
1286
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
1287
-        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
1287
+        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
1288
+        Me.DataGridView2.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
1288 1289
         Me.DataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
1289 1290
         Me.DataGridView2.Location = New System.Drawing.Point(91, 146)
1290 1291
         Me.DataGridView2.Name = "DataGridView2"
@@ -1741,8 +1742,8 @@ Partial Class 訂單控制表
1741 1742
         '
1742 1743
         '除錯_dgv
1743 1744
         '
1744
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
1745
-        Me.除錯_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
1745
+        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
1746
+        Me.除錯_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
1746 1747
         Me.除錯_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
1747 1748
         Me.除錯_dgv.Location = New System.Drawing.Point(48, 36)
1748 1749
         Me.除錯_dgv.Name = "除錯_dgv"
@@ -1754,8 +1755,8 @@ Partial Class 訂單控制表
1754 1755
         '
1755 1756
         '裝箱控制表_dgv
1756 1757
         '
1757
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1758
-        Me.裝箱控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
1758
+        DataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer))
1759
+        Me.裝箱控制表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle10
1759 1760
         Me.裝箱控制表_dgv.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
1760 1761
             Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
1761 1762
         Me.裝箱控制表_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
@@ -1767,6 +1768,22 @@ Partial Class 訂單控制表
1767 1768
         Me.裝箱控制表_dgv.Size = New System.Drawing.Size(465, 214)
1768 1769
         Me.裝箱控制表_dgv.TabIndex = 3
1769 1770
         '
1771
+        '裝箱明細_dgv
1772
+        '
1773
+        DataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
1774
+        Me.裝箱明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle11
1775
+        Me.裝箱明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
1776
+            Or System.Windows.Forms.AnchorStyles.Left) _
1777
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
1778
+        Me.裝箱明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
1779
+        Me.裝箱明細_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
1780
+        Me.裝箱明細_dgv.Location = New System.Drawing.Point(475, 2)
1781
+        Me.裝箱明細_dgv.Name = "裝箱明細_dgv"
1782
+        Me.裝箱明細_dgv.RowHeadersWidth = 5
1783
+        Me.裝箱明細_dgv.RowTemplate.Height = 24
1784
+        Me.裝箱明細_dgv.Size = New System.Drawing.Size(1418, 214)
1785
+        Me.裝箱明細_dgv.TabIndex = 4
1786
+        '
1770 1787
         '資訊_gb
1771 1788
         '
1772 1789
         Me.資訊_gb.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -2297,8 +2314,8 @@ Partial Class 訂單控制表
2297 2314
         '
2298 2315
         '明細表_dgv
2299 2316
         '
2300
-        DataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
2301
-        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle6
2317
+        DataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
2318
+        Me.明細表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle12
2302 2319
         Me.明細表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
2303 2320
             Or System.Windows.Forms.AnchorStyles.Left) _
2304 2321
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -2311,29 +2328,13 @@ Partial Class 訂單控制表
2311 2328
         Me.明細表_dgv.Size = New System.Drawing.Size(1418, 214)
2312 2329
         Me.明細表_dgv.TabIndex = 2
2313 2330
         '
2314
-        '裝箱明細_dgv
2315
-        '
2316
-        DataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(255, Byte), Integer))
2317
-        Me.裝箱明細_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle5
2318
-        Me.裝箱明細_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
2319
-            Or System.Windows.Forms.AnchorStyles.Left) _
2320
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
2321
-        Me.裝箱明細_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
2322
-        Me.裝箱明細_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
2323
-        Me.裝箱明細_dgv.Location = New System.Drawing.Point(475, 2)
2324
-        Me.裝箱明細_dgv.Name = "裝箱明細_dgv"
2325
-        Me.裝箱明細_dgv.RowHeadersWidth = 5
2326
-        Me.裝箱明細_dgv.RowTemplate.Height = 24
2327
-        Me.裝箱明細_dgv.Size = New System.Drawing.Size(1418, 214)
2328
-        Me.裝箱明細_dgv.TabIndex = 4
2329
-        '
2330 2331
         '訂單明細_bt
2331 2332
         '
2332 2333
         Me.訂單明細_bt.Enabled = False
2333 2334
         Me.訂單明細_bt.ForeColor = System.Drawing.Color.Red
2334
-        Me.訂單明細_bt.Location = New System.Drawing.Point(1624, 174)
2335
+        Me.訂單明細_bt.Location = New System.Drawing.Point(1624, 173)
2335 2336
         Me.訂單明細_bt.Name = "訂單明細_bt"
2336
-        Me.訂單明細_bt.Size = New System.Drawing.Size(85, 45)
2337
+        Me.訂單明細_bt.Size = New System.Drawing.Size(85, 35)
2337 2338
         Me.訂單明細_bt.TabIndex = 754
2338 2339
         Me.訂單明細_bt.Text = "訂單明細"
2339 2340
         Me.訂單明細_bt.UseVisualStyleBackColor = True
@@ -2341,9 +2342,9 @@ Partial Class 訂單控制表
2341 2342
         '裝箱明細_bt
2342 2343
         '
2343 2344
         Me.裝箱明細_bt.ForeColor = System.Drawing.Color.Red
2344
-        Me.裝箱明細_bt.Location = New System.Drawing.Point(1624, 267)
2345
+        Me.裝箱明細_bt.Location = New System.Drawing.Point(1624, 243)
2345 2346
         Me.裝箱明細_bt.Name = "裝箱明細_bt"
2346
-        Me.裝箱明細_bt.Size = New System.Drawing.Size(85, 45)
2347
+        Me.裝箱明細_bt.Size = New System.Drawing.Size(85, 35)
2347 2348
         Me.裝箱明細_bt.TabIndex = 755
2348 2349
         Me.裝箱明細_bt.Text = "裝箱明細"
2349 2350
         Me.裝箱明細_bt.UseVisualStyleBackColor = True
@@ -2351,9 +2352,9 @@ Partial Class 訂單控制表
2351 2352
         '裝箱資訊_bt
2352 2353
         '
2353 2354
         Me.裝箱資訊_bt.ForeColor = System.Drawing.Color.Red
2354
-        Me.裝箱資訊_bt.Location = New System.Drawing.Point(1624, 220)
2355
+        Me.裝箱資訊_bt.Location = New System.Drawing.Point(1624, 208)
2355 2356
         Me.裝箱資訊_bt.Name = "裝箱資訊_bt"
2356
-        Me.裝箱資訊_bt.Size = New System.Drawing.Size(85, 45)
2357
+        Me.裝箱資訊_bt.Size = New System.Drawing.Size(85, 35)
2357 2358
         Me.裝箱資訊_bt.TabIndex = 756
2358 2359
         Me.裝箱資訊_bt.Text = "裝箱資訊"
2359 2360
         Me.裝箱資訊_bt.UseVisualStyleBackColor = True
@@ -2376,12 +2377,23 @@ Partial Class 訂單控制表
2376 2377
         Me.清單全選_bt.Text = "清單全選"
2377 2378
         Me.清單全選_bt.UseVisualStyleBackColor = True
2378 2379
         '
2380
+        '指定拆單_bt
2381
+        '
2382
+        Me.指定拆單_bt.ForeColor = System.Drawing.Color.Purple
2383
+        Me.指定拆單_bt.Location = New System.Drawing.Point(1624, 279)
2384
+        Me.指定拆單_bt.Name = "指定拆單_bt"
2385
+        Me.指定拆單_bt.Size = New System.Drawing.Size(85, 33)
2386
+        Me.指定拆單_bt.TabIndex = 759
2387
+        Me.指定拆單_bt.Text = "指定拆單"
2388
+        Me.指定拆單_bt.UseVisualStyleBackColor = True
2389
+        '
2379 2390
         '訂單控制表
2380 2391
         '
2381 2392
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 15.0!)
2382 2393
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
2383 2394
         Me.AutoScroll = True
2384 2395
         Me.ClientSize = New System.Drawing.Size(1914, 966)
2396
+        Me.Controls.Add(Me.指定拆單_bt)
2385 2397
         Me.Controls.Add(Me.清單全選_bt)
2386 2398
         Me.Controls.Add(Me.ProgressBar1)
2387 2399
         Me.Controls.Add(Me.裝箱資訊_bt)
@@ -2545,10 +2557,10 @@ Partial Class 訂單控制表
2545 2557
         Me.SplitContainer1.ResumeLayout(False)
2546 2558
         CType(Me.除錯_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2547 2559
         CType(Me.裝箱控制表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2560
+        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2548 2561
         Me.資訊_gb.ResumeLayout(False)
2549 2562
         Me.資訊_gb.PerformLayout()
2550 2563
         CType(Me.明細表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2551
-        CType(Me.裝箱明細_dgv, System.ComponentModel.ISupportInitialize).EndInit()
2552 2564
         Me.ResumeLayout(False)
2553 2565
         Me.PerformLayout()
2554 2566
 
@@ -2773,5 +2785,6 @@ Partial Class 訂單控制表
2773 2785
     Friend WithEvents Label50 As Label
2774 2786
     Friend WithEvents ProgressBar1 As ProgressBar
2775 2787
     Friend WithEvents 清單全選_bt As Button
2788
+    Friend WithEvents 指定拆單_bt As Button
2776 2789
 End Class
2777 2790
 

+ 132
- 0
TENDEN-MES-SYS/量產訂單管理/量產訂單系統/訂單控制表.vb Parādīt failu

@@ -1155,6 +1155,73 @@ Public Class 訂單控制表
1155 1155
                 conn.Close() : PictureBox2.SizeMode = 4
1156 1156
 
1157 1157
                 驗貨報告 = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString
1158
+
1159
+                PB(0) = 控制表_dgv("訂單流水號", e.RowIndex).Value.ToString
1160
+                PB(1) = 控制表_dgv("年份季度", e.RowIndex).Value.ToString
1161
+                PB(2) = 控制表_dgv("客戶訂單號", e.RowIndex).Value.ToString
1162
+                PB(4) = 控制表_dgv("形體號", e.RowIndex).Value.ToString
1163
+                PB(5) = 控制表_dgv("顏色", e.RowIndex).Value.ToString
1164
+                PB(6) = 控制表_dgv("楦型", e.RowIndex).Value.ToString
1165
+                DN(0) = 控制表_dgv("訂單數量", e.RowIndex).Value.ToString
1166
+                PB(7) = 控制表_dgv("客戶交期", e.RowIndex).Value.ToString
1167
+                DN(1) = 控制表_dgv("單價", e.RowIndex).Value.ToString
1168
+                DN(2) = 控制表_dgv("總金額", e.RowIndex).Value.ToString
1169
+                PB(8) = 控制表_dgv("備註", e.RowIndex).Value.ToString
1170
+                PB(9) = 控制表_dgv("生產工廠", e.RowIndex).Value.ToString
1171
+                PB(10) = 控制表_dgv("訂單種類", e.RowIndex).Value.ToString
1172
+                PB(11) = 控制表_dgv("工廠回復交期", e.RowIndex).Value.ToString
1173
+                PB(12) = 控制表_dgv("CFMSPEC", e.RowIndex).Value.ToString
1174
+                PB(13) = 控制表_dgv("CFMSAMPLE", e.RowIndex).Value.ToString
1175
+                PB(14) = 控制表_dgv("TRIAL1", e.RowIndex).Value.ToString
1176
+                PB(15) = 控制表_dgv("TRIAL2", e.RowIndex).Value.ToString
1177
+                PB(16) = 控制表_dgv("TRIAL3", e.RowIndex).Value.ToString
1178
+                PB(17) = 控制表_dgv("TRIAL4", e.RowIndex).Value.ToString
1179
+                PB(18) = 控制表_dgv("包裝確認時間", e.RowIndex).Value.ToString
1180
+                PB(19) = 控制表_dgv("貼標時間", e.RowIndex).Value.ToString
1181
+                PB(20) = 控制表_dgv("裁斷時間", e.RowIndex).Value.ToString
1182
+                PB(21) = 控制表_dgv("針車時間", e.RowIndex).Value.ToString
1183
+                PB(22) = 控制表_dgv("成型時間", e.RowIndex).Value.ToString
1184
+                PB(23) = 控制表_dgv("驗貨時間", e.RowIndex).Value.ToString
1185
+                PB(24) = 控制表_dgv("實際離廠日", e.RowIndex).Value.ToString
1186
+                PB(25) = 控制表_dgv("資料流水號", e.RowIndex).Value.ToString
1187
+                BL(0) = 控制表_dgv("明細建檔", e.RowIndex).Value
1188
+                PB(26) = 控制表_dgv("GOODBOX", e.RowIndex).Value.ToString
1189
+                PB(27) = 控制表_dgv("LEATHER", e.RowIndex).Value.ToString
1190
+                PB(28) = 控制表_dgv("LEA_Note", e.RowIndex).Value.ToString
1191
+                DN(3) = 控制表_dgv("出貨數量", e.RowIndex).Value.ToString
1192
+                PB(29) = 控制表_dgv("接單日", e.RowIndex).Value.ToString
1193
+                PB(30) = 控制表_dgv("需求日期", e.RowIndex).Value.ToString
1194
+                PB(31) = 控制表_dgv("確認日期", e.RowIndex).Value.ToString
1195
+                PB(32) = 控制表_dgv("修訂日期", e.RowIndex).Value.ToString
1196
+                PB(33) = 控制表_dgv("Special_Packaging", e.RowIndex).Value.ToString
1197
+                PB(34) = 控制表_dgv("Remarks", e.RowIndex).Value.ToString
1198
+                PB(35) = 控制表_dgv("出貨地", e.RowIndex).Value.ToString
1199
+                PB(36) = 控制表_dgv("TVW", e.RowIndex).Value.ToString
1200
+                PB(37) = 控制表_dgv("楦頭號", e.RowIndex).Value.ToString
1201
+                PB(38) = 控制表_dgv("材質", e.RowIndex).Value.ToString
1202
+                PB(39) = 控制表_dgv("WEAR_TEST", e.RowIndex).Value.ToString
1203
+                PB(40) = 控制表_dgv("面料", e.RowIndex).Value.ToString
1204
+                PB(41) = 控制表_dgv("副料", e.RowIndex).Value.ToString
1205
+                PB(42) = 控制表_dgv("中底", e.RowIndex).Value.ToString
1206
+                PB(43) = 控制表_dgv("鞋墊", e.RowIndex).Value.ToString
1207
+                PB(44) = 控制表_dgv("大底", e.RowIndex).Value.ToString
1208
+                PB(45) = 控制表_dgv("跟", e.RowIndex).Value.ToString
1209
+                PB(46) = 控制表_dgv("工廠進度表備註1", e.RowIndex).Value.ToString
1210
+                PB(47) = 控制表_dgv("七號模具", e.RowIndex).Value.ToString
1211
+                PB(48) = 控制表_dgv("工廠進度表備註2", e.RowIndex).Value.ToString
1212
+                BL(1) = 0
1213
+                PB(49) = 控制表_dgv("客戶包裝確認", e.RowIndex).Value.ToString
1214
+                PB(50) = 控制表_dgv("東莞業務備註", e.RowIndex).Value.ToString
1215
+                PB(51) = 控制表_dgv("驗貨報告圖片", e.RowIndex).Value.ToString
1216
+                PB(52) = 控制表_dgv("工廠確認", e.RowIndex).Value.ToString
1217
+                PB(53) = 控制表_dgv("利威確認", e.RowIndex).Value.ToString
1218
+                PB(54) = 控制表_dgv("結關日", e.RowIndex).Value.ToString
1219
+                PB(55) = 控制表_dgv("SMS簽回", e.RowIndex).Value.ToString
1220
+                PB(56) = 控制表_dgv("FRS簽回", e.RowIndex).Value.ToString
1221
+                PB(57) = 控制表_dgv("MASTER_SWATCH", e.RowIndex).Value.ToString
1222
+                PB(58) = 控制表_dgv("力威訂單號", e.RowIndex).Value.ToString
1223
+                PB(59) = 控制表_dgv("ProductID", e.RowIndex).Value.ToString
1224
+                PB(60) = 控制表_dgv("UoM", e.RowIndex).Value.ToString
1158 1225
             End If
1159 1226
         End If
1160 1227
     End Sub
@@ -1843,4 +1910,69 @@ Public Class 訂單控制表
1843 1910
             控制表_dgv("選擇", I).Value = True
1844 1911
         Next
1845 1912
     End Sub
1913
+
1914
+    Private Sub 指定拆單_bt_Click(sender As Object, e As EventArgs) Handles 指定拆單_bt.Click
1915
+        If PB(0) = "" Or PB(0) = Nothing Then
1916
+            MsgBox("請先選擇要猜單的訂單資料!!")
1917
+        Else
1918
+            PA8 = InputBox("請輸入拆單數量!!")
1919
+            If IsNumeric(PA8) = False Then
1920
+                MsgBox("輸入的資料不是阿拉伯數字!!")
1921
+            Else
1922
+                If DN(0) <= Val(PA8) Then
1923
+                    MsgBox("訂單拆單數量大於等於原始數量無法完成拆單!!")
1924
+                Else
1925
+                    PA9 = InputBox("請輸入交期!! - (注意格式範例如下 : 2021/01/01 ,一定要十碼長度!!)")
1926
+                    If Len(PA9) <> 10 Then
1927
+                        MsgBox("輸入的格式不正確!!")
1928
+                    Else
1929
+                        '----------修改訂單資料--------------------------------------------------------------------------------------
1930
+                        DN(0) = DN(0) - Val(PA8) : DN(2) = DN(1) * DN(0)
1931
+                        ConnOpen()
1932
+                        SQL1 = "UPDATE " & 訂單資料表(1) & " SET  訂單數量 = '" & DN(0) & "', 總金額 = '" & DN(2) & "' WHERE (資料流水號 = '" & PB(25) & "')"
1933
+                        CmdSet_For_dr() : conn.Close()
1934
+                        '----------新增訂單資料--------------------------------------------------------------------------------------
1935
+                        ConnOpen()
1936
+                        SQL1 = "SELECT TOP (1) 資料流水號 FROM " & 訂單資料表(1) & " GROUP BY 資料流水號 ORDER BY 資料流水號 DESC"
1937
+                        CmdSet_For_dr()
1938
+                        If dr.Read() Then : PB(25) = dr("資料流水號").ToString : Else : PB(25) = "" : End If
1939
+                        conn.Close()
1940
+                        Dim NUM1 As Integer
1941
+                        NUM1 = Double.Parse(Strings.Right(PB(25), 8)) + 1
1942
+                        If NUM1 < 10 Then : PB(25) = "PO" & "0000000" & NUM1
1943
+                        ElseIf NUM1 > 9 And NUM1 < 100 Then : PB(25) = "PO" & "000000" & NUM1
1944
+                        ElseIf NUM1 > 99 And NUM1 < 1000 Then : PB(25) = "PO" & "00000" & NUM1
1945
+                        ElseIf NUM1 > 999 And NUM1 < 10000 Then : PB(25) = "PO" & "0000" & NUM1
1946
+                        ElseIf NUM1 > 9999 And NUM1 < 100000 Then : PB(25) = "PO" & "000" & NUM1
1947
+                        ElseIf NUM1 > 99999 And NUM1 < 100000 Then : PB(25) = "PO" & "00" & NUM1
1948
+                        ElseIf NUM1 > 999999 And NUM1 < 1000000 Then : PB(25) = "PO" & "0" & NUM1
1949
+                        ElseIf NUM1 > 9999999 Then : PB(25) = "PO" & NUM1
1950
+                        End If
1951
+                        DN(0) = Val(PA8) : DN(2) = DN(1) * DN(0)
1952
+                        PB(7) = PA9 : PB(11) = PA9 : PB(29) = PA9 : PB(30) = PA9 : PB(31) = PA9 : PB(32) = PA9
1953
+                        ConnOpen()
1954
+                        SQL1 = "INSERT INTO " & 訂單資料表(1) & " (訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 
1955
+                                                                   工廠回復交期, CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 
1956
+                                                                   成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, 出貨數量, PO_S_Date, Requested_XF,
1957
+                                                                   Confirm_XF, Revised_XF, Special_Packaging, Remarks, 出貨地, TVW, 楦頭號, 材質, 長期試穿, 面料, 副料, 中底, 鞋墊, 大底,
1958
+                                                                   跟, 工廠進度表備註1, 七號模具, 工廠進度表備註2, 國標測試, 客戶包裝確認, 東莞業務備註, 驗貨報告圖片, 工廠確認, 利威確認,
1959
+                                                                   結關日, SMS簽回, FRS簽回, MASTER_SWATCH, 力威訂單號, ProductID, UoM)
1960
+                                VALUES (N'" & PB(0) & "',N'" & PB(1) & "',N'" & PB(2) & "',N'" & PB(4) & "',N'" & PB(5) & "',N'" & PB(6) & "',N'" & DN(0) & "',N'" & PB(7) & "',
1961
+                                        N'" & DN(1) & "',N'" & DN(2) & "',N'" & PB(8) & "',N'" & PB(9) & "',N'" & PB(10) & "',N'" & PB(11) & "',N'" & PB(12) & "',N'" & PB(13) & "',
1962
+                                        N'" & PB(14) & "',N'" & PB(15) & "',N'" & PB(16) & "',N'" & PB(17) & "',N'" & PB(18) & "',N'" & PB(19) & "',N'" & PB(20) & "',N'" & PB(21) & "',
1963
+                                        N'" & PB(22) & "',N'" & PB(23) & "',N'" & PB(24) & "',N'" & PB(25) & "',N'" & BL(0) & "',N'" & PB(26) & "',N'" & PB(27) & "',N'" & PB(28) & "',
1964
+                                        N'" & DN(3) & "',N'" & PB(29) & "',N'" & PB(30) & "',N'" & PB(31) & "',N'" & PB(32) & "',N'" & PB(33) & "',N'" & PB(34) & "',N'" & PB(35) & "',
1965
+                                        N'" & PB(36) & "',N'" & PB(37) & "',N'" & PB(38) & "',N'" & PB(39) & "',N'" & PB(40) & "',N'" & PB(41) & "',N'" & PB(42) & "',N'" & PB(43) & "',
1966
+                                        N'" & PB(44) & "',N'" & PB(45) & "',N'" & PB(46) & "',N'" & PB(47) & "',N'" & PB(48) & "',N'" & BL(1) & "',N'" & PB(49) & "',N'" & PB(50) & "',
1967
+                                        N'" & PB(51) & "',N'" & PB(52) & "',N'" & PB(53) & "',N'" & PB(54) & "',N'" & PB(55) & "',N'" & PB(56) & "',N'" & PB(57) & "',N'" & PB(58) & "',
1968
+                                        N'" & PB(59) & "',N'" & PB(60) & "')"
1969
+                        CmdSet_For_dr() : conn.Close()
1970
+                        MsgBox("訂單拆單完成!!") : For i As Integer = 0 To 60 : PB(i) = "" : Next
1971
+                        返回_bt.PerformClick()
1972
+                    End If
1973
+                End If
1974
+            End If
1975
+        End If
1976
+
1977
+    End Sub
1846 1978
 End Class

+ 71
- 45
TENDEN-MES-SYS/量產訂單管理/量產訂單系統/訂單資料比對與修改_力威.vb Parādīt failu

@@ -1436,12 +1436,12 @@ Public Class 訂單資料比對與修改_力威
1436 1436
         If BB01_lb.Text = "對等" Then
1437 1437
             For I As Integer = 0 To 控制表2_dgv.Rows.Count - 1
1438 1438
                 For II As Integer = 0 To 控制表3_dgv.Rows.Count - 1
1439
-                    If 控制表2_dgv.Rows(I).Cells("形體號").Value = 控制表3_dgv.Rows(II).Cells("形體號").Value And
1440
-                       控制表2_dgv.Rows(I).Cells("楦型").Value = 控制表3_dgv.Rows(II).Cells("楦型").Value And
1441
-                       控制表2_dgv.Rows(I).Cells("ProductID").Value = 控制表3_dgv.Rows(II).Cells("ProductID").Value And
1442
-                       控制表2_dgv.Rows(I).Cells("顏色").Value = 控制表3_dgv.Rows(II).Cells("顏色").Value Then
1439
+                    If 控制表2_dgv.Rows(I).Cells("形體號").Value.ToString = 控制表3_dgv.Rows(II).Cells("形體號").Value.ToString And
1440
+                       控制表2_dgv.Rows(I).Cells("楦型").Value.ToString = 控制表3_dgv.Rows(II).Cells("楦型").Value.ToString And
1441
+                       控制表2_dgv.Rows(I).Cells("ProductID").Value.ToString = 控制表3_dgv.Rows(II).Cells("ProductID").Value.ToString And
1442
+                       控制表2_dgv.Rows(I).Cells("顏色").Value.ToString = 控制表3_dgv.Rows(II).Cells("顏色").Value.ToString Then
1443 1443
                         索引 += 1
1444
-                        控制表3_dgv.Rows(II).Cells("資料流水號").Value = 控制表2_dgv.Rows(II).Cells("資料流水號").Value
1444
+                        控制表3_dgv.Rows(II).Cells("資料流水號").Value = 控制表2_dgv.Rows(II).Cells("資料流水號").Value.ToString
1445 1445
 
1446 1446
                         If 控制表2_dgv.Rows(I).Cells("訂單數量").Value <> 控制表3_dgv.Rows(II).Cells("訂單數量").Value Then
1447 1447
                             控制表3_dgv.Rows(II).Cells("訂單數量").Style.ForeColor = Color.Red : 控制表2_dgv.Rows(I).Cells("訂單數量").Style.ForeColor = Color.Red
@@ -1449,19 +1449,19 @@ Public Class 訂單資料比對與修改_力威
1449 1449
                             控制表3_dgv.Rows(II).Cells("訂單數量").Style.ForeColor = Color.Black : 控制表2_dgv.Rows(I).Cells("訂單數量").Style.ForeColor = Color.Black
1450 1450
                         End If
1451 1451
 
1452
-                        If 控制表2_dgv.Rows(I).Cells("客戶交期").Value <> 控制表3_dgv.Rows(II).Cells("客戶交期").Value Then
1452
+                        If 控制表2_dgv.Rows(I).Cells("客戶交期").Value.ToString <> 控制表3_dgv.Rows(II).Cells("客戶交期").Value.ToString Then
1453 1453
                             控制表3_dgv.Rows(II).Cells("客戶交期").Style.ForeColor = Color.Red : 控制表2_dgv.Rows(I).Cells("客戶交期").Style.ForeColor = Color.Red
1454 1454
                         Else
1455 1455
                             控制表3_dgv.Rows(II).Cells("客戶交期").Style.ForeColor = Color.Black : 控制表2_dgv.Rows(I).Cells("客戶交期").Style.ForeColor = Color.Black
1456 1456
                         End If
1457 1457
 
1458
-                        If 控制表2_dgv.Rows(I).Cells("工廠回復交期").Value <> 控制表3_dgv.Rows(II).Cells("工廠回復交期").Value Then
1458
+                        If 控制表2_dgv.Rows(I).Cells("工廠回復交期").Value.ToString <> 控制表3_dgv.Rows(II).Cells("工廠回復交期").Value.ToString Then
1459 1459
                             控制表3_dgv.Rows(II).Cells("工廠回復交期").Style.ForeColor = Color.Red : 控制表2_dgv.Rows(I).Cells("工廠回復交期").Style.ForeColor = Color.Red
1460 1460
                         Else
1461 1461
                             控制表3_dgv.Rows(II).Cells("工廠回復交期").Style.ForeColor = Color.Black : 控制表2_dgv.Rows(I).Cells("工廠回復交期").Style.ForeColor = Color.Black
1462 1462
                         End If
1463 1463
 
1464
-                        If 控制表2_dgv.Rows(I).Cells("UoM").Value <> 控制表3_dgv.Rows(II).Cells("UoM").Value Then
1464
+                        If 控制表2_dgv.Rows(I).Cells("UoM").Value.ToString <> 控制表3_dgv.Rows(II).Cells("UoM").Value.ToString Then
1465 1465
                             控制表3_dgv.Rows(II).Cells("UoM").Style.ForeColor = Color.Red : 控制表2_dgv.Rows(I).Cells("UoM").Style.ForeColor = Color.Red
1466 1466
                         Else
1467 1467
                             控制表3_dgv.Rows(II).Cells("UoM").Style.ForeColor = Color.Black : 控制表2_dgv.Rows(I).Cells("UoM").Style.ForeColor = Color.Black
@@ -1476,10 +1476,10 @@ Public Class 訂單資料比對與修改_力威
1476 1476
         If BB02_lb.Text = "對等" Then
1477 1477
             For I As Integer = 0 To 明細表2_dgv.Rows.Count - 1
1478 1478
                 For II As Integer = 0 To 明細表3_dgv.Rows.Count - 1
1479
-                    If 明細表2_dgv.Rows(I).Cells("ItemNumber").Value = 明細表3_dgv.Rows(II).Cells("ItemNumber").Value And
1480
-                       明細表2_dgv.Rows(I).Cells("ProductName").Value = 明細表3_dgv.Rows(II).Cells("ProductName").Value And
1481
-                       明細表2_dgv.Rows(I).Cells("Color").Value = 明細表3_dgv.Rows(II).Cells("Color").Value And
1482
-                       明細表2_dgv.Rows(I).Cells("DM").Value = 明細表3_dgv.Rows(II).Cells("DM").Value Then
1479
+                    If 明細表2_dgv.Rows(I).Cells("ItemNumber").Value.ToString = 明細表3_dgv.Rows(II).Cells("ItemNumber").Value.ToString And
1480
+                       明細表2_dgv.Rows(I).Cells("ProductName").Value.ToString = 明細表3_dgv.Rows(II).Cells("ProductName").Value.ToString And
1481
+                       明細表2_dgv.Rows(I).Cells("Color").Value.ToString = 明細表3_dgv.Rows(II).Cells("Color").Value.ToString And
1482
+                       明細表2_dgv.Rows(I).Cells("DM").Value.ToString = 明細表3_dgv.Rows(II).Cells("DM").Value.ToString Then
1483 1483
                         索引 += 1
1484 1484
                         If 明細表2_dgv.Rows(I).Cells("5").Value <> 明細表3_dgv.Rows(II).Cells("5").Value Then
1485 1485
                             明細表3_dgv.Rows(II).Cells("5").Style.ForeColor = Color.Red : 明細表2_dgv.Rows(I).Cells("5").Style.ForeColor = Color.Red : Else
@@ -1562,162 +1562,188 @@ Public Class 訂單資料比對與修改_力威
1562 1562
         If BB03_lb.Text = "對等" Then
1563 1563
             For I As Integer = 0 To 裝箱控制2_dgv.Rows.Count - 1
1564 1564
                 For II As Integer = 0 To 裝箱控制3_dgv.Rows.Count - 1
1565
-                    If 裝箱控制2_dgv.Rows(I).Cells("天盾流水號").Value = 裝箱控制3_dgv.Rows(II).Cells("天盾流水號").Value And
1566
-                       裝箱控制2_dgv.Rows(I).Cells("Item").Value = 裝箱控制3_dgv.Rows(II).Cells("Item").Value And
1567
-                       裝箱控制2_dgv.Rows(I).Cells("Material").Value = 裝箱控制3_dgv.Rows(II).Cells("Material").Value And
1568
-                       裝箱控制2_dgv.Rows(I).Cells("ProductID").Value = 裝箱控制3_dgv.Rows(II).Cells("ProductID").Value Then
1565
+                    If 裝箱控制2_dgv.Rows(I).Cells("天盾流水號").Value.ToString = 裝箱控制3_dgv.Rows(II).Cells("天盾流水號").Value.ToString And
1566
+                       裝箱控制2_dgv.Rows(I).Cells("Item").Value.ToString = 裝箱控制3_dgv.Rows(II).Cells("Item").Value.ToString And
1567
+                       裝箱控制2_dgv.Rows(I).Cells("Material").Value.ToString = 裝箱控制3_dgv.Rows(II).Cells("Material").Value.ToString And
1568
+                       裝箱控制2_dgv.Rows(I).Cells("ProductID").Value.ToString = 裝箱控制3_dgv.Rows(II).Cells("ProductID").Value.ToString Then
1569 1569
                         索引 += 1
1570
-                        If 裝箱控制2_dgv.Rows(I).Cells("MaterialDescription").Value <> 裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Value Then
1570
+                        If 裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Value = "" : End If
1571
+                        If 裝箱控制2_dgv.Rows(I).Cells("MaterialDescription").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Value.ToString Then
1571 1572
                             裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("MaterialDescription").Style.ForeColor = Color.Red
1572 1573
                         Else
1573 1574
                             裝箱控制3_dgv.Rows(II).Cells("MaterialDescription").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("MaterialDescription").Style.ForeColor = Color.Black
1574 1575
                         End If
1575 1576
 
1576
-                        If 裝箱控制2_dgv.Rows(I).Cells("Qty").Value <> 裝箱控制3_dgv.Rows(II).Cells("Qty").Value Then
1577
+                        If 裝箱控制3_dgv.Rows(II).Cells("Qty").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Qty").Value = "" : End If
1578
+                        If 裝箱控制2_dgv.Rows(I).Cells("Qty").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Qty").Value.ToString Then
1577 1579
                             裝箱控制3_dgv.Rows(II).Cells("Qty").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Qty").Style.ForeColor = Color.Red
1578 1580
                         Else
1579 1581
                             裝箱控制3_dgv.Rows(II).Cells("Qty").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Qty").Style.ForeColor = Color.Black
1580 1582
                         End If
1581 1583
 
1582
-                        If 裝箱控制2_dgv.Rows(I).Cells("UoM").Value <> 裝箱控制3_dgv.Rows(II).Cells("UoM").Value Then
1584
+                        If 裝箱控制3_dgv.Rows(II).Cells("UoM").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("UoM").Value = "" : End If
1585
+                        If 裝箱控制2_dgv.Rows(I).Cells("UoM").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("UoM").Value.ToString Then
1583 1586
                             裝箱控制3_dgv.Rows(II).Cells("UoM").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("UoM").Style.ForeColor = Color.Red
1584 1587
                         Else
1585 1588
                             裝箱控制3_dgv.Rows(II).Cells("UoM").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("UoM").Style.ForeColor = Color.Black
1586 1589
                         End If
1587 1590
 
1588
-                        If 裝箱控制2_dgv.Rows(I).Cells("ProductDescription").Value <> 裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Value Then
1591
+                        If 裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Value = "" : End If
1592
+                        If 裝箱控制2_dgv.Rows(I).Cells("ProductDescription").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Value.ToString Then
1589 1593
                             裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("ProductDescription").Style.ForeColor = Color.Red
1590 1594
                         Else
1591 1595
                             裝箱控制3_dgv.Rows(II).Cells("ProductDescription").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("ProductDescription").Style.ForeColor = Color.Black
1592 1596
                         End If
1593 1597
 
1594
-                        If 裝箱控制2_dgv.Rows(I).Cells("IncoTerms").Value <> 裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Value Then
1598
+                        If 裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Value = "" : End If
1599
+                        If 裝箱控制2_dgv.Rows(I).Cells("IncoTerms").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Value.ToString Then
1595 1600
                             裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("IncoTerms").Style.ForeColor = Color.Red
1596 1601
                         Else
1597 1602
                             裝箱控制3_dgv.Rows(II).Cells("IncoTerms").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("IncoTerms").Style.ForeColor = Color.Black
1598 1603
                         End If
1599 1604
 
1600
-                        If 裝箱控制2_dgv.Rows(I).Cells("CustomerData").Value <> 裝箱控制3_dgv.Rows(II).Cells("CustomerData").Value Then
1605
+                        If 裝箱控制3_dgv.Rows(II).Cells("CustomerData").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("CustomerData").Value = "" : End If
1606
+                        If 裝箱控制2_dgv.Rows(I).Cells("CustomerData").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("CustomerData").Value.ToString Then
1601 1607
                             裝箱控制3_dgv.Rows(II).Cells("CustomerData").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("CustomerData").Style.ForeColor = Color.Red
1602 1608
                         Else
1603 1609
                             裝箱控制3_dgv.Rows(II).Cells("CustomerData").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CustomerData").Style.ForeColor = Color.Black
1604 1610
                         End If
1605 1611
 
1606
-                        If 裝箱控制2_dgv.Rows(I).Cells("Size").Value <> 裝箱控制3_dgv.Rows(II).Cells("Size").Value Then
1612
+                        If 裝箱控制3_dgv.Rows(II).Cells("Size").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Size").Value = "" : End If
1613
+                        If 裝箱控制2_dgv.Rows(I).Cells("Size").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Size").Value.ToString Then
1607 1614
                             裝箱控制3_dgv.Rows(II).Cells("Size").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Size").Style.ForeColor = Color.Red
1608 1615
                         Else
1609 1616
                             裝箱控制3_dgv.Rows(II).Cells("Size").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Size").Style.ForeColor = Color.Black
1610 1617
                         End If
1611 1618
 
1612
-                        If 裝箱控制2_dgv.Rows(I).Cells("HS").Value <> 裝箱控制3_dgv.Rows(II).Cells("HS").Value Then
1619
+                        If 裝箱控制3_dgv.Rows(II).Cells("HS").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("HS").Value = "" : End If
1620
+                        If 裝箱控制2_dgv.Rows(I).Cells("HS").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("HS").Value.ToString Then
1613 1621
                             裝箱控制3_dgv.Rows(II).Cells("HS").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("HS").Style.ForeColor = Color.Red
1614 1622
                         Else
1615 1623
                             裝箱控制3_dgv.Rows(II).Cells("HS").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("HS").Style.ForeColor = Color.Black
1616 1624
                         End If
1617 1625
 
1618
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value Then
1626
+                        If 裝箱控制3_dgv.Rows(II).Cells("Units1").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Units1").Value = "" : End If
1627
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value.ToString Then
1619 1628
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Red
1620 1629
                         Else
1621 1630
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Black
1622 1631
                         End If
1623 1632
 
1624
-                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value Then
1633
+                        If 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value = "" : End If
1634
+                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value.ToString Then
1625 1635
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Red
1626 1636
                         Else
1627 1637
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Black
1628 1638
                         End If
1629 1639
 
1630
-                        If 裝箱控制2_dgv.Rows(I).Cells("AddOnDty").Value <> 裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Value Then
1640
+                        If 裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Value = "" : End If
1641
+                        If 裝箱控制2_dgv.Rows(I).Cells("AddOnDty").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Value.ToString Then
1631 1642
                             裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("AddOnDty").Style.ForeColor = Color.Red
1632 1643
                         Else
1633 1644
                             裝箱控制3_dgv.Rows(II).Cells("AddOnDty").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("AddOnDty").Style.ForeColor = Color.Black
1634 1645
                         End If
1635 1646
 
1636
-                        If 裝箱控制2_dgv.Rows(I).Cells("UnitsCtn").Value <> 裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Value Then
1647
+                        If 裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Value = "" : End If
1648
+                        If 裝箱控制2_dgv.Rows(I).Cells("UnitsCtn").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Value.ToString Then
1637 1649
                             裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("UnitsCtn").Style.ForeColor = Color.Red
1638 1650
                         Else
1639 1651
                             裝箱控制3_dgv.Rows(II).Cells("UnitsCtn").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("UnitsCtn").Style.ForeColor = Color.Black
1640 1652
                         End If
1641 1653
 
1642
-                        If 裝箱控制2_dgv.Rows(I).Cells("NoCtn").Value <> 裝箱控制3_dgv.Rows(II).Cells("NoCtn").Value Then
1654
+                        If 裝箱控制3_dgv.Rows(II).Cells("NoCtn").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("NoCtn").Value = "" : End If
1655
+                        If 裝箱控制2_dgv.Rows(I).Cells("NoCtn").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("NoCtn").Value.ToString Then
1643 1656
                             裝箱控制3_dgv.Rows(II).Cells("NoCtn").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("NoCtn").Style.ForeColor = Color.Red
1644 1657
                         Else
1645 1658
                             裝箱控制3_dgv.Rows(II).Cells("NoCtn").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("NoCtn").Style.ForeColor = Color.Black
1646 1659
                         End If
1647 1660
 
1648
-                        If 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Value <> 裝箱控制3_dgv.Rows(II).Cells("CtnNo").Value Then
1661
+                        If 裝箱控制3_dgv.Rows(II).Cells("CtnNo").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("CtnNo").Value = "" : End If
1662
+                        If 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("CtnNo").Value.ToString Then
1649 1663
                             裝箱控制3_dgv.Rows(II).Cells("CtnNo").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Style.ForeColor = Color.Red
1650 1664
                         Else
1651 1665
                             裝箱控制3_dgv.Rows(II).Cells("CtnNo").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Style.ForeColor = Color.Black
1652 1666
                         End If
1653 1667
 
1654
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value Then
1668
+                        If 裝箱控制3_dgv.Rows(II).Cells("Units2").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Units2").Value = "" : End If
1669
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value.ToString Then
1655 1670
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Red
1656 1671
                         Else
1657 1672
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Black
1658 1673
                         End If
1659 1674
 
1660
-                        If 裝箱控制2_dgv.Rows(I).Cells("PLMSeason").Value <> 裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Value Then
1675
+                        If 裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Value = "" : End If
1676
+                        If 裝箱控制2_dgv.Rows(I).Cells("PLMSeason").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Value.ToString Then
1661 1677
                             裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("PLMSeason").Style.ForeColor = Color.Red
1662 1678
                         Else
1663 1679
                             裝箱控制3_dgv.Rows(II).Cells("PLMSeason").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("PLMSeason").Style.ForeColor = Color.Black
1664 1680
                         End If
1665 1681
 
1666
-                        If 裝箱控制2_dgv.Rows(I).Cells("Stock").Value <> 裝箱控制3_dgv.Rows(II).Cells("Stock").Value Then
1682
+                        If 裝箱控制3_dgv.Rows(II).Cells("Stock").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Stock").Value = "" : End If
1683
+                        If 裝箱控制2_dgv.Rows(I).Cells("Stock").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Stock").Value.ToString Then
1667 1684
                             裝箱控制3_dgv.Rows(II).Cells("Stock").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Stock").Style.ForeColor = Color.Red
1668 1685
                         Else
1669 1686
                             裝箱控制3_dgv.Rows(II).Cells("Stock").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Stock").Style.ForeColor = Color.Black
1670 1687
                         End If
1671 1688
 
1672
-                        If 裝箱控制2_dgv.Rows(I).Cells("StkName").Value <> 裝箱控制3_dgv.Rows(II).Cells("StkName").Value Then
1689
+                        If 裝箱控制3_dgv.Rows(II).Cells("StkName").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("StkName").Value = "" : End If
1690
+                        If 裝箱控制2_dgv.Rows(I).Cells("StkName").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("StkName").Value.ToString Then
1673 1691
                             裝箱控制3_dgv.Rows(II).Cells("StkName").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("StkName").Style.ForeColor = Color.Red
1674 1692
                         Else
1675 1693
                             裝箱控制3_dgv.Rows(II).Cells("StkName").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("StkName").Style.ForeColor = Color.Black
1676 1694
                         End If
1677 1695
 
1678
-                        If 裝箱控制2_dgv.Rows(I).Cells("CustStk").Value <> 裝箱控制3_dgv.Rows(II).Cells("CustStk").Value Then
1696
+                        If 裝箱控制3_dgv.Rows(II).Cells("CustStk").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("CustStk").Value = "" : End If
1697
+                        If 裝箱控制2_dgv.Rows(I).Cells("CustStk").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("CustStk").Value.ToString Then
1679 1698
                             裝箱控制3_dgv.Rows(II).Cells("CustStk").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("CustStk").Style.ForeColor = Color.Red
1680 1699
                         Else
1681 1700
                             裝箱控制3_dgv.Rows(II).Cells("CustStk").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CustStk").Style.ForeColor = Color.Black
1682 1701
                         End If
1683 1702
 
1684
-                        If 裝箱控制2_dgv.Rows(I).Cells("CustStkName").Value <> 裝箱控制3_dgv.Rows(II).Cells("CustStkName").Value Then
1703
+                        If 裝箱控制3_dgv.Rows(II).Cells("CustStkName").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("CustStkName").Value = "" : End If
1704
+                        If 裝箱控制2_dgv.Rows(I).Cells("CustStkName").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("CustStkName").Value.ToString Then
1685 1705
                             裝箱控制3_dgv.Rows(II).Cells("CustStkName").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("CustStkName").Style.ForeColor = Color.Red
1686 1706
                         Else
1687 1707
                             裝箱控制3_dgv.Rows(II).Cells("CustStkName").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CustStkName").Style.ForeColor = Color.Black
1688 1708
                         End If
1689 1709
 
1690
-                        If 裝箱控制2_dgv.Rows(I).Cells("CasePack").Value <> 裝箱控制3_dgv.Rows(II).Cells("CasePack").Value Then
1710
+                        If 裝箱控制3_dgv.Rows(II).Cells("CasePack").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("CasePack").Value = "" : End If
1711
+                        If 裝箱控制2_dgv.Rows(I).Cells("CasePack").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("CasePack").Value.ToString Then
1691 1712
                             裝箱控制3_dgv.Rows(II).Cells("CasePack").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("CasePack").Style.ForeColor = Color.Red
1692 1713
                         Else
1693 1714
                             裝箱控制3_dgv.Rows(II).Cells("CasePack").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CasePack").Style.ForeColor = Color.Black
1694 1715
                         End If
1695 1716
 
1696
-                        If 裝箱控制2_dgv.Rows(I).Cells("Colorway").Value <> 裝箱控制3_dgv.Rows(II).Cells("Colorway").Value Then
1717
+                        If 裝箱控制3_dgv.Rows(II).Cells("Colorway").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Colorway").Value = "" : End If
1718
+                        If 裝箱控制2_dgv.Rows(I).Cells("Colorway").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Colorway").Value.ToString Then
1697 1719
                             裝箱控制3_dgv.Rows(II).Cells("Colorway").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Colorway").Style.ForeColor = Color.Red
1698 1720
                         Else
1699 1721
                             裝箱控制3_dgv.Rows(II).Cells("Colorway").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Colorway").Style.ForeColor = Color.Black
1700 1722
                         End If
1701 1723
 
1702
-                        If 裝箱控制2_dgv.Rows(I).Cells("OrderColor").Value <> 裝箱控制3_dgv.Rows(II).Cells("OrderColor").Value Then
1724
+                        If 裝箱控制3_dgv.Rows(II).Cells("OrderColor").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("OrderColor").Value = "" : End If
1725
+                        If 裝箱控制2_dgv.Rows(I).Cells("OrderColor").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("OrderColor").Value.ToString Then
1703 1726
                             裝箱控制3_dgv.Rows(II).Cells("OrderColor").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("OrderColor").Style.ForeColor = Color.Red
1704 1727
                         Else
1705 1728
                             裝箱控制3_dgv.Rows(II).Cells("OrderColor").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("OrderColor").Style.ForeColor = Color.Black
1706 1729
                         End If
1707 1730
 
1708
-                        If 裝箱控制2_dgv.Rows(I).Cells("Logo").Value <> 裝箱控制3_dgv.Rows(II).Cells("Logo").Value Then
1731
+                        If 裝箱控制3_dgv.Rows(II).Cells("Logo").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("Logo").Value = "" : End If
1732
+                        If 裝箱控制2_dgv.Rows(I).Cells("Logo").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Logo").Value.ToString Then
1709 1733
                             裝箱控制3_dgv.Rows(II).Cells("Logo").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Logo").Style.ForeColor = Color.Red
1710 1734
                         Else
1711 1735
                             裝箱控制3_dgv.Rows(II).Cells("Logo").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Logo").Style.ForeColor = Color.Black
1712 1736
                         End If
1713 1737
 
1714
-                        If 裝箱控制2_dgv.Rows(I).Cells("POItemText").Value <> 裝箱控制3_dgv.Rows(II).Cells("POItemText").Value Then
1738
+                        If 裝箱控制3_dgv.Rows(II).Cells("POItemText").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("POItemText").Value = "" : End If
1739
+                        If 裝箱控制2_dgv.Rows(I).Cells("POItemText").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("POItemText").Value.ToString Then
1715 1740
                             裝箱控制3_dgv.Rows(II).Cells("POItemText").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("POItemText").Style.ForeColor = Color.Red
1716 1741
                         Else
1717 1742
                             裝箱控制3_dgv.Rows(II).Cells("POItemText").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("POItemText").Style.ForeColor = Color.Black
1718 1743
                         End If
1719 1744
 
1720
-                        If 裝箱控制2_dgv.Rows(I).Cells("FinalCustomerShipTo").Value <> 裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Value Then
1745
+                        If 裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Value = Nothing Then : 裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Value = "" : End If
1746
+                        If 裝箱控制2_dgv.Rows(I).Cells("FinalCustomerShipTo").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Value.ToString Then
1721 1747
                             裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("FinalCustomerShipTo").Style.ForeColor = Color.Red
1722 1748
                         Else
1723 1749
                             裝箱控制3_dgv.Rows(II).Cells("FinalCustomerShipTo").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("FinalCustomerShipTo").Style.ForeColor = Color.Black
@@ -1732,9 +1758,9 @@ Public Class 訂單資料比對與修改_力威
1732 1758
         If BB04_lb.Text = "對等" Then
1733 1759
             For I As Integer = 0 To 裝箱明細2_dgv.Rows.Count - 1
1734 1760
                 For II As Integer = 0 To 裝箱明細3_dgv.Rows.Count - 1
1735
-                    If 裝箱明細2_dgv.Rows(I).Cells("Item").Value = 裝箱明細3_dgv.Rows(II).Cells("Item").Value And
1736
-                       裝箱明細2_dgv.Rows(I).Cells("Material").Value = 裝箱明細3_dgv.Rows(II).Cells("Material").Value And
1737
-                       裝箱明細2_dgv.Rows(I).Cells("DM").Value = 裝箱明細3_dgv.Rows(II).Cells("DM").Value Then
1761
+                    If 裝箱明細2_dgv.Rows(I).Cells("Item").Value.ToString = 裝箱明細3_dgv.Rows(II).Cells("Item").Value.ToString And
1762
+                       裝箱明細2_dgv.Rows(I).Cells("Material").Value.ToString = 裝箱明細3_dgv.Rows(II).Cells("Material").Value.ToString And
1763
+                       裝箱明細2_dgv.Rows(I).Cells("DM").Value.ToString = 裝箱明細3_dgv.Rows(II).Cells("DM").Value.ToString Then
1738 1764
                         索引 += 1
1739 1765
                         If 裝箱明細2_dgv.Rows(I).Cells("5").Value <> 裝箱明細3_dgv.Rows(II).Cells("5").Value Then
1740 1766
                             裝箱明細3_dgv.Rows(II).Cells("5").Style.ForeColor = Color.Red : 裝箱明細2_dgv.Rows(I).Cells("5").Style.ForeColor = Color.Red : Else

Notiek ielāde…
Atcelt
Saglabāt