20230722備份

SHENKANG-MES-SYS/MyModule/SQL_量產訂單管理系統.vb

@@ -524,7 +524,7 @@
                 FROM        訂單明細表 FULL OUTER JOIN
                             訂單控制表 ON 訂單明細表.資料流水號 = 訂單控制表.資料流水號
                 WHERE      (訂單明細表.客戶訂單號 LIKE N'" & 量產訂單明細表.Number_tb.Text & "') AND (訂單明細表.訂單流水號 LIKE N'" & 量產訂單明細表.訂單號_tb.Text & "')
-                ORDER BY   ProductName, 訂單明細表.Color"
+                ORDER BY    訂單控制表.資料流水號"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_訂單附件資料()

SHENKANG-MES-SYS/MyModule/全域變數.vb

@@ -7,7 +7,7 @@
                                  CC51, CC52, CC53, CC54, CC55, CC56, CC57, CC58, CC59, CC60, CC61, CC62, CC63, CC64, CC65, CC66, CC67, CC68, CC69, CC70, CC71, CC72, CC73, CC74, CC75, CC76, CC77, CC78, 
                                  CC79, CC80, CC81, CC82, CC83, CC84, CC85, CC86, CC87, CC88, CC89, CC90, CC91, CC92, CC93, CC94, CC95 FROM"
     '----系統版本-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2023052901"
+    Public 版本 As String = "2023071201"
     '----系統用全域變數-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public PA, PA1, PA2, PA3, PA4, PA5, PA6, PA7, PA8, PA9, PA10, PA11, PA12, PA13, PA14, PA15, PA16, PA17, PA18, PA19, PA20, PA21, PA22, PA23, PA24, PA25, PA26, PA27, PA28, PA29, PA30, PA31,
            PA32, PA33 As String

SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>iiKat76soT3t0QQf7Ng3grYkPbTTIYOshBwyHWCmGzI=</dsig:DigestValue>
+        <dsig:DigestValue>CX7/NbFA85PNtkHgdvt31OHRpsuanSPCUokKOp4ZrSk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/bin/Debug/WINPROFIT-ERP-SYS.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5665280">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5666304">
       <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>JzOLO8lt0pvmNNr5PQxfy46K4V2+3rA5K7nFeJo6vwU=</dsig:DigestValue>
+        <dsig:DigestValue>CCyyDLwPaJZU83N1xEAP95V/1TU05Hwyvnt9o1GQMuQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.application

@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>iiKat76soT3t0QQf7Ng3grYkPbTTIYOshBwyHWCmGzI=</dsig:DigestValue>
+        <dsig:DigestValue>CX7/NbFA85PNtkHgdvt31OHRpsuanSPCUokKOp4ZrSk=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/obj/Debug/WINPROFIT-ERP-SYS.exe.manifest

@@ -43,14 +43,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5665280">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="WINPROFIT-ERP-SYS.exe" size="5666304">
       <assemblyIdentity name="WINPROFIT-ERP-SYS" version="1.1.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>JzOLO8lt0pvmNNr5PQxfy46K4V2+3rA5K7nFeJo6vwU=</dsig:DigestValue>
+        <dsig:DigestValue>CCyyDLwPaJZU83N1xEAP95V/1TU05Hwyvnt9o1GQMuQ=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

SHENKANG-MES-SYS/樣品訂單管理系統/列印_樣品單_NEW.Designer.vb

@@ -35,6 +35,8 @@ Partial Class 列印_樣品單_NEW
         Me.DataGridView1 = New System.Windows.Forms.DataGridView()
         Me.PictureBox1 = New System.Windows.Forms.PictureBox()
         Me.DataGridView5 = New System.Windows.Forms.DataGridView()
+        Me.森康_cb = New System.Windows.Forms.CheckBox()
+        Me.巨益_cb = New System.Windows.Forms.CheckBox()
         CType(Me.DataGridView4, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DataGridView2, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -83,7 +85,7 @@ Partial Class 列印_樣品單_NEW
         '
         Me.取消列印_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.取消列印_bt.ForeColor = System.Drawing.Color.Red
-        Me.取消列印_bt.Location = New System.Drawing.Point(128, 11)
+        Me.取消列印_bt.Location = New System.Drawing.Point(128, 35)
         Me.取消列印_bt.Name = "取消列印_bt"
         Me.取消列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.取消列印_bt.TabIndex = 718
@@ -94,7 +96,7 @@ Partial Class 列印_樣品單_NEW
         '
         Me.確認列印_bt.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.確認列印_bt.ForeColor = System.Drawing.Color.Blue
-        Me.確認列印_bt.Location = New System.Drawing.Point(12, 11)
+        Me.確認列印_bt.Location = New System.Drawing.Point(12, 35)
         Me.確認列印_bt.Name = "確認列印_bt"
         Me.確認列印_bt.Size = New System.Drawing.Size(110, 54)
         Me.確認列印_bt.TabIndex = 717
@@ -135,11 +137,33 @@ Partial Class 列印_樣品單_NEW
         Me.DataGridView5.Size = New System.Drawing.Size(775, 143)
         Me.DataGridView5.TabIndex = 723
         '
+        '森康_cb
+        '
+        Me.森康_cb.AutoSize = True
+        Me.森康_cb.Location = New System.Drawing.Point(34, 9)
+        Me.森康_cb.Name = "森康_cb"
+        Me.森康_cb.Size = New System.Drawing.Size(50, 20)
+        Me.森康_cb.TabIndex = 724
+        Me.森康_cb.Text = "森康"
+        Me.森康_cb.UseVisualStyleBackColor = True
+        '
+        '巨益_cb
+        '
+        Me.巨益_cb.AutoSize = True
+        Me.巨益_cb.Location = New System.Drawing.Point(150, 9)
+        Me.巨益_cb.Name = "巨益_cb"
+        Me.巨益_cb.Size = New System.Drawing.Size(50, 20)
+        Me.巨益_cb.TabIndex = 725
+        Me.巨益_cb.Text = "巨益"
+        Me.巨益_cb.UseVisualStyleBackColor = True
+        '
         '列印_樣品單_NEW
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(252, 75)
+        Me.ClientSize = New System.Drawing.Size(252, 95)
+        Me.Controls.Add(Me.巨益_cb)
+        Me.Controls.Add(Me.森康_cb)
         Me.Controls.Add(Me.DataGridView5)
         Me.Controls.Add(Me.DataGridView4)
         Me.Controls.Add(Me.PictureBox1)
@@ -160,6 +184,7 @@ Partial Class 列印_樣品單_NEW
         CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DataGridView5, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
+        Me.PerformLayout()
 
     End Sub
     Friend WithEvents DataGridView4 As DataGridView
@@ -170,4 +195,6 @@ Partial Class 列印_樣品單_NEW
     Friend WithEvents 確認列印_bt As Button
     Friend WithEvents DataGridView1 As DataGridView
     Friend WithEvents DataGridView5 As DataGridView
+    Friend WithEvents 森康_cb As CheckBox
+    Friend WithEvents 巨益_cb As CheckBox
 End Class

SHENKANG-MES-SYS/樣品訂單管理系統/列印_樣品單_NEW.vb

@@ -74,6 +74,12 @@ Public Class 列印_樣品單_NEW
         SQL1 = "SELECT 項次, 備註 FROM 樣品訂單清單 WHERE (SO LIKE N'" & 列印用SQL & "' AND 版次 LIKE N'" & 列印用SQL2 & "') ORDER BY 項次"
         CmdSet_For_DGV() : da.Fill(ds5) : DataGridView5.DataSource = ds5.Tables(0) : conn.Close()
     End Sub
+    Private Sub 森康_cb_CheckedChanged(sender As Object, e As EventArgs) Handles 森康_cb.Click
+        森康_cb.Checked = True : 巨益_cb.Checked = False
+    End Sub
+    Private Sub 巨益_cb_CheckedChanged(sender As Object, e As EventArgs) Handles 巨益_cb.Click
+        森康_cb.Checked = False : 巨益_cb.Checked = True
+    End Sub
     Private Sub 列印_樣品單_NEW_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         FormBorderStyle = FormBorderStyle.SizableToolWindow : ControlBox = False
         N1 = 0 : N2 = 0 : N3 = 0 : N4 = 0 : N5 = 0 : Q1 = 0 : AAA1 = "" : AAA2 = ""
@@ -83,19 +89,25 @@ Public Class 列印_樣品單_NEW
         列印用SQL = "" : 列印用SQL2 = "" : Me.Close()
     End Sub
     Private Sub 列印1()
-        xlSheet.Cells(1, 1) = "森康鞋業有限公司  SenKang Footwear Ltd."
-        If DataGridView1.Rows(0).Cells("狀態").Value.ToString = "DEVELOPMENT" Then
-            xlSheet.Cells(1, 4) = "DEVELOPMENT SAMPLE ORDER (開發樣品單)"
-        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "SALES" Then
-            xlSheet.Cells(1, 4) = "SALES SAMPLE ORDER (銷樣樣品單)"
-        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "CONFIRMATION" Then
-            xlSheet.Cells(1, 4) = "CONFIRMATION SAMPLE ORDER (確認樣品單)"
-        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "SHOW" Then
-            xlSheet.Cells(1, 4) = "SHOW SAMPLE ORDER (秀展樣品單)"
-        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "TRIAL " Then
-            xlSheet.Cells(1, 4) = "TRIAL SAMPLE ORDER (試穿樣品單)"
+        If 森康_cb.Checked = True Then
+            xlSheet.Cells(1, 1) = "森康鞋業有限公司  SenKang Footwear Ltd."
+        Else
+            xlSheet.Cells(1, 1) = "巨益貿易有限公司  WTL Co., Ltd."
+        End If
+
+        If DataGridView1.Rows(0).Cells("狀態").Value.ToString = "DEVELOPMENT" Then : xlSheet.Cells(1, 4) = "DEVELOPMENT SAMPLE ORDER (開發樣品單)"
+        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "SALES" Then : xlSheet.Cells(1, 4) = "SALES SAMPLE ORDER (銷樣樣品單)"
+        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "CONFIRMATION" Then : xlSheet.Cells(1, 4) = "CONFIRMATION SAMPLE ORDER (確認樣品單)"
+        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "SHOW" Then : xlSheet.Cells(1, 4) = "SHOW SAMPLE ORDER (秀展樣品單)"
+        ElseIf DataGridView1.Rows(0).Cells("狀態").Value.ToString = "TRIAL " Then : xlSheet.Cells(1, 4) = "TRIAL SAMPLE ORDER (試穿樣品單)"
+        End If
+        xlSheet.Cells(2, 1) = "廣東東莞市厚街鎮湖景大道南1號"
+        If 森康_cb.Checked = True Then
+            xlSheet.Cells(3, 1) = "TEL:0769-38937740"
+        Else
+            xlSheet.Cells(3, 1) = ""
         End If
-        xlSheet.Cells(2, 1) = "廣東東莞市厚街鎮湖景大道南1號" : xlSheet.Cells(3, 1) = "TEL:0769-38937740"
+
         xlSheet.Cells(3, 4) = "PRINT DATE :" : xlSheet.Cells(3, 5) = "=TODAY()"
 
         xlSheet.Cells(5, 1) = "S/O # (單號) :" : xlSheet.Cells(6, 1) = "CUST (客戶) :" : xlSheet.Cells(7, 1) = "FACTORY (工廠) :" : xlSheet.Cells(8, 1) = "STYLE # (型體號) :"
@@ -352,26 +364,30 @@ Public Class 列印_樣品單_NEW
         FF(xlApp, xlSheet) : DD(xlApp, xlSheet)
     End Sub
     Private Sub Button11_Click(sender As Object, e As EventArgs) Handles 確認列印_bt.Click
-        xlApp = CType(CreateObject("Excel.Application"), Microsoft.Office.Interop.Excel.Application)
-        xlBook = xlApp.Workbooks.Add
-        xlApp.DisplayAlerts = True
-        xlApp.Visible = True
-        xlApp.Application.WindowState = xlMaximized
-        N2 = 0
-        For i As Integer = 0 To DataGridView2.Rows.Count - 1
-            If i = 0 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第一頁" : N2 = 3 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
-            ElseIf i = 4 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第二頁" : N2 = 7 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
-            ElseIf i = 8 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第三頁" : N2 = 11 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
-            ElseIf i = 12 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第四頁" : N2 = 15 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
-            End If
-        Next
+        If 森康_cb.Checked = False And 巨益_cb.Checked = False Then
+            MsgBox("請先選擇抬頭!!")
+        Else
+            xlApp = CType(CreateObject("Excel.Application"), Microsoft.Office.Interop.Excel.Application)
+            xlBook = xlApp.Workbooks.Add
+            xlApp.DisplayAlerts = True
+            xlApp.Visible = True
+            xlApp.Application.WindowState = xlMaximized
+            N2 = 0
+            For i As Integer = 0 To DataGridView2.Rows.Count - 1
+                If i = 0 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第一頁" : N2 = 3 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
+                ElseIf i = 4 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第二頁" : N2 = 7 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
+                ElseIf i = 8 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第三頁" : N2 = 11 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
+                ElseIf i = 12 Then : xlSheet = NewMethod(xlBook) : xlApp.Sheets(1).Name = "第四頁" : N2 = 15 : xlBook.Activate() : xlSheet.Activate() : 列印1() : Q1 = 0
+                End If
+            Next
 
-        xlSheet.PageSetup.PrintArea = ""
-        xlApp.Cells.Select()
-        xlSheet.Range("B1").Select()
-        xlApp.Application.WindowState = xlMinimized
-        MsgBox("列印完成")
-        Me.Close()
+            xlSheet.PageSetup.PrintArea = ""
+            xlApp.Cells.Select()
+            xlSheet.Range("B1").Select()
+            xlApp.Application.WindowState = xlMinimized
+            MsgBox("列印完成")
+            Me.Close()
+        End If
     End Sub
     Private Shared Function NewMethod(xlBook As Workbook) As Worksheet
         Return CType(xlBook.Worksheets.Add, Worksheet)