1. 新增配方EXCEL匯入功能

.vs/OW-ERP-SYS/v17/DocumentLayout.json

@@ -7,8 +7,20 @@
       "RelativeMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|solutionrelative:ow-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\project1\\ow-erp-sys\\ow-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\Project1\\OW-ERP-SYS\\ow-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
       "RelativeMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|solutionrelative:ow-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\project1\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "RelativeMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|solutionrelative:ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\Project1\\OW-ERP-SYS\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form",
+      "RelativeMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|solutionrelative:ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\Project1\\OW-ERP-SYS\\ow-erp-sys\\0\u3001mymodule\\\u4E3B\u8CC7\u6599\u5EAB\\sql_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "RelativeMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|solutionrelative:ow-erp-sys\\0\u3001mymodule\\\u4E3B\u8CC7\u6599\u5EAB\\sql_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     }
   ],
   "DocumentGroupContainers": [
@@ -18,7 +30,7 @@
       "DocumentGroups": [
         {
           "DockedWidth": 200,
-          "SelectedChildIndex": 2,
+          "SelectedChildIndex": 5,
           "Children": [
             {
               "$type": "Bookmark",
@@ -28,6 +40,42 @@
               "$type": "Bookmark",
               "Name": "ST:0:0:{004be353-6879-467c-9d1e-9ac23cdf6d49}"
             },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
+              "DocumentMoniker": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
+              "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
+              "ViewState": "AQIAAE4AAAAAAAAAAAAhwFgAAAAdAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-08-28T08:43:32.37Z"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 2,
+              "Title": "\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "DocumentMoniker": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "ViewState": "AQIAAJsGAAAAAAAAAAAjwKwGAAA6AAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-08-28T03:35:20.818Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
+              "Title": "\u88FD\u7A0B\u914D\u65B9\u8868.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb",
+              "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u914D\u65B9\u8868.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-08-28T03:35:08.862Z"
+            },
             {
               "$type": "Document",
               "DocumentIndex": 0,
@@ -36,7 +84,7 @@
               "RelativeDocumentMoniker": "OW-ERP-SYS\\LoginForm1.vb",
               "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\LoginForm1.vb",
               "RelativeToolTip": "OW-ERP-SYS\\LoginForm1.vb",
-              "ViewState": "AQIAAJ8AAAAAAAAAAAAYwKQAAAAOAAAA",
+              "ViewState": "AQIAAJ8AAAAAAAAAAAAYwKwAAAAEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-08-12T06:36:55.284Z",
               "EditorCaption": ""
@@ -49,7 +97,7 @@
               "RelativeDocumentMoniker": "OW-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
               "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
               "RelativeToolTip": "OW-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
-              "ViewState": "AQIAAAEAAAAAAAAAAAAuwA8AAAApAAAA",
+              "ViewState": "AQIAAAEAAAAAAAAAAAAuwAsAAAAjAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-07-30T10:34:10.581Z",
               "EditorCaption": ""

OW-ERP-SYS/05、技術管理系統/製程管制紀錄表_奶油組.Designer.vb

@@ -37,6 +37,8 @@ Partial Class 製程管制紀錄表_奶油組
         Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.原料顯示_pl = New System.Windows.Forms.Panel()
         Me.輸入重量_pl = New System.Windows.Forms.Panel()
+        Me.投入備註_tb = New System.Windows.Forms.TextBox()
+        Me.投入備註_lb = New System.Windows.Forms.Label()
         Me.確認重量_bt = New System.Windows.Forms.Button()
         Me.投料狀態_tb = New System.Windows.Forms.TextBox()
         Me.投料狀態_lb = New System.Windows.Forms.Label()
@@ -296,8 +298,6 @@ Partial Class 製程管制紀錄表_奶油組
         Me.開簽名檔_bt = New System.Windows.Forms.Button()
         Me.簽名檔_dgv = New System.Windows.Forms.DataGridView()
         Me.暫存簽名檔圖片_pb = New System.Windows.Forms.PictureBox()
-        Me.投入備註_tb = New System.Windows.Forms.TextBox()
-        Me.投入備註_lb = New System.Windows.Forms.Label()
         Me.原料顯示_pl.SuspendLayout()
         Me.輸入重量_pl.SuspendLayout()
         CType(Me.重量數值_nud, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -413,6 +413,23 @@ Partial Class 製程管制紀錄表_奶油組
         Me.輸入重量_pl.Size = New System.Drawing.Size(165, 188)
         Me.輸入重量_pl.TabIndex = 2087
         '
+        '投入備註_tb
+        '
+        Me.投入備註_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.投入備註_tb.Location = New System.Drawing.Point(68, 63)
+        Me.投入備註_tb.Name = "投入備註_tb"
+        Me.投入備註_tb.Size = New System.Drawing.Size(92, 23)
+        Me.投入備註_tb.TabIndex = 2124
+        '
+        '投入備註_lb
+        '
+        Me.投入備註_lb.AutoSize = True
+        Me.投入備註_lb.Location = New System.Drawing.Point(3, 66)
+        Me.投入備註_lb.Name = "投入備註_lb"
+        Me.投入備註_lb.Size = New System.Drawing.Size(37, 16)
+        Me.投入備註_lb.TabIndex = 2123
+        Me.投入備註_lb.Text = "備註 :"
+        '
         '確認重量_bt
         '
         Me.確認重量_bt.ForeColor = System.Drawing.Color.OrangeRed
@@ -3349,23 +3366,6 @@ Partial Class 製程管制紀錄表_奶油組
         Me.暫存簽名檔圖片_pb.TabIndex = 1393
         Me.暫存簽名檔圖片_pb.TabStop = False
         '
-        '投入備註_tb
-        '
-        Me.投入備註_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.投入備註_tb.Location = New System.Drawing.Point(68, 63)
-        Me.投入備註_tb.Name = "投入備註_tb"
-        Me.投入備註_tb.Size = New System.Drawing.Size(92, 23)
-        Me.投入備註_tb.TabIndex = 2124
-        '
-        '投入備註_lb
-        '
-        Me.投入備註_lb.AutoSize = True
-        Me.投入備註_lb.Location = New System.Drawing.Point(3, 66)
-        Me.投入備註_lb.Name = "投入備註_lb"
-        Me.投入備註_lb.Size = New System.Drawing.Size(37, 16)
-        Me.投入備註_lb.TabIndex = 2123
-        Me.投入備註_lb.Text = "備註 :"
-        '
         '製程管制紀錄表_奶油組
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)

OW-ERP-SYS/05、技術管理系統/製程配方表.Designer.vb

@@ -42,6 +42,8 @@ Partial Class 製程配方表
         Dim DataGridViewCellStyle17 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle18 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim DataGridViewCellStyle19 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle20 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle21 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.配方原料油_dgv = New System.Windows.Forms.DataGridView()
         Me.配方香料_dgv = New System.Windows.Forms.DataGridView()
         Me.配方乳化劑_dgv = New System.Windows.Forms.DataGridView()
@@ -79,6 +81,11 @@ Partial Class 製程配方表
         Me.明細流水號_tb = New System.Windows.Forms.TextBox()
         Me.登入使用者_tb = New System.Windows.Forms.TextBox()
         Me.配方_DTP = New System.Windows.Forms.DateTimePicker()
+        Me.匯入Excel_bt = New System.Windows.Forms.Button()
+        Me.讀取日期_tb = New System.Windows.Forms.TextBox()
+        Me.讀取料號_tb = New System.Windows.Forms.TextBox()
+        Me.讀取品名_tb = New System.Windows.Forms.TextBox()
+        Me.讀取檔名_tb = New System.Windows.Forms.TextBox()
         Me.規格項目名稱_tb = New System.Windows.Forms.TextBox()
         Me.規格選項內容_tb = New System.Windows.Forms.TextBox()
         Me.規格項次_tb = New System.Windows.Forms.TextBox()
@@ -99,11 +106,17 @@ Partial Class 製程配方表
         Me.油脂種類_cb = New System.Windows.Forms.ComboBox()
         Me.認證標章_cb = New System.Windows.Forms.ComboBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.Button1 = New System.Windows.Forms.Button()
-        Me.TextBox4 = New System.Windows.Forms.TextBox()
-        Me.TextBox3 = New System.Windows.Forms.TextBox()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.PictureBox3 = New System.Windows.Forms.PictureBox()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.檢視油脂列表_bt = New System.Windows.Forms.Button()
+        Me.Panel5 = New System.Windows.Forms.Panel()
+        Me.讀取組別_tb = New System.Windows.Forms.TextBox()
+        Me.讀取標章_tb = New System.Windows.Forms.TextBox()
+        Me.讀取產量_tb = New System.Windows.Forms.TextBox()
+        Me.讀取代工_tb = New System.Windows.Forms.TextBox()
+        Me.讀取版本_tb = New System.Windows.Forms.TextBox()
+        Me.讀取季節_tb = New System.Windows.Forms.TextBox()
+        Me.讀取油種_tb = New System.Windows.Forms.TextBox()
         Me.隱藏_pl2 = New System.Windows.Forms.Panel()
         Me.暫存簽名編碼_tb = New System.Windows.Forms.TextBox()
         Me.組別_dgv = New System.Windows.Forms.DataGridView()
@@ -252,6 +265,18 @@ Partial Class 製程配方表
         Me.開簽名檔_bt = New System.Windows.Forms.Button()
         Me.簽名檔_dgv = New System.Windows.Forms.DataGridView()
         Me.暫存簽名檔圖片_pb = New System.Windows.Forms.PictureBox()
+        Me.Panel6 = New System.Windows.Forms.Panel()
+        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+        Me.Search_列表編號_cb = New System.Windows.Forms.CheckBox()
+        Me.Search_列表名稱_cb = New System.Windows.Forms.CheckBox()
+        Me.關鍵字1_tb = New System.Windows.Forms.TextBox()
+        Me.列表關鍵字_bt = New System.Windows.Forms.Button()
+        Me.關鍵字1_lb = New System.Windows.Forms.Label()
+        Me.列表儲存_bt = New System.Windows.Forms.Button()
+        Me.配方列表_dgv = New System.Windows.Forms.DataGridView()
+        Me.油脂種類1_cb = New System.Windows.Forms.ComboBox()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.關閉列表_bt = New System.Windows.Forms.Button()
         CType(Me.配方原料油_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.配方香料_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.配方乳化劑_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -263,6 +288,9 @@ Partial Class 製程配方表
         CType(Me.版本_nud, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.隱藏_pl1.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel5.SuspendLayout()
         Me.隱藏_pl2.SuspendLayout()
         CType(Me.組別_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.淨重單位_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -291,6 +319,9 @@ Partial Class 製程配方表
         Me.最高權限_pl.SuspendLayout()
         CType(Me.簽名檔_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.暫存簽名檔圖片_pb, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.Panel6.SuspendLayout()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.配方列表_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '配方原料油_dgv
@@ -620,15 +651,10 @@ Partial Class 製程配方表
         '隱藏_pl1
         '
         Me.隱藏_pl1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.隱藏_pl1.Controls.Add(Me.Button1)
         Me.隱藏_pl1.Controls.Add(Me.簽名_DTP)
-        Me.隱藏_pl1.Controls.Add(Me.TextBox4)
         Me.隱藏_pl1.Controls.Add(Me.規格刪單_bt)
-        Me.隱藏_pl1.Controls.Add(Me.TextBox3)
         Me.隱藏_pl1.Controls.Add(Me.規格入單_bt)
-        Me.隱藏_pl1.Controls.Add(Me.TextBox2)
         Me.隱藏_pl1.Controls.Add(Me.原料刪單_bt)
-        Me.隱藏_pl1.Controls.Add(Me.TextBox1)
         Me.隱藏_pl1.Controls.Add(Me.原料入單_bt)
         Me.隱藏_pl1.Controls.Add(Me.原料重量_tb)
         Me.隱藏_pl1.Controls.Add(Me.油脂比_tb)
@@ -731,6 +757,44 @@ Partial Class 製程配方表
         Me.配方_DTP.TabIndex = 1942
         Me.配方_DTP.Value = New Date(2023, 12, 8, 11, 34, 6, 0)
         '
+        '匯入Excel_bt
+        '
+        Me.匯入Excel_bt.Location = New System.Drawing.Point(425, 0)
+        Me.匯入Excel_bt.Name = "匯入Excel_bt"
+        Me.匯入Excel_bt.Size = New System.Drawing.Size(96, 28)
+        Me.匯入Excel_bt.TabIndex = 2067
+        Me.匯入Excel_bt.Text = "匯入 Excel"
+        Me.匯入Excel_bt.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.匯入Excel_bt.UseVisualStyleBackColor = True
+        '
+        '讀取日期_tb
+        '
+        Me.讀取日期_tb.Location = New System.Drawing.Point(6, 94)
+        Me.讀取日期_tb.Name = "讀取日期_tb"
+        Me.讀取日期_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取日期_tb.TabIndex = 2066
+        '
+        '讀取料號_tb
+        '
+        Me.讀取料號_tb.Location = New System.Drawing.Point(6, 65)
+        Me.讀取料號_tb.Name = "讀取料號_tb"
+        Me.讀取料號_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取料號_tb.TabIndex = 2065
+        '
+        '讀取品名_tb
+        '
+        Me.讀取品名_tb.Location = New System.Drawing.Point(6, 36)
+        Me.讀取品名_tb.Name = "讀取品名_tb"
+        Me.讀取品名_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取品名_tb.TabIndex = 2064
+        '
+        '讀取檔名_tb
+        '
+        Me.讀取檔名_tb.Location = New System.Drawing.Point(6, 7)
+        Me.讀取檔名_tb.Name = "讀取檔名_tb"
+        Me.讀取檔名_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取檔名_tb.TabIndex = 2063
+        '
         '規格項目名稱_tb
         '
         Me.規格項目名稱_tb.Location = New System.Drawing.Point(368, 2)
@@ -921,6 +985,11 @@ Partial Class 製程配方表
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.Panel1.AutoScroll = True
         Me.Panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel1.Controls.Add(Me.PictureBox3)
+        Me.Panel1.Controls.Add(Me.PictureBox1)
+        Me.Panel1.Controls.Add(Me.檢視油脂列表_bt)
+        Me.Panel1.Controls.Add(Me.匯入Excel_bt)
+        Me.Panel1.Controls.Add(Me.Panel5)
         Me.Panel1.Controls.Add(Me.隱藏_pl1)
         Me.Panel1.Controls.Add(Me.隱藏_pl2)
         Me.Panel1.Controls.Add(Me.配方香料_dgv)
@@ -973,42 +1042,102 @@ Partial Class 製程配方表
         Me.Panel1.Size = New System.Drawing.Size(975, 634)
         Me.Panel1.TabIndex = 2013
         '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(223, 132)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 2067
-        Me.Button1.Text = "Button1"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
-        'TextBox4
-        '
-        Me.TextBox4.Location = New System.Drawing.Point(223, 103)
-        Me.TextBox4.Name = "TextBox4"
-        Me.TextBox4.Size = New System.Drawing.Size(100, 23)
-        Me.TextBox4.TabIndex = 2066
-        '
-        'TextBox3
-        '
-        Me.TextBox3.Location = New System.Drawing.Point(223, 78)
-        Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(100, 23)
-        Me.TextBox3.TabIndex = 2065
-        '
-        'TextBox2
-        '
-        Me.TextBox2.Location = New System.Drawing.Point(223, 54)
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(100, 23)
-        Me.TextBox2.TabIndex = 2064
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Location = New System.Drawing.Point(223, 28)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(100, 23)
-        Me.TextBox1.TabIndex = 2063
+        'PictureBox3
+        '
+        Me.PictureBox3.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Open_file_01
+        Me.PictureBox3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox3.Location = New System.Drawing.Point(304, 3)
+        Me.PictureBox3.Name = "PictureBox3"
+        Me.PictureBox3.Size = New System.Drawing.Size(22, 22)
+        Me.PictureBox3.TabIndex = 2084
+        Me.PictureBox3.TabStop = False
+        '
+        'PictureBox1
+        '
+        Me.PictureBox1.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Excel
+        Me.PictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox1.Location = New System.Drawing.Point(429, 3)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(22, 22)
+        Me.PictureBox1.TabIndex = 2070
+        Me.PictureBox1.TabStop = False
+        '
+        '檢視油脂列表_bt
+        '
+        Me.檢視油脂列表_bt.Location = New System.Drawing.Point(299, 0)
+        Me.檢視油脂列表_bt.Name = "檢視油脂列表_bt"
+        Me.檢視油脂列表_bt.Size = New System.Drawing.Size(125, 28)
+        Me.檢視油脂列表_bt.TabIndex = 2071
+        Me.檢視油脂列表_bt.Text = "檢 視 油 脂 列 表"
+        Me.檢視油脂列表_bt.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.檢視油脂列表_bt.UseVisualStyleBackColor = True
+        '
+        'Panel5
+        '
+        Me.Panel5.Controls.Add(Me.讀取組別_tb)
+        Me.Panel5.Controls.Add(Me.讀取標章_tb)
+        Me.Panel5.Controls.Add(Me.讀取產量_tb)
+        Me.Panel5.Controls.Add(Me.讀取代工_tb)
+        Me.Panel5.Controls.Add(Me.讀取版本_tb)
+        Me.Panel5.Controls.Add(Me.讀取檔名_tb)
+        Me.Panel5.Controls.Add(Me.讀取季節_tb)
+        Me.Panel5.Controls.Add(Me.讀取品名_tb)
+        Me.Panel5.Controls.Add(Me.讀取料號_tb)
+        Me.Panel5.Controls.Add(Me.讀取油種_tb)
+        Me.Panel5.Controls.Add(Me.讀取日期_tb)
+        Me.Panel5.Location = New System.Drawing.Point(561, 50)
+        Me.Panel5.Name = "Panel5"
+        Me.Panel5.Size = New System.Drawing.Size(332, 131)
+        Me.Panel5.TabIndex = 2069
+        '
+        '讀取組別_tb
+        '
+        Me.讀取組別_tb.Location = New System.Drawing.Point(218, 65)
+        Me.讀取組別_tb.Name = "讀取組別_tb"
+        Me.讀取組別_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取組別_tb.TabIndex = 2073
+        '
+        '讀取標章_tb
+        '
+        Me.讀取標章_tb.Location = New System.Drawing.Point(218, 36)
+        Me.讀取標章_tb.Name = "讀取標章_tb"
+        Me.讀取標章_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取標章_tb.TabIndex = 2072
+        '
+        '讀取產量_tb
+        '
+        Me.讀取產量_tb.Location = New System.Drawing.Point(218, 7)
+        Me.讀取產量_tb.Name = "讀取產量_tb"
+        Me.讀取產量_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取產量_tb.TabIndex = 2071
+        '
+        '讀取代工_tb
+        '
+        Me.讀取代工_tb.Location = New System.Drawing.Point(112, 94)
+        Me.讀取代工_tb.Name = "讀取代工_tb"
+        Me.讀取代工_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取代工_tb.TabIndex = 2070
+        '
+        '讀取版本_tb
+        '
+        Me.讀取版本_tb.Location = New System.Drawing.Point(112, 65)
+        Me.讀取版本_tb.Name = "讀取版本_tb"
+        Me.讀取版本_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取版本_tb.TabIndex = 2069
+        '
+        '讀取季節_tb
+        '
+        Me.讀取季節_tb.Location = New System.Drawing.Point(112, 36)
+        Me.讀取季節_tb.Name = "讀取季節_tb"
+        Me.讀取季節_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取季節_tb.TabIndex = 2068
+        '
+        '讀取油種_tb
+        '
+        Me.讀取油種_tb.Location = New System.Drawing.Point(112, 7)
+        Me.讀取油種_tb.Name = "讀取油種_tb"
+        Me.讀取油種_tb.Size = New System.Drawing.Size(100, 23)
+        Me.讀取油種_tb.TabIndex = 2067
         '
         '隱藏_pl2
         '
@@ -2524,7 +2653,6 @@ Partial Class 製程配方表
         Me.Panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.Panel2.Controls.Add(Me.規格_pl)
         Me.Panel2.Controls.Add(Me.Panel1)
-        Me.Panel2.Controls.Add(Me.配方選擇_pl)
         Me.Panel2.Location = New System.Drawing.Point(1, 54)
         Me.Panel2.Name = "Panel2"
         Me.Panel2.Size = New System.Drawing.Size(1339, 634)
@@ -2550,7 +2678,7 @@ Partial Class 製程配方表
         Me.配方選擇_pl.Controls.Add(Me.配方分類_dgv)
         Me.配方選擇_pl.Controls.Add(Me.配方控制表_dgv)
         Me.配方選擇_pl.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.配方選擇_pl.Location = New System.Drawing.Point(1, 0)
+        Me.配方選擇_pl.Location = New System.Drawing.Point(3, 54)
         Me.配方選擇_pl.Name = "配方選擇_pl"
         Me.配方選擇_pl.Size = New System.Drawing.Size(874, 547)
         Me.配方選擇_pl.TabIndex = 2015
@@ -2648,6 +2776,8 @@ Partial Class 製程配方表
         'Search_編號_cb
         '
         Me.Search_編號_cb.AutoSize = True
+        Me.Search_編號_cb.Checked = True
+        Me.Search_編號_cb.CheckState = System.Windows.Forms.CheckState.Checked
         Me.Search_編號_cb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Search_編號_cb.Location = New System.Drawing.Point(575, 3)
         Me.Search_編號_cb.Margin = New System.Windows.Forms.Padding(2)
@@ -2660,8 +2790,6 @@ Partial Class 製程配方表
         'Search_名稱_cb
         '
         Me.Search_名稱_cb.AutoSize = True
-        Me.Search_名稱_cb.Checked = True
-        Me.Search_名稱_cb.CheckState = System.Windows.Forms.CheckState.Checked
         Me.Search_名稱_cb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Search_名稱_cb.Location = New System.Drawing.Point(629, 3)
         Me.Search_名稱_cb.Margin = New System.Windows.Forms.Padding(2)
@@ -2810,6 +2938,161 @@ Partial Class 製程配方表
         Me.暫存簽名檔圖片_pb.TabIndex = 1393
         Me.暫存簽名檔圖片_pb.TabStop = False
         '
+        'Panel6
+        '
+        Me.Panel6.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.Panel6.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.Panel6.Controls.Add(Me.PictureBox2)
+        Me.Panel6.Controls.Add(Me.Search_列表編號_cb)
+        Me.Panel6.Controls.Add(Me.Search_列表名稱_cb)
+        Me.Panel6.Controls.Add(Me.關鍵字1_tb)
+        Me.Panel6.Controls.Add(Me.列表關鍵字_bt)
+        Me.Panel6.Controls.Add(Me.關鍵字1_lb)
+        Me.Panel6.Controls.Add(Me.列表儲存_bt)
+        Me.Panel6.Controls.Add(Me.配方列表_dgv)
+        Me.Panel6.Controls.Add(Me.油脂種類1_cb)
+        Me.Panel6.Controls.Add(Me.Label2)
+        Me.Panel6.Controls.Add(Me.關閉列表_bt)
+        Me.Panel6.Location = New System.Drawing.Point(1, 0)
+        Me.Panel6.Name = "Panel6"
+        Me.Panel6.Size = New System.Drawing.Size(1339, 687)
+        Me.Panel6.TabIndex = 2072
+        '
+        'PictureBox2
+        '
+        Me.PictureBox2.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.PictureBox2.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Save_Win11
+        Me.PictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom
+        Me.PictureBox2.Location = New System.Drawing.Point(1216, 4)
+        Me.PictureBox2.Name = "PictureBox2"
+        Me.PictureBox2.Size = New System.Drawing.Size(24, 24)
+        Me.PictureBox2.TabIndex = 2083
+        Me.PictureBox2.TabStop = False
+        '
+        'Search_列表編號_cb
+        '
+        Me.Search_列表編號_cb.AutoSize = True
+        Me.Search_列表編號_cb.Checked = True
+        Me.Search_列表編號_cb.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.Search_列表編號_cb.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Search_列表編號_cb.Location = New System.Drawing.Point(704, 6)
+        Me.Search_列表編號_cb.Margin = New System.Windows.Forms.Padding(2)
+        Me.Search_列表編號_cb.Name = "Search_列表編號_cb"
+        Me.Search_列表編號_cb.Size = New System.Drawing.Size(58, 23)
+        Me.Search_列表編號_cb.TabIndex = 2082
+        Me.Search_列表編號_cb.Text = "編號"
+        Me.Search_列表編號_cb.UseVisualStyleBackColor = True
+        '
+        'Search_列表名稱_cb
+        '
+        Me.Search_列表名稱_cb.AutoSize = True
+        Me.Search_列表名稱_cb.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Search_列表名稱_cb.Location = New System.Drawing.Point(766, 6)
+        Me.Search_列表名稱_cb.Margin = New System.Windows.Forms.Padding(2)
+        Me.Search_列表名稱_cb.Name = "Search_列表名稱_cb"
+        Me.Search_列表名稱_cb.Size = New System.Drawing.Size(58, 23)
+        Me.Search_列表名稱_cb.TabIndex = 2081
+        Me.Search_列表名稱_cb.Text = "名稱"
+        Me.Search_列表名稱_cb.UseVisualStyleBackColor = True
+        '
+        '關鍵字1_tb
+        '
+        Me.關鍵字1_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.關鍵字1_tb.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.關鍵字1_tb.Location = New System.Drawing.Point(341, 3)
+        Me.關鍵字1_tb.Name = "關鍵字1_tb"
+        Me.關鍵字1_tb.Size = New System.Drawing.Size(321, 27)
+        Me.關鍵字1_tb.TabIndex = 2078
+        '
+        '列表關鍵字_bt
+        '
+        Me.列表關鍵字_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Search_01
+        Me.列表關鍵字_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.列表關鍵字_bt.Location = New System.Drawing.Point(665, 2)
+        Me.列表關鍵字_bt.Name = "列表關鍵字_bt"
+        Me.列表關鍵字_bt.Size = New System.Drawing.Size(28, 28)
+        Me.列表關鍵字_bt.TabIndex = 2080
+        Me.列表關鍵字_bt.UseVisualStyleBackColor = True
+        '
+        '關鍵字1_lb
+        '
+        Me.關鍵字1_lb.AutoSize = True
+        Me.關鍵字1_lb.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.關鍵字1_lb.Location = New System.Drawing.Point(277, 7)
+        Me.關鍵字1_lb.Name = "關鍵字1_lb"
+        Me.關鍵字1_lb.Size = New System.Drawing.Size(62, 19)
+        Me.關鍵字1_lb.TabIndex = 2079
+        Me.關鍵字1_lb.Text = "關 鍵 字"
+        '
+        '列表儲存_bt
+        '
+        Me.列表儲存_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.列表儲存_bt.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.列表儲存_bt.Location = New System.Drawing.Point(1211, 1)
+        Me.列表儲存_bt.Name = "列表儲存_bt"
+        Me.列表儲存_bt.Size = New System.Drawing.Size(93, 30)
+        Me.列表儲存_bt.TabIndex = 2077
+        Me.列表儲存_bt.Text = "儲  存   "
+        Me.列表儲存_bt.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.列表儲存_bt.UseVisualStyleBackColor = True
+        '
+        '配方列表_dgv
+        '
+        DataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.配方列表_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle20
+        Me.配方列表_dgv.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.配方列表_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.配方列表_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        DataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window
+        DataGridViewCellStyle21.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText
+        DataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        DataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.配方列表_dgv.DefaultCellStyle = DataGridViewCellStyle21
+        Me.配方列表_dgv.Location = New System.Drawing.Point(3, 32)
+        Me.配方列表_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.配方列表_dgv.Name = "配方列表_dgv"
+        Me.配方列表_dgv.RowHeadersWidth = 5
+        Me.配方列表_dgv.RowTemplate.Height = 24
+        Me.配方列表_dgv.Size = New System.Drawing.Size(1331, 647)
+        Me.配方列表_dgv.TabIndex = 2075
+        '
+        '油脂種類1_cb
+        '
+        Me.油脂種類1_cb.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.油脂種類1_cb.FormattingEnabled = True
+        Me.油脂種類1_cb.Location = New System.Drawing.Point(72, 3)
+        Me.油脂種類1_cb.Name = "油脂種類1_cb"
+        Me.油脂種類1_cb.Size = New System.Drawing.Size(193, 27)
+        Me.油脂種類1_cb.TabIndex = 2074
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Font = New System.Drawing.Font("微軟正黑體", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.Label2.Location = New System.Drawing.Point(4, 7)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(76, 19)
+        Me.Label2.TabIndex = 2073
+        Me.Label2.Text = "油脂種類 :"
+        '
+        '關閉列表_bt
+        '
+        Me.關閉列表_bt.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.關閉列表_bt.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.Cancel_01
+        Me.關閉列表_bt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.關閉列表_bt.Location = New System.Drawing.Point(1305, 1)
+        Me.關閉列表_bt.Name = "關閉列表_bt"
+        Me.關閉列表_bt.Size = New System.Drawing.Size(30, 30)
+        Me.關閉列表_bt.TabIndex = 2072
+        Me.關閉列表_bt.UseVisualStyleBackColor = True
+        '
         '製程配方表
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(10.0!, 20.0!)
@@ -2818,6 +3101,8 @@ Partial Class 製程配方表
         Me.Controls.Add(Me.最高權限_pl)
         Me.Controls.Add(Me.Panel3)
         Me.Controls.Add(Me.Panel2)
+        Me.Controls.Add(Me.Panel6)
+        Me.Controls.Add(Me.配方選擇_pl)
         Me.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
         Me.MaximizeBox = False
@@ -2838,6 +3123,10 @@ Partial Class 製程配方表
         Me.隱藏_pl1.PerformLayout()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
+        CType(Me.PictureBox3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel5.ResumeLayout(False)
+        Me.Panel5.PerformLayout()
         Me.隱藏_pl2.ResumeLayout(False)
         Me.隱藏_pl2.PerformLayout()
         CType(Me.組別_dgv, System.ComponentModel.ISupportInitialize).EndInit()
@@ -2876,6 +3165,10 @@ Partial Class 製程配方表
         Me.最高權限_pl.PerformLayout()
         CType(Me.簽名檔_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.暫存簽名檔圖片_pb, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.Panel6.ResumeLayout(False)
+        Me.Panel6.PerformLayout()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.配方列表_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
 
     End Sub
@@ -3084,9 +3377,32 @@ Partial Class 製程配方表
     Friend WithEvents 中間距_ch As CheckBox
     Friend WithEvents 大間距_ch As CheckBox
     Friend WithEvents Search_全油種_cb As CheckBox
-    Friend WithEvents TextBox4 As TextBox
-    Friend WithEvents TextBox3 As TextBox
-    Friend WithEvents TextBox2 As TextBox
-    Friend WithEvents TextBox1 As TextBox
-    Friend WithEvents Button1 As Button
+    Friend WithEvents 讀取日期_tb As TextBox
+    Friend WithEvents 讀取料號_tb As TextBox
+    Friend WithEvents 讀取品名_tb As TextBox
+    Friend WithEvents 讀取檔名_tb As TextBox
+    Friend WithEvents 匯入Excel_bt As Button
+    Friend WithEvents 讀取季節_tb As TextBox
+    Friend WithEvents 讀取油種_tb As TextBox
+    Friend WithEvents Panel5 As Panel
+    Friend WithEvents 讀取代工_tb As TextBox
+    Friend WithEvents 讀取版本_tb As TextBox
+    Friend WithEvents 讀取標章_tb As TextBox
+    Friend WithEvents 讀取產量_tb As TextBox
+    Friend WithEvents 讀取組別_tb As TextBox
+    Friend WithEvents PictureBox1 As PictureBox
+    Friend WithEvents 檢視油脂列表_bt As Button
+    Friend WithEvents Panel6 As Panel
+    Friend WithEvents 關閉列表_bt As Button
+    Friend WithEvents 配方列表_dgv As DataGridView
+    Friend WithEvents 油脂種類1_cb As ComboBox
+    Friend WithEvents Label2 As Label
+    Friend WithEvents 列表儲存_bt As Button
+    Friend WithEvents PictureBox2 As PictureBox
+    Friend WithEvents Search_列表編號_cb As CheckBox
+    Friend WithEvents Search_列表名稱_cb As CheckBox
+    Friend WithEvents 關鍵字1_tb As TextBox
+    Friend WithEvents 列表關鍵字_bt As Button
+    Friend WithEvents 關鍵字1_lb As Label
+    Friend WithEvents PictureBox3 As PictureBox
 End Class

OW-ERP-SYS/05、技術管理系統/製程配方表.vb

@@ -2,7 +2,8 @@
 Imports System.Globalization
 Imports System.IO
 Imports System.Runtime.InteropServices
-'Imports Microsoft.Office.Interop.Excel
+Imports System.Text.RegularExpressions
+Imports System.ComponentModel
 
 Public Class 製程配方表
     Dim 加入原料按鈕, 原料選項_pl顯示, 加入規格按鈕, 規格選項_pl顯示, 修改狀態, 刪除原料種類, 刪除規格種類, 搜尋暫存_油脂種類 As String
@@ -12,6 +13,7 @@ Public Class 製程配方表
     Dim 重合計 As Decimal
     Private isProgrammaticChange As Boolean = False
     Private Button_light As Boolean = False
+    Private Const MaxColumnWidth As Integer = 1500 ' 定義最大列寬
     Private Sub Set_配方控制表_油脂種類_讀取()
         Dim ds1 As New DataSet : 配方分類_dgv.DataSource = Nothing : ds1.Clear()
         配方分類_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -37,6 +39,25 @@ Public Class 製程配方表
         配方控制表_dgv.Columns(10).FillWeight = 20 : 配方控制表_dgv.Columns(17).FillWeight = 20
         For i As Integer = 0 To 配方控制表_dgv.Rows.Count - 1 : 配方控制表_dgv.Rows(i).Cells("項次").Value = i + 1 : Next
     End Sub
+    Private Sub Set_製程配方控制表_完整顯示(油脂種類 As String)
+        Dim ds1 As New DataSet : 配方列表_dgv.DataSource = Nothing : ds1.Clear()
+        SetDGV樣式值(配方列表_dgv)
+        SQL_配方控制表_讀取_列表用(油脂種類)
+        da.Fill(ds1) : 配方列表_dgv.DataSource = ds1.Tables(0) : conn.Close()
+        ' 隱藏指定範圍的列
+        For i As Integer = 0 To 24
+            If i = 0 Or i = 10 Then ' 保留第 N 列
+                配方列表_dgv.Columns(i).Visible = False
+            End If
+        Next
+        配方列表_dgv.Columns(0).ReadOnly = True : 配方列表_dgv.Columns(1).ReadOnly = True : 配方列表_dgv.Columns(2).ReadOnly = True
+        配方列表_dgv.Columns(3).ReadOnly = True : 配方列表_dgv.Columns(4).ReadOnly = True
+
+        ' 凍結前五列
+        配方列表_dgv.Columns(4).Frozen = True
+        ConfigureDataGridView()
+
+    End Sub
     Public Sub Set_搜尋配方清單()
         Dim ds1 As New DataSet : 配方控制表_dgv.DataSource = Nothing : ds1.Clear()
         SetDGV樣式值(配方控制表_dgv)
@@ -67,6 +88,31 @@ Public Class 製程配方表
         配方控制表_dgv.Columns(10).FillWeight = 20 : 配方控制表_dgv.Columns(18).FillWeight = 20
         For i As Integer = 0 To 配方控制表_dgv.Rows.Count - 1 : 配方控制表_dgv.Rows(i).Cells("項次").Value = i + 1 : Next
     End Sub
+    Public Sub Set_搜尋配方列表清單()
+        Dim ds1 As New DataSet : 配方列表_dgv.DataSource = Nothing : ds1.Clear()
+        SetDGV樣式值(配方列表_dgv)
+        Dim Search_select As String = String.Empty
+        Dim keyword As String = 關鍵字1_tb.Text
+        If Search_列表名稱_cb.Checked Then : Search_select = "產品名稱"
+        ElseIf Search_列表編號_cb.Checked Then : Search_select = "舊編號"
+        End If
+        If Not String.IsNullOrEmpty(Search_select) Then
+            SQL_搜尋配方控制表_讀取_列表用(keyword, Search_select)
+        End If
+        da.Fill(ds1) : 配方列表_dgv.DataSource = ds1.Tables(0) : conn.Close()
+        ' 隱藏指定範圍的列
+        For i As Integer = 0 To 24
+            If i = 0 Or i = 10 Then ' 保留第 N 列
+                配方列表_dgv.Columns(i).Visible = False
+            End If
+        Next
+        配方列表_dgv.Columns(0).ReadOnly = True : 配方列表_dgv.Columns(1).ReadOnly = True : 配方列表_dgv.Columns(2).ReadOnly = True
+        配方列表_dgv.Columns(3).ReadOnly = True : 配方列表_dgv.Columns(4).ReadOnly = True
+
+        ' 凍結前五列
+        配方列表_dgv.Columns(4).Frozen = True
+        ConfigureDataGridView()
+    End Sub
     Private Sub Set_配方明細表原料油_讀取(配方編號 As String)
         Dim ds2 As New DataSet : 配方原料油_dgv.DataSource = Nothing : ds2.Clear()
         配方原料油_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -257,7 +303,8 @@ Public Class 製程配方表
         配方產品規格_dgv.EditMode = DataGridViewEditMode.EditOnEnter
 
 
-        介面 = "H201" : 表頭(16) = "單位" : 登入使用者_tb.Text = gUserName : 隱藏_pl1.SendToBack() : 隱藏_pl2.SendToBack() : 加入規格內容_pl.SendToBack()
+        介面 = "H201" : 表頭(16) = "單位" : 登入使用者_tb.Text = gUserName
+        隱藏_pl1.SendToBack() : 隱藏_pl2.SendToBack() : 加入規格內容_pl.SendToBack() : Panel5.SendToBack() : Panel6.SendToBack()
         配方選擇_pl.Visible = False : 配方原料選項_pl.Visible = False : 配方規格選項_pl.Visible = False
         最高權限_pl.Height = 73 : 最高權限_pl.Width = 159
         If 登入人級別 = "00" Then : 最高權限_pl.Visible = True
@@ -269,16 +316,11 @@ Public Class 製程配方表
             End If
         End If
 
-        新增配方_bt.Enabled = True : 修改_bt.Enabled = True : 儲存_bt.Enabled = False : 刪除配方_bt.Enabled = True : 另存新檔_bt.Enabled = True
+        新增配方_bt.Enabled = True : 修改_bt.Enabled = True : 儲存_bt.Enabled = True : 刪除配方_bt.Enabled = True : 另存新檔_bt.Enabled = True
         加入原料油_bt.Enabled = False : 加入乳化劑_bt.Enabled = False : 加入香料_bt.Enabled = False : 加入其他_bt.Enabled = False : 加入著色劑_bt.Enabled = False
         加入原料油脂規格_bt.Enabled = False : 加入產品規格_bt.Enabled = False
         修改狀態 = ""
-        產品名稱_tb.ReadOnly = True : 產品名稱_tb.BackColor = SystemColors.Window : 產品流水號_tb.ReadOnly = True : 產品流水號_tb.BackColor = SystemColors.Window
-        產品編號_tb.ReadOnly = True : 產品編號_tb.BackColor = SystemColors.Window
-        備註_tb.ReadOnly = True : 備註_tb.BackColor = SystemColors.Window : 油脂種類_cb.Enabled = False : 油脂種類_cb.BackColor = SystemColors.Window
-        季節_cb.Enabled = True : 季節_cb.BackColor = SystemColors.Window : 認證標章_cb.Enabled = True : 認證標章_cb.BackColor = SystemColors.Window
-        出貨類型_cb.Enabled = True : 出貨類型_cb.BackColor = SystemColors.Window : 生產噸數_nud.Enabled = True : 生產噸數_nud.BackColor = SystemColors.Window
-        版本_nud.Enabled = True : 版本_nud.BackColor = SystemColors.Window : 組別_cb.Enabled = True : 組別_cb.BackColor = SystemColors.Window
+        產品流水號_tb.ReadOnly = True : 產品流水號_tb.BackColor = SystemColors.Window
 
         原料油比總和_tb.ReadOnly = True : 原料油比總和_tb.BackColor = SystemColors.Window : 原料油產品和_tb.ReadOnly = True : 原料油產品和_tb.BackColor = SystemColors.Window
         原料油重總和_tb.ReadOnly = True : 原料油重總和_tb.BackColor = SystemColors.Window
@@ -287,12 +329,6 @@ Public Class 製程配方表
         其他產品和_tb.ReadOnly = True : 其他產品和_tb.BackColor = SystemColors.Window : 其他重總和_tb.ReadOnly = True : 其他重總和_tb.BackColor = SystemColors.Window
         著色劑產品和_tb.ReadOnly = True : 著色劑產品和_tb.BackColor = SystemColors.Window : 著色劑重總和_tb.ReadOnly = True : 著色劑重總和_tb.BackColor = SystemColors.Window
         合計產品比_tb.ReadOnly = True : 合計產品比_tb.BackColor = SystemColors.Window : 合計重量_tb.ReadOnly = True : 合計重量_tb.BackColor = SystemColors.Window
-        油比規格_tb.ReadOnly = True : 油比規格_tb.BackColor = SystemColors.Window : 熟成溫度_tb.ReadOnly = True : 熟成溫度_tb.BackColor = SystemColors.Window
-        熟成時間_tb.ReadOnly = True : 熟成時間_tb.BackColor = SystemColors.Window : 包材類型_tb.ReadOnly = True : 包材類型_tb.BackColor = SystemColors.Window
-        打包帶_tb.ReadOnly = True : 打包帶_tb.BackColor = SystemColors.Window : 淨重_tb.ReadOnly = True : 淨重_tb.BackColor = SystemColors.Window
-        淨重單位_cb.Enabled = False : 淨重單位_cb.BackColor = SystemColors.Window : 保存條件_tb.ReadOnly = True : 保存條件_tb.BackColor = SystemColors.Window
-        保存期限_tb.ReadOnly = True : 保存期限_tb.BackColor = SystemColors.Window : 有效日期_tb.ReadOnly = True : 有效日期_tb.BackColor = SystemColors.Window
-        過敏原_tb.ReadOnly = True : 過敏原_tb.BackColor = SystemColors.Window
 
         配方原料油_dgv.ReadOnly = True : 配方乳化劑_dgv.ReadOnly = True : 配方香料_dgv.ReadOnly = True : 配方其他_dgv.ReadOnly = True : 配方著色劑_dgv.ReadOnly = True
         配方油脂規格_dgv.ReadOnly = True : 配方產品規格_dgv.ReadOnly = True
@@ -311,6 +347,17 @@ Public Class 製程配方表
 
         '為每個項目添加事件處理程序
         AddHandler txtKeyword_tb.KeyDown, AddressOf txtKeyword_tb_KeyDown
+        AddHandler 關鍵字1_tb.KeyDown, AddressOf 關鍵字1_tb_KeyDown
+
+    End Sub
+    Private Sub 關鍵字1_tb_KeyDown(sender As Object, e As KeyEventArgs)
+        If e.KeyCode = Keys.Enter Then
+            Set_搜尋配方列表清單()
+
+            ' 如果您不希望在按下Enter鍵時換行或進行其他默認操作，可以添加以下代碼：
+            e.Handled = True
+            e.SuppressKeyPress = True
+        End If
     End Sub
     Private Sub txtKeyword_tb_KeyDown(sender As Object, e As KeyEventArgs)
         If e.KeyCode = Keys.Enter Then
@@ -1316,14 +1363,24 @@ Public Class 製程配方表
     End Sub
     Private Sub CheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles Search_名稱_cb.CheckedChanged, Search_編號_cb.CheckedChanged,
                                                                                   Search_標章_cb.CheckedChanged, Search_代工_cb.CheckedChanged
-
         Dim 選中Ch_Box As Windows.Forms.CheckBox = DirectCast(sender, Windows.Forms.CheckBox)
-
         If 選中Ch_Box.Checked Then
             Dim 其餘Ch_Box As New List(Of Windows.Forms.CheckBox) From {
                 Search_名稱_cb, Search_編號_cb, Search_標章_cb, Search_代工_cb
             }
-
+            For Each 其餘中的任一Ch_Box In 其餘Ch_Box
+                If 其餘中的任一Ch_Box IsNot 選中Ch_Box Then
+                    其餘中的任一Ch_Box.Checked = False
+                End If
+            Next
+        End If
+    End Sub
+    Private Sub 列表CB_CheckedChanged(sender As Object, e As EventArgs) Handles Search_列表名稱_cb.CheckedChanged, Search_列表編號_cb.CheckedChanged
+        Dim 選中Ch_Box As Windows.Forms.CheckBox = DirectCast(sender, Windows.Forms.CheckBox)
+        If 選中Ch_Box.Checked Then
+            Dim 其餘Ch_Box As New List(Of Windows.Forms.CheckBox) From {
+                Search_列表名稱_cb, Search_列表編號_cb
+            }
             For Each 其餘中的任一Ch_Box In 其餘Ch_Box
                 If 其餘中的任一Ch_Box IsNot 選中Ch_Box Then
                     其餘中的任一Ch_Box.Checked = False
@@ -1607,12 +1664,67 @@ Public Class 製程配方表
     Private Sub 表單簽名_bt_MouseEnter(sender As Object, e As EventArgs) Handles 表單簽名_bt.MouseEnter
         ToolTip1.SetToolTip(Me.表單簽名_bt, "配方表單簽名審核")
     End Sub
+    Private Sub 檢視油脂列表_bt_Click(sender As Object, e As EventArgs) Handles 檢視油脂列表_bt.Click
+        Panel6.BringToFront()
+        油脂種類1_cb.Items.Clear() ' 清空 ComboBox2 的項目
+        For Each item In 油脂種類_cb.Items
+            油脂種類1_cb.Items.Add(item)
+        Next
+    End Sub
+    Private Sub 關閉列表_bt_Click(sender As Object, e As EventArgs) Handles 關閉列表_bt.Click
+        Panel6.SendToBack()
+    End Sub
+    Private Sub 油脂種類1_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 油脂種類1_cb.SelectedIndexChanged
+        Set_製程配方控制表_完整顯示(油脂種類1_cb.Text)
+    End Sub
+    Private Sub 列表關鍵字_bt_Click(sender As Object, e As EventArgs) Handles 列表關鍵字_bt.Click
+        Set_搜尋配方列表清單()
+    End Sub
 
-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        ReadExcelToTextBoxes()
+    Private Sub 列表儲存_bt_Click(sender As Object, e As EventArgs) Handles 列表儲存_bt.Click
+        MGB("確 定 要 儲 存 資 料 嗎?", 2) ' 確認刪除操作
+        If 訊息回應 <> "YES" Then Exit Sub
+
+        For i As Integer = 0 To 配方列表_dgv.Rows.Count - 1
+            Dim 配方編號 As String = 配方列表_dgv.Rows(i).Cells("配方編號").Value.ToString
+            Dim 產品編號 As String = 配方列表_dgv.Rows(i).Cells("產品編號").Value.ToString
+            Dim 產品名稱 As String = 配方列表_dgv.Rows(i).Cells("產品名稱").Value.ToString
+            Dim 季節 As String = 配方列表_dgv.Rows(i).Cells("季節").Value.ToString
+            Dim 版本 As String = 配方列表_dgv.Rows(i).Cells("版本").Value.ToString
+            Dim 制定日期 As String = 配方列表_dgv.Rows(i).Cells("制定日期").Value.ToString
+            Dim 生產噸數 As String = 配方列表_dgv.Rows(i).Cells("生產噸數").Value.ToString
+            Dim 認證標章 As String = 配方列表_dgv.Rows(i).Cells("認證標章").Value.ToString
+            Dim 代工 As Boolean = 配方列表_dgv.Rows(i).Cells("代工").Value
+            Dim 出貨類型 As String = 配方列表_dgv.Rows(i).Cells("出貨類型").Value.ToString
+            Dim 物料料號 As String = 配方列表_dgv.Rows(i).Cells("物料料號").Value.ToString
+            Dim 停用 As Boolean = 配方列表_dgv.Rows(i).Cells("停用").Value
+            Dim 油脂比例規格 As String = 配方列表_dgv.Rows(i).Cells("油脂比例規格").Value.ToString
+            Dim 熟成溫度 As String = 配方列表_dgv.Rows(i).Cells("熟成溫度").Value.ToString
+            Dim 熟成時間 As String = 配方列表_dgv.Rows(i).Cells("熟成時間").Value.ToString
+            Dim 包材類型 As String = 配方列表_dgv.Rows(i).Cells("包材類型").Value.ToString
+            Dim 打包帶 As String = 配方列表_dgv.Rows(i).Cells("打包帶").Value.ToString
+            Dim 淨重 As String = 配方列表_dgv.Rows(i).Cells("淨重").Value.ToString
+            Dim 淨重單位 As String = 配方列表_dgv.Rows(i).Cells("淨重單位").Value.ToString
+            Dim 保存條件 As String = 配方列表_dgv.Rows(i).Cells("保存條件").Value.ToString
+            Dim 保存期限 As String = 配方列表_dgv.Rows(i).Cells("保存期限").Value.ToString
+            Dim 有效日期 As String = 配方列表_dgv.Rows(i).Cells("有效日期").Value.ToString
+            Dim 過敏原信息 As String = 配方列表_dgv.Rows(i).Cells("過敏原信息").Value.ToString
+            Dim 備註 As String = 配方列表_dgv.Rows(i).Cells("備註").Value.ToString
+            Dim 組別 As String = 配方列表_dgv.Rows(i).Cells("組別").Value.ToString
+
+            SQL_配方控制表_列表更新(配方編號, 產品編號, 產品名稱, 季節, 版本, 生產噸數, 認證標章, 出貨類型, 代工, 物料料號, 停用,
+                           制定日期, 油脂比例規格, 熟成溫度, 熟成時間, 包材類型, 打包帶, 淨重, 淨重單位, 保存條件, 保存期限, 有效日期,
+                           過敏原信息, 備註, 組別)
+        Next
+        'Set_製程配方控制表_完整顯示(油脂種類1_cb.Text)
+        MGB("儲存完畢!", 1)
+    End Sub
+
+    Private Sub 匯入Excel_bt_Click(sender As Object, e As EventArgs) Handles 匯入Excel_bt.Click
+        讀取Excel到TextBox()
     End Sub
 
-    Private Sub ReadExcelToTextBoxes()
+    Private Sub 讀取Excel到TextBox()
         Dim excelApp As Microsoft.Office.Interop.Excel.Application = Nothing
         Dim workbook As Microsoft.Office.Interop.Excel.Workbook = Nothing
         Dim worksheet As Microsoft.Office.Interop.Excel.Worksheet = Nothing
@@ -1626,48 +1738,210 @@ Public Class 製程配方表
             If openFileDialog.ShowDialog() = DialogResult.OK Then
                 Dim filePath As String = openFileDialog.FileName
 
-                ' 讀取文件名到 TextBox1
-                TextBox1.Text = IO.Path.GetFileName(filePath)
+                原料油比總和_tb.Text = "" : 原料油產品和_tb.Text = "" : 原料油重總和_tb.Text = "" : 乳化劑產品和_tb.Text = "" : 乳化劑重總和_tb.Text = ""
+                香料產品和_tb.Text = "" : 香料重總和_tb.Text = "" : 其他產品和_tb.Text = "" : 其他重總和_tb.Text = "" : 著色劑產品和_tb.Text = "" : 著色劑重總和_tb.Text = ""
+                配方原料油_dgv.DataSource = Nothing : 配方乳化劑_dgv.DataSource = Nothing : 配方香料_dgv.DataSource = Nothing
+                配方其他_dgv.DataSource = Nothing : 配方著色劑_dgv.DataSource = Nothing
+                配方油脂規格_dgv.DataSource = Nothing : 配方產品規格_dgv.DataSource = Nothing
+                油比規格_tb.Text = "" : 熟成溫度_tb.Text = "" : 熟成時間_tb.Text = "" : 包材類型_tb.Text = "" : 打包帶_tb.Text = "" : 淨重_tb.Text = ""
+                淨重單位_cb.Text = "" : 保存條件_tb.Text = "" : 保存期限_tb.Text = "" : 有效日期_tb.Text = "" : 過敏原_tb.Text = "" : 組別_cb.Text = ""
+                油脂種類_cb.Text = "" : 季節_cb.Text = "" : 認證標章_cb.Text = "" : 出貨類型_cb.Text = "" : 產品編號_tb.Text = ""
+
+                讀取檔名_tb.Text = "" : 讀取品名_tb.Text = "" : 讀取料號_tb.Text = "" : 讀取日期_tb.Text = ""
+                讀取季節_tb.Text = "" : 讀取組別_tb.Text = "" : 讀取產量_tb.Text = "" : 讀取版本_tb.Text = ""
+                讀取油種_tb.Text = "" : 讀取標章_tb.Text = "" : 讀取代工_tb.Text = ""
+
+                ' 讀取文件名
+                讀取檔名_tb.Text = IO.Path.GetFileName(filePath)
 
                 ' 創建 Excel 應用程序實例
                 excelApp = New Microsoft.Office.Interop.Excel.Application()
                 workbook = excelApp.Workbooks.Open(filePath)
                 worksheet = workbook.Worksheets(1)
 
-                ' 讀取 B2 單元格內容到 TextBox2
-                TextBox2.Text = CStr(worksheet.Range("B2").Value)
-
-                ' 讀取 A3 單元格內容，提取料號到 TextBox3
-                Dim cellA3 As String = CStr(worksheet.Range("A3").Value)
-                Dim startIndex As Integer = cellA3.IndexOf("料號:") + 3
-                If startIndex > 2 Then
-                    Dim productNumber = cellA3.Substring(startIndex).Trim()
-                    ' 移除最後的 ")"
-                    If productNumber.EndsWith(")") Then
-                        productNumber = productNumber.Substring(0, productNumber.Length - 1)
-                    End If
-                    TextBox3.Text = productNumber
-                End If
+                Dim startIndex As Integer
 
-                ' 讀取 F3 單元格內容，提取日期到 TextBox4
-                Dim cellF3 As String = CStr(worksheet.Range("F3").Value)
+                ' 讀取 F3 單元格內容，提取日期
+                Dim cellF3 As String = CStr(worksheet.Range("F5").Value)
                 startIndex = cellF3.IndexOf("制定日期:") + 5
                 If startIndex > 4 Then
                     Dim dateString = cellF3.Substring(startIndex).Trim()
                     ' 嘗試解析日期並重新格式化
                     Dim 提取日期 As DateTime
                     If DateTime.TryParseExact(dateString, "yyyy.MM.dd", CultureInfo.InvariantCulture, DateTimeStyles.None, 提取日期) Then
-                        TextBox4.Text = 提取日期.ToString("yyyy/MM/dd")
+                        讀取日期_tb.Text = 提取日期.ToString("yyyy/MM/dd")
                     Else
-                        TextBox4.Text = dateString  ' 如果解析失敗，保留原始字符串
+                        讀取日期_tb.Text = dateString  ' 如果解析失敗，保留原始字符串
                     End If
                 End If
 
-                MessageBox.Show("Excel 資料已成功匯入！", "成功", MessageBoxButtons.OK, MessageBoxIcon.Information)
+                Dim cellC5 As String = CStr(worksheet.Range("C5").Value)
+                startIndex = cellC5.IndexOf("代工產品:") + 5
+                If startIndex > 4 Then
+                    Dim productNumber = cellC5.Substring(startIndex).Trim()
+                    讀取代工_tb.Text = If(productNumber = "是", "1", "0")
+                Else
+                    讀取代工_tb.Text = ""
+                End If
+
+                讀取品名_tb.Text = ExtractCellValue(worksheet, "A2", "品名:", 3)
+                讀取料號_tb.Text = ExtractCellValue(worksheet, "A3", "料號:", 3)
+                讀取季節_tb.Text = ExtractCellValue(worksheet, "A4", "季節:", 3)
+                讀取版本_tb.Text = ExtractCellValue(worksheet, "A5", "版本:", 3)
+                讀取油種_tb.Text = ExtractCellValue(worksheet, "C3", "油脂種類:", 5)
+                讀取組別_tb.Text = ExtractCellValue(worksheet, "C4", "組別:", 3)
+                讀取標章_tb.Text = ExtractCellValue(worksheet, "G3", "認證標章:", 5)
+
+                讀取產量_tb.Text = CStr(worksheet.Range("B6").Value)
+
+                ' 定義需要搜尋的關鍵字及其初始行號
+                Dim keywords As New Dictionary(Of String, Integer) From {
+                    {"乳化劑", -1}, {"香   料", -1}, {"其   他", -1}, {"著色劑", -1}}
+                Dim 規格keywords As New Dictionary(Of String, Integer) From {
+                    {"原 料 油 脂 規 格", -1}, {"產  品  規  格", -1}, {"備            註", -1}}
+
+                ' 儲存 "小   計" 所在的所有行號
+                Dim subtotalRows As New List(Of Integer)
+
+                ' 搜尋 A 列中的關鍵字和 "小   計"
+                Dim lastRow As Integer = worksheet.Cells(worksheet.Rows.Count, "A").End(Microsoft.Office.Interop.Excel.XlDirection.xlUp).Row
+
+                For i As Integer = 1 To lastRow
+                    Dim cellValue As Object = worksheet.Cells(i, "A").Value
+                    Dim cellValue1 As Object = worksheet.Cells(i, "F").Value
+                    If cellValue IsNot Nothing Then
+                        Dim cellText As String = CStr(cellValue).Trim()
+
+                        ' 搜尋關鍵字
+                        For Each keyword In keywords.Keys.ToList()
+                            If cellText.Contains(keyword) Then
+                                keywords(keyword) = i
+                            End If
+                        Next
+                        ' 搜尋 "小   計"
+                        If cellText.Contains("小   計") Then
+                            subtotalRows.Add(i)
+                        End If
+                    End If
+
+                    If cellValue1 IsNot Nothing Then
+                        Dim cellText As String = CStr(cellValue1).Trim()
+
+                        ' 搜尋關鍵字
+                        For Each keyword In 規格keywords.Keys.ToList()
+                            If cellText.Contains(keyword) Then
+                                規格keywords(keyword) = i
+                            End If
+                        Next
+                    End If
+                Next
+
+                ' 檢查搜尋結果
+                For Each kvp In keywords
+                    If kvp.Value = -1 Then
+                        MGB("在 EXCEL A 行中未找到 '" & kvp.Key.Trim() & "'", 1)
+                    End If
+                Next
+
+                ' 判斷 配方控制表 是否已經有 相同資料
+                SQL_配方控制表_規格比對_讀取(讀取品名_tb.Text, 讀取料號_tb.Text, 讀取油種_tb.Text, 讀取季節_tb.Text, 讀取版本_tb.Text)
+                If dr.Read Then
+                    MGB("已存在以下 <" & 讀取油種_tb.Text & "> 的配方規格 : " & Environment.NewLine & Environment.NewLine & 讀取品名_tb.Text &
+                " (" & 讀取料號_tb.Text & ")(" & 讀取季節_tb.Text & ")(第" & 讀取版本_tb.Text & "版)", 1)
+                Else
+                    ' 新增途徑: 先查出 最後一筆流水號 方可自動產生流水號 
+                    產品流水號_tb.Text = 產生新流水號("PR", "配方控制表", "配方編號")
+                    SQL_配方控制表_新增(產品流水號_tb.Text, 讀取品名_tb.Text, 讀取油種_tb.Text, 讀取季節_tb.Text, "", 讀取日期_tb.Text,
+                            讀取產量_tb.Text, 讀取標章_tb.Text, 讀取代工_tb.Text, "", "", "", "", "", 讀取料號_tb.Text, "", 讀取版本_tb.Text, False,
+                            "", "", "", "", "", "", "", "", "", "", "", 讀取組別_tb.Text)
+
+                    Dim 乳化劑Value As Integer = keywords("乳化劑")
+                    Dim 香料Value As Integer = keywords("香   料")
+                    Dim 其他Value As Integer = keywords("其   他")
+                    Dim 著色劑Value As Integer = keywords("著色劑")
+
+                    ' 定義一個列表來儲存原料油內容
+                    Dim rawMaterials As New List(Of Dictionary(Of String, String))()
+
+                    ' 假設數據從第8行開始，到遇到 "小   計" 或空白行為止
+                    Dim startRow As Integer = 8
+
+                    For i As Integer = startRow To 乳化劑Value - 1
+                        Dim cellValue As Object = worksheet.Cells(i, "A").Value
+                        If cellValue IsNot Nothing Then
+                            Dim cellText As String = CStr(cellValue).Trim()
+
+                            ' 遇到 "小 計" 或空白就停止
+                            If cellText.Contains("小   計") OrElse String.IsNullOrEmpty(cellText) Then
+                                Exit For
+                            End If
+
+                            ' 獲取整行資料
+                            Dim rowDict As New Dictionary(Of String, String)()
+                            rowDict("原料油") = Regex.Replace(CStr(worksheet.Cells(i, "A").Value), "\s", "")
+                            rowDict("油脂%") = CStr(worksheet.Cells(i, "B").Value)
+                            rowDict("產品%") = CStr(worksheet.Cells(i, "C").Value)
+                            rowDict("kg") = CStr(worksheet.Cells(i, "D").Value)
+
+                            rawMaterials.Add(rowDict)
+                        End If
+                    Next
+
+                    ' 顯示獲取到的數據
+                    If rawMaterials.Count > 0 Then
+                        For Each material As Dictionary(Of String, String) In rawMaterials
+                            Dim 物料料號 As String = ""
+                            SQL_配方_原料名稱比對_讀取("原料油", material("原料油"))
+                            If dr.Read Then
+                                物料料號 = dr("物料料號").ToString
+                                明細流水號_新增 = 產生新流水號("PS", "配方明細表", "明細流水號")
+                                SQL_配方明細表_原料_新增(明細流水號_新增, 產品流水號_tb.Text, "原料油", material("原料油"), material("油脂%"),
+                                                 material("產品%"), material("kg"), "", 物料料號)
+                            Else
+                                MGB("原料油: " & material("原料油") & " 找不到物料編號!", 1)
+                            End If
+                        Next
+                    End If
+
+                    EXCEL原料細項讀取(worksheet, 乳化劑Value + 1, 香料Value, "乳化劑")
+                    EXCEL原料細項讀取(worksheet, 香料Value + 1, 其他Value, "香料")
+                    EXCEL原料細項讀取(worksheet, 其他Value + 1, 著色劑Value, "其他")
+                    EXCEL原料細項讀取(worksheet, 著色劑Value + 1, lastRow, "著色劑")
+
+                    ' 假設數據從第X行開始，到遇到空白行為止
+                    Dim 油脂規格Value As Integer = 規格keywords("原 料 油 脂 規 格")
+                    Dim 產品規格Value As Integer = 規格keywords("產  品  規  格")
+                    Dim 備註Value As Integer = 規格keywords("備            註")
+
+                    EXCEL規格細項讀取(worksheet, 油脂規格Value + 2, 產品規格Value, "油脂規格")
+                    EXCEL規格細項讀取(worksheet, 產品規格Value + 1, 備註Value, "產品規格")
+
+                    產品名稱_tb.Text = 讀取品名_tb.Text
+                    油脂種類_cb.Text = 讀取油種_tb.Text
+                    季節_cb.Text = 讀取季節_tb.Text
+                    組別_cb.Text = 讀取組別_tb.Text
+                    生產噸數_nud.Value = Convert.ToDecimal(If(IsDBNull(讀取產量_tb.Text), 0, 讀取產量_tb.Text))
+                    認證標章_cb.Text = 讀取標章_tb.Text
+                    配方_DTP.Text = 讀取日期_tb.Text
+                    版本_nud.Value = Convert.ToDecimal(If(IsDBNull(讀取版本_tb.Text), 0, 讀取版本_tb.Text))
+                    產品編號_tb.Text = 讀取料號_tb.Text
+                    代工產品_ch.Checked = If(讀取代工_tb.Text = "是", True, False)
+
+                    Set_配方明細表原料油_讀取(產品流水號_tb.Text) : Set_配方明細表乳化劑_讀取(產品流水號_tb.Text) : Set_配方明細表香料_讀取(產品流水號_tb.Text)
+                    Set_配方明細表其他_讀取(產品流水號_tb.Text)
+                    Set_配方明細表著色劑_讀取(產品流水號_tb.Text) : Set_配方規格表油脂_讀取(產品流水號_tb.Text)
+                    Set_配方規格表產品_讀取(產品流水號_tb.Text)
+
+                    MGB("Excel 資料已成功匯入！", 1)
+                End If
             End If
 
+        Catch ex As COMException
+            MessageBox.Show("Excel COM 操作錯誤: " & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
+        Catch ex As IOException
+            MessageBox.Show("文件 IO 錯誤: " & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
         Catch ex As Exception
-            MessageBox.Show("發生錯誤: " & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
+            MessageBox.Show("發生未預期的錯誤: " & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
         Finally
             ' 清理資源
             If workbook IsNot Nothing Then
@@ -1675,9 +1949,7 @@ Public Class 製程配方表
             End If
             If excelApp IsNot Nothing Then
                 excelApp.Quit()
-                ReleaseObject(worksheet)
-                ReleaseObject(workbook)
-                ReleaseObject(excelApp)
+                ReleaseObject(worksheet) : ReleaseObject(workbook) : ReleaseObject(excelApp)
             End If
         End Try
     End Sub
@@ -1693,4 +1965,139 @@ Public Class 製程配方表
             GC.Collect()
         End Try
     End Sub
+    Private Function ExtractCellValue(worksheet As Microsoft.Office.Interop.Excel.Worksheet, cellAddress As String, keyword As String, offset As Integer) As String
+        Dim cellValue As String = CStr(worksheet.Range(cellAddress).Value)
+        Dim startIndex As Integer = cellValue.IndexOf(keyword) + offset
+        If startIndex > offset - 1 Then
+            Return cellValue.Substring(startIndex).Trim()
+        Else
+            Return keyword & "未填"
+        End If
+    End Function
+    Private Sub EXCEL原料細項讀取(worksheet As Microsoft.Office.Interop.Excel.Worksheet, startRow As Integer, endRow As Integer, materialType As String)
+        Dim materials As New List(Of Dictionary(Of String, String))()
+
+        For i As Integer = startRow To endRow - 1
+            Dim cellValue As Object = worksheet.Cells(i, "A").Value
+            If cellValue IsNot Nothing Then
+                Dim cellText As String = CStr(cellValue).Trim()
+                If cellText.Contains("小   計") OrElse String.IsNullOrEmpty(cellText) Then
+                    Exit For
+                End If
+
+                Dim rowDict As New Dictionary(Of String, String)()
+                rowDict(materialType) = Regex.Replace(CStr(cellText), "\s", "")
+                rowDict("過敏原資訊") = CStr(worksheet.Cells(i, "B").Value)
+                rowDict("產品%") = CStr(worksheet.Cells(i, "C").Value)
+                rowDict("重量") = CStr(worksheet.Cells(i, "D").Value)
+                materials.Add(rowDict)
+            End If
+        Next
+
+        If materials.Count > 0 Then
+            For Each material As Dictionary(Of String, String) In materials
+                Dim 物料料號 As String = ""
+                SQL_配方_原料名稱比對_讀取(materialType, material(materialType))
+                If dr.Read Then
+                    物料料號 = dr("物料料號").ToString
+                    明細流水號_新增 = 產生新流水號("PS", "配方明細表", "明細流水號")
+                    SQL_配方明細表_原料_新增(明細流水號_新增, 產品流水號_tb.Text, materialType, material(materialType), "",
+                                     material("產品%"), material("重量"), material("過敏原資訊"), 物料料號)
+                Else
+                    MGB(materialType & ": " & material(materialType) & " 找不到物料編號!", 1)
+                End If
+            Next
+        End If
+    End Sub
+    Private Sub EXCEL規格細項讀取(worksheet As Microsoft.Office.Interop.Excel.Worksheet, startRow As Integer, endRow As Integer, materialType As String)
+        Dim materials As New List(Of Dictionary(Of String, String))()
+
+        For i As Integer = startRow To endRow - 1
+            Dim cellValue As Object = worksheet.Cells(i, "F").Value
+            If cellValue IsNot Nothing Then
+                Dim cellText As String = CStr(cellValue).Trim()
+                ' 遇到空白就停止
+                If String.IsNullOrEmpty(cellText) Then
+                    Exit For
+                End If
+                ' 獲取整行資料
+                Dim rowDict As New Dictionary(Of String, String)()
+                rowDict("項目") = Regex.Replace(CStr(cellText), "\s", "")
+                rowDict("標準") = CStr(worksheet.Cells(i, "G").Value)
+                materials.Add(rowDict)
+            End If
+        Next
+
+        ' 顯示獲取到的數據
+        If materials.Count > 0 Then
+            For Each material As Dictionary(Of String, String) In materials
+                Dim 規格編號 As String = ""
+                SQL_配方規格選項_內容_讀取(materialType, material("項目"))
+                If dr.Read Then
+                    規格編號 = dr("流水號").ToString
+                    規格流水號_新增 = 產生新流水號("SP", "配方規格表", "規格流水號")
+                    SQL_配方規格表_新增(規格流水號_新增, 產品流水號_tb.Text, materialType, material("項目"), material("標準"))
+                Else
+                    MGB("項目: " & material("項目") & " 找不到規格編號!", 1)
+                End If
+            Next
+        End If
+    End Sub
+
+
+    Private Sub ConfigureDataGridView()
+        With 配方列表_dgv
+            ' 基本設置
+            .AllowUserToResizeColumns = True
+            .DefaultCellStyle.WrapMode = DataGridViewTriState.True
+            .AutoSizeRowsMode = DataGridViewAutoSizeRowsMode.AllCells
+            .AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None
+            .DefaultCellStyle.Alignment = DataGridViewContentAlignment.TopLeft
+
+            ' 設置最小列寬
+            For Each column As DataGridViewColumn In .Columns
+                column.MinimumWidth = 50
+            Next
+
+            ' 添加事件處理器
+            AddHandler .ColumnHeaderMouseDoubleClick, AddressOf 配方列表_dgv_ColumnHeaderDoubleClick
+            AddHandler .ColumnWidthChanged, AddressOf 配方列表_dgv_ColumnWidthChanged
+
+            ' 定義列寬
+            Dim columnWidths As New Dictionary(Of String, Integer) From {
+            {"產品名稱", 180}, {"產品編號", 85}, {"版本", 50},
+            {"季節", 70}, {"代工", 50}, {"停用", 50},
+            {"生產噸數", 80}, {"油脂比例規格", 250}, {"熟成溫度", 80},
+            {"熟成時間", 80}, {"淨重", 50}, {"淨重單位", 80},
+            {"過敏原信息", 350}, {"備註", 550}, {"保存條件", 150},
+            {"保存期限", 150}, {"有效日期", 150}
+        }
+
+            ' 設置列寬
+            For Each kvp In columnWidths
+                If .Columns.Contains(kvp.Key) Then
+                    .Columns(kvp.Key).Width = kvp.Value
+                End If
+            Next
+        End With
+    End Sub
+
+    Private Sub 配方列表_dgv_ColumnHeaderDoubleClick(sender As Object, e As DataGridViewCellMouseEventArgs)
+        If e.ColumnIndex >= 0 AndAlso e.RowIndex = -1 Then
+            Dim newWidth = Math.Min(配方列表_dgv.Columns(e.ColumnIndex).GetPreferredWidth(DataGridViewAutoSizeColumnMode.AllCells, True), MaxColumnWidth)
+            配方列表_dgv.Columns(e.ColumnIndex).Width = newWidth
+        End If
+    End Sub
+
+    Private Sub 配方列表_dgv_ColumnWidthChanged(sender As Object, e As DataGridViewColumnEventArgs)
+        ' 限制列寬不超過最大值
+        If e.Column.Width > MaxColumnWidth Then
+            e.Column.Width = MaxColumnWidth
+        End If
+
+        ' 重新調整行高以適應新的列寬
+        配方列表_dgv.AutoResizeRows(DataGridViewAutoSizeRowsMode.AllCells)
+    End Sub
+
+
 End Class

OW-ERP-SYS/0、MyModule/主資料庫/SQL_技術管理系統.vb

@@ -70,6 +70,44 @@ Module SQL_技術管理系統
                 END, 版本 DESC"
         CmdSet_For_DGV()
     End Sub
+    Friend Sub SQL_配方控制表_讀取_列表用(油脂種類 As String)
+        ConnOpen()
+        SQL1 = "SELECT     配方編號, 舊編號 AS 產品編號, 產品名稱, 季節, 版本, 制定日期, 生產噸數, 認證標章, 代工, 
+                           出貨類型, 物料料號, 停用, 油脂比例規格, 熟成溫度, 熟成時間, 
+                           包材類型, 打包帶, 淨重, 淨重單位, 保存條件, 保存期限, 有效日期, 過敏原信息, 備註, 組別
+                FROM      配方控制表
+                WHERE     油脂種類 LIKE N'%" & 油脂種類 & "'
+                ORDER BY  產品名稱, 舊編號,
+				        CASE 季節 
+			        		WHEN '春' THEN 1
+			        		WHEN '夏' THEN 2
+		        			WHEN '秋' THEN 3
+		        			WHEN '冬' THEN 4
+		        			WHEN '春秋' THEN 5
+		        			WHEN '不分季' THEN 6
+                        ELSE 7
+                END, 版本 DESC"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_搜尋配方控制表_讀取_列表用(Search_word As String, Search_select As String)
+        ConnOpen()
+        SQL1 = "SELECT     配方編號, 舊編號 AS 產品編號, 產品名稱, 季節, 版本, 制定日期, 生產噸數, 認證標章, 代工, 
+                           出貨類型, 物料料號, 停用, 油脂比例規格, 熟成溫度, 熟成時間, 
+                           包材類型, 打包帶, 淨重, 淨重單位, 保存條件, 保存期限, 有效日期, 過敏原信息, 備註, 組別
+                FROM      配方控制表
+                WHERE     (" & Search_select & " LIKE N'%" & Search_word & "%')
+                ORDER BY  產品名稱, 舊編號,
+				        CASE 季節 
+			        		WHEN '春' THEN 1
+			        		WHEN '夏' THEN 2
+		        			WHEN '秋' THEN 3
+		        			WHEN '冬' THEN 4
+		        			WHEN '春秋' THEN 5
+		        			WHEN '不分季' THEN 6
+                        ELSE 7
+                END, 版本 DESC"
+        CmdSet_For_DGV()
+    End Sub
     Friend Sub SQL_配方控制表_產品名稱查詢_讀取(產品名稱 As String, 油脂種類 As String, 季節 As String, 出貨類型 As String, 版本 As String)
         ConnOpen()
         SQL1 = "SELECT    產品名稱
@@ -117,6 +155,20 @@ Module SQL_技術管理系統
                 WHERE   (配方編號 LIKE N'" & 配方編號 & "')"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_配方控制表_列表更新(配方編號 As String, 舊編號 As String, 產品名稱 As String, 季節 As String, 版本 As String, 生產噸數 As String,
+                            認證標章 As String, 出貨類型 As String, 代工 As Boolean, 物料料號 As String, 停用 As Boolean, 制定日期 As String,
+                            油脂比例規格 As String, 熟成溫度 As String, 熟成時間 As String, 包材類型 As String, 打包帶 As String, 淨重 As String,
+                            淨重單位 As String, 保存條件 As String, 保存期限 As String, 有效日期 As String, 過敏原信息 As String, 備註 As String, 組別 As String)
+        ConnOpen()
+        SQL1 = "UPDATE  配方控制表 SET 產品名稱 = N'" & 產品名稱 & "', 季節 = N'" & 季節 & "', 出貨類型 = N'" & 出貨類型 & "'
+                        , 生產噸數 = N'" & 生產噸數 & "', 認證標章 = N'" & 認證標章 & "', 代工 = N'" & 代工 & "', 備註 = N'" & 備註 & "', 舊編號 = N'" & 舊編號 & "'
+                        , 物料料號 = N'" & 物料料號 & "', 版本 = N'" & 版本 & "', 停用 = N'" & 停用 & "', 制定日期 = N'" & 制定日期 & "', 油脂比例規格 = N'" & 油脂比例規格 & "'
+                        , 熟成溫度 = N'" & 熟成溫度 & "', 熟成時間 = N'" & 熟成時間 & "', 包材類型 = N'" & 包材類型 & "', 打包帶 = N'" & 打包帶 & "'
+                        , 淨重 = N'" & 淨重 & "', 淨重單位 = N'" & 淨重單位 & "', 保存條件 = N'" & 保存條件 & "', 保存期限 = N'" & 保存期限 & "'
+                        , 有效日期 = N'" & 有效日期 & "', 過敏原信息 = N'" & 過敏原信息 & "', 組別 = N'" & 組別 & "'
+                WHERE   (配方編號 LIKE N'" & 配方編號 & "')"
+        CmdSet_For_dr()
+    End Sub
     Friend Sub SQL_配方控制表_依配方編號_刪除(配方編號 As String)
         ConnOpen()
         SQL1 = "DELETE FROM 配方控制表 
@@ -306,6 +358,21 @@ Module SQL_技術管理系統
         SQL1 = String.Format("UPDATE {0} SET {1} = N'{2}', {3} = N'{4}' WHERE (配方編號 LIKE N'{5}')", 表名, 簽名編碼選擇, 暫存簽名編碼, 簽名日期字段, Strings.Format(Today(), "yyyy/MM/dd"), 配方編號)
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_配方控制表_規格比對_讀取(產品名稱 As String, 產品編號 As String, 油脂種類 As String, 季節 As String, 版本 As String)
+        ConnOpen()
+        SQL1 = "SELECT      產品名稱, 舊編號, 油脂種類, 季節, 版本, 制定日期, 認證標章, 生產噸數, 代工
+                FROM        配方控制表
+                WHERE       (產品名稱 LIKE N'" & 產品名稱 & "') AND (舊編號 LIKE N'" & 產品編號 & "') AND (油脂種類 LIKE N'" & 油脂種類 & "')
+                             AND (季節 LIKE N'" & 季節 & "') AND (版本 LIKE N'" & 版本 & "')"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_配方_原料名稱比對_讀取(種類 As String, 名稱 As String)
+        ConnOpen()
+        SQL1 = "SELECT      物料料號
+                FROM        物料規格表
+                WHERE       (種類 LIKE N'" & 種類 & "') AND (名稱 LIKE N'" & 名稱 & "')"
+        CmdSet_For_dr()
+    End Sub
 
     ' ---------------------------- 設備點檢表 -----------------------------------
     Friend Sub SQL_點檢控制表_讀取(startDate As DateTime, deviceIds As String)

OW-ERP-SYS/0、MyModule/模組/全域變數.vb

@@ -9,7 +9,7 @@
     '------LINE變數-------
     Public 發送對象, LINE_權限代號, PA201, PA202, PA203, PA204, PA205, 通知變數X, 通知變數Y As String
     '----系統版本----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-    Public 版本 As String = "2024082001" : Public 資料庫版本 As String
+    Public 版本 As String = "2024090201" : Public 資料庫版本 As String
     '----系統閒置----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 判斷重登, 重登確認, 主頁開啟, 首次開啟, 物料查詢, 深色風格, 不刪除檔案 As Boolean
     Public timeExit, timeExit2, timeNow, timeNow2 As Integer