1. 一些BUG修正

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

   "WorkspaceRootPath": "D:\\Project1\\OW-ERP-SYS\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\Project1\\OW-ERP-SYS\\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\\loginform1.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\\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}",
-      "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}",
+      "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",
+      "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\\\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}"
     }
   ],
   "DocumentGroupContainers": [
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 1,
               "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": "AQIAAMAGAAAAAAAAAAAjwMAGAAAIAAAA",
+              "ViewState": "AQIAACMIAAAAAAAAAADwvzkIAAAoAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-09-05T03:02:18.757Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 2,
               "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",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\LoginForm1.vb",
               "ToolTip": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\LoginForm1.vb",
               "RelativeToolTip": "OW-ERP-SYS\\LoginForm1.vb",
-              "ViewState": "AQIAAJ8AAAAAAAAAAAAYwKkAAAALAAAA",
+              "ViewState": "AQIAAEkAAAAAAAAAAAAAwJ4AAAAUAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-08-12T06:36:55.284Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 3,
               "Title": "\u5168\u57DF\u8B8A\u6578.vb",
               "DocumentMoniker": "D:\\Project1\\OW-ERP-SYS\\OW-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",

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

         '
         Me.備註_lb.AutoSize = True
         Me.備註_lb.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.備註_lb.Location = New System.Drawing.Point(2, 246)
+        Me.備註_lb.Location = New System.Drawing.Point(2, 210)
         Me.備註_lb.Name = "備註_lb"
         Me.備註_lb.Size = New System.Drawing.Size(79, 16)
         Me.備註_lb.TabIndex = 1977
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.備註_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.備註_tb.ForeColor = System.Drawing.Color.Blue
-        Me.備註_tb.Location = New System.Drawing.Point(6, 265)
+        Me.備註_tb.Location = New System.Drawing.Point(6, 227)
         Me.備註_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.備註_tb.Multiline = True
         Me.備註_tb.Name = "備註_tb"
         Me.備註_tb.ScrollBars = System.Windows.Forms.ScrollBars.Both
-        Me.備註_tb.Size = New System.Drawing.Size(414, 116)
+        Me.備註_tb.Size = New System.Drawing.Size(414, 131)
         Me.備註_tb.TabIndex = 1976
         '
         '產品名稱_lb
         '隱藏_pl1
         '
         Me.隱藏_pl1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.隱藏_pl1.Controls.Add(Me.過敏原_tb)
         Me.隱藏_pl1.Controls.Add(Me.簽名_DTP)
         Me.隱藏_pl1.Controls.Add(Me.規格刪單_bt)
+        Me.隱藏_pl1.Controls.Add(Me.過敏原_lb)
         Me.隱藏_pl1.Controls.Add(Me.規格入單_bt)
         Me.隱藏_pl1.Controls.Add(Me.原料刪單_bt)
         Me.隱藏_pl1.Controls.Add(Me.原料入單_bt)
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.備註欄_pl.AutoScroll = True
         Me.備註欄_pl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.備註欄_pl.Controls.Add(Me.過敏原_tb)
         Me.備註欄_pl.Controls.Add(Me.淨重單位_cb)
-        Me.備註欄_pl.Controls.Add(Me.過敏原_lb)
         Me.備註欄_pl.Controls.Add(Me.有效日期_lb)
         Me.備註欄_pl.Controls.Add(Me.有效日期_tb)
         Me.備註欄_pl.Controls.Add(Me.保存期限_lb)
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.過敏原_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.過敏原_tb.ForeColor = System.Drawing.Color.Blue
-        Me.過敏原_tb.Location = New System.Drawing.Point(86, 211)
+        Me.過敏原_tb.Location = New System.Drawing.Point(226, 59)
         Me.過敏原_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.過敏原_tb.Name = "過敏原_tb"
-        Me.過敏原_tb.Size = New System.Drawing.Size(338, 23)
+        Me.過敏原_tb.Size = New System.Drawing.Size(71, 23)
         Me.過敏原_tb.TabIndex = 2079
         '
         '淨重單位_cb
         '過敏原_lb
         '
         Me.過敏原_lb.AutoSize = True
-        Me.過敏原_lb.Location = New System.Drawing.Point(2, 215)
+        Me.過敏原_lb.Location = New System.Drawing.Point(224, 34)
         Me.過敏原_lb.Name = "過敏原_lb"
         Me.過敏原_lb.Size = New System.Drawing.Size(85, 16)
         Me.過敏原_lb.TabIndex = 2080

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

                 Dim startIndex As Integer
 
                 ' 讀取 F3 單元格內容，提取日期
-                Dim cellF3 As String = CStr(worksheet.Range("F5").Value)
+                Dim cellF3 As String = CStr(worksheet.Range("F3").Value)
                 startIndex = cellF3.IndexOf("制定日期:") + 5
                 If startIndex > 4 Then
                     Dim dateString = cellF3.Substring(startIndex).Trim()
                     End If
                 End If
 
-                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
+                '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, "E2", "季節:", 3)
+                讀取版本_tb.Text = ExtractCellValue(worksheet, "F2", "版本:", 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)
+                讀取組別_tb.Text = ExtractCellValue(worksheet, "G2", "組別:", 3)
+                讀取產量_tb.Text = CStr(worksheet.Range("B4").Value).Trim()
+                油比規格_tb.Text = ExtractCellValue(worksheet, "F19", "1.", 2)
+                熟成溫度_tb.Text = ExtractCellValue(worksheet, "F20", "2.熟成溫度:", 7)
+                熟成時間_tb.Text = ExtractCellValue(worksheet, "G20", "3.熟成時間:", 7)
+                淨重_tb.Text = ExtractCellValue(worksheet, "F21", "4.淨重:", 5)
+                包材類型_tb.Text = ExtractCellValue(worksheet, "F22", "6.包材:", 5)
+                打包帶_tb.Text = ExtractCellValue(worksheet, "G22", "7.打包帶:", 6)
+                保存條件_tb.Text = ExtractCellValue(worksheet, "F23", "8.保存條件:", 7)
+                保存期限_tb.Text = ExtractCellValue(worksheet, "F24", "9.保存期限:", 7)
+                有效日期_tb.Text = ExtractCellValue(worksheet, "F25", "10.有效期限:", 8)
+                淨重單位_cb.Text = ExtractCellValue(worksheet, "G21", "5.淨重單位:", 7)
+                認證標章_cb.Text = ExtractCellValue(worksheet, "F26", "11.認證標章:", 8)
+                備註_tb.Text = Extract備註Value(worksheet, "F27", "12.其他:", 6)
+                'CStr(worksheet.Range("F27").Value).Trim()
+                過敏原_tb.Text = ""
 
                 ' 定義需要搜尋的關鍵字及其初始行號
                 Dim keywords As New Dictionary(Of String, Integer) From {
-                    {"乳化劑", -1}, {"香   料", -1}, {"其   他", -1}, {"著色劑", -1}}
+                    {"原料油", -1}, {"乳化劑", -1}, {"香   料", -1}, {"其   他", -1}, {"著色劑", -1}}
                 Dim 規格keywords As New Dictionary(Of String, Integer) From {
                     {"原 料 油 脂 規 格", -1}, {"產  品  規  格", -1}, {"備            註", -1}}
 
                     ' 新增途徑: 先查出 最後一筆流水號 方可自動產生流水號 
                     產品流水號_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)
+                            讀取產量_tb.Text, 讀取標章_tb.Text, False, 備註_tb.Text, "", "", "", "", 讀取料號_tb.Text, "", 讀取版本_tb.Text, False,
+                            油比規格_tb.Text, 熟成溫度_tb.Text, 熟成時間_tb.Text, 包材類型_tb.Text, 打包帶_tb.Text, 淨重_tb.Text, 淨重單位_cb.Text,
+                            保存條件_tb.Text, 保存期限_tb.Text, 有效日期_tb.Text, "", 讀取組別_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
+                    For i As Integer = 原料油Value + 1 To 乳化劑Value - 1
                         Dim cellValue As Object = worksheet.Cells(i, "A").Value
                         If cellValue IsNot Nothing Then
                             Dim cellText As String = CStr(cellValue).Trim()
             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
+    Private Function Extract備註Value(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 & "未填"
+            Return ""
+        End If
+    End Function
+    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
+            Dim extractedValue As String = cellValue.Substring(startIndex).Trim()
+            ' 移除 ℃ 和 /hr
+            extractedValue = extractedValue.Replace("℃", "").Replace("/hr", "")
+            Return extractedValue
+        Else
+            Return ""
         End If
     End Function
     Private Sub EXCEL原料細項讀取(worksheet As Microsoft.Office.Interop.Excel.Worksheet, startRow As Integer, endRow As Integer, materialType As String)

OW-ERP-SYS/bin/Debug/OPUPDATE.txt

-...