202011141備份

Signed-off-by: B70340 <b70340@gmail.com>

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 = "2020110201"
+    Public 版本 As String = "2020111301"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 匯率 As Double
 

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

@@ -650,6 +650,10 @@ Public Class 列印_中文樣品單
             xlSheet.Rows(位置11).Select : myExcel.Selection.RowHeight = 攔寬 + 20
         Next
 
+        xlSheet.Range("C11:G11").Select()
+        With myExcel.Selection : .HorizontalAlignment = xlCenter : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False : .IndentLevel = 0
+            .ShrinkToFit = True : .ReadingOrder = xlContext : .MergeCells = False : End With
+
         xlSheet.Range("G2").Select()
         With myExcel.Selection.Font : .Name = "Microsoft YaHei UI" : .Size = 10 : .Strikethrough = False : .Superscript = False : .Subscript = False : .OutlineFont = False : .Shadow = False
             .Underline = xlUnderlineStyleNone : .ThemeColor = xlThemeColorLight1 : .TintAndShade = 0 : .ThemeFont = xlThemeFontNone : End With

TENDEN-MES-SYS/量產訂單管理/生產進度表.vb

@@ -133,7 +133,7 @@ Public Class 生產進度表
                                     "工廠進度表備註2 = N'" & xlSheet.Cells(i, 33).value & "', " &
                                   "Special_Packaging = N'" & xlSheet.Cells(i, 34).value & "', " &
                                             "Remarks = N'" & xlSheet.Cells(i, 35).value & "' " &
-                       "WHERE (客戶訂單號 LIKE '" & xlSheet.Cells(i, 4).value & "') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 10).value & "') " &
+                       "WHERE (客戶訂單號 LIKE '%" & xlSheet.Cells(i, 4).value & "%') AND (形體號 LIKE '" & xlSheet.Cells(i, 5).value & "') AND (顏色 LIKE '" & xlSheet.Cells(i, 10).value & "') " &
                        "AND (楦型 LIKE '" & xlSheet.Cells(i, 8).value & "') AND (訂單數量 = " & xlSheet.Cells(i, 11).value & ")"
                 CmdSet_For_dr() : conn.Close()
                 '"驗貨時間 = N'" & xlSheet.Cells(i, 31).value & "', " &

TENDEN-MES-SYS/量產訂單管理/訂單列印選擇.Designer.vb

@@ -159,6 +159,13 @@ Partial Class 訂單列印選擇
         Me.週選_週數_cb = New System.Windows.Forms.ComboBox()
         Me.週選_起日_tb = New System.Windows.Forms.TextBox()
         Me.Label62 = New System.Windows.Forms.Label()
+        Me.CheckBox53 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox54 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox55 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox56 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox57 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox58 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox59 = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.月份選擇_gb.SuspendLayout()
         Me.週數選擇_gb.SuspendLayout()
@@ -191,7 +198,7 @@ Partial Class 訂單列印選擇
         'Label57
         '
         Me.Label57.AutoSize = True
-        Me.Label57.Location = New System.Drawing.Point(192, 210)
+        Me.Label57.Location = New System.Drawing.Point(178, 210)
         Me.Label57.Name = "Label57"
         Me.Label57.Size = New System.Drawing.Size(56, 16)
         Me.Label57.TabIndex = 335
@@ -200,7 +207,7 @@ Partial Class 訂單列印選擇
         'Label54
         '
         Me.Label54.AutoSize = True
-        Me.Label54.Location = New System.Drawing.Point(192, 190)
+        Me.Label54.Location = New System.Drawing.Point(178, 190)
         Me.Label54.Name = "Label54"
         Me.Label54.Size = New System.Drawing.Size(32, 16)
         Me.Label54.TabIndex = 334
@@ -209,7 +216,7 @@ Partial Class 訂單列印選擇
         'Label51
         '
         Me.Label51.AutoSize = True
-        Me.Label51.Location = New System.Drawing.Point(192, 170)
+        Me.Label51.Location = New System.Drawing.Point(178, 170)
         Me.Label51.Name = "Label51"
         Me.Label51.Size = New System.Drawing.Size(44, 16)
         Me.Label51.TabIndex = 333
@@ -218,7 +225,7 @@ Partial Class 訂單列印選擇
         'Label48
         '
         Me.Label48.AutoSize = True
-        Me.Label48.Location = New System.Drawing.Point(192, 150)
+        Me.Label48.Location = New System.Drawing.Point(178, 150)
         Me.Label48.Name = "Label48"
         Me.Label48.Size = New System.Drawing.Size(35, 16)
         Me.Label48.TabIndex = 332
@@ -227,7 +234,7 @@ Partial Class 訂單列印選擇
         'Label45
         '
         Me.Label45.AutoSize = True
-        Me.Label45.Location = New System.Drawing.Point(192, 130)
+        Me.Label45.Location = New System.Drawing.Point(178, 130)
         Me.Label45.Name = "Label45"
         Me.Label45.Size = New System.Drawing.Size(107, 16)
         Me.Label45.TabIndex = 331
@@ -236,7 +243,7 @@ Partial Class 訂單列印選擇
         'Label42
         '
         Me.Label42.AutoSize = True
-        Me.Label42.Location = New System.Drawing.Point(192, 110)
+        Me.Label42.Location = New System.Drawing.Point(178, 110)
         Me.Label42.Name = "Label42"
         Me.Label42.Size = New System.Drawing.Size(113, 16)
         Me.Label42.TabIndex = 330
@@ -245,7 +252,7 @@ Partial Class 訂單列印選擇
         'Label39
         '
         Me.Label39.AutoSize = True
-        Me.Label39.Location = New System.Drawing.Point(192, 90)
+        Me.Label39.Location = New System.Drawing.Point(178, 90)
         Me.Label39.Name = "Label39"
         Me.Label39.Size = New System.Drawing.Size(50, 16)
         Me.Label39.TabIndex = 329
@@ -254,7 +261,7 @@ Partial Class 訂單列印選擇
         'Label36
         '
         Me.Label36.AutoSize = True
-        Me.Label36.Location = New System.Drawing.Point(192, 70)
+        Me.Label36.Location = New System.Drawing.Point(178, 70)
         Me.Label36.Name = "Label36"
         Me.Label36.Size = New System.Drawing.Size(71, 16)
         Me.Label36.TabIndex = 328
@@ -263,7 +270,7 @@ Partial Class 訂單列印選擇
         'Label33
         '
         Me.Label33.AutoSize = True
-        Me.Label33.Location = New System.Drawing.Point(192, 50)
+        Me.Label33.Location = New System.Drawing.Point(178, 50)
         Me.Label33.Name = "Label33"
         Me.Label33.Size = New System.Drawing.Size(72, 16)
         Me.Label33.TabIndex = 327
@@ -272,7 +279,7 @@ Partial Class 訂單列印選擇
         'Label30
         '
         Me.Label30.AutoSize = True
-        Me.Label30.Location = New System.Drawing.Point(192, 30)
+        Me.Label30.Location = New System.Drawing.Point(178, 30)
         Me.Label30.Name = "Label30"
         Me.Label30.Size = New System.Drawing.Size(88, 16)
         Me.Label30.TabIndex = 326
@@ -281,7 +288,7 @@ Partial Class 訂單列印選擇
         'Label27
         '
         Me.Label27.AutoSize = True
-        Me.Label27.Location = New System.Drawing.Point(192, 10)
+        Me.Label27.Location = New System.Drawing.Point(178, 10)
         Me.Label27.Name = "Label27"
         Me.Label27.Size = New System.Drawing.Size(69, 16)
         Me.Label27.TabIndex = 325
@@ -344,7 +351,7 @@ Partial Class 訂單列印選擇
         'Label10
         '
         Me.Label10.AutoSize = True
-        Me.Label10.Location = New System.Drawing.Point(505, 94)
+        Me.Label10.Location = New System.Drawing.Point(446, 90)
         Me.Label10.Name = "Label10"
         Me.Label10.Size = New System.Drawing.Size(64, 16)
         Me.Label10.TabIndex = 318
@@ -353,7 +360,7 @@ Partial Class 訂單列印選擇
         'Label9
         '
         Me.Label9.AutoSize = True
-        Me.Label9.Location = New System.Drawing.Point(505, 74)
+        Me.Label9.Location = New System.Drawing.Point(446, 70)
         Me.Label9.Name = "Label9"
         Me.Label9.Size = New System.Drawing.Size(41, 16)
         Me.Label9.TabIndex = 317
@@ -522,7 +529,7 @@ Partial Class 訂單列印選擇
         'CheckBox9
         '
         Me.CheckBox9.AutoSize = True
-        Me.CheckBox9.Location = New System.Drawing.Point(484, 76)
+        Me.CheckBox9.Location = New System.Drawing.Point(425, 72)
         Me.CheckBox9.Name = "CheckBox9"
         Me.CheckBox9.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox9.TabIndex = 344
@@ -531,7 +538,7 @@ Partial Class 訂單列印選擇
         'CheckBox10
         '
         Me.CheckBox10.AutoSize = True
-        Me.CheckBox10.Location = New System.Drawing.Point(484, 96)
+        Me.CheckBox10.Location = New System.Drawing.Point(425, 92)
         Me.CheckBox10.Name = "CheckBox10"
         Me.CheckBox10.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox10.TabIndex = 345
@@ -598,7 +605,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox17.AutoSize = True
         Me.CheckBox17.Checked = True
         Me.CheckBox17.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox17.Location = New System.Drawing.Point(171, 12)
+        Me.CheckBox17.Location = New System.Drawing.Point(157, 12)
         Me.CheckBox17.Name = "CheckBox17"
         Me.CheckBox17.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox17.TabIndex = 352
@@ -609,7 +616,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox18.AutoSize = True
         Me.CheckBox18.Checked = True
         Me.CheckBox18.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox18.Location = New System.Drawing.Point(171, 32)
+        Me.CheckBox18.Location = New System.Drawing.Point(157, 32)
         Me.CheckBox18.Name = "CheckBox18"
         Me.CheckBox18.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox18.TabIndex = 353
@@ -620,7 +627,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox19.AutoSize = True
         Me.CheckBox19.Checked = True
         Me.CheckBox19.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox19.Location = New System.Drawing.Point(171, 52)
+        Me.CheckBox19.Location = New System.Drawing.Point(157, 52)
         Me.CheckBox19.Name = "CheckBox19"
         Me.CheckBox19.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox19.TabIndex = 354
@@ -631,7 +638,7 @@ Partial Class 訂單列印選擇
         Me.CheckBox20.AutoSize = True
         Me.CheckBox20.Checked = True
         Me.CheckBox20.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox20.Location = New System.Drawing.Point(171, 72)
+        Me.CheckBox20.Location = New System.Drawing.Point(157, 72)
         Me.CheckBox20.Name = "CheckBox20"
         Me.CheckBox20.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox20.TabIndex = 355
@@ -640,7 +647,7 @@ Partial Class 訂單列印選擇
         'CheckBox21
         '
         Me.CheckBox21.AutoSize = True
-        Me.CheckBox21.Location = New System.Drawing.Point(171, 92)
+        Me.CheckBox21.Location = New System.Drawing.Point(157, 92)
         Me.CheckBox21.Name = "CheckBox21"
         Me.CheckBox21.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox21.TabIndex = 356
@@ -649,7 +656,7 @@ Partial Class 訂單列印選擇
         'CheckBox22
         '
         Me.CheckBox22.AutoSize = True
-        Me.CheckBox22.Location = New System.Drawing.Point(171, 112)
+        Me.CheckBox22.Location = New System.Drawing.Point(157, 112)
         Me.CheckBox22.Name = "CheckBox22"
         Me.CheckBox22.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox22.TabIndex = 357
@@ -658,7 +665,7 @@ Partial Class 訂單列印選擇
         'CheckBox23
         '
         Me.CheckBox23.AutoSize = True
-        Me.CheckBox23.Location = New System.Drawing.Point(171, 132)
+        Me.CheckBox23.Location = New System.Drawing.Point(157, 132)
         Me.CheckBox23.Name = "CheckBox23"
         Me.CheckBox23.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox23.TabIndex = 358
@@ -667,7 +674,7 @@ Partial Class 訂單列印選擇
         'CheckBox24
         '
         Me.CheckBox24.AutoSize = True
-        Me.CheckBox24.Location = New System.Drawing.Point(171, 152)
+        Me.CheckBox24.Location = New System.Drawing.Point(157, 152)
         Me.CheckBox24.Name = "CheckBox24"
         Me.CheckBox24.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox24.TabIndex = 359
@@ -676,7 +683,7 @@ Partial Class 訂單列印選擇
         'CheckBox25
         '
         Me.CheckBox25.AutoSize = True
-        Me.CheckBox25.Location = New System.Drawing.Point(171, 172)
+        Me.CheckBox25.Location = New System.Drawing.Point(157, 172)
         Me.CheckBox25.Name = "CheckBox25"
         Me.CheckBox25.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox25.TabIndex = 360
@@ -685,7 +692,7 @@ Partial Class 訂單列印選擇
         'CheckBox26
         '
         Me.CheckBox26.AutoSize = True
-        Me.CheckBox26.Location = New System.Drawing.Point(171, 192)
+        Me.CheckBox26.Location = New System.Drawing.Point(157, 192)
         Me.CheckBox26.Name = "CheckBox26"
         Me.CheckBox26.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox26.TabIndex = 361
@@ -694,7 +701,7 @@ Partial Class 訂單列印選擇
         'CheckBox27
         '
         Me.CheckBox27.AutoSize = True
-        Me.CheckBox27.Location = New System.Drawing.Point(171, 212)
+        Me.CheckBox27.Location = New System.Drawing.Point(157, 212)
         Me.CheckBox27.Name = "CheckBox27"
         Me.CheckBox27.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox27.TabIndex = 362
@@ -703,7 +710,7 @@ Partial Class 訂單列印選擇
         'CheckBox28
         '
         Me.CheckBox28.AutoSize = True
-        Me.CheckBox28.Location = New System.Drawing.Point(171, 232)
+        Me.CheckBox28.Location = New System.Drawing.Point(157, 232)
         Me.CheckBox28.Name = "CheckBox28"
         Me.CheckBox28.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox28.TabIndex = 364
@@ -712,7 +719,7 @@ Partial Class 訂單列印選擇
         'Label14
         '
         Me.Label14.AutoSize = True
-        Me.Label14.Location = New System.Drawing.Point(192, 230)
+        Me.Label14.Location = New System.Drawing.Point(178, 230)
         Me.Label14.Name = "Label14"
         Me.Label14.Size = New System.Drawing.Size(22, 16)
         Me.Label14.TabIndex = 363
@@ -721,7 +728,7 @@ Partial Class 訂單列印選擇
         'CheckBox29
         '
         Me.CheckBox29.AutoSize = True
-        Me.CheckBox29.Location = New System.Drawing.Point(171, 252)
+        Me.CheckBox29.Location = New System.Drawing.Point(157, 252)
         Me.CheckBox29.Name = "CheckBox29"
         Me.CheckBox29.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox29.TabIndex = 366
@@ -730,7 +737,7 @@ Partial Class 訂單列印選擇
         'Label15
         '
         Me.Label15.AutoSize = True
-        Me.Label15.Location = New System.Drawing.Point(192, 250)
+        Me.Label15.Location = New System.Drawing.Point(178, 250)
         Me.Label15.Name = "Label15"
         Me.Label15.Size = New System.Drawing.Size(22, 16)
         Me.Label15.TabIndex = 365
@@ -739,7 +746,7 @@ Partial Class 訂單列印選擇
         'CheckBox30
         '
         Me.CheckBox30.AutoSize = True
-        Me.CheckBox30.Location = New System.Drawing.Point(171, 272)
+        Me.CheckBox30.Location = New System.Drawing.Point(157, 272)
         Me.CheckBox30.Name = "CheckBox30"
         Me.CheckBox30.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox30.TabIndex = 368
@@ -748,7 +755,7 @@ Partial Class 訂單列印選擇
         'Label16
         '
         Me.Label16.AutoSize = True
-        Me.Label16.Location = New System.Drawing.Point(192, 270)
+        Me.Label16.Location = New System.Drawing.Point(178, 270)
         Me.Label16.Name = "Label16"
         Me.Label16.Size = New System.Drawing.Size(76, 16)
         Me.Label16.TabIndex = 367
@@ -757,7 +764,7 @@ Partial Class 訂單列印選擇
         'CheckBox31
         '
         Me.CheckBox31.AutoSize = True
-        Me.CheckBox31.Location = New System.Drawing.Point(326, 12)
+        Me.CheckBox31.Location = New System.Drawing.Point(298, 12)
         Me.CheckBox31.Name = "CheckBox31"
         Me.CheckBox31.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox31.TabIndex = 370
@@ -766,7 +773,7 @@ Partial Class 訂單列印選擇
         'Label17
         '
         Me.Label17.AutoSize = True
-        Me.Label17.Location = New System.Drawing.Point(347, 10)
+        Me.Label17.Location = New System.Drawing.Point(319, 10)
         Me.Label17.Name = "Label17"
         Me.Label17.Size = New System.Drawing.Size(34, 16)
         Me.Label17.TabIndex = 369
@@ -775,7 +782,7 @@ Partial Class 訂單列印選擇
         'CheckBox32
         '
         Me.CheckBox32.AutoSize = True
-        Me.CheckBox32.Location = New System.Drawing.Point(326, 34)
+        Me.CheckBox32.Location = New System.Drawing.Point(298, 33)
         Me.CheckBox32.Name = "CheckBox32"
         Me.CheckBox32.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox32.TabIndex = 372
@@ -784,7 +791,7 @@ Partial Class 訂單列印選擇
         'Label19
         '
         Me.Label19.AutoSize = True
-        Me.Label19.Location = New System.Drawing.Point(347, 32)
+        Me.Label19.Location = New System.Drawing.Point(319, 31)
         Me.Label19.Name = "Label19"
         Me.Label19.Size = New System.Drawing.Size(22, 16)
         Me.Label19.TabIndex = 371
@@ -793,7 +800,7 @@ Partial Class 訂單列印選擇
         'CheckBox33
         '
         Me.CheckBox33.AutoSize = True
-        Me.CheckBox33.Location = New System.Drawing.Point(326, 54)
+        Me.CheckBox33.Location = New System.Drawing.Point(298, 52)
         Me.CheckBox33.Name = "CheckBox33"
         Me.CheckBox33.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox33.TabIndex = 374
@@ -802,7 +809,7 @@ Partial Class 訂單列印選擇
         'Label20
         '
         Me.Label20.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(347, 52)
+        Me.Label20.Location = New System.Drawing.Point(319, 50)
         Me.Label20.Name = "Label20"
         Me.Label20.Size = New System.Drawing.Size(22, 16)
         Me.Label20.TabIndex = 373
@@ -811,7 +818,7 @@ Partial Class 訂單列印選擇
         'CheckBox34
         '
         Me.CheckBox34.AutoSize = True
-        Me.CheckBox34.Location = New System.Drawing.Point(326, 74)
+        Me.CheckBox34.Location = New System.Drawing.Point(298, 72)
         Me.CheckBox34.Name = "CheckBox34"
         Me.CheckBox34.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox34.TabIndex = 376
@@ -820,7 +827,7 @@ Partial Class 訂單列印選擇
         'Label22
         '
         Me.Label22.AutoSize = True
-        Me.Label22.Location = New System.Drawing.Point(347, 72)
+        Me.Label22.Location = New System.Drawing.Point(319, 70)
         Me.Label22.Name = "Label22"
         Me.Label22.Size = New System.Drawing.Size(36, 16)
         Me.Label22.TabIndex = 375
@@ -829,7 +836,7 @@ Partial Class 訂單列印選擇
         'CheckBox35
         '
         Me.CheckBox35.AutoSize = True
-        Me.CheckBox35.Location = New System.Drawing.Point(326, 94)
+        Me.CheckBox35.Location = New System.Drawing.Point(298, 92)
         Me.CheckBox35.Name = "CheckBox35"
         Me.CheckBox35.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox35.TabIndex = 378
@@ -838,7 +845,7 @@ Partial Class 訂單列印選擇
         'Label23
         '
         Me.Label23.AutoSize = True
-        Me.Label23.Location = New System.Drawing.Point(347, 92)
+        Me.Label23.Location = New System.Drawing.Point(319, 90)
         Me.Label23.Name = "Label23"
         Me.Label23.Size = New System.Drawing.Size(32, 16)
         Me.Label23.TabIndex = 377
@@ -847,7 +854,7 @@ Partial Class 訂單列印選擇
         'CheckBox36
         '
         Me.CheckBox36.AutoSize = True
-        Me.CheckBox36.Location = New System.Drawing.Point(326, 114)
+        Me.CheckBox36.Location = New System.Drawing.Point(298, 112)
         Me.CheckBox36.Name = "CheckBox36"
         Me.CheckBox36.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox36.TabIndex = 380
@@ -856,7 +863,7 @@ Partial Class 訂單列印選擇
         'Label25
         '
         Me.Label25.AutoSize = True
-        Me.Label25.Location = New System.Drawing.Point(347, 112)
+        Me.Label25.Location = New System.Drawing.Point(319, 110)
         Me.Label25.Name = "Label25"
         Me.Label25.Size = New System.Drawing.Size(32, 16)
         Me.Label25.TabIndex = 379
@@ -865,7 +872,7 @@ Partial Class 訂單列印選擇
         'CheckBox37
         '
         Me.CheckBox37.AutoSize = True
-        Me.CheckBox37.Location = New System.Drawing.Point(326, 134)
+        Me.CheckBox37.Location = New System.Drawing.Point(298, 132)
         Me.CheckBox37.Name = "CheckBox37"
         Me.CheckBox37.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox37.TabIndex = 382
@@ -874,7 +881,7 @@ Partial Class 訂單列印選擇
         'Label26
         '
         Me.Label26.AutoSize = True
-        Me.Label26.Location = New System.Drawing.Point(347, 132)
+        Me.Label26.Location = New System.Drawing.Point(319, 130)
         Me.Label26.Name = "Label26"
         Me.Label26.Size = New System.Drawing.Size(32, 16)
         Me.Label26.TabIndex = 381
@@ -883,7 +890,7 @@ Partial Class 訂單列印選擇
         'CheckBox38
         '
         Me.CheckBox38.AutoSize = True
-        Me.CheckBox38.Location = New System.Drawing.Point(326, 152)
+        Me.CheckBox38.Location = New System.Drawing.Point(298, 150)
         Me.CheckBox38.Name = "CheckBox38"
         Me.CheckBox38.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox38.TabIndex = 384
@@ -892,7 +899,7 @@ Partial Class 訂單列印選擇
         'Label28
         '
         Me.Label28.AutoSize = True
-        Me.Label28.Location = New System.Drawing.Point(347, 150)
+        Me.Label28.Location = New System.Drawing.Point(319, 148)
         Me.Label28.Name = "Label28"
         Me.Label28.Size = New System.Drawing.Size(32, 16)
         Me.Label28.TabIndex = 383
@@ -901,7 +908,7 @@ Partial Class 訂單列印選擇
         'CheckBox39
         '
         Me.CheckBox39.AutoSize = True
-        Me.CheckBox39.Location = New System.Drawing.Point(326, 172)
+        Me.CheckBox39.Location = New System.Drawing.Point(298, 170)
         Me.CheckBox39.Name = "CheckBox39"
         Me.CheckBox39.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox39.TabIndex = 386
@@ -910,7 +917,7 @@ Partial Class 訂單列印選擇
         'Label29
         '
         Me.Label29.AutoSize = True
-        Me.Label29.Location = New System.Drawing.Point(347, 170)
+        Me.Label29.Location = New System.Drawing.Point(319, 168)
         Me.Label29.Name = "Label29"
         Me.Label29.Size = New System.Drawing.Size(32, 16)
         Me.Label29.TabIndex = 385
@@ -919,7 +926,7 @@ Partial Class 訂單列印選擇
         'CheckBox40
         '
         Me.CheckBox40.AutoSize = True
-        Me.CheckBox40.Location = New System.Drawing.Point(326, 194)
+        Me.CheckBox40.Location = New System.Drawing.Point(298, 192)
         Me.CheckBox40.Name = "CheckBox40"
         Me.CheckBox40.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox40.TabIndex = 388
@@ -928,7 +935,7 @@ Partial Class 訂單列印選擇
         'Label31
         '
         Me.Label31.AutoSize = True
-        Me.Label31.Location = New System.Drawing.Point(347, 192)
+        Me.Label31.Location = New System.Drawing.Point(319, 190)
         Me.Label31.Name = "Label31"
         Me.Label31.Size = New System.Drawing.Size(20, 16)
         Me.Label31.TabIndex = 387
@@ -937,7 +944,7 @@ Partial Class 訂單列印選擇
         'CheckBox41
         '
         Me.CheckBox41.AutoSize = True
-        Me.CheckBox41.Location = New System.Drawing.Point(326, 214)
+        Me.CheckBox41.Location = New System.Drawing.Point(298, 212)
         Me.CheckBox41.Name = "CheckBox41"
         Me.CheckBox41.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox41.TabIndex = 390
@@ -946,7 +953,7 @@ Partial Class 訂單列印選擇
         'Label32
         '
         Me.Label32.AutoSize = True
-        Me.Label32.Location = New System.Drawing.Point(347, 212)
+        Me.Label32.Location = New System.Drawing.Point(319, 210)
         Me.Label32.Name = "Label32"
         Me.Label32.Size = New System.Drawing.Size(32, 16)
         Me.Label32.TabIndex = 389
@@ -955,7 +962,7 @@ Partial Class 訂單列印選擇
         'CheckBox42
         '
         Me.CheckBox42.AutoSize = True
-        Me.CheckBox42.Location = New System.Drawing.Point(326, 234)
+        Me.CheckBox42.Location = New System.Drawing.Point(298, 232)
         Me.CheckBox42.Name = "CheckBox42"
         Me.CheckBox42.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox42.TabIndex = 392
@@ -964,7 +971,7 @@ Partial Class 訂單列印選擇
         'Label34
         '
         Me.Label34.AutoSize = True
-        Me.Label34.Location = New System.Drawing.Point(347, 232)
+        Me.Label34.Location = New System.Drawing.Point(319, 230)
         Me.Label34.Name = "Label34"
         Me.Label34.Size = New System.Drawing.Size(32, 16)
         Me.Label34.TabIndex = 391
@@ -973,7 +980,7 @@ Partial Class 訂單列印選擇
         'CheckBox43
         '
         Me.CheckBox43.AutoSize = True
-        Me.CheckBox43.Location = New System.Drawing.Point(326, 254)
+        Me.CheckBox43.Location = New System.Drawing.Point(298, 252)
         Me.CheckBox43.Name = "CheckBox43"
         Me.CheckBox43.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox43.TabIndex = 394
@@ -982,7 +989,7 @@ Partial Class 訂單列印選擇
         'Label35
         '
         Me.Label35.AutoSize = True
-        Me.Label35.Location = New System.Drawing.Point(347, 252)
+        Me.Label35.Location = New System.Drawing.Point(319, 250)
         Me.Label35.Name = "Label35"
         Me.Label35.Size = New System.Drawing.Size(32, 16)
         Me.Label35.TabIndex = 393
@@ -991,7 +998,7 @@ Partial Class 訂單列印選擇
         'CheckBox44
         '
         Me.CheckBox44.AutoSize = True
-        Me.CheckBox44.Location = New System.Drawing.Point(326, 274)
+        Me.CheckBox44.Location = New System.Drawing.Point(298, 272)
         Me.CheckBox44.Name = "CheckBox44"
         Me.CheckBox44.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox44.TabIndex = 396
@@ -1000,7 +1007,7 @@ Partial Class 訂單列印選擇
         'Label37
         '
         Me.Label37.AutoSize = True
-        Me.Label37.Location = New System.Drawing.Point(347, 272)
+        Me.Label37.Location = New System.Drawing.Point(319, 270)
         Me.Label37.Name = "Label37"
         Me.Label37.Size = New System.Drawing.Size(32, 16)
         Me.Label37.TabIndex = 395
@@ -1009,7 +1016,7 @@ Partial Class 訂單列印選擇
         'CheckBox45
         '
         Me.CheckBox45.AutoSize = True
-        Me.CheckBox45.Location = New System.Drawing.Point(484, 12)
+        Me.CheckBox45.Location = New System.Drawing.Point(425, 12)
         Me.CheckBox45.Name = "CheckBox45"
         Me.CheckBox45.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox45.TabIndex = 398
@@ -1018,7 +1025,7 @@ Partial Class 訂單列印選擇
         'Label38
         '
         Me.Label38.AutoSize = True
-        Me.Label38.Location = New System.Drawing.Point(505, 10)
+        Me.Label38.Location = New System.Drawing.Point(446, 10)
         Me.Label38.Name = "Label38"
         Me.Label38.Size = New System.Drawing.Size(32, 16)
         Me.Label38.TabIndex = 397
@@ -1027,7 +1034,7 @@ Partial Class 訂單列印選擇
         'CheckBox46
         '
         Me.CheckBox46.AutoSize = True
-        Me.CheckBox46.Location = New System.Drawing.Point(484, 34)
+        Me.CheckBox46.Location = New System.Drawing.Point(425, 32)
         Me.CheckBox46.Name = "CheckBox46"
         Me.CheckBox46.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox46.TabIndex = 400
@@ -1036,7 +1043,7 @@ Partial Class 訂單列印選擇
         'Label40
         '
         Me.Label40.AutoSize = True
-        Me.Label40.Location = New System.Drawing.Point(505, 32)
+        Me.Label40.Location = New System.Drawing.Point(446, 30)
         Me.Label40.Name = "Label40"
         Me.Label40.Size = New System.Drawing.Size(99, 16)
         Me.Label40.TabIndex = 399
@@ -1045,7 +1052,7 @@ Partial Class 訂單列印選擇
         'CheckBox47
         '
         Me.CheckBox47.AutoSize = True
-        Me.CheckBox47.Location = New System.Drawing.Point(484, 56)
+        Me.CheckBox47.Location = New System.Drawing.Point(425, 52)
         Me.CheckBox47.Name = "CheckBox47"
         Me.CheckBox47.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox47.TabIndex = 402
@@ -1054,7 +1061,7 @@ Partial Class 訂單列印選擇
         'Label41
         '
         Me.Label41.AutoSize = True
-        Me.Label41.Location = New System.Drawing.Point(505, 54)
+        Me.Label41.Location = New System.Drawing.Point(446, 50)
         Me.Label41.Name = "Label41"
         Me.Label41.Size = New System.Drawing.Size(99, 16)
         Me.Label41.TabIndex = 401
@@ -1063,7 +1070,7 @@ Partial Class 訂單列印選擇
         'CheckBox48
         '
         Me.CheckBox48.AutoSize = True
-        Me.CheckBox48.Location = New System.Drawing.Point(484, 116)
+        Me.CheckBox48.Location = New System.Drawing.Point(425, 112)
         Me.CheckBox48.Name = "CheckBox48"
         Me.CheckBox48.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox48.TabIndex = 403
@@ -1072,7 +1079,7 @@ Partial Class 訂單列印選擇
         'CheckBox49
         '
         Me.CheckBox49.AutoSize = True
-        Me.CheckBox49.Location = New System.Drawing.Point(484, 199)
+        Me.CheckBox49.Location = New System.Drawing.Point(425, 192)
         Me.CheckBox49.Name = "CheckBox49"
         Me.CheckBox49.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox49.TabIndex = 404
@@ -1081,7 +1088,7 @@ Partial Class 訂單列印選擇
         'Label43
         '
         Me.Label43.AutoSize = True
-        Me.Label43.Location = New System.Drawing.Point(505, 114)
+        Me.Label43.Location = New System.Drawing.Point(446, 110)
         Me.Label43.Name = "Label43"
         Me.Label43.Size = New System.Drawing.Size(80, 16)
         Me.Label43.TabIndex = 405
@@ -1090,7 +1097,7 @@ Partial Class 訂單列印選擇
         'Label44
         '
         Me.Label44.AutoSize = True
-        Me.Label44.Location = New System.Drawing.Point(505, 197)
+        Me.Label44.Location = New System.Drawing.Point(446, 190)
         Me.Label44.Name = "Label44"
         Me.Label44.Size = New System.Drawing.Size(80, 16)
         Me.Label44.TabIndex = 406
@@ -1099,7 +1106,7 @@ Partial Class 訂單列印選擇
         'Label46
         '
         Me.Label46.AutoSize = True
-        Me.Label46.Location = New System.Drawing.Point(505, 135)
+        Me.Label46.Location = New System.Drawing.Point(446, 130)
         Me.Label46.Name = "Label46"
         Me.Label46.Size = New System.Drawing.Size(80, 16)
         Me.Label46.TabIndex = 408
@@ -1108,7 +1115,7 @@ Partial Class 訂單列印選擇
         'CheckBox50
         '
         Me.CheckBox50.AutoSize = True
-        Me.CheckBox50.Location = New System.Drawing.Point(484, 137)
+        Me.CheckBox50.Location = New System.Drawing.Point(425, 132)
         Me.CheckBox50.Name = "CheckBox50"
         Me.CheckBox50.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox50.TabIndex = 407
@@ -1117,7 +1124,7 @@ Partial Class 訂單列印選擇
         'Label47
         '
         Me.Label47.AutoSize = True
-        Me.Label47.Location = New System.Drawing.Point(505, 157)
+        Me.Label47.Location = New System.Drawing.Point(446, 150)
         Me.Label47.Name = "Label47"
         Me.Label47.Size = New System.Drawing.Size(56, 16)
         Me.Label47.TabIndex = 410
@@ -1126,7 +1133,7 @@ Partial Class 訂單列印選擇
         'CheckBox51
         '
         Me.CheckBox51.AutoSize = True
-        Me.CheckBox51.Location = New System.Drawing.Point(484, 159)
+        Me.CheckBox51.Location = New System.Drawing.Point(425, 152)
         Me.CheckBox51.Name = "CheckBox51"
         Me.CheckBox51.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox51.TabIndex = 409
@@ -1135,7 +1142,7 @@ Partial Class 訂單列印選擇
         'Label49
         '
         Me.Label49.AutoSize = True
-        Me.Label49.Location = New System.Drawing.Point(505, 177)
+        Me.Label49.Location = New System.Drawing.Point(446, 170)
         Me.Label49.Name = "Label49"
         Me.Label49.Size = New System.Drawing.Size(44, 16)
         Me.Label49.TabIndex = 412
@@ -1144,7 +1151,7 @@ Partial Class 訂單列印選擇
         'CheckBox52
         '
         Me.CheckBox52.AutoSize = True
-        Me.CheckBox52.Location = New System.Drawing.Point(484, 179)
+        Me.CheckBox52.Location = New System.Drawing.Point(425, 172)
         Me.CheckBox52.Name = "CheckBox52"
         Me.CheckBox52.Size = New System.Drawing.Size(15, 14)
         Me.CheckBox52.TabIndex = 411
@@ -1390,7 +1397,7 @@ Partial Class 訂單列印選擇
         'Label61
         '
         Me.Label61.AutoSize = True
-        Me.Label61.Location = New System.Drawing.Point(655, 10)
+        Me.Label61.Location = New System.Drawing.Point(686, 10)
         Me.Label61.Name = "Label61"
         Me.Label61.Size = New System.Drawing.Size(140, 16)
         Me.Label61.TabIndex = 434
@@ -1399,7 +1406,7 @@ Partial Class 訂單列印選擇
         '彙總表_cb
         '
         Me.彙總表_cb.AutoSize = True
-        Me.彙總表_cb.Location = New System.Drawing.Point(634, 12)
+        Me.彙總表_cb.Location = New System.Drawing.Point(665, 12)
         Me.彙總表_cb.Name = "彙總表_cb"
         Me.彙總表_cb.Size = New System.Drawing.Size(15, 14)
         Me.彙總表_cb.TabIndex = 435
@@ -1461,11 +1468,89 @@ Partial Class 訂單列印選擇
         Me.Label62.TabIndex = 440
         Me.Label62.Text = "顯示週數"
         '
+        'CheckBox53
+        '
+        Me.CheckBox53.AutoSize = True
+        Me.CheckBox53.Location = New System.Drawing.Point(425, 209)
+        Me.CheckBox53.Name = "CheckBox53"
+        Me.CheckBox53.Size = New System.Drawing.Size(83, 20)
+        Me.CheckBox53.TabIndex = 437
+        Me.CheckBox53.Text = "  SMS簽回"
+        Me.CheckBox53.UseVisualStyleBackColor = True
+        '
+        'CheckBox54
+        '
+        Me.CheckBox54.AutoSize = True
+        Me.CheckBox54.Location = New System.Drawing.Point(425, 229)
+        Me.CheckBox54.Name = "CheckBox54"
+        Me.CheckBox54.Size = New System.Drawing.Size(78, 20)
+        Me.CheckBox54.TabIndex = 438
+        Me.CheckBox54.Text = "  FRS簽回"
+        Me.CheckBox54.UseVisualStyleBackColor = True
+        '
+        'CheckBox55
+        '
+        Me.CheckBox55.AutoSize = True
+        Me.CheckBox55.Location = New System.Drawing.Point(425, 249)
+        Me.CheckBox55.Name = "CheckBox55"
+        Me.CheckBox55.Size = New System.Drawing.Size(136, 20)
+        Me.CheckBox55.TabIndex = 439
+        Me.CheckBox55.Text = "  MASTER SWATCH"
+        Me.CheckBox55.UseVisualStyleBackColor = True
+        '
+        'CheckBox56
+        '
+        Me.CheckBox56.AutoSize = True
+        Me.CheckBox56.Checked = True
+        Me.CheckBox56.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.CheckBox56.Location = New System.Drawing.Point(425, 269)
+        Me.CheckBox56.Name = "CheckBox56"
+        Me.CheckBox56.Size = New System.Drawing.Size(93, 20)
+        Me.CheckBox56.TabIndex = 440
+        Me.CheckBox56.Text = "  力威訂單號"
+        Me.CheckBox56.UseVisualStyleBackColor = True
+        '
+        'CheckBox57
+        '
+        Me.CheckBox57.AutoSize = True
+        Me.CheckBox57.Location = New System.Drawing.Point(547, 9)
+        Me.CheckBox57.Name = "CheckBox57"
+        Me.CheckBox57.Size = New System.Drawing.Size(89, 20)
+        Me.CheckBox57.TabIndex = 441
+        Me.CheckBox57.Text = "  ProductID"
+        Me.CheckBox57.UseVisualStyleBackColor = True
+        '
+        'CheckBox58
+        '
+        Me.CheckBox58.AutoSize = True
+        Me.CheckBox58.Location = New System.Drawing.Point(547, 29)
+        Me.CheckBox58.Name = "CheckBox58"
+        Me.CheckBox58.Size = New System.Drawing.Size(62, 20)
+        Me.CheckBox58.TabIndex = 442
+        Me.CheckBox58.Text = "  UoM"
+        Me.CheckBox58.UseVisualStyleBackColor = True
+        '
+        'CheckBox59
+        '
+        Me.CheckBox59.AutoSize = True
+        Me.CheckBox59.Location = New System.Drawing.Point(547, 49)
+        Me.CheckBox59.Name = "CheckBox59"
+        Me.CheckBox59.Size = New System.Drawing.Size(57, 20)
+        Me.CheckBox59.TabIndex = 443
+        Me.CheckBox59.Text = "  HS#"
+        Me.CheckBox59.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(1159, 296)
+        Me.Controls.Add(Me.CheckBox59)
+        Me.Controls.Add(Me.CheckBox58)
+        Me.Controls.Add(Me.CheckBox56)
+        Me.Controls.Add(Me.CheckBox55)
+        Me.Controls.Add(Me.CheckBox54)
+        Me.Controls.Add(Me.CheckBox53)
         Me.Controls.Add(Me.週數選擇_gb)
         Me.Controls.Add(Me.彙總表_cb)
         Me.Controls.Add(Me.Label61)
@@ -1576,6 +1661,7 @@ Partial Class 訂單列印選擇
         Me.Controls.Add(Me.Label5)
         Me.Controls.Add(Me.DataGridView1)
         Me.Controls.Add(Me.Button11)
+        Me.Controls.Add(Me.CheckBox57)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "訂單列印選擇"
@@ -1727,5 +1813,12 @@ Partial Class 訂單列印選擇
     Friend WithEvents Label62 As Label
     Friend WithEvents 加一個月_bt As Button
     Friend WithEvents 減一個月_bt As Button
+    Friend WithEvents CheckBox53 As CheckBox
+    Friend WithEvents CheckBox54 As CheckBox
+    Friend WithEvents CheckBox55 As CheckBox
+    Friend WithEvents CheckBox56 As CheckBox
+    Friend WithEvents CheckBox57 As CheckBox
+    Friend WithEvents CheckBox58 As CheckBox
+    Friend WithEvents CheckBox59 As CheckBox
 End Class
 

TENDEN-MES-SYS/量產訂單管理/訂單列印選擇.vb

@@ -17,12 +17,53 @@ Public Class 訂單列印選擇
     Dim xlApp As Microsoft.Office.Interop.Excel.Application
     Dim xlBook As Microsoft.Office.Interop.Excel.Workbook
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
-    ReadOnly SQL字串1 As String = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, " &
-                   "TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, 出貨數量, PO_S_Date AS 接單日, " &
-                   "Requested_XF AS 需求日期, Confirm_XF AS 確認日期, Revised_XF AS 修訂日期, 工廠回復交期 AS 工廠交期, Special_Packaging, Remarks, 出貨地, TVW, 楦頭號, 材質, 七號模具, TRIAL1 AS T1, " &
-                   "TRIAL2 AS T2, 長期試穿 AS WEAR_TEST, CFMSAMPLE AS CFM, TRIAL3 AS T3, TRIAL4 AS T4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, " &
-                   "針車時間 AS 針車, 成型時間 AS 成型, 驗貨時間 AS 驗貨, 工廠進度表備註1, 工廠進度表備註2, 客戶包裝確認, 東莞業務備註, 工廠確認, 利威確認, 結關日 FROM " & 訂單資料表(1) & ""
-    ReadOnly SQL字串2 As String = " ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC"
+    ReadOnly SQL字串1 As String = "SELECT  " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號,  " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, 
+                                           " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, " & 訂單資料表(1) & ".總金額, 
+                                           " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".CFMSPEC, 
+                                           " & 訂單資料表(1) & ".CFMSAMPLE, " & 訂單資料表(1) & ".TRIAL1, " & 訂單資料表(1) & ".TRIAL2, " & 訂單資料表(1) & ".TRIAL3, " & 訂單資料表(1) & ".TRIAL4, 
+                                           " & 訂單資料表(1) & ".包裝確認時間, " & 訂單資料表(1) & ".貼標時間, " & 訂單資料表(1) & ".裁斷時間, " & 訂單資料表(1) & ".針車時間, 
+                                           " & 訂單資料表(1) & ".成型時間, " & 訂單資料表(1) & ".驗貨時間, " & 訂單資料表(1) & ".實際離廠日, " & 訂單資料表(1) & ".資料流水號, 
+                                           " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".GOODBOX, " & 訂單資料表(1) & ".LEATHER, " & 訂單資料表(1) & ".LEA_Note, " & 訂單資料表(1) & ".出貨數量, 
+                                           " & 訂單資料表(1) & ".PO_S_Date AS 接單日, " & 訂單資料表(1) & ".Requested_XF AS 需求日期, " & 訂單資料表(1) & ".Confirm_XF AS 確認日期, 
+                                           " & 訂單資料表(1) & ".Revised_XF AS 修訂日期, " & 訂單資料表(1) & ".工廠回復交期 AS 工廠交期, " & 訂單資料表(1) & ".Special_Packaging, 
+                                           " & 訂單資料表(1) & ".Remarks, " & 訂單資料表(1) & ".出貨地, " & 訂單資料表(1) & ".TVW, " & 訂單資料表(1) & ".楦頭號, " & 訂單資料表(1) & ".材質, 
+                                           " & 訂單資料表(1) & ".七號模具, " & 訂單資料表(1) & ".TRIAL1 AS T1, " & 訂單資料表(1) & ".TRIAL2 AS T2, " & 訂單資料表(1) & ".長期試穿 AS WEAR_TEST, 
+                                           " & 訂單資料表(1) & ".CFMSAMPLE AS CFM, " & 訂單資料表(1) & ".TRIAL3 AS T3, " & 訂單資料表(1) & ".TRIAL4 AS T4, " & 訂單資料表(1) & ".CFMSPEC AS TEST, 
+                                           " & 訂單資料表(1) & ".面料, " & 訂單資料表(1) & ".副料, " & 訂單資料表(1) & ".中底, " & 訂單資料表(1) & ".鞋墊, " & 訂單資料表(1) & ".大底, 
+                                           " & 訂單資料表(1) & ".跟, " & 訂單資料表(1) & ".包裝確認時間 AS 包裝, " & 訂單資料表(1) & ".裁斷時間 AS 裁斷, " & 訂單資料表(1) & ".針車時間 AS 針車, 
+                                           " & 訂單資料表(1) & ".成型時間 AS 成型, " & 訂單資料表(1) & ".驗貨時間 AS 驗貨, " & 訂單資料表(1) & ".工廠進度表備註1, " & 訂單資料表(1) & ".工廠進度表備註2, 
+                                           " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
+                                           " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, " & 訂單資料表(1) & ".力威訂單號, 
+                                           " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS
+                                     FROM  " & 訂單資料表(1) & " LEFT OUTER JOIN " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
+                                           " & 訂單資料表(1) & ".ProductID = " & 訂單資料表(2) & ".ProductID AND " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(2) & ".天盾流水號 AND 
+                                           " & 訂單資料表(1) & ".客戶訂單號 = " & 訂單資料表(2) & ".客戶訂單號"
+
+    ReadOnly SQL字串2 As String = " GROUP BY " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, " & 訂單資料表(1) & ".顏色, 
+                                             " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".單價, " & 訂單資料表(1) & ".總金額, 
+                                             " & 訂單資料表(1) & ".備註, " & 訂單資料表(1) & ".生產工廠, " & 訂單資料表(1) & ".訂單種類, " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".CFMSPEC, 
+                                             " & 訂單資料表(1) & ".CFMSAMPLE, " & 訂單資料表(1) & ".TRIAL1, " & 訂單資料表(1) & ".TRIAL2, " & 訂單資料表(1) & ".TRIAL3, " & 訂單資料表(1) & ".TRIAL4, 
+                                             " & 訂單資料表(1) & ".包裝確認時間, " & 訂單資料表(1) & ".貼標時間, " & 訂單資料表(1) & ".裁斷時間, " & 訂單資料表(1) & ".針車時間, 
+                                             " & 訂單資料表(1) & ".成型時間, " & 訂單資料表(1) & ".驗貨時間, " & 訂單資料表(1) & ".實際離廠日, " & 訂單資料表(1) & ".資料流水號, 
+                                             " & 訂單資料表(1) & ".明細建檔, " & 訂單資料表(1) & ".GOODBOX, " & 訂單資料表(1) & ".LEATHER, " & 訂單資料表(1) & ".LEA_Note, " & 訂單資料表(1) & ".出貨數量, 
+                                             " & 訂單資料表(1) & ".PO_S_Date, " & 訂單資料表(1) & ".Requested_XF, " & 訂單資料表(1) & ".Confirm_XF, " & 訂單資料表(1) & ".Revised_XF, 
+                                             " & 訂單資料表(1) & ".工廠回復交期, " & 訂單資料表(1) & ".Special_Packaging, " & 訂單資料表(1) & ".Remarks, " & 訂單資料表(1) & ".出貨地, 
+                                             " & 訂單資料表(1) & ".TVW, " & 訂單資料表(1) & ".楦頭號, " & 訂單資料表(1) & ".材質, " & 訂單資料表(1) & ".七號模具, " & 訂單資料表(1) & ".TRIAL1, 
+                                             " & 訂單資料表(1) & ".TRIAL2, " & 訂單資料表(1) & ".長期試穿, " & 訂單資料表(1) & ".CFMSAMPLE, " & 訂單資料表(1) & ".TRIAL3, " & 訂單資料表(1) & ".TRIAL4, 
+                                             " & 訂單資料表(1) & ".CFMSPEC, " & 訂單資料表(1) & ".面料, " & 訂單資料表(1) & ".副料, " & 訂單資料表(1) & ".中底, " & 訂單資料表(1) & ".鞋墊, 
+                                             " & 訂單資料表(1) & ".大底, " & 訂單資料表(1) & ".跟, " & 訂單資料表(1) & ".包裝確認時間, " & 訂單資料表(1) & ".裁斷時間, " & 訂單資料表(1) & ".針車時間, 
+                                             " & 訂單資料表(1) & ".成型時間, " & 訂單資料表(1) & ".驗貨時間, " & 訂單資料表(1) & ".工廠進度表備註1, " & 訂單資料表(1) & ".工廠進度表備註2, 
+                                             " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".工廠確認, " & 訂單資料表(1) & ".利威確認, 
+                                             " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH, 
+                                             " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, " & 訂單資料表(1) & ".UoM, " & 訂單資料表(2) & ".HS
+                                    ORDER BY SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
+
+    'ReadOnly SQL字串1 As String = "SELECT 訂單流水號, 年份季度, 客戶訂單號, 形體號, 顏色, 楦型, 訂單數量, 客戶交期, 單價, 總金額, 備註, 生產工廠, 訂單種類, 工廠回復交期, CFMSPEC, CFMSAMPLE, TRIAL1, TRIAL2, " &
+    '               "TRIAL3, TRIAL4, 包裝確認時間, 貼標時間, 裁斷時間, 針車時間, 成型時間, 驗貨時間, 實際離廠日, 資料流水號, 明細建檔, GOODBOX, LEATHER, LEA_Note, 出貨數量, PO_S_Date AS 接單日, " &
+    '               "Requested_XF AS 需求日期, Confirm_XF AS 確認日期, Revised_XF AS 修訂日期, 工廠回復交期 AS 工廠交期, Special_Packaging, Remarks, 出貨地, TVW, 楦頭號, 材質, 七號模具, TRIAL1 AS T1, " &
+    '               "TRIAL2 AS T2, 長期試穿 AS WEAR_TEST, CFMSAMPLE AS CFM, TRIAL3 AS T3, TRIAL4 AS T4, CFMSPEC AS TEST, 面料, 副料, 中底, 鞋墊, 大底, 跟, 包裝確認時間 AS 包裝, 裁斷時間 AS 裁斷, " &
+    '               "針車時間 AS 針車, 成型時間 AS 成型, 驗貨時間 AS 驗貨, 工廠進度表備註1, 工廠進度表備註2, 客戶包裝確認, 東莞業務備註, 工廠確認, 利威確認, 結關日 FROM " & 訂單資料表(1) & ""
+    'ReadOnly SQL字串2 As String = " ORDER BY SUBSTRING(訂單流水號, 4, 6) DESC"
     Private Sub Set_DGV1載入前設定()
         DataGridView1.DataSource = Nothing : ds.Clear()
         DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -36,11 +77,11 @@ Public Class 訂單列印選擇
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定()
         If OPEXC(0) = True Then
-            SQL1 = SQL字串1 & 列印用SQL & "AND (生產工廠 LIKE 'JH')" & SQL字串2
+            SQL1 = SQL字串1 & 列印用SQL & "AND (" & 訂單資料表(1) & ".生產工廠 LIKE 'JH')" & SQL字串2
         ElseIf OPEXC(1) = True Then
-            SQL1 = SQL字串1 & 列印用SQL & "AND (生產工廠 LIKE 'SK')" & SQL字串2
+            SQL1 = SQL字串1 & 列印用SQL & "AND (" & 訂單資料表(1) & ".生產工廠 LIKE 'SK')" & SQL字串2
         ElseIf OPEXC(2) = True Then
-            SQL1 = SQL字串1 & 列印用SQL & "AND (生產工廠 LIKE 'NJ')" & SQL字串2
+            SQL1 = SQL字串1 & 列印用SQL & "AND (" & 訂單資料表(1) & ".生產工廠 LIKE 'NJ')" & SQL字串2
         End If
         Set_DGV1載入後設定()
     End Sub
@@ -103,8 +144,16 @@ Public Class 訂單列印選擇
         If CheckBox50.Checked = True Then : xlSheet.Cells(3, W) = "工廠包裝確認" : Q = W : W += 1 : End If
         If CheckBox51.Checked = True Then : xlSheet.Cells(3, W) = "利威驗貨確認" : Q = W : W += 1 : End If
         If CheckBox52.Checked = True Then : xlSheet.Cells(3, W) = "結關日" : Q = W : W += 1 : End If
+        If CheckBox53.Checked = True Then : xlSheet.Cells(3, W) = "SMS簽回" : Q = W : W += 1 : End If
+        If CheckBox54.Checked = True Then : xlSheet.Cells(3, W) = "FRS簽回" : Q = W : W += 1 : End If
+        If CheckBox55.Checked = True Then : xlSheet.Cells(3, W) = "MASTER SWATCH" : Q = W : W += 1 : End If
+        If CheckBox56.Checked = True Then : xlSheet.Cells(3, W) = "力威訂單號" : Q = W : W += 1 : End If
+        If CheckBox57.Checked = True Then : xlSheet.Cells(3, W) = "ProductID" : Q = W : W += 1 : End If
+        If CheckBox58.Checked = True Then : xlSheet.Cells(3, W) = "UoM" : Q = W : W += 1 : End If
+        If CheckBox59.Checked = True Then : xlSheet.Cells(3, W) = "HS#" : Q = W : W += 1 : End If
         If CheckBox49.Checked = True Then : xlSheet.Cells(3, W) = "東莞業務備註" : Q = W : W += 1 : End If
         Set_訂單清單()
+
         For i As Integer = 0 To DataGridView1.Rows.Count - 1
             W = 2
             If CheckBox1.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("訂單流水號").Value : W += 1 : End If
@@ -158,6 +207,13 @@ Public Class 訂單列印選擇
             If CheckBox50.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("工廠確認").Value : W += 1 : End If
             If CheckBox51.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("利威確認").Value : W += 1 : End If
             If CheckBox52.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("結關日").Value : W += 1 : End If
+            If CheckBox53.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("SMS簽回").Value : W += 1 : End If
+            If CheckBox54.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("FRS簽回").Value : W += 1 : End If
+            If CheckBox55.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("MASTER_SWATCH").Value : W += 1 : End If
+            If CheckBox56.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("力威訂單號").Value : W += 1 : End If
+            If CheckBox57.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("ProductID").Value : W += 1 : End If
+            If CheckBox58.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("UoM").Value : W += 1 : End If
+            If CheckBox59.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("HS").Value : W += 1 : End If
             If CheckBox49.Checked = True Then : xlSheet.Cells(i + 4, W) = DataGridView1.Rows(i).Cells("東莞業務備註").Value : W += 1 : End If
             With xlApp.Selection
                 .Font.Bold = True

TENDEN-MES-SYS/量產訂單管理/訂單執行資訊輸入.vb

@@ -18,16 +18,18 @@ Public Class 訂單執行資訊輸入
         If PA = "" Then
             SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
                            " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 
-                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
+                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, 
+                           " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
                            " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
                            " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
                     FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
                     WHERE (" & 訂單資料表(1) & ".CXL = 0 OR " & 訂單資料表(1) & ".CXL IS NULL) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) 
-                    ORDER BY   SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
+                    ORDER BY   " & 訂單資料表(1) & ".客戶訂單號 DESC"
         Else
             SQL1 = "SELECT " & 訂單資料表(1) & ".訂單流水號, " & 訂單資料表(1) & ".年份季度 AS 季度, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".形體號, 
                            " & 訂單資料表(1) & ".顏色, " & 訂單資料表(1) & ".楦型, " & 訂單資料表(1) & ".訂單數量, " & 訂單資料表(1) & ".客戶交期, " & 訂單資料表(1) & ".工廠回復交期, 
-                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
+                           " & 訂單資料表(1) & ".生產工廠 AS 工廠, " & 訂單資料表(1) & ".訂單種類, STYLELIST.APMA確認, " & 訂單資料表(1) & ".力威訂單號, " & 訂單資料表(1) & ".ProductID, 
+                           " & 訂單資料表(1) & ".客戶包裝確認, " & 訂單資料表(1) & ".工廠確認 AS 工廠包裝, 
                            " & 訂單資料表(1) & ".利威確認 AS 利威驗貨, " & 訂單資料表(1) & ".結關日, " & 訂單資料表(1) & ".東莞業務備註, " & 訂單資料表(1) & ".資料流水號, 
                            " & 訂單資料表(1) & ".SMS簽回, " & 訂單資料表(1) & ".FRS簽回, " & 訂單資料表(1) & ".MASTER_SWATCH 
                     FROM " & 訂單資料表(1) & " LEFT OUTER JOIN STYLELIST ON " & 訂單資料表(1) & ".形體號 = STYLELIST.ProductName 
@@ -36,41 +38,44 @@ Public Class 訂單執行資訊輸入
                            " & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' 
                             OR " & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%' 
                             OR " & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單數量 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%' 
-                            OR " & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%') 
-                    ORDER BY   SUBSTRING(" & 訂單資料表(1) & ".訂單流水號, 4, 6) DESC"
+                            OR " & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".力威訂單號 LIKE '%" & PA & "%' 
+                            OR " & 訂單資料表(1) & ".ProductID LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".SMS簽回 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".FRS簽回 LIKE '%" & PA & "%'  
+                            OR " & 訂單資料表(1) & ".MASTER_SWATCH LIKE '%" & PA & "%') 
+                    ORDER BY   " & 訂單資料表(1) & ".客戶訂單號 DESC"
         End If
         CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 控制表_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_grid()
         '--變動格攔框總和  423
-        控制表_dgv.Columns(0).FillWeight = 80 : 控制表_dgv.Columns(1).FillWeight = 50 : 控制表_dgv.Columns(2).FillWeight = 115 : 控制表_dgv.Columns(3).FillWeight = 200
-        控制表_dgv.Columns(4).FillWeight = 130 : 控制表_dgv.Columns(5).FillWeight = 50 : 控制表_dgv.Columns(6).FillWeight = 65 : 控制表_dgv.Columns(7).FillWeight = 90
-        控制表_dgv.Columns(8).FillWeight = 90 : 控制表_dgv.Columns(9).FillWeight = 50 : 控制表_dgv.Columns(10).FillWeight = 90 : 控制表_dgv.Columns(11).FillWeight = 90
-        控制表_dgv.Columns(12).FillWeight = 106 : 控制表_dgv.Columns(13).FillWeight = 106 : 控制表_dgv.Columns(14).FillWeight = 106 : 控制表_dgv.Columns(15).FillWeight = 105
-        控制表_dgv.Columns(16).FillWeight = 423 : 控制表_dgv.Columns(17).Visible = False : 控制表_dgv.Columns(18).FillWeight = 100 : 控制表_dgv.Columns(19).FillWeight = 100
-        控制表_dgv.Columns(20).FillWeight = 223
+        控制表_dgv.Columns(0).FillWeight = 70 : 控制表_dgv.Columns(1).FillWeight = 50 : 控制表_dgv.Columns(2).FillWeight = 110 : 控制表_dgv.Columns(3).FillWeight = 180
+        控制表_dgv.Columns(4).FillWeight = 120 : 控制表_dgv.Columns(5).FillWeight = 45 : 控制表_dgv.Columns(6).FillWeight = 60 : 控制表_dgv.Columns(7).FillWeight = 80
+        控制表_dgv.Columns(8).FillWeight = 80 : 控制表_dgv.Columns(9).FillWeight = 40 : 控制表_dgv.Columns(10).FillWeight = 75 : 控制表_dgv.Columns(11).FillWeight = 80
+        控制表_dgv.Columns(12).FillWeight = 80 : 控制表_dgv.Columns(13).FillWeight = 115
+        控制表_dgv.Columns(14).FillWeight = 106 : 控制表_dgv.Columns(15).FillWeight = 106 : 控制表_dgv.Columns(16).FillWeight = 106 : 控制表_dgv.Columns(17).FillWeight = 105
+        控制表_dgv.Columns(18).FillWeight = 423 : 控制表_dgv.Columns(19).Visible = False : 控制表_dgv.Columns(20).FillWeight = 100 : 控制表_dgv.Columns(21).FillWeight = 100
+        控制表_dgv.Columns(22).FillWeight = 223
 
         If 分頁一_bt.Enabled = False Then
-            For i As Integer = 12 To 15 : 控制表_dgv.Columns(i).Visible = True : Next
-            控制表_dgv.Columns(16).Visible = False
-            For i As Integer = 18 To 20 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 14 To 17 : 控制表_dgv.Columns(i).Visible = True : Next
+            控制表_dgv.Columns(18).Visible = False
+            For i As Integer = 20 To 22 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf 分頁二_bt.Enabled = False Then
-            For i As Integer = 12 To 15 : 控制表_dgv.Columns(i).Visible = False : Next
-            控制表_dgv.Columns(16).Visible = True
-            For i As Integer = 18 To 20 : 控制表_dgv.Columns(i).Visible = False : Next
+            For i As Integer = 14 To 17 : 控制表_dgv.Columns(i).Visible = False : Next
+            控制表_dgv.Columns(18).Visible = True
+            For i As Integer = 20 To 22 : 控制表_dgv.Columns(i).Visible = False : Next
         ElseIf 分頁三_bt.Enabled = False Then
-            For i As Integer = 12 To 15 : 控制表_dgv.Columns(i).Visible = False : Next
-            控制表_dgv.Columns(16).Visible = False
-            For i As Integer = 18 To 20 : 控制表_dgv.Columns(i).Visible = True : Next
+            For i As Integer = 14 To 17 : 控制表_dgv.Columns(i).Visible = False : Next
+            控制表_dgv.Columns(18).Visible = False
+            For i As Integer = 20 To 22 : 控制表_dgv.Columns(i).Visible = True : Next
         End If
 
         控制表_dgv.Columns(6).DefaultCellStyle.Format = "#,##0"
         控制表_dgv.Columns(6).DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleRight : 控制表_dgv.Columns(6).HeaderCell.Style.Alignment = DataGridViewContentAlignment.MiddleRight
-
-        控制表_dgv.Columns(12).DefaultCellStyle.BackColor = Color.MistyRose : 控制表_dgv.Columns(13).DefaultCellStyle.BackColor = Color.MistyRose
+        控制表_dgv.Columns(17).DefaultCellStyle.BackColor = Color.MistyRose
         控制表_dgv.Columns(14).DefaultCellStyle.BackColor = Color.MistyRose : 控制表_dgv.Columns(15).DefaultCellStyle.BackColor = Color.MistyRose
         控制表_dgv.Columns(16).DefaultCellStyle.BackColor = Color.MistyRose : 控制表_dgv.Columns(18).DefaultCellStyle.BackColor = Color.MistyRose
         控制表_dgv.Columns(19).DefaultCellStyle.BackColor = Color.MistyRose : 控制表_dgv.Columns(20).DefaultCellStyle.BackColor = Color.MistyRose
+        控制表_dgv.Columns(21).DefaultCellStyle.BackColor = Color.MistyRose : 控制表_dgv.Columns(22).DefaultCellStyle.BackColor = Color.MistyRose
         控制表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
     End Sub
     Private Sub 進度條()
@@ -136,29 +141,29 @@ Public Class 訂單執行資訊輸入
         If EU(0) = "" Then : Else
             日期1_dtp.Text = EU(0) : 控制表_dgv.Rows(e.RowIndex).Cells(11).Value = Format(日期1_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(1) = 控制表_dgv(12, e.RowIndex).Value.ToString
+        EU(1) = 控制表_dgv(14, e.RowIndex).Value.ToString
         If EU(1) = "" Then : Else
-            日期_dtp.Text = EU(1) : 控制表_dgv.Rows(e.RowIndex).Cells(12).Value = Format(日期_dtp.Value, "yyyy/MM/dd")
+            日期_dtp.Text = EU(1) : 控制表_dgv.Rows(e.RowIndex).Cells(14).Value = Format(日期_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(2) = 控制表_dgv(13, e.RowIndex).Value.ToString
+        EU(2) = 控制表_dgv(15, e.RowIndex).Value.ToString
         If EU(2) = "" Then : Else
-            日期2_dtp.Text = EU(2) : 控制表_dgv.Rows(e.RowIndex).Cells(13).Value = Format(日期2_dtp.Value, "yyyy/MM/dd")
+            日期2_dtp.Text = EU(2) : 控制表_dgv.Rows(e.RowIndex).Cells(15).Value = Format(日期2_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(3) = 控制表_dgv(14, e.RowIndex).Value.ToString
+        EU(3) = 控制表_dgv(16, e.RowIndex).Value.ToString
         If EU(3) = "" Then : Else
-            日期3_dtp.Text = EU(3) : 控制表_dgv.Rows(e.RowIndex).Cells(14).Value = Format(日期3_dtp.Value, "yyyy/MM/dd")
+            日期3_dtp.Text = EU(3) : 控制表_dgv.Rows(e.RowIndex).Cells(16).Value = Format(日期3_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(4) = 控制表_dgv(15, e.RowIndex).Value.ToString
+        EU(4) = 控制表_dgv(17, e.RowIndex).Value.ToString
         If EU(4) = "" Then : Else
-            日期4_dtp.Text = EU(4) : 控制表_dgv.Rows(e.RowIndex).Cells(15).Value = Format(日期4_dtp.Value, "yyyy/MM/dd")
+            日期4_dtp.Text = EU(4) : 控制表_dgv.Rows(e.RowIndex).Cells(17).Value = Format(日期4_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(5) = 控制表_dgv(18, e.RowIndex).Value.ToString
+        EU(5) = 控制表_dgv(20, e.RowIndex).Value.ToString
         If EU(5) = "" Then : Else
-            日期5_dtp.Text = EU(5) : 控制表_dgv.Rows(e.RowIndex).Cells(18).Value = Format(日期5_dtp.Value, "yyyy/MM/dd")
+            日期5_dtp.Text = EU(5) : 控制表_dgv.Rows(e.RowIndex).Cells(20).Value = Format(日期5_dtp.Value, "yyyy/MM/dd")
         End If
-        EU(6) = 控制表_dgv(19, e.RowIndex).Value.ToString
+        EU(6) = 控制表_dgv(21, e.RowIndex).Value.ToString
         If EU(6) = "" Then : Else
-            日期6_dtp.Text = EU(6) : 控制表_dgv.Rows(e.RowIndex).Cells(19).Value = Format(日期6_dtp.Value, "yyyy/MM/dd")
+            日期6_dtp.Text = EU(6) : 控制表_dgv.Rows(e.RowIndex).Cells(21).Value = Format(日期6_dtp.Value, "yyyy/MM/dd")
         End If
     End Sub
     Private Sub 訂單控制表_dgv_RowPostPaint(ByVal sender As Object, ByVal e As DataGridViewRowPostPaintEventArgs) Handles 控制表_dgv.RowPostPaint
@@ -167,7 +172,7 @@ Public Class 訂單執行資訊輸入
             If e.RowIndex = 控制表_dgv.Rows.Count - 1 Then
                 Exit Sub
             Else
-                If 控制表_dgv(0, e.RowIndex).Value.ToString <> 控制表_dgv(0, e.RowIndex + 1).Value.ToString Then
+                If 控制表_dgv(2, e.RowIndex).Value.ToString <> 控制表_dgv(2, e.RowIndex + 1).Value.ToString Then
                     Dim startX As Integer = IIf(控制表_dgv.RowHeadersVisible, 控制表_dgv.RowHeadersWidth, 0)
                     Dim startY As Integer = e.RowBounds.Top + e.RowBounds.Height - 1
                     Dim endX As Integer = startX + 控制表_dgv.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - 控制表_dgv.HorizontalScrollingOffset
@@ -179,7 +184,7 @@ Public Class 訂單執行資訊輸入
             If e.RowIndex = 控制表_dgv.Rows.Count - 1 Then
                 Exit Sub
             Else
-                If 控制表_dgv(3, e.RowIndex).Value.ToString <> 控制表_dgv(3, e.RowIndex + 1).Value.ToString Then
+                If 控制表_dgv(2, e.RowIndex).Value.ToString <> 控制表_dgv(2, e.RowIndex + 1).Value.ToString Then
                     Dim startX As Integer = IIf(控制表_dgv.RowHeadersVisible, 控制表_dgv.RowHeadersWidth, 0)
                     Dim startY As Integer = e.RowBounds.Top + e.RowBounds.Height - 1
                     Dim endX As Integer = startX + 控制表_dgv.Columns.GetColumnsWidth(DataGridViewElementStates.Visible) - 控制表_dgv.HorizontalScrollingOffset

TENDEN-MES-SYS/量產訂單管理/訂單控制表.vb

@@ -163,7 +163,7 @@ Public Class 訂單控制表
     End Sub
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定()
-        列印用SQL = " WHERE ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0) "
+        列印用SQL = " WHERE ((" & 訂單資料表(1) & ".CXL = 0) OR (" & 訂單資料表(1) & ".CXL IS NULL)) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) "
         SQL1 = SQL字串1 & 列印用SQL & SQL字串2
         Set_DGV1載入後設定()
     End Sub
@@ -175,9 +175,11 @@ Public Class 訂單控制表
         End If
         If CheckBox23.Checked = True Then
             PA = InputBox("請輸入要查詢的資料")
-            列印用SQL = " WHERE (訂單流水號 LIKE '%" & PA & "%' OR 年份季度 LIKE '%" & PA & "%' OR 客戶訂單號 LIKE '%" & PA & "%' OR 形體號 LIKE '%" & PA & "%' OR 顏色 LIKE '%" & PA & "%' OR 
-                                 楦型 LIKE '%" & PA & "%' OR 備註 LIKE '%" & PA & "%' OR 生產工廠 LIKE '%" & PA & "%' OR 訂單種類 LIKE '%" & PA & "%' OR 力威訂單號 LIKE '%" & PA & "%' OR 
-                                 ProductID LIKE '%" & PA & "%' OR UoM LIKE '%" & PA & "%') AND ((CXL = 0) OR (CXL IS NULL)) AND (訂單數量 - 出貨數量 <> 0) "
+            列印用SQL = " WHERE (" & 訂單資料表(1) & ".訂單流水號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".年份季度 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".客戶訂單號 LIKE '%" & PA & "%' OR 
+                                 " & 訂單資料表(1) & ".形體號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".顏色 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".楦型 LIKE '%" & PA & "%' OR 
+                                 " & 訂單資料表(1) & ".備註 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".生產工廠 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".訂單種類 LIKE '%" & PA & "%' OR 
+                                 " & 訂單資料表(1) & ".力威訂單號 LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".ProductID LIKE '%" & PA & "%' OR " & 訂單資料表(1) & ".UoM LIKE '%" & PA & "%') AND 
+                                 ((" & 訂單資料表(1) & ".CXL = 0) OR (" & 訂單資料表(1) & ".CXL IS NULL)) AND (" & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(1) & ".出貨數量 <> 0) "
             SQL1 = SQL字串1 & 列印用SQL & SQL字串2
             PA = ""
             '-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

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

@@ -210,7 +210,6 @@ Public Class 訂單資料比對與修改_力威
         SQL1 = "SELECT 客戶名稱 FROM 客戶資料"
         CmdSet_For_dr() : Brand_cb.Items.Clear() : Brand1_cb.Items.Clear() : Brand2_cb.Items.Clear()
         While (dr.Read()) : Brand_cb.Items.Add(dr("客戶名稱")) : Brand1_cb.Items.Add(dr("客戶名稱")) : Brand2_cb.Items.Add(dr("客戶名稱")) : End While : conn.Close()
-        Brand_cb.SelectedIndex = 0
     End Sub
     Private Sub SEASON_cb_下拉表單資料載入()
         conn.Close() : ConnOpen()
@@ -616,7 +615,7 @@ Public Class 訂單資料比對與修改_力威
 
             FTY1_cb.Text = 抬頭清單_dgv("工廠簡稱", e.RowIndex).Value : FTY_cb.Text = 抬頭清單_dgv("工廠簡稱", e.RowIndex).Value : FTY2_cb.Text = 抬頭清單_dgv("工廠簡稱", e.RowIndex).Value
 
-            總雙數1_tb.Text = Format(Val(總雙數1_tb.Text), "#,##0") : 總案件1_tb.Text = Format(Val(總案件1_tb.Text), "#,##0")
+            總雙數1_tb.Text = Format(Val(總雙數1_tb.Text), "###0") : 總案件1_tb.Text = Format(Val(總案件1_tb.Text), "###0")
 
             Set_訂單控制表() : Set_訂單明細() : Set_裝箱控制表() : Set_裝箱明細()
             SEASON1_cb.Text = 控制表1_dgv("年份季度", 0).Value : DIV1_cb.Text = 控制表1_dgv("訂單種類", 0).Value
@@ -1585,13 +1584,13 @@ Public Class 訂單資料比對與修改_力威
                             裝箱控制3_dgv.Rows(II).Cells("HS").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("HS").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units1").Value.ToString.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units1").Value.ToString Then
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("Units1").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units1").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("DtyRate").Value.ToString Then
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("DtyRate").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("DtyRate").Style.ForeColor = Color.Black
@@ -1621,7 +1620,7 @@ Public Class 訂單資料比對與修改_力威
                             裝箱控制3_dgv.Rows(II).Cells("CtnNo").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("CtnNo").Style.ForeColor = Color.Black
                         End If
 
-                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value Then
+                        If 裝箱控制2_dgv.Rows(I).Cells("Units2").Value.ToString <> 裝箱控制3_dgv.Rows(II).Cells("Units2").Value.ToString Then
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Red : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Red
                         Else
                             裝箱控制3_dgv.Rows(II).Cells("Units2").Style.ForeColor = Color.Black : 裝箱控制2_dgv.Rows(I).Cells("Units2").Style.ForeColor = Color.Black