20220331備份

TENDEN-MES-SYS/Module/SQL_成本系統管理.vb

@@ -72,9 +72,7 @@
                             " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling AS CollectedToolng, " & 訂單資料表(7) & ".年份, 
                             " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity AS 驗證, 
                             STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
-                            " & 訂單資料表(2) & ".Material, " & 訂單資料表(2) & ".MaterialDescription, " & 訂單資料表(2) & ".Colorway, 
-                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, 
-                            " & 訂單資料表(2) & ".CustomerData
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送
                 FROM        " & 訂單資料表(1) & " LEFT OUTER JOIN
                             " & 訂單資料表(0) & " ON " & 訂單資料表(1) & ".訂單流水號 = " & 訂單資料表(0) & ".天盾流水號 LEFT OUTER JOIN
                             " & 訂單資料表(2) & " ON " & 訂單資料表(1) & ".顏色 = " & 訂單資料表(2) & ".Colorway AND 
@@ -95,9 +93,7 @@
                             " & 訂單資料表(7) & ".EXWsaving, " & 訂單資料表(7) & ".Quantity * " & 訂單資料表(7) & ".Tooling, 
                             " & 訂單資料表(7) & ".年份, " & 訂單資料表(7) & ".利潤表流水號, " & 訂單資料表(1) & ".訂單數量 - " & 訂單資料表(7) & ".Quantity, 
                             STYLELIST.ItemNumber, " & 訂單資料表(7) & ".審核, " & 訂單資料表(1) & ".客戶訂單號, " & 訂單資料表(1) & ".ProductID, 
-                            " & 訂單資料表(2) & ".Material, " & 訂單資料表(2) & ".MaterialDescription, " & 訂單資料表(2) & ".Colorway, 
-                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送, 
-                            " & 訂單資料表(2) & ".CustomerData
+                            " & 訂單資料表(0) & ".SalesOrder, " & 訂單資料表(0) & ".CustomerName, " & 訂單資料表(0) & ".最終運送
                 ORDER BY    " & 訂單資料表(1) & ".訂單流水號 DESC"
     End Sub
     '----------------------------------訂單價格利潤明細表--------------------------------------------------------------

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

TENDEN-MES-SYS/圖片資料庫管理/楦頭圖片系統/楦頭圖片導入資料庫.vb

@@ -3,7 +3,6 @@ Imports System.Net
 Public Class 楦頭圖片導入資料庫
     Public Property Credentials As ICredentials
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet
-    ReadOnly DTP As String
     Private Sub Set_DGV1載入前設定()
         Try
             楦頭規格控制表_dgv.DataSource = Nothing : ds.Clear()

TENDEN-MES-SYS/圖片資料庫管理/驗貨報告系統/驗貨報告圖片導入資料庫.vb

@@ -3,7 +3,6 @@ Imports System.Net
 Public Class 驗貨報告圖片導入資料庫
     Public Property Credentials As ICredentials
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet
-    Dim DTP As String
     Private Sub Set_DGV1載入前設定()
         Try
             訂單清單_dgv.DataSource = Nothing : ds.Clear()

TENDEN-MES-SYS/成本系統管理/列印_訂單價格利潤表.Designer.vb

@@ -25,8 +25,8 @@ Partial Class 列印_訂單價格利潤表
         Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.取消列印_bt = New System.Windows.Forms.Button()
         Me.確認列印_bt = New System.Windows.Forms.Button()
-        Me.DataGridView1 = New System.Windows.Forms.DataGridView()
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.利潤表_dgv = New System.Windows.Forms.DataGridView()
+        CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '取消列印_bt
@@ -51,17 +51,17 @@ Partial Class 列印_訂單價格利潤表
         Me.確認列印_bt.Text = "確認列印"
         Me.確認列印_bt.UseVisualStyleBackColor = True
         '
-        'DataGridView1
+        '利潤表_dgv
         '
         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
-        Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.DataGridView1.Location = New System.Drawing.Point(12, 12)
-        Me.DataGridView1.Name = "DataGridView1"
-        Me.DataGridView1.RowHeadersWidth = 5
-        Me.DataGridView1.RowTemplate.Height = 24
-        Me.DataGridView1.Size = New System.Drawing.Size(775, 143)
-        Me.DataGridView1.TabIndex = 312
+        Me.利潤表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        Me.利潤表_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.利潤表_dgv.Location = New System.Drawing.Point(12, 12)
+        Me.利潤表_dgv.Name = "利潤表_dgv"
+        Me.利潤表_dgv.RowHeadersWidth = 5
+        Me.利潤表_dgv.RowTemplate.Height = 24
+        Me.利潤表_dgv.Size = New System.Drawing.Size(775, 143)
+        Me.利潤表_dgv.TabIndex = 312
         '
         '列印_訂單價格利潤表
         '
@@ -70,19 +70,19 @@ Partial Class 列印_訂單價格利潤表
         Me.ClientSize = New System.Drawing.Size(250, 73)
         Me.Controls.Add(Me.取消列印_bt)
         Me.Controls.Add(Me.確認列印_bt)
-        Me.Controls.Add(Me.DataGridView1)
+        Me.Controls.Add(Me.利潤表_dgv)
         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 = "列印_訂單價格利潤表"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "訂單價格利潤表列印"
-        CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.利潤表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
 
     Friend WithEvents 取消列印_bt As Button
     Friend WithEvents 確認列印_bt As Button
-    Friend WithEvents DataGridView1 As DataGridView
+    Friend WithEvents 利潤表_dgv As DataGridView
 End Class
 

TENDEN-MES-SYS/成本系統管理/列印_訂單價格利潤表.vb

@@ -10,20 +10,20 @@ Imports Microsoft.Office.Interop.Excel.XlWindowState
 Public Class 列印_訂單價格利潤表
     ReadOnly ds As New DataSet
     Private Sub Set_DGV1載入前設定()
-        DataGridView1.DataSource = Nothing : ds.Clear()
-        DataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
-        DataGridView1.ColumnHeadersHeight = 25
-        DataGridView1.AllowUserToAddRows = False
+        利潤表_dgv.DataSource = Nothing : ds.Clear()
+        利潤表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
+        利潤表_dgv.ColumnHeadersHeight = 25
+        利潤表_dgv.AllowUserToAddRows = False
         ConnOpen()
     End Sub
     Private Sub Set_DGV1載入後設定()
-        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : DataGridView1.DataSource = ds.Tables(0) : conn.Close()
+        CmdSet_For_DGV() : da.SelectCommand.CommandTimeout = 900 : da.Fill(ds) : 利潤表_dgv.DataSource = ds.Tables(0) : conn.Close()
     End Sub
     Private Sub Set_訂單清單()
         Set_DGV1載入前設定() : SQL_訂單價格利潤表() : Set_DGV1載入後設定()
     End Sub
     Private Sub Set_格式設定()
-        DataGridView1.Visible = False
+        利潤表_dgv.Visible = False
     End Sub
     Private Sub 列印_訂單價格利潤表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.SizableToolWindow : ControlBox = False
@@ -89,56 +89,48 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Cells(3, 31) = "ItemNumber"
         xlSheet.Cells(3, 32) = "審核"
         xlSheet.Cells(3, 33) = "Vionic Po#"
-        xlSheet.Cells(3, 34) = "Material"
-        xlSheet.Cells(3, 35) = "Material Description"
-        xlSheet.Cells(3, 36) = "Colorway"
-        xlSheet.Cells(3, 37) = "Ship Mode"
-        xlSheet.Cells(3, 38) = "Company code"
-        xlSheet.Cells(3, 39) = "Final Customer Ship To"
-        xlSheet.Cells(3, 40) = "Customer Data"
+        xlSheet.Cells(3, 34) = "Ship Mode"
+        xlSheet.Cells(3, 35) = "Company code"
+        xlSheet.Cells(3, 36) = "Final Customer Ship To"
         AA(xlApp, xlSheet)
-        For i As Integer = 0 To DataGridView1.Rows.Count - 1
-            xlSheet.Cells(i + 4, 1) = DataGridView1.Rows(i).Cells("訂單流水號").Value
-            xlSheet.Cells(i + 4, 2) = DataGridView1.Rows(i).Cells("年份季度").Value
-            xlSheet.Cells(i + 4, 3) = DataGridView1.Rows(i).Cells("力威訂單號").Value
-            xlSheet.Cells(i + 4, 4) = DataGridView1.Rows(i).Cells("形體號").Value
-            xlSheet.Cells(i + 4, 5) = DataGridView1.Rows(i).Cells("顏色").Value
-            xlSheet.Cells(i + 4, 6) = DataGridView1.Rows(i).Cells("ProductID").Value
+        For i As Integer = 0 To 利潤表_dgv.Rows.Count - 1
+            xlSheet.Cells(i + 4, 1) = 利潤表_dgv.Rows(i).Cells("訂單流水號").Value
+            xlSheet.Cells(i + 4, 2) = 利潤表_dgv.Rows(i).Cells("年份季度").Value
+            xlSheet.Cells(i + 4, 3) = 利潤表_dgv.Rows(i).Cells("力威訂單號").Value
+            xlSheet.Cells(i + 4, 4) = 利潤表_dgv.Rows(i).Cells("形體號").Value
+            xlSheet.Cells(i + 4, 5) = 利潤表_dgv.Rows(i).Cells("顏色").Value
+            xlSheet.Cells(i + 4, 6) = 利潤表_dgv.Rows(i).Cells("ProductID").Value
 
-            xlSheet.Cells(i + 4, 7) = DataGridView1.Rows(i).Cells("楦型").Value
-            xlSheet.Cells(i + 4, 8) = DataGridView1.Rows(i).Cells("Quantity").Value
-            xlSheet.Cells(i + 4, 9) = DataGridView1.Rows(i).Cells("客戶交期").Value
+            xlSheet.Cells(i + 4, 7) = 利潤表_dgv.Rows(i).Cells("楦型").Value
+            xlSheet.Cells(i + 4, 8) = 利潤表_dgv.Rows(i).Cells("數量").Value
+            xlSheet.Cells(i + 4, 9) = 利潤表_dgv.Rows(i).Cells("客戶交期").Value
             xlSheet.Cells(i + 4, 10) = "=T" & i + 4 & "+U" & i + 4 & "+V" & i + 4 & "+W" & i + 4 & "+X" & i + 4 & "+Y" & i + 4 & "+Z" & i + 4 & "+AA" & i + 4 & "/AD" & i + 4 & "-AB" & i + 4
             xlSheet.Cells(i + 4, 11) = "=H" & i + 4 & "*J" & i + 4 & ""
-            xlSheet.Cells(i + 4, 12) = DataGridView1.Rows(i).Cells("備註").Value
-            xlSheet.Cells(i + 4, 13) = DataGridView1.Rows(i).Cells("工廠").Value
-            xlSheet.Cells(i + 4, 14) = DataGridView1.Rows(i).Cells("訂單種類").Value
-            xlSheet.Cells(i + 4, 15) = DataGridView1.Rows(i).Cells("FTYPrice").Value
+            xlSheet.Cells(i + 4, 12) = 利潤表_dgv.Rows(i).Cells("備註").Value
+            xlSheet.Cells(i + 4, 13) = 利潤表_dgv.Rows(i).Cells("工廠").Value
+            xlSheet.Cells(i + 4, 14) = 利潤表_dgv.Rows(i).Cells("訂單種類").Value
+            xlSheet.Cells(i + 4, 15) = 利潤表_dgv.Rows(i).Cells("FTYPrice").Value
             xlSheet.Cells(i + 4, 16) = "=K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & ")"
             xlSheet.Cells(i + 4, 17) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
             xlSheet.Cells(i + 4, 18) = "=(K" & i + 4 & "-(H" & i + 4 & "*O" & i + 4 & "))/2"
             xlSheet.Cells(i + 4, 19) = "=IF(K" & i + 4 & "=0,0,(K" & i + 4 & "-H" & i + 4 & "*O" & i + 4 & ")/K" & i + 4 & ")"
-            xlSheet.Cells(i + 4, 20) = DataGridView1.Rows(i).Cells("BasicPrice").Value
-            xlSheet.Cells(i + 4, 21) = DataGridView1.Rows(i).Cells("Polybag").Value
-            xlSheet.Cells(i + 4, 22) = DataGridView1.Rows(i).Cells("FOOTorPET").Value
-            xlSheet.Cells(i + 4, 23) = DataGridView1.Rows(i).Cells("Tooling").Value
-            xlSheet.Cells(i + 4, 24) = DataGridView1.Rows(i).Cells("RubberBand").Value
-            xlSheet.Cells(i + 4, 25) = DataGridView1.Rows(i).Cells("JHOOK").Value
-            xlSheet.Cells(i + 4, 26) = DataGridView1.Rows(i).Cells("WaterResistant").Value
-            xlSheet.Cells(i + 4, 27) = DataGridView1.Rows(i).Cells("P16VAT").Value
-            xlSheet.Cells(i + 4, 28) = DataGridView1.Rows(i).Cells("EXWsaving").Value
+            xlSheet.Cells(i + 4, 20) = 利潤表_dgv.Rows(i).Cells("BasicPrice").Value
+            xlSheet.Cells(i + 4, 21) = 利潤表_dgv.Rows(i).Cells("Polybag").Value
+            xlSheet.Cells(i + 4, 22) = 利潤表_dgv.Rows(i).Cells("FOOTorPET").Value
+            xlSheet.Cells(i + 4, 23) = 利潤表_dgv.Rows(i).Cells("Tooling").Value
+            xlSheet.Cells(i + 4, 24) = 利潤表_dgv.Rows(i).Cells("RubberBand").Value
+            xlSheet.Cells(i + 4, 25) = 利潤表_dgv.Rows(i).Cells("JHOOK").Value
+            xlSheet.Cells(i + 4, 26) = 利潤表_dgv.Rows(i).Cells("WaterResistant").Value
+            xlSheet.Cells(i + 4, 27) = 利潤表_dgv.Rows(i).Cells("P16VAT").Value
+            xlSheet.Cells(i + 4, 28) = 利潤表_dgv.Rows(i).Cells("EXWsaving").Value
             xlSheet.Cells(i + 4, 29) = "=W" & i + 4 & "*H" & i + 4 & ""
-            xlSheet.Cells(i + 4, 30) = DataGridView1.Rows(i).Cells("Exchange").Value
-            xlSheet.Cells(i + 4, 31) = DataGridView1.Rows(i).Cells("ItemNumber").Value
-            xlSheet.Cells(i + 4, 32) = DataGridView1.Rows(i).Cells("審核").Value
-            xlSheet.Cells(i + 4, 33) = DataGridView1.Rows(i).Cells("客戶訂單號").Value
-            xlSheet.Cells(i + 4, 34) = DataGridView1.Rows(i).Cells("Material").Value
-            xlSheet.Cells(i + 4, 35) = DataGridView1.Rows(i).Cells("MaterialDescription").Value
-            xlSheet.Cells(i + 4, 36) = DataGridView1.Rows(i).Cells("Colorway").Value
-            xlSheet.Cells(i + 4, 37) = DataGridView1.Rows(i).Cells("SalesOrder").Value
-            xlSheet.Cells(i + 4, 38) = DataGridView1.Rows(i).Cells("CustomerName").Value
-            xlSheet.Cells(i + 4, 39) = DataGridView1.Rows(i).Cells("最終運送").Value
-            xlSheet.Cells(i + 4, 40) = DataGridView1.Rows(i).Cells("CustomerData").Value
+            xlSheet.Cells(i + 4, 30) = 利潤表_dgv.Rows(i).Cells("Exchange").Value
+            xlSheet.Cells(i + 4, 31) = 利潤表_dgv.Rows(i).Cells("ItemNumber").Value
+            xlSheet.Cells(i + 4, 32) = 利潤表_dgv.Rows(i).Cells("審核").Value
+            xlSheet.Cells(i + 4, 33) = 利潤表_dgv.Rows(i).Cells("客戶訂單號").Value
+            xlSheet.Cells(i + 4, 34) = 利潤表_dgv.Rows(i).Cells("SalesOrder").Value
+            xlSheet.Cells(i + 4, 35) = 利潤表_dgv.Rows(i).Cells("CustomerName").Value
+            xlSheet.Cells(i + 4, 36) = 利潤表_dgv.Rows(i).Cells("最終運送").Value
             With xlApp.Selection
                 .Font.Bold = True
             End With
@@ -180,10 +172,9 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Columns("AB:AB").Select : myExcel.Selection.ColumnWidth = 9 : xlSheet.Columns("AC:AC").Select : myExcel.Selection.ColumnWidth = 8
         xlSheet.Columns("AD:AD").Select : myExcel.Selection.ColumnWidth = 11 : xlSheet.Columns("AE:AE").Select : myExcel.Selection.ColumnWidth = 11
         xlSheet.Columns("AF:AF").Select : myExcel.Selection.ColumnWidth = 13 : xlSheet.Columns("AG:AG").Select : myExcel.Selection.ColumnWidth = 13
-        xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 15 : xlSheet.Columns("AI:AI").Select : myExcel.Selection.ColumnWidth = 30
-        xlSheet.Columns("AJ:AJ").Select : myExcel.Selection.ColumnWidth = 12 : xlSheet.Columns("AK:AK").Select : myExcel.Selection.ColumnWidth = 14
-        xlSheet.Columns("AL:AL").Select : myExcel.Selection.ColumnWidth = 8 : xlSheet.Columns("AM:AM").Select : myExcel.Selection.ColumnWidth = 75
-        xlSheet.Columns("AN:AN").Select : myExcel.Selection.ColumnWidth = 105
+        xlSheet.Columns("AH:AH").Select : myExcel.Selection.ColumnWidth = 14 : xlSheet.Columns("AI:AI").Select : myExcel.Selection.ColumnWidth = 8
+        xlSheet.Columns("AJ:AJ").Select : myExcel.Selection.ColumnWidth = 75
+
 
         xlSheet.Cells.Select()
         With myExcel.Selection.Font
@@ -269,7 +260,7 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Range("T1:AC3").Select() : With myExcel.Selection.Interior
             .Pattern = xlSolid : .PatternColorIndex = xlAutomatic : .ThemeColor = xlThemeColorAccent6 : .TintAndShade = 0.399975585192419 : .PatternTintAndShade = 0 : End With
 
-        xlSheet.Range("A1:AN3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
+        xlSheet.Range("A1:AJ3").Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeBottom) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -280,10 +271,10 @@ Public Class 列印_訂單價格利潤表
         xlSheet.Rows("3:3").Select : myExcel.Selection.AutoFilter
 
         Dim M As Integer = 4
-        For M = 4 To DataGridView1.Rows.Count + 2
+        For M = 4 To 利潤表_dgv.Rows.Count + 2
             M += 1
         Next M
-        位置1 = "A4:AN" & M
+        位置1 = "A4:AJ" & M
         xlSheet.Range(位置1).Select() : myExcel.Selection.Borders(xlDiagonalDown).LineStyle = xlNone : myExcel.Selection.Borders(xlDiagonalUp).LineStyle = xlNone
         With myExcel.Selection.Borders(xlEdgeLeft) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
         With myExcel.Selection.Borders(xlEdgeTop) : .LineStyle = xlContinuous : .ColorIndex = 0 : .TintAndShade = 0 : .Weight = xlThin : End With
@@ -297,7 +288,7 @@ Public Class 列印_訂單價格利潤表
             .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False
         End With : myExcel.Selection.Merge
 
-        xlSheet.Range("AM4:AN" & M).Select()
+        xlSheet.Range("AJ4:AJ" & M).Select()
         With myExcel.Selection : .HorizontalAlignment = xlGeneral : .VerticalAlignment = xlCenter : .WrapText = False : .Orientation = 0 : .AddIndent = False
             .IndentLevel = 0 : .ShrinkToFit = False : .ReadingOrder = xlContext : .MergeCells = False : End With
 

TENDEN-MES-SYS/樣品訂單管理/中文樣品單系統/中文樣品吊牌管理.vb

@@ -2,7 +2,6 @@
 Imports System.IO
 Public Class 中文樣品吊牌管理
     ReadOnly ds As New DataSet : ReadOnly ds1 As New DataSet : ReadOnly ds2 As New DataSet
-    ReadOnly DTP(0) As String
     Private Sub Set_DGV1載入前設定()
         Try
             樣品吊牌管理_dtp.DataSource = Nothing : ds.Clear()

TENDEN-MES-SYS/資料庫系統管理/下拉清單_1.Designer.vb

@@ -35,7 +35,7 @@ Partial Class 下拉清單_1
         '
         Me.ListBox1.FormattingEnabled = True
         Me.ListBox1.ItemHeight = 16
-        Me.ListBox1.Location = New System.Drawing.Point(2, 2)
+        Me.ListBox1.Location = New System.Drawing.Point(4, 2)
         Me.ListBox1.Name = "ListBox1"
         Me.ListBox1.Size = New System.Drawing.Size(214, 404)
         Me.ListBox1.TabIndex = 0
@@ -44,7 +44,7 @@ Partial Class 下拉清單_1
         '
         Me.ListBox2.FormattingEnabled = True
         Me.ListBox2.ItemHeight = 16
-        Me.ListBox2.Location = New System.Drawing.Point(194, 2)
+        Me.ListBox2.Location = New System.Drawing.Point(217, 2)
         Me.ListBox2.Name = "ListBox2"
         Me.ListBox2.Size = New System.Drawing.Size(214, 404)
         Me.ListBox2.TabIndex = 1
@@ -53,7 +53,7 @@ Partial Class 下拉清單_1
         '
         Me.ListBox3.FormattingEnabled = True
         Me.ListBox3.ItemHeight = 16
-        Me.ListBox3.Location = New System.Drawing.Point(409, 3)
+        Me.ListBox3.Location = New System.Drawing.Point(430, 2)
         Me.ListBox3.Name = "ListBox3"
         Me.ListBox3.Size = New System.Drawing.Size(214, 404)
         Me.ListBox3.TabIndex = 2
@@ -62,7 +62,7 @@ Partial Class 下拉清單_1
         '
         Me.ListBox4.FormattingEnabled = True
         Me.ListBox4.ItemHeight = 16
-        Me.ListBox4.Location = New System.Drawing.Point(624, 3)
+        Me.ListBox4.Location = New System.Drawing.Point(643, 2)
         Me.ListBox4.Name = "ListBox4"
         Me.ListBox4.Size = New System.Drawing.Size(214, 404)
         Me.ListBox4.TabIndex = 3
@@ -70,7 +70,7 @@ Partial Class 下拉清單_1
         '上一頁_bt
         '
         Me.上一頁_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.上一頁_bt.Location = New System.Drawing.Point(2, 407)
+        Me.上一頁_bt.Location = New System.Drawing.Point(4, 407)
         Me.上一頁_bt.Name = "上一頁_bt"
         Me.上一頁_bt.Size = New System.Drawing.Size(160, 25)
         Me.上一頁_bt.TabIndex = 1523
@@ -80,7 +80,7 @@ Partial Class 下拉清單_1
         '下一頁_bt
         '
         Me.下一頁_bt.ForeColor = System.Drawing.Color.FromArgb(CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.下一頁_bt.Location = New System.Drawing.Point(677, 407)
+        Me.下一頁_bt.Location = New System.Drawing.Point(697, 407)
         Me.下一頁_bt.Name = "下一頁_bt"
         Me.下一頁_bt.Size = New System.Drawing.Size(160, 25)
         Me.下一頁_bt.TabIndex = 1524
@@ -91,7 +91,7 @@ Partial Class 下拉清單_1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(839, 432)
+        Me.ClientSize = New System.Drawing.Size(861, 432)
         Me.Controls.Add(Me.下一頁_bt)
         Me.Controls.Add(Me.上一頁_bt)
         Me.Controls.Add(Me.ListBox4)

TENDEN-MES-SYS/量產訂單管理/系統列印介面/列印_生產進度表.Designer.vb

@@ -32,7 +32,7 @@ Partial Class 列印_生產進度表
         Me.JH_QVC_ch = New System.Windows.Forms.CheckBox()
         Me.SK_QVC_ch = New System.Windows.Forms.CheckBox()
         Me.NJ_QVC_ch = New System.Windows.Forms.CheckBox()
-        Me.CheckBox7 = New System.Windows.Forms.CheckBox()
+        Me.全資料_ch = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -136,22 +136,22 @@ Partial Class 列印_生產進度表
         Me.NJ_QVC_ch.Text = "NJ-QVC"
         Me.NJ_QVC_ch.UseVisualStyleBackColor = True
         '
-        'CheckBox7
+        '全資料_ch
         '
-        Me.CheckBox7.AutoSize = True
-        Me.CheckBox7.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.CheckBox7.Location = New System.Drawing.Point(219, 15)
-        Me.CheckBox7.Name = "CheckBox7"
-        Me.CheckBox7.Size = New System.Drawing.Size(15, 14)
-        Me.CheckBox7.TabIndex = 326
-        Me.CheckBox7.UseVisualStyleBackColor = True
+        Me.全資料_ch.AutoSize = True
+        Me.全資料_ch.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.全資料_ch.Location = New System.Drawing.Point(219, 15)
+        Me.全資料_ch.Name = "全資料_ch"
+        Me.全資料_ch.Size = New System.Drawing.Size(15, 14)
+        Me.全資料_ch.TabIndex = 326
+        Me.全資料_ch.UseVisualStyleBackColor = True
         '
         '列印_生產進度表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 12.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(246, 116)
-        Me.Controls.Add(Me.CheckBox7)
+        Me.Controls.Add(Me.全資料_ch)
         Me.Controls.Add(Me.NJ_QVC_ch)
         Me.Controls.Add(Me.SK_QVC_ch)
         Me.Controls.Add(Me.JH_QVC_ch)
@@ -179,6 +179,6 @@ Partial Class 列印_生產進度表
     Friend WithEvents JH_QVC_ch As CheckBox
     Friend WithEvents SK_QVC_ch As CheckBox
     Friend WithEvents NJ_QVC_ch As CheckBox
-    Friend WithEvents CheckBox7 As CheckBox
+    Friend WithEvents 全資料_ch As CheckBox
 End Class
 

TENDEN-MES-SYS/量產訂單管理/系統列印介面/列印_生產進度表.vb

@@ -24,7 +24,7 @@ Public Class 列印_生產進度表
             DataGridView1.ColumnHeadersHeight = 25
             DataGridView1.AllowUserToAddRows = False
             ConnOpen()
-            If CheckBox7.Checked = True Then
+            If 全資料_ch.Checked = True Then
                 SQL_讀取訂單清單()
             ElseIf NJ_ch.Checked = True And NJ_QVC_ch.Checked = True Then
                 SQL_讀取訂單清單1()
@@ -53,10 +53,9 @@ Public Class 列印_生產進度表
     Private Sub Set_格式設定()
         DataGridView1.Visible = False
         If gUserName = "李協叡" Then
-            CheckBox7.Visible = True
+            全資料_ch.Visible = True
         Else
-            CheckBox7.Visible = False
-
+            全資料_ch.Visible = False
         End If
     End Sub
     Private Sub 列印_生產進度表_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -84,7 +83,7 @@ Public Class 列印_生產進度表
             xlApp.Sheets(1).Select
 
             If xlApp.Sheets(1).Name = "工作表2" Then
-                If CheckBox7.Checked = True Then : xlApp.Sheets("工作表2").Name = "全資料"
+                If 全資料_ch.Checked = True Then : xlApp.Sheets("工作表2").Name = "全資料"
                 ElseIf NJ_ch.Checked = True Then : xlApp.Sheets("工作表2").Name = "NJ"
                 ElseIf SK_ch.Checked = True Then : xlApp.Sheets("工作表2").Name = "SK"
                 ElseIf JH_ch.Checked = True Then : xlApp.Sheets("工作表2").Name = "JH"
@@ -93,7 +92,7 @@ Public Class 列印_生產進度表
                 ElseIf NJ_QVC_ch.Checked = True Then : xlApp.Sheets("工作表2").Name = "NJ-QVC"
                 End If
             Else
-                If CheckBox7.Checked = True Then : xlApp.Sheets("sheet2").Name = "全資料"
+                If 全資料_ch.Checked = True Then : xlApp.Sheets("sheet2").Name = "全資料"
                 ElseIf NJ_ch.Checked = True Then : xlApp.Sheets("sheet2").Name = "NJ"
                 ElseIf SK_ch.Checked = True Then : xlApp.Sheets("sheet2").Name = "SK"
                 ElseIf JH_ch.Checked = True Then : xlApp.Sheets("sheet2").Name = "JH"
@@ -106,7 +105,7 @@ Public Class 列印_生產進度表
             xlBook.Activate()
             xlSheet.Activate()
             xlSheet.Range("A1").Select()
-            If CheckBox7.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & "  大貨進度表"
+            If 全資料_ch.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & "  大貨進度表"
             ElseIf NJ_ch.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(楠晋)"
             ElseIf SK_ch.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(森康)"
             ElseIf JH_ch.Checked = True Then : xlSheet.Cells(1, 1) = "" & PID & " 大貨進度表(玖弘)"
@@ -384,30 +383,30 @@ Public Class 列印_生產進度表
     End Sub
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles NJ_ch.Click
         If NJ_ch.Checked = True Then : NJ_ch.Checked = True
-            SK_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : SK_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            SK_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : SK_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox2_CheckedChanged(sender As Object, e As EventArgs) Handles SK_ch.Click
         If SK_ch.Checked = True Then : SK_ch.Checked = True
-            NJ_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            NJ_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox3_CheckedChanged(sender As Object, e As EventArgs) Handles JH_ch.Click
         If JH_ch.Checked = True Then : JH_ch.Checked = True
-            NJ_ch.Checked = False : SK_ch.Checked = False : SK_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            NJ_ch.Checked = False : SK_ch.Checked = False : SK_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox4_CheckedChanged(sender As Object, e As EventArgs) Handles JH_QVC_ch.Click
         If JH_QVC_ch.Checked = True Then : JH_QVC_ch.Checked = True
-            NJ_ch.Checked = False : SK_ch.Checked = False : SK_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            NJ_ch.Checked = False : SK_ch.Checked = False : SK_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox5_CheckedChanged(sender As Object, e As EventArgs) Handles SK_QVC_ch.Click
         If SK_QVC_ch.Checked = True Then : SK_QVC_ch.Checked = True
-            NJ_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            NJ_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
     Private Sub CheckBox6_CheckedChanged(sender As Object, e As EventArgs) Handles NJ_QVC_ch.Click
         If NJ_QVC_ch.Checked = True Then : NJ_QVC_ch.Checked = True
-            SK_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : SK_QVC_ch.Checked = False : CheckBox7.Checked = False : End If
+            SK_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : SK_QVC_ch.Checked = False : 全資料_ch.Checked = False : End If
     End Sub
-    Private Sub CheckBox7_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox7.Click
-        If CheckBox7.Checked = True Then : CheckBox7.Checked = True
+    Private Sub CheckBox7_CheckedChanged(sender As Object, e As EventArgs) Handles 全資料_ch.Click
+        If 全資料_ch.Checked = True Then : 全資料_ch.Checked = True
             NJ_ch.Checked = False : SK_ch.Checked = False : JH_ch.Checked = False : JH_QVC_ch.Checked = False : SK_QVC_ch.Checked = False : NJ_QVC_ch.Checked = False : End If
     End Sub
 End Class

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

@@ -7,7 +7,6 @@ Public Class 訂單執行資訊輸入
     Dim xlSheet As Microsoft.Office.Interop.Excel.Worksheet
     Dim file_name As String = ""
     ReadOnly QQ(1) As Boolean
-    Public 平均數 As Integer : Public 最終數 As Integer = 0 : Public 資料數 As Integer = 0
     Public 平均數1 As Integer : Public 最終數1 As Integer = 0 : Public 資料數1 As Integer = 0
     Private Sub Set_清單()
         Try