20210101備份

TENDEN-MES-SYS/Module/全域變數.vb

@@ -4,7 +4,7 @@
     Public Target As String : Public Target1 As String : Public Target2 As String : Public FTP帳號 As String : Public FTP密碼 As String : Public 登入人IP As String
     Public CC(99) As Boolean : Public AA(99) As String : Public 登入判斷 As Boolean
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2020111301"
+    Public 版本 As String = "2020122601"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

TENDEN-MES-SYS/樣品訂單管理/中文樣品單.Designer.vb

@@ -1421,7 +1421,7 @@ Partial Class 中文樣品單
         '
         Me.ComboBox9.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox9.FormattingEnabled = True
-        Me.ComboBox9.Items.AddRange(New Object() {"", "ILR", "FLR", "SS", "Proto", "Line"})
+        Me.ComboBox9.Items.AddRange(New Object() {"", "ILR", "FLR", "SS", "Proto", "Line", "Canada"})
         Me.ComboBox9.Location = New System.Drawing.Point(59, 112)
         Me.ComboBox9.Name = "ComboBox9"
         Me.ComboBox9.Size = New System.Drawing.Size(155, 24)

TENDEN-MES-SYS/樣品訂單管理/中文樣品單.vb

@@ -326,7 +326,9 @@ Public Class 中文樣品單
         ElseIf 開發部門 = True And 確認部門 = False Then
             ComboBox16.Items.Clear() : ComboBox8.Items.Clear()
             ComboBox8.Items.Add("ILR") : ComboBox8.Items.Add("FLR") : ComboBox8.Items.Add("SMS") : ComboBox8.Items.Add("SMU") : ComboBox8.Items.Add("Proto") : ComboBox8.Items.Add("Line")
+            ComboBox8.Items.Add("Canada")
             ComboBox16.Items.Add("ILR") : ComboBox16.Items.Add("FLR") : ComboBox16.Items.Add("SMS") : ComboBox16.Items.Add("SMU") : ComboBox16.Items.Add("Proto") : ComboBox16.Items.Add("Line")
+            ComboBox16.Items.Add("Canada")
         End If
     End Sub
     Private Sub Set_格式設定()
@@ -677,7 +679,7 @@ Public Class 中文樣品單
                             樣品單列印_bt.Enabled = False : 樣品單存檔_bt.Enabled = False : 刷新資料_bt.Enabled = False : 刪除樣品單_bt.Enabled = False
                         End If
                     ElseIf 開發部門 = True And 確認部門 = False Then
-                        If QA = "ILR" Or QA = "FLR" Or QA = "SMS" Or QA = "SMU" Or QA = "Proto" Or QA = "Line" Then
+                        If QA = "ILR" Or QA = "FLR" Or QA = "SMS" Or QA = "SMU" Or QA = "Proto" Or QA = "Line" Or QA = "Canada" Then
                             樣品單列印_bt.Enabled = True : 樣品單存檔_bt.Enabled = True : 刷新資料_bt.Enabled = True : 刪除樣品單_bt.Enabled = True
                         Else
                             樣品單列印_bt.Enabled = False : 樣品單存檔_bt.Enabled = False : 刷新資料_bt.Enabled = False : 刪除樣品單_bt.Enabled = False
@@ -706,6 +708,7 @@ Public Class 中文樣品單
             ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
             ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
             ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
+            ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
             End If
             If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
@@ -713,6 +716,7 @@ Public Class 中文樣品單
             ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             End If
         End If
     End Sub
@@ -756,6 +760,7 @@ Public Class 中文樣品單
             ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
             ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
             ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
+            ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
             End If
             If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
@@ -763,6 +768,7 @@ Public Class 中文樣品單
             ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+            ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
             End If
         End If
     End Sub
@@ -2246,7 +2252,7 @@ Public Class 中文樣品單
                 MsgBox("確認部門不能修改開發部門資料")
             End If
         ElseIf 開發部門 = True And 確認部門 = False Then
-            If QA = "ILR" Or QA = "FLR" Or QA = "SMS" Or QA = "SMU" Or QA = "Proto" Or QA = "Line" Then
+            If QA = "ILR" Or QA = "FLR" Or QA = "SMS" Or QA = "SMU" Or QA = "Proto" Or QA = "Line" Or QA = "Canada" Then
                 If 暫存模式 = False Then
                     新增樣品單_bt.Enabled = False : 新增OR複製_bt.Enabled = False : 樣品單列印_bt.Enabled = False : 編輯模式_bt.Enabled = False
                     新增顏色清單_bt.Enabled = True : 新增項目清單_bt.Enabled = True : 新增廠商清單_bt.Enabled = True : 新增面料_bt.Enabled = True : Button37.Enabled = True
@@ -2282,6 +2288,7 @@ Public Class 中文樣品單
         ElseIf ComboBox8.Text = "SMU" Or ComboBox8.Text = "SMU" Then : ComboBox9.Text = ""
         ElseIf ComboBox8.Text = "Proto" Then : ComboBox9.Text = "Proto"
         ElseIf ComboBox8.Text = "Line" Then : ComboBox9.Text = "Line"
+        ElseIf ComboBox8.Text = "Canada" Then : ComboBox9.Text = "Canada"
         End If
         If ComboBox8.Text = "ILR" Or ComboBox8.Text = "FLR" Then : CheckBox8.Checked = True : CheckBox7.Checked = False : CheckBox6.Checked = False
         ElseIf ComboBox8.Text = "CFM" Then : CheckBox8.Checked = False : CheckBox7.Checked = True : CheckBox6.Checked = False
@@ -2289,6 +2296,7 @@ Public Class 中文樣品單
         ElseIf ComboBox8.Text = "SMU" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
         ElseIf ComboBox8.Text = "Proto" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
         ElseIf ComboBox8.Text = "Line" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
+        ElseIf ComboBox8.Text = "Canada" Then : CheckBox8.Checked = False : CheckBox7.Checked = False : CheckBox6.Checked = False
         End If
         TextBox2.Focus()
     End Sub
@@ -2386,6 +2394,7 @@ Public Class 中文樣品單
         ElseIf 開發部門 = True And 確認部門 = False Then
             ComboBox16.Items.Clear()
             ComboBox16.Items.Add("ILR") : ComboBox16.Items.Add("FLR") : ComboBox16.Items.Add("SMS") : ComboBox16.Items.Add("SMU") : ComboBox16.Items.Add("Proto") : ComboBox16.Items.Add("Line")
+            ComboBox16.Items.Add("Canada")
         End If
     End Sub
     Private Sub Button60_Click(sender As Object, e As EventArgs) Handles 清除條件_bt.Click

TENDEN-MES-SYS/樣品訂單管理/中文樣品單清單.Designer.vb

@@ -22,7 +22,7 @@ Partial Class 中文樣品單清單
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()>
     Private  Sub InitializeComponent()
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.Label27 = New System.Windows.Forms.Label()
         Me.ComboBox3 = New System.Windows.Forms.ComboBox()
@@ -39,8 +39,8 @@ Partial Class 中文樣品單清單
         '
         'DataGridView1
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.DataGridView1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -136,7 +136,7 @@ Partial Class 中文樣品單清單
         '
         Me.ComboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList
         Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Items.AddRange(New Object() {"ILR", "FLR", "SMS", "SMU", "CFM", "Proto"})
+        Me.ComboBox1.Items.AddRange(New Object() {"ILR", "FLR", "SMS", "SMU", "CFM", "Proto", "Line", "Canada"})
         Me.ComboBox1.Location = New System.Drawing.Point(449, 6)
         Me.ComboBox1.Name = "ComboBox1"
         Me.ComboBox1.Size = New System.Drawing.Size(68, 24)

TENDEN-MES-SYS/樣品訂單管理/中文樣品單階段.Designer.vb

@@ -29,6 +29,7 @@ Partial Class 中文樣品單階段
         Me.Button11 = New System.Windows.Forms.Button()
         Me.CheckBox5 = New System.Windows.Forms.CheckBox()
         Me.CheckBox6 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox7 = New System.Windows.Forms.CheckBox()
         Me.SuspendLayout()
         '
         'CheckBox1
@@ -44,7 +45,7 @@ Partial Class 中文樣品單階段
         'CheckBox2
         '
         Me.CheckBox2.AutoSize = True
-        Me.CheckBox2.Location = New System.Drawing.Point(62, 12)
+        Me.CheckBox2.Location = New System.Drawing.Point(71, 12)
         Me.CheckBox2.Name = "CheckBox2"
         Me.CheckBox2.Size = New System.Drawing.Size(47, 20)
         Me.CheckBox2.TabIndex = 1
@@ -54,7 +55,7 @@ Partial Class 中文樣品單階段
         'CheckBox3
         '
         Me.CheckBox3.AutoSize = True
-        Me.CheckBox3.Location = New System.Drawing.Point(115, 12)
+        Me.CheckBox3.Location = New System.Drawing.Point(133, 12)
         Me.CheckBox3.Name = "CheckBox3"
         Me.CheckBox3.Size = New System.Drawing.Size(53, 20)
         Me.CheckBox3.TabIndex = 2
@@ -64,7 +65,7 @@ Partial Class 中文樣品單階段
         'CheckBox4
         '
         Me.CheckBox4.AutoSize = True
-        Me.CheckBox4.Location = New System.Drawing.Point(174, 12)
+        Me.CheckBox4.Location = New System.Drawing.Point(204, 12)
         Me.CheckBox4.Name = "CheckBox4"
         Me.CheckBox4.Size = New System.Drawing.Size(55, 20)
         Me.CheckBox4.TabIndex = 3
@@ -75,9 +76,9 @@ Partial Class 中文樣品單階段
         '
         Me.Button11.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Button11.ForeColor = System.Drawing.Color.Blue
-        Me.Button11.Location = New System.Drawing.Point(12, 38)
+        Me.Button11.Location = New System.Drawing.Point(12, 64)
         Me.Button11.Name = "Button11"
-        Me.Button11.Size = New System.Drawing.Size(345, 28)
+        Me.Button11.Size = New System.Drawing.Size(247, 28)
         Me.Button11.TabIndex = 388
         Me.Button11.Text = "確定新增"
         Me.Button11.UseVisualStyleBackColor = True
@@ -85,7 +86,7 @@ Partial Class 中文樣品單階段
         'CheckBox5
         '
         Me.CheckBox5.AutoSize = True
-        Me.CheckBox5.Location = New System.Drawing.Point(235, 12)
+        Me.CheckBox5.Location = New System.Drawing.Point(12, 38)
         Me.CheckBox5.Name = "CheckBox5"
         Me.CheckBox5.Size = New System.Drawing.Size(58, 20)
         Me.CheckBox5.TabIndex = 389
@@ -95,18 +96,29 @@ Partial Class 中文樣品單階段
         'CheckBox6
         '
         Me.CheckBox6.AutoSize = True
-        Me.CheckBox6.Location = New System.Drawing.Point(299, 12)
+        Me.CheckBox6.Location = New System.Drawing.Point(71, 38)
         Me.CheckBox6.Name = "CheckBox6"
         Me.CheckBox6.Size = New System.Drawing.Size(50, 20)
         Me.CheckBox6.TabIndex = 390
         Me.CheckBox6.Text = "Line"
         Me.CheckBox6.UseVisualStyleBackColor = True
         '
+        'CheckBox7
+        '
+        Me.CheckBox7.AutoSize = True
+        Me.CheckBox7.Location = New System.Drawing.Point(130, 38)
+        Me.CheckBox7.Name = "CheckBox7"
+        Me.CheckBox7.Size = New System.Drawing.Size(71, 20)
+        Me.CheckBox7.TabIndex = 391
+        Me.CheckBox7.Text = "Canada"
+        Me.CheckBox7.UseVisualStyleBackColor = True
+        '
         '中文樣品單階段
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(367, 77)
+        Me.ClientSize = New System.Drawing.Size(267, 103)
+        Me.Controls.Add(Me.CheckBox7)
         Me.Controls.Add(Me.CheckBox6)
         Me.Controls.Add(Me.CheckBox5)
         Me.Controls.Add(Me.Button11)
@@ -131,5 +143,6 @@ Partial Class 中文樣品單階段
     Friend WithEvents Button11 As Button
     Friend WithEvents CheckBox5 As CheckBox
     Friend WithEvents CheckBox6 As CheckBox
+    Friend WithEvents CheckBox7 As CheckBox
 End Class
 

TENDEN-MES-SYS/樣品訂單管理/中文樣品單階段.vb

@@ -4,12 +4,14 @@
         Button11.Enabled = False
     End Sub
     Private Sub Button11_CheckedChanged(sender As Object, e As EventArgs) Handles Button11.Click
-        CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False
+        CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = False
         Me.Close()
     End Sub
     Private  Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.Click
         If CheckBox1.Checked = True Then
-            CheckBox1.Checked = True : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : Button11.Enabled = True
+            CheckBox1.Checked = True : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = False
+            CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "ILR"
         Else
             CheckBox1.Checked = False : Button11.Enabled = False
@@ -17,7 +19,8 @@
     End Sub
     Private  Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox2.Click
         If CheckBox2.Checked = True Then
-            CheckBox1.Checked = False : CheckBox2.Checked = True : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : Button11.Enabled = True
+            CheckBox1.Checked = False : CheckBox2.Checked = True : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "FLR"
         Else
             CheckBox2.Checked = False : Button11.Enabled = False
@@ -25,7 +28,8 @@
     End Sub
     Private  Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox3.Click
         If CheckBox3.Checked = True Then
-            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = True : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : Button11.Enabled = True
+            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = True : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "SMS"
         Else
             CheckBox3.Checked = False : Button11.Enabled = False
@@ -33,7 +37,8 @@
     End Sub
     Private Sub CheckBox4_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox4.Click
         If CheckBox4.Checked = True Then
-            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = True : CheckBox5.Checked = False : CheckBox6.Checked = False : Button11.Enabled = True
+            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = True : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "SMU"
         Else
             CheckBox4.Checked = False : Button11.Enabled = False
@@ -41,7 +46,8 @@
     End Sub
     Private Sub CheckBox5_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox5.Click
         If CheckBox5.Checked = True Then
-            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = True : CheckBox6.Checked = False : Button11.Enabled = True
+            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = True : CheckBox6.Checked = False : CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "Proto"
         Else
             CheckBox4.Checked = False : Button11.Enabled = False
@@ -49,10 +55,20 @@
     End Sub
     Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox6.Click
         If CheckBox6.Checked = True Then
-            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = True : Button11.Enabled = True
+            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = True : CheckBox7.Checked = False
+            Button11.Enabled = True
             QA = "Line"
         Else
             CheckBox4.Checked = False : Button11.Enabled = False
         End If
     End Sub
+    Private Sub CheckBox7_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox7.Click
+        If CheckBox7.Checked = True Then
+            CheckBox1.Checked = False : CheckBox2.Checked = False : CheckBox3.Checked = False : CheckBox4.Checked = False : CheckBox5.Checked = False : CheckBox6.Checked = False : CheckBox7.Checked = True
+            Button11.Enabled = True
+            QA = "Canada"
+        Else
+            CheckBox4.Checked = False : Button11.Enabled = False
+        End If
+    End Sub
 End Class

TENDEN-MES-SYS/量產訂單管理/訂單資料匯入-力威.vb

@@ -390,9 +390,16 @@ Public Class 訂單資料匯入_力威
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 23) = "NLT - Ex - Factory Date" Then
                             For I As Integer = 1 To 3
                                 日期_tb.Text = xlSheet.Cells(YY + I, XX).value
-                                客戶交期_dtp.Text = 日期_tb.Text
-                                If 日期_tb.Text <> "" Then
-                                    Exit For
+                                If 日期_tb.Text = "Per Item" Then
+                                    客戶交期_dtp.Text = Today()
+                                    If 日期_tb.Text <> "" Then
+                                        Exit For
+                                    End If
+                                Else
+                                    客戶交期_dtp.Text = 日期_tb.Text
+                                    If 日期_tb.Text <> "" Then
+                                        Exit For
+                                    End If
                                 End If
                             Next
                         End If
@@ -486,6 +493,7 @@ Public Class 訂單資料匯入_力威
                                     控制表_dgv.Rows(0).Cells("工廠回復交期").Value = Strings.Format(客戶交期_dtp.Value, "yyyy/MM/dd")
                                     控制表_dgv.Rows(0).Cells("生產工廠").Value = FTY_cb.Text
                                     控制表_dgv.Rows(0).Cells("訂單種類").Value = DIV_cb.Text
+                                    型體描述 = ""
                                     For I As Integer = 0 To 60 : 資料數2 = 60 : 進度條2()
                                         If Strings.Left(xlSheet.Cells(YY, XX1 + I).value, 20) = "Material Description" Then
                                             For WW As Integer = 1 To 100 : 資料數3 = 100 : 進度條3()

TENDEN-MES-SYS/量產訂單管理/訂單資料比對與修改_力威.vb

@@ -716,9 +716,16 @@ Public Class 訂單資料比對與修改_力威
                         If Strings.Left(xlSheet.Cells(YY, XX).value, 23) = "NLT - Ex - Factory Date" Then
                             For I As Integer = 1 To 3
                                 日期_tb.Text = xlSheet.Cells(YY + I, XX).value
-                                客戶交期_dtp.Text = 日期_tb.Text
-                                If 日期_tb.Text <> "" Then
-                                    Exit For
+                                If 日期_tb.Text = "Per Item" Then
+                                    客戶交期_dtp.Text = Today()
+                                    If 日期_tb.Text <> "" Then
+                                        Exit For
+                                    End If
+                                Else
+                                    客戶交期_dtp.Text = 客戶交期1_dtp.Text
+                                    If 日期_tb.Text <> "" Then
+                                        Exit For
+                                    End If
                                 End If
                             Next
                         End If