backup

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

@@ -2,57 +2,97 @@
   "Version": 1,
   "WorkspaceRootPath": "D:\\ow-erp-sys\\",
   "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.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\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\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}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.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\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.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\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.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\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\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}"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|d:\\ow-erp-sys\\ow-erp-sys\\ow-erp-sys.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\\ow-erp-sys.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
     {
       "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.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\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\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\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\ow-erp-sys.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\\ow-erp-sys.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\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\\\u751F\u7522\u6392\u7A0B\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:\\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:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.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\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.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\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\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:\\ow-erp-sys\\ow-erp-sys\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.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\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.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\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.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\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     },
     {
       "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\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:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\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\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
+    },
+    {
+      "AbsoluteMoniker": "D:0:0:{6EC44D36-D153-43A1-BE08-174C088DDE70}|OW-ERP-SYS\\OW-ERP-SYS.vbproj|D:\\ow-erp-sys\\ow-erp-sys\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\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\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
     }
   ],
   "DocumentGroupContainers": [
@@ -66,45 +106,130 @@
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 2,
-              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "ViewState": "AQIAAAAAAAAAAAAAAAAAAHEAAAAdAAAA",
+              "DocumentIndex": 7,
+              "Title": "\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "ViewState": "AQIAAM0AAAAAAAAAAAAvwOcAAACEAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-11-01T05:40:29.977Z",
+              "WhenOpened": "2024-11-13T02:56:59.009Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
-              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
-              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
-              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
-              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
+              "DocumentIndex": 2,
+              "Title": "\u6210\u54C1\u5165\u5EAB\u55AE.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u6210\u54C1\u5165\u5EAB\u55AE.vb [\u8A2D\u8A08]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-11-01T03:07:54.034Z",
+              "WhenOpened": "2024-11-13T02:56:54.223Z",
               "EditorCaption": " [\u8A2D\u8A08]"
             },
             {
               "$type": "Document",
               "DocumentIndex": 0,
-              "Title": "\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
-              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
-              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
-              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
-              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
-              "ViewState": "AQIAABsBAAAAAAAAAAAWwCoBAAAuAAAA",
+              "Title": "\u7269\u6599\u9818\u6599\u55AE.vb",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "ViewState": "AQIAAHMBAAAAAAAAAAAcwFsBAAAyAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-10-28T03:17:41.128Z",
+              "WhenOpened": "2024-11-13T02:57:02.772Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 4,
+              "DocumentIndex": 3,
+              "Title": "\u7269\u6599\u9818\u6599\u55AE.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\03\u3001\u5009\u5132\u7BA1\u7406\u7CFB\u7D71\\\u5009\u5132\u57FA\u672C\u63A7\u5236\\\u7269\u6599\u9818\u6599\u55AE.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-13T02:56:51.059Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 9,
+              "Title": "OW-ERP-SYS.vb",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "ViewState": "AQIAAMQBAAAAAAAAAAA1wM8BAAAQAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:39:11.251Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 14,
+              "Title": "OW-ERP-SYS.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\OW-ERP-SYS.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\OW-ERP-SYS.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\OW-ERP-SYS.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:39:09.774Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 13,
+              "Title": "\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u901A\u7528\u8B8A\u6578\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:36:51.119Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 16,
+              "Title": "\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u7D44\u7E54\u67B6\u69CB\u8A2D\u5B9A.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:36:48.771Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 17,
+              "Title": "\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u57F7\u884C\u6A94\u7248\u672C\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:36:46.911Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 18,
+              "Title": "\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\09\u3001\u8CC7\u6599\u5EAB\u7CFB\u7D71\u7BA1\u7406\\\u7CFB\u7D71\u4F7F\u7528\u8005\u7BA1\u7406.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-12T06:33:09.008Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 5,
               "Title": "\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
@@ -114,60 +239,111 @@
               "WhenOpened": "2024-10-28T02:41:31.094Z",
               "EditorCaption": " [\u8A2D\u8A08]"
             },
+            {
+              "$type": "Document",
+              "DocumentIndex": 4,
+              "Title": "\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u7CBE\u88FD\u7D44.vb",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAABUDAAAIAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-10-28T03:17:41.128Z",
+              "EditorCaption": ""
+            },
             {
               "$type": "Document",
               "DocumentIndex": 6,
-              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
-              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
-              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
-              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
-              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
+              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb [\u8A2D\u8A08]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-10-28T02:01:56.788Z",
+              "WhenOpened": "2024-11-01T03:07:54.034Z",
               "EditorCaption": " [\u8A2D\u8A08]"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 8,
+              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u7CBE\u88FD\u7D44.vb",
+              "ViewState": "AQIAAAkCAAAAAAAAAAAuwBwCAAAXAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-11-01T05:40:29.977Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 1,
               "Title": "SQL_\u6280\u8853\u7BA1\u7406\u7CFB\u7D71.vb",
               "DocumentMoniker": "D:\\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:\\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": "AQIAANQHAAAAAAAAAAAMwO0HAABCAAAA",
+              "ViewState": "AQIAACoIAAAAAAAAAAAowDsIAAApAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-10-29T01:16:08.224Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 7,
+              "DocumentIndex": 10,
               "Title": "\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
               "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
               "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
-              "ViewState": "AQIAALoBAAAAAAAAAAAYwMgBAABTAAAA",
+              "ViewState": "AQIAAGYAAAAAAAAAAAAIwKgCAAALAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-10-29T05:29:35.043Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 5,
+              "DocumentIndex": 11,
               "Title": "\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb",
               "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb",
               "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u5976\u6CB9\u7D44.vb",
-              "ViewState": "AQIAAMsAAAAAAAAAAAAQwHQBAAA4AAAA",
+              "ViewState": "AQIAAAAAAAAAAAAAAAAAAHQBAAA4AAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
               "WhenOpened": "2024-10-29T01:15:54.57Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 8,
+              "DocumentIndex": 19,
+              "Title": "\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
+              "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
+              "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb",
+              "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
+              "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u65E5\u5831\u8868_\u5976\u6CB9\u7D44.vb [\u8A2D\u8A08]",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-10-28T02:01:56.788Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 20,
+              "Title": "\u5168\u57DF\u8B8A\u6578.vb",
+              "DocumentMoniker": "D:\\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",
+              "ToolTip": "D:\\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": "AQIAAAAAAAAAAAAAAABAwAsAAAAjAAAA",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
+              "WhenOpened": "2024-07-30T10:34:10.581Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 21,
               "Title": "\u751F\u7522\u6392\u7A0B\u8868.vb",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
@@ -175,53 +351,45 @@
               "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
               "ViewState": "AQIAAF4AAAAAAAAAAAAUwH0BAAALAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-10-14T06:17:02.197Z"
+              "WhenOpened": "2024-10-14T06:17:02.197Z",
+              "EditorCaption": ""
             },
             {
               "$type": "Document",
-              "DocumentIndex": 9,
+              "DocumentIndex": 22,
               "Title": "\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
               "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
               "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-10-28T03:29:49.294Z"
+              "WhenOpened": "2024-10-28T03:29:49.294Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 10,
+              "DocumentIndex": 12,
               "Title": "\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb [\u8A2D\u8A08]",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb",
               "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb [\u8A2D\u8A08]",
               "RelativeToolTip": "OW-ERP-SYS\\05\u3001\u6280\u8853\u7BA1\u7406\u7CFB\u7D71\\\u88FD\u7A0B\u7BA1\u5236\u7D00\u9304\u8868_\u4E00\u822C\u7D44.vb [\u8A2D\u8A08]",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-10-28T02:01:21.101Z"
+              "WhenOpened": "2024-10-28T02:01:21.101Z",
+              "EditorCaption": " [\u8A2D\u8A08]"
             },
             {
               "$type": "Document",
-              "DocumentIndex": 11,
+              "DocumentIndex": 15,
               "Title": "LoginForm1.vb",
               "DocumentMoniker": "D:\\ow-erp-sys\\OW-ERP-SYS\\LoginForm1.vb",
               "RelativeDocumentMoniker": "OW-ERP-SYS\\LoginForm1.vb",
               "ToolTip": "D:\\ow-erp-sys\\OW-ERP-SYS\\LoginForm1.vb",
               "RelativeToolTip": "OW-ERP-SYS\\LoginForm1.vb",
-              "ViewState": "AQIAAJ0AAAAAAAAAAAAWwKsAAAALAAAA",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-08-12T06:36:55.284Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 12,
-              "Title": "\u5168\u57DF\u8B8A\u6578.vb",
-              "DocumentMoniker": "D:\\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",
-              "ToolTip": "D:\\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": "AgIAAAEAAAAAAAAAAAAuwAcAAAAqAAAAAAAAAA==",
+              "ViewState": "AQIAAIgAAAAAAAAAAAAWwKsAAAALAAAA",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
-              "WhenOpened": "2024-07-30T10:34:10.581Z"
+              "WhenOpened": "2024-08-12T06:36:55.284Z",
+              "EditorCaption": ""
             }
           ]
         }

OW-ERP-SYS/03、倉儲管理系統/倉儲基本控制/成品入庫單.vb

@@ -57,143 +57,196 @@ Public Class 成品入庫單
             SQL_生產日報_製程管制_奶油組_讀取(日報日期)
         ElseIf 組別 = "一般油脂組" Then
             SQL_生產日報_製程管制_一般組_讀取(日報日期)
+        ElseIf 組別 = "精製組" Then
+            SQL_生產日報控制表_精製組_讀取(日報日期, "%%")
         Else
             MGB("組別選取錯誤!", 1)
             Exit Sub
         End If
         If dr.Read() Then ' 有資料，續查日報表
-            日報明細_dgv.Columns.Clear()
-            SetDGV樣式值(日報明細_dgv)
+            If 組別 = "奶油組" Or 組別 = "一般油脂組" Then
+                日報明細_dgv.Columns.Clear()
+                SetDGV樣式值(日報明細_dgv)
 
-            日報明細_dgv.Columns.Add("產品名稱", "產品名稱") : 日報明細_dgv.Columns.Add("配方流水號", "配方流水號")
-            日報明細_dgv.Columns.Add("淨重", "淨重") : 日報明細_dgv.Columns.Add("生產流水號", "生產流水號")
-            日報明細_dgv.Columns.Add("批次", "批次") : 日報明細_dgv.Columns.Add("生產日期", "生產日期")
-            日報明細_dgv.Columns.Add("有效日期", "有效日期")
-            日報明細_dgv.Columns.Add("產量", "產量") : 日報明細_dgv.Columns.Add("包裝容器", "包裝容器")
+                日報明細_dgv.Columns.Add("產品名稱", "產品名稱") : 日報明細_dgv.Columns.Add("配方流水號", "配方流水號")
+                日報明細_dgv.Columns.Add("淨重", "淨重") : 日報明細_dgv.Columns.Add("生產流水號", "生產流水號")
+                日報明細_dgv.Columns.Add("批次", "批次") : 日報明細_dgv.Columns.Add("生產日期", "生產日期")
+                日報明細_dgv.Columns.Add("有效日期", "有效日期")
+                日報明細_dgv.Columns.Add("產量", "產量") : 日報明細_dgv.Columns.Add("包裝容器", "包裝容器")
 
-            If 組別 = "奶油組" Then
-                SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "奶油組")
-            ElseIf 組別 = "一般油脂組" Then
-                SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "一般油脂組")
-            End If
-            While dr.Read()
-                Dim productName As String = dr.Item("產品名稱").ToString()
-                Dim 配方編號 As String = dr.Item("各配方編號").ToString()
-                Dim 淨重 As String = dr.Item("淨重").ToString()
-                Dim 生產流水號 As String = dr.Item("生產流水號").ToString()
-                Dim 批次 As String = dr.Item("批次").ToString()
-                Dim 生產日期 As String = dr.Item("生產日期").ToString()
-                Dim 保存期限 As String = dr.Item("保存期限").ToString()
-                Dim 有效日期 As String = 解析有效日期(保存期限, 日報日期)
-                日報明細_dgv.Rows.Insert(日報明細_dgv.Rows.Count, productName, 配方編號, 淨重, 生產流水號, 批次, 生產日期, 有效日期)
-            End While
+                If 組別 = "奶油組" Then
+                    SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "奶油組")
+                ElseIf 組別 = "一般油脂組" Then
+                    SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "一般油脂組")
+                End If
+                While dr.Read()
+                    Dim productName As String = dr.Item("產品名稱").ToString()
+                    Dim 配方編號 As String = dr.Item("各配方編號").ToString()
+                    Dim 淨重 As String = dr.Item("淨重").ToString()
+                    Dim 生產流水號 As String = dr.Item("生產流水號").ToString()
+                    Dim 批次 As String = dr.Item("批次").ToString()
+                    Dim 生產日期 As String = dr.Item("生產日期").ToString()
+                    Dim 保存期限 As String = dr.Item("保存期限").ToString()
+                    Dim 有效日期 As String = 解析有效日期(保存期限, 日報日期)
+                    日報明細_dgv.Rows.Insert(日報明細_dgv.Rows.Count, productName, 配方編號, 淨重, 生產流水號, 批次, 生產日期, 有效日期)
+                End While
 
-            If 組別 = "奶油組" Then
-                SQL_成品入庫_領料出庫_日報_讀取(日報日期, "奶油組")
-            ElseIf 組別 = "一般油脂組" Then
-                SQL_成品入庫_領料出庫_日報_讀取(日報日期, "一般油脂組")
-            End If
-            While dr.Read()
-                Dim 產品名稱 As String = dr("產品名稱").ToString()
-                Dim 配方編號 As String = dr("配方流水號").ToString()
-                Dim 生產流水號 As String = dr("生產流水號").ToString()
-                Dim 生產日期 As String = dr("生產日期").ToString()
-                Dim 重量 As String = dr("淨重")
-                Dim 批次 As String = dr("批次")
-                Dim 實際產量1 As String = dr("實際產量1").ToString()
-                Dim 實際產量2 As String = dr("實際產量2").ToString()
-                Dim 實際產量3 As String = dr("實際產量3").ToString()
-                Dim 包裝容器1 As String = "" : Dim 包裝容器2 As String = "" : Dim 包裝容器3 As String = ""
                 If 組別 = "奶油組" Then
-                    包裝容器1 = dr("包裝尺寸1").ToString() : 包裝容器2 = dr("包裝尺寸2").ToString() : 包裝容器3 = dr("包裝尺寸3").ToString()
+                    SQL_成品入庫_領料出庫_日報_讀取(日報日期, "奶油組")
                 ElseIf 組別 = "一般油脂組" Then
-                    包裝容器1 = dr("包裝容器1").ToString() : 包裝容器2 = dr("包裝容器2").ToString() : 包裝容器3 = dr("包裝容器3").ToString()
+                    SQL_成品入庫_領料出庫_日報_讀取(日報日期, "一般油脂組")
                 End If
+                While dr.Read()
+                    Dim 產品名稱 As String = dr("產品名稱").ToString()
+                    Dim 配方編號 As String = dr("配方流水號").ToString()
+                    Dim 生產流水號 As String = dr("生產流水號").ToString()
+                    Dim 生產日期 As String = dr("生產日期").ToString()
+                    Dim 重量 As String = dr("淨重")
+                    Dim 批次 As String = dr("批次")
+                    Dim 實際產量1 As String = dr("實際產量1").ToString()
+                    Dim 實際產量2 As String = dr("實際產量2").ToString()
+                    Dim 實際產量3 As String = dr("實際產量3").ToString()
+                    Dim 包裝容器1 As String = "" : Dim 包裝容器2 As String = "" : Dim 包裝容器3 As String = ""
+                    If 組別 = "奶油組" Then
+                        包裝容器1 = dr("包裝尺寸1").ToString() : 包裝容器2 = dr("包裝尺寸2").ToString() : 包裝容器3 = dr("包裝尺寸3").ToString()
+                    ElseIf 組別 = "一般油脂組" Then
+                        包裝容器1 = dr("包裝容器1").ToString() : 包裝容器2 = dr("包裝容器2").ToString() : 包裝容器3 = dr("包裝容器3").ToString()
+                    End If
 
-                Dim rowIndex As Integer = -1 : Dim rowIndex1 As Integer = -1 : Dim rowIndex2 As Integer = -1
-                Dim 包裝rowIndex1 As Integer = -1 : Dim 包裝rowIndex2 As Integer = -1
-                ' 查找產品名稱所在的行
-                For Each row As DataGridViewRow In 日報明細_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() = 產品名稱 AndAlso
+                    Dim rowIndex As Integer = -1 : Dim rowIndex1 As Integer = -1 : Dim rowIndex2 As Integer = -1
+                    Dim 包裝rowIndex1 As Integer = -1 : Dim 包裝rowIndex2 As Integer = -1
+                    ' 查找產品名稱所在的行
+                    For Each row As DataGridViewRow In 日報明細_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() = 產品名稱 AndAlso
                         row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        rowIndex = row.Index
-                        Exit For
-                    End If
-                Next
-                For Each row As DataGridViewRow In 日報明細_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
+                            rowIndex = row.Index
+                            Exit For
+                        End If
+                    Next
+                    For Each row As DataGridViewRow In 日報明細_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
                         row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        If 實際產量3 IsNot Nothing AndAlso 實際產量3 <> "" Then
-                            rowIndex1 = row.Index
-                            rowIndex2 = rowIndex1 + 1
-                        ElseIf (實際產量3 Is Nothing OrElse 實際產量3 = "") AndAlso (實際產量2 IsNot Nothing AndAlso 實際產量2 <> "") Then
-                            rowIndex1 = row.Index
+                            If 實際產量3 IsNot Nothing AndAlso 實際產量3 <> "" Then
+                                rowIndex1 = row.Index
+                                rowIndex2 = rowIndex1 + 1
+                            ElseIf (實際產量3 Is Nothing OrElse 實際產量3 = "") AndAlso (實際產量2 IsNot Nothing AndAlso 實際產量2 <> "") Then
+                                rowIndex1 = row.Index
+                            End If
+                            Exit For
                         End If
-                        Exit For
-                    End If
-                Next
-                For Each row As DataGridViewRow In 日報明細_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
+                    Next
+                    For Each row As DataGridViewRow In 日報明細_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
                         row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        If 包裝容器3 IsNot Nothing AndAlso 包裝容器3 <> "" Then
-                            包裝rowIndex1 = row.Index
-                            包裝rowIndex2 = 包裝rowIndex1 + 1
-                        ElseIf (包裝容器3 Is Nothing OrElse 包裝容器3 = "") AndAlso (包裝容器2 IsNot Nothing AndAlso 包裝容器2 <> "") Then
-                            包裝rowIndex1 = row.Index
+                            If 包裝容器3 IsNot Nothing AndAlso 包裝容器3 <> "" Then
+                                包裝rowIndex1 = row.Index
+                                包裝rowIndex2 = 包裝rowIndex1 + 1
+                            ElseIf (包裝容器3 Is Nothing OrElse 包裝容器3 = "") AndAlso (包裝容器2 IsNot Nothing AndAlso 包裝容器2 <> "") Then
+                                包裝rowIndex1 = row.Index
+                            End If
+                            Exit For
                         End If
-                        Exit For
-                    End If
-                Next
+                    Next
 
-                '確認找到行後， 再查找列索引
-                If rowIndex <> -1 Then
-                    日報明細_dgv.Rows(rowIndex).Cells("產量").Value = 實際產量1
-                    日報明細_dgv.Rows(rowIndex).Cells("包裝容器").Value = 包裝容器1
-                End If
-                If rowIndex1 <> -1 Then
-                    日報明細_dgv.Rows(rowIndex1).Cells("產量").Value = 實際產量2
-                End If
-                If rowIndex2 <> -1 Then
-                    日報明細_dgv.Rows(rowIndex2).Cells("產量").Value = 實際產量3
-                End If
-                If 包裝rowIndex1 <> -1 Then
-                    日報明細_dgv.Rows(包裝rowIndex1).Cells("包裝容器").Value = 包裝容器2
-                End If
-                If 包裝rowIndex2 <> -1 Then
-                    日報明細_dgv.Rows(包裝rowIndex2).Cells("包裝容器").Value = 包裝容器3
-                End If
-            End While
+                    '確認找到行後， 再查找列索引
+                    If rowIndex <> -1 Then
+                        日報明細_dgv.Rows(rowIndex).Cells("產量").Value = 實際產量1
+                        日報明細_dgv.Rows(rowIndex).Cells("包裝容器").Value = 包裝容器1
+                    End If
+                    If rowIndex1 <> -1 Then
+                        日報明細_dgv.Rows(rowIndex1).Cells("產量").Value = 實際產量2
+                    End If
+                    If rowIndex2 <> -1 Then
+                        日報明細_dgv.Rows(rowIndex2).Cells("產量").Value = 實際產量3
+                    End If
+                    If 包裝rowIndex1 <> -1 Then
+                        日報明細_dgv.Rows(包裝rowIndex1).Cells("包裝容器").Value = 包裝容器2
+                    End If
+                    If 包裝rowIndex2 <> -1 Then
+                        日報明細_dgv.Rows(包裝rowIndex2).Cells("包裝容器").Value = 包裝容器3
+                    End If
+                End While
 
-            ' 新增成品入庫單編號
-            入庫單編號_tb.Text = 產生新流水號("WR", "成品入庫控制表", "入庫單編號")
-            SQL_成品入庫控制表_新增(入庫單編號_tb.Text, 新增入庫組別_cb.Text, 入庫日期_dtp.Value.ToString("yyyy/MM/dd"), "待入庫", "待製表",
+                ' 新增成品入庫單編號
+                入庫單編號_tb.Text = 產生新流水號("WR", "成品入庫控制表", "入庫單編號")
+                SQL_成品入庫控制表_新增(入庫單編號_tb.Text, 新增入庫組別_cb.Text, 入庫日期_dtp.Value.ToString("yyyy/MM/dd"), "待入庫", "待製表",
                            日報日期_dtp.Value.ToString("yyyy/MM/dd"))
 
-            For I As Integer = 0 To 日報明細_dgv.Rows.Count - 1
-                明細流水號_tb.Text = 產生新流水號("WS", "成品入庫明細表", "入庫單明細編號")
-                Dim 配方編號 As String = If(日報明細_dgv.Rows(I).Cells("配方流水號").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("配方流水號").Value.ToString())
-                Dim 產品名稱 As String = If(日報明細_dgv.Rows(I).Cells("產品名稱").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("產品名稱").Value.ToString())
-                Dim 批次 As String = If(日報明細_dgv.Rows(I).Cells("批次").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("批次").Value.ToString())
-                Dim formattedBatch As String = Convert.ToInt32(批次).ToString("D2") ' 將批次轉換為兩位數格式
-                Dim formattedDate As String = 日報日期.Replace("/", "")
-                Dim 生產批號 As String = formattedDate & formattedBatch ' 組合生產批號
-                Dim 包裝容器 As String = If(日報明細_dgv.Rows(I).Cells("包裝容器").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("包裝容器").Value.ToString())
-                Dim 規格 As String = 包裝容器
-                Dim 淨重 As String = If(日報明細_dgv.Rows(I).Cells("淨重").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("淨重").Value.ToString())
-                Dim 規格內容 As String = 淨重
-                Dim 產品數量 As String = If(日報明細_dgv.Rows(I).Cells("產量").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("產量").Value.ToString())
-                Dim 有效日期 As String = If(日報明細_dgv.Rows(I).Cells("有效日期").Value Is Nothing, "未知", 日報明細_dgv.Rows(I).Cells("有效日期").Value.ToString())
+                For I As Integer = 0 To 日報明細_dgv.Rows.Count - 1
+                    明細流水號_tb.Text = 產生新流水號("WS", "成品入庫明細表", "入庫單明細編號")
+                    Dim 配方編號 As String = If(日報明細_dgv.Rows(I).Cells("配方流水號").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("配方流水號").Value.ToString())
+                    Dim 產品名稱 As String = If(日報明細_dgv.Rows(I).Cells("產品名稱").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("產品名稱").Value.ToString())
+                    Dim 批次 As String = If(日報明細_dgv.Rows(I).Cells("批次").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("批次").Value.ToString())
+                    Dim formattedBatch As String = Convert.ToInt32(批次).ToString("D2") ' 將批次轉換為兩位數格式
+                    Dim formattedDate As String = 日報日期.Replace("/", "")
+                    Dim 生產批號 As String = formattedDate & formattedBatch ' 組合生產批號
+                    Dim 包裝容器 As String = If(日報明細_dgv.Rows(I).Cells("包裝容器").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("包裝容器").Value.ToString())
+                    Dim 規格 As String = 包裝容器
+                    Dim 淨重 As String = If(日報明細_dgv.Rows(I).Cells("淨重").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("淨重").Value.ToString())
+                    Dim 規格內容 As String = 淨重
+                    Dim 產品數量 As String = If(日報明細_dgv.Rows(I).Cells("產量").Value Is Nothing, "0", 日報明細_dgv.Rows(I).Cells("產量").Value.ToString())
+                    Dim 有效日期 As String = If(日報明細_dgv.Rows(I).Cells("有效日期").Value Is Nothing, "未知", 日報明細_dgv.Rows(I).Cells("有效日期").Value.ToString())
 
-                ' 調用 SQL 插入方法
-                If 組別 = "奶油組" Then
-                    SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, 配方編號, "", 產品名稱, 生產批號, "", 規格, 規格內容, 產品數量,
+                    ' 調用 SQL 插入方法
+                    If 組別 = "奶油組" Then
+                        SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, 配方編號, "", 產品名稱, 生產批號, "", 規格, 規格內容, 產品數量,
                                   "只", "", 有效日期, "", "")
-                ElseIf 組別 = "一般油脂組" Then
-                    SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, 配方編號, "", 產品名稱, 生產批號, "", 規格, 規格內容, 產品數量,
+                    ElseIf 組別 = "一般油脂組" Then
+                        SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, 配方編號, "", 產品名稱, 生產批號, "", 規格, 規格內容, 產品數量,
                                   "桶", "", 有效日期, "", "")
-                End If
-            Next
-            Set_成品入庫歷史表單() : Set_成品入庫明細表單()
+                    End If
+                Next
+                Set_成品入庫歷史表單() : Set_成品入庫明細表單()
+            Else
+                Dim ds1 As New DataSet : 日報明細_dgv.DataSource = Nothing : ds1.Clear()
+                SetDGV樣式值(日報明細_dgv)
+                SQL_成品入庫_精製組_讀取(日報日期)
+                da.Fill(ds1) : 日報明細_dgv.DataSource = ds1.Tables(0) : conn.Close()
+
+                入庫單編號_tb.Text = 產生新流水號("WR", "成品入庫控制表", "入庫單編號")
+                SQL_成品入庫控制表_新增(入庫單編號_tb.Text, 新增入庫組別_cb.Text, 入庫日期_dtp.Value.ToString("yyyy/MM/dd"), "待入庫", "待製表",
+                           日報日期_dtp.Value.ToString("yyyy/MM/dd"))
+
+                For I As Integer = 0 To 日報明細_dgv.Rows.Count - 1
+                    If 日報明細_dgv.Rows(I).Cells("FCQ553結束").Value.ToString() <> "" Then
+                        Dim 產品名稱 As String = If(日報明細_dgv.Rows(I).Cells("原料油").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("原料油").Value.ToString())
+                        Dim 料號 As String = If(日報明細_dgv.Rows(I).Cells("料號").Value Is Nothing, "", 日報明細_dgv.Rows(I).Cells("料號").Value.ToString())
+                        Dim 分段 As String() = 日報明細_dgv.Rows(I).Cells("FCQ553結束").Value.ToString().Split(";"c)
+                        If 日報明細_dgv.Rows(I).Cells("FCQ553結束").Value.ToString() <> "" Then
+                            Dim 分段1 As String() = 日報明細_dgv.Rows(I).Cells("桶槽").Value.ToString().Split(";"c)
+                            If 分段.Length = 分段1.Length Then
+                                For II As Integer = 0 To 分段.Length - 1
+                                    ' 檢查分段(i) 是否不為空
+                                    If Not String.IsNullOrEmpty(分段(II)) Then
+                                        ' 呼叫 SQL_成品入庫明細表_新增
+                                        明細流水號_tb.Text = 產生新流水號("WS", "成品入庫明細表", "入庫單明細編號")
+                                        SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, "", 料號, 產品名稱, "", "", "散裝", "", 分段(II), "kg", 分段1(II), "", "", "")
+                                    End If
+                                Next
+                            Else
+                                For II As Integer = 0 To 分段.Length - 1
+                                    ' 檢查分段(i) 是否不為空
+                                    If Not String.IsNullOrEmpty(分段(II)) Then
+                                        ' 呼叫 SQL_成品入庫明細表_新增
+                                        明細流水號_tb.Text = 產生新流水號("WS", "成品入庫明細表", "入庫單明細編號")
+                                        SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, "", 料號, 產品名稱, "", "", "散裝", "", 分段(II), "kg", "", "", "", "")
+                                    End If
+                                Next
+                            End If
+                        Else
+                            For Each 部分 As String In 分段
+                                If Not String.IsNullOrEmpty(部分) Then
+                                    ' 呼叫 SQL_成品入庫明細表_新增
+                                    明細流水號_tb.Text = 產生新流水號("WS", "成品入庫明細表", "入庫單明細編號")
+                                    SQL_成品入庫明細表_新增(明細流水號_tb.Text, 入庫單編號_tb.Text, "", 料號, 產品名稱, "", "", "散裝", "", 部分, "kg", "", "", "", "")
+                                End If
+                            Next
+                        End If
+                    End If
+                Next
+                Set_成品入庫歷史表單() : Set_成品入庫明細表單()
+            End If
+
 
             ' 日報新增 第一筆 會不知道 PA10
             If PA10 Is String.Empty Then
@@ -341,7 +394,7 @@ Public Class 成品入庫單
 
         ' 定義組別映射
         Dim groupMapping As New Dictionary(Of String, String) From {
-    {"0004.奶油組", "奶油組"}, {"0003.一般油脂組", "一般油脂組"}, {"0001.精緻組", "精緻組"}
+    {"0004.奶油組", "奶油組"}, {"0003.一般油脂組", "一般油脂組"}, {"0001.精製組", "精製組"}
 }
         ' 定義要更新的控件列表
         Dim controlsToUpdate As ComboBox() = {新增入庫組別_cb, 新增入庫組別1_cb, 入庫組別_cb}

OW-ERP-SYS/03、倉儲管理系統/倉儲基本控制/物料領料單.vb

@@ -58,190 +58,340 @@ Public Class 物料領料單
             SQL_生產日報_製程管制_奶油組_讀取(日報日期)
         ElseIf 組別 = "一般油脂組" Then
             SQL_生產日報_製程管制_一般組_讀取(日報日期)
+        ElseIf 組別 = "精製組" Then
+            SQL_生產日報控制表_精製組_讀取(日報日期, "%%")
         Else
             MGB("組別選取錯誤!", 1)
             Exit Sub
         End If
 
         If dr.Read() Then ' 有資料，續查日報表
-            日報明細1_dgv.Columns.Clear()
-            SetDGV樣式值(日報明細1_dgv)
-
-            日報明細1_dgv.Columns.Add("產品名稱", "產品名稱") : 日報明細1_dgv.Columns.Add("配方流水號", "配方流水號")
-            日報明細1_dgv.Columns.Add("淨重", "淨重") : 日報明細1_dgv.Columns.Add("生產流水號", "生產流水號")
-            日報明細1_dgv.Columns.Add("批次", "批次") : 日報明細1_dgv.Columns.Add("生產日期", "生產日期")
-            日報明細1_dgv.Columns.Add("有效日期", "有效日期")
-            日報明細1_dgv.Columns.Add("產量", "產量") : 日報明細1_dgv.Columns.Add("包裝容器", "包裝容器")
-
-            If 組別 = "奶油組" Then
-                SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "奶油組")
-            ElseIf 組別 = "一般油脂組" Then
-                SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "一般油脂組")
-            End If
-            While dr.Read()
-                Dim productName As String = dr.Item("產品名稱").ToString()
-                Dim 配方編號 As String = dr.Item("各配方編號").ToString()
-                Dim 淨重 As String = dr.Item("淨重").ToString()
-                Dim 生產流水號 As String = dr.Item("生產流水號").ToString()
-                Dim 批次 As String = dr.Item("批次").ToString()
-                Dim 生產日期 As String = dr.Item("生產日期").ToString()
-                Dim 保存期限 As String = dr.Item("保存期限").ToString()
-                Dim 有效日期 As String = 解析有效日期(保存期限, 日報日期)
-
-                日報明細1_dgv.Rows.Insert(日報明細1_dgv.Rows.Count, productName, 配方編號, 淨重, 生產流水號, 批次, 生產日期, 有效日期)
-            End While
+            If 組別 = "奶油組" Or 組別 = "一般油脂組" Then
+                日報明細1_dgv.Columns.Clear()
+                SetDGV樣式值(日報明細1_dgv)
+
+                日報明細1_dgv.Columns.Add("產品名稱", "產品名稱") : 日報明細1_dgv.Columns.Add("配方流水號", "配方流水號")
+                日報明細1_dgv.Columns.Add("淨重", "淨重") : 日報明細1_dgv.Columns.Add("生產流水號", "生產流水號")
+                日報明細1_dgv.Columns.Add("批次", "批次") : 日報明細1_dgv.Columns.Add("生產日期", "生產日期")
+                日報明細1_dgv.Columns.Add("有效日期", "有效日期")
+                日報明細1_dgv.Columns.Add("產量", "產量") : 日報明細1_dgv.Columns.Add("包裝容器", "包裝容器")
 
-            If 組別 = "奶油組" Then : SQL_成品入庫_領料出庫_日報_讀取(日報日期, "奶油組")
-            ElseIf 組別 = "一般油脂組" Then : SQL_成品入庫_領料出庫_日報_讀取(日報日期, "一般油脂組")
-            End If
-            While dr.Read()
-                Dim 產品名稱 As String = dr("產品名稱").ToString()
-                Dim 配方編號 As String = dr("配方流水號").ToString()
-                Dim 生產流水號 As String = dr("生產流水號").ToString()
-                Dim 生產日期 As String = dr("生產日期").ToString()
-                Dim 重量 As String = dr("淨重")
-                Dim 批次 As String = dr("批次")
-                Dim 實際產量1 As String = dr("實際產量1").ToString()
-                Dim 實際產量2 As String = dr("實際產量2").ToString()
-                Dim 實際產量3 As String = dr("實際產量3").ToString()
-                Dim 包裝容器1 As String = "" : Dim 包裝容器2 As String = "" : Dim 包裝容器3 As String = ""
                 If 組別 = "奶油組" Then
-                    包裝容器1 = dr("包裝尺寸1").ToString() : 包裝容器2 = dr("包裝尺寸2").ToString() : 包裝容器3 = dr("包裝尺寸3").ToString()
+                    SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "奶油組")
                 ElseIf 組別 = "一般油脂組" Then
-                    包裝容器1 = dr("包裝容器1").ToString() : 包裝容器2 = dr("包裝容器2").ToString() : 包裝容器3 = dr("包裝容器3").ToString()
+                    SQL_成品入庫_領料出庫_日報_品名讀取(日報日期, "一般油脂組")
                 End If
+                While dr.Read()
+                    Dim productName As String = dr.Item("產品名稱").ToString()
+                    Dim 配方編號 As String = dr.Item("各配方編號").ToString()
+                    Dim 淨重 As String = dr.Item("淨重").ToString()
+                    Dim 生產流水號 As String = dr.Item("生產流水號").ToString()
+                    Dim 批次 As String = dr.Item("批次").ToString()
+                    Dim 生產日期 As String = dr.Item("生產日期").ToString()
+                    Dim 保存期限 As String = dr.Item("保存期限").ToString()
+                    Dim 有效日期 As String = 解析有效日期(保存期限, 日報日期)
 
-                Dim rowIndex As Integer = -1 : Dim rowIndex1 As Integer = -1 : Dim rowIndex2 As Integer = -1
-                Dim 包裝rowIndex1 As Integer = -1 : Dim 包裝rowIndex2 As Integer = -1
-                ' 查找產品名稱所在的行
-                For Each row As DataGridViewRow In 日報明細1_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() = 產品名稱 AndAlso
-                        row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        rowIndex = row.Index
-                        Exit For
+                    日報明細1_dgv.Rows.Insert(日報明細1_dgv.Rows.Count, productName, 配方編號, 淨重, 生產流水號, 批次, 生產日期, 有效日期)
+                End While
+
+                If 組別 = "奶油組" Then : SQL_成品入庫_領料出庫_日報_讀取(日報日期, "奶油組")
+                ElseIf 組別 = "一般油脂組" Then : SQL_成品入庫_領料出庫_日報_讀取(日報日期, "一般油脂組")
+                End If
+                While dr.Read()
+                    Dim 產品名稱 As String = dr("產品名稱").ToString()
+                    Dim 配方編號 As String = dr("配方流水號").ToString()
+                    Dim 生產流水號 As String = dr("生產流水號").ToString()
+                    Dim 生產日期 As String = dr("生產日期").ToString()
+                    Dim 重量 As String = dr("淨重")
+                    Dim 批次 As String = dr("批次")
+                    Dim 實際產量1 As String = dr("實際產量1").ToString()
+                    Dim 實際產量2 As String = dr("實際產量2").ToString()
+                    Dim 實際產量3 As String = dr("實際產量3").ToString()
+                    Dim 包裝容器1 As String = "" : Dim 包裝容器2 As String = "" : Dim 包裝容器3 As String = ""
+                    If 組別 = "奶油組" Then
+                        包裝容器1 = dr("包裝尺寸1").ToString() : 包裝容器2 = dr("包裝尺寸2").ToString() : 包裝容器3 = dr("包裝尺寸3").ToString()
+                    ElseIf 組別 = "一般油脂組" Then
+                        包裝容器1 = dr("包裝容器1").ToString() : 包裝容器2 = dr("包裝容器2").ToString() : 包裝容器3 = dr("包裝容器3").ToString()
                     End If
-                Next
-                For Each row As DataGridViewRow In 日報明細1_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
-                        row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        If 實際產量3 IsNot Nothing AndAlso 實際產量3 <> "" Then
-                            rowIndex1 = row.Index
-                            rowIndex2 = rowIndex1 + 1
-                        ElseIf (實際產量3 Is Nothing OrElse 實際產量3 = "") AndAlso (實際產量2 IsNot Nothing AndAlso 實際產量2 <> "") Then
-                            rowIndex1 = row.Index
+
+                    Dim rowIndex As Integer = -1 : Dim rowIndex1 As Integer = -1 : Dim rowIndex2 As Integer = -1
+                    Dim 包裝rowIndex1 As Integer = -1 : Dim 包裝rowIndex2 As Integer = -1
+                    ' 查找產品名稱所在的行
+                    For Each row As DataGridViewRow In 日報明細1_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() = 產品名稱 AndAlso
+                            row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
+                            rowIndex = row.Index
+                            Exit For
                         End If
-                        Exit For
-                    End If
-                Next
-                For Each row As DataGridViewRow In 日報明細1_dgv.Rows
-                    If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
-                        row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
-                        If 包裝容器3 IsNot Nothing AndAlso 包裝容器3 <> "" Then
-                            包裝rowIndex1 = row.Index
-                            包裝rowIndex2 = 包裝rowIndex1 + 1
-                        ElseIf (包裝容器3 Is Nothing OrElse 包裝容器3 = "") AndAlso (包裝容器2 IsNot Nothing AndAlso 包裝容器2 <> "") Then
-                            包裝rowIndex1 = row.Index
+                    Next
+                    For Each row As DataGridViewRow In 日報明細1_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
+                            row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
+                            If 實際產量3 IsNot Nothing AndAlso 實際產量3 <> "" Then
+                                rowIndex1 = row.Index
+                                rowIndex2 = rowIndex1 + 1
+                            ElseIf (實際產量3 Is Nothing OrElse 實際產量3 = "") AndAlso (實際產量2 IsNot Nothing AndAlso 實際產量2 <> "") Then
+                                rowIndex1 = row.Index
+                            End If
+                            Exit For
+                        End If
+                    Next
+                    For Each row As DataGridViewRow In 日報明細1_dgv.Rows
+                        If row.Cells("產品名稱").Value IsNot Nothing AndAlso row.Cells("產品名稱").Value.ToString() <> 產品名稱 AndAlso
+                            row.Cells("生產流水號").Value.ToString() = 生產流水號 Then
+                            If 包裝容器3 IsNot Nothing AndAlso 包裝容器3 <> "" Then
+                                包裝rowIndex1 = row.Index
+                                包裝rowIndex2 = 包裝rowIndex1 + 1
+                            ElseIf (包裝容器3 Is Nothing OrElse 包裝容器3 = "") AndAlso (包裝容器2 IsNot Nothing AndAlso 包裝容器2 <> "") Then
+                                包裝rowIndex1 = row.Index
+                            End If
+                            Exit For
                         End If
-                        Exit For
+                    Next
+                    '確認找到行後， 再查找列索引
+                    If rowIndex <> -1 Then
+                        日報明細1_dgv.Rows(rowIndex).Cells("產量").Value = 實際產量1
+                        日報明細1_dgv.Rows(rowIndex).Cells("包裝容器").Value = 包裝容器1
+                    End If
+                    If rowIndex1 <> -1 Then
+                        日報明細1_dgv.Rows(rowIndex1).Cells("產量").Value = 實際產量2
+                    End If
+                    If rowIndex2 <> -1 Then
+                        日報明細1_dgv.Rows(rowIndex2).Cells("產量").Value = 實際產量3
+                    End If
+                    If 包裝rowIndex1 <> -1 Then
+                        日報明細1_dgv.Rows(包裝rowIndex1).Cells("包裝容器").Value = 包裝容器2
+                    End If
+                    If 包裝rowIndex2 <> -1 Then
+                        日報明細1_dgv.Rows(包裝rowIndex2).Cells("包裝容器").Value = 包裝容器3
+                    End If
+                End While
+
+                Dim 資料字典 As New Dictionary(Of String, Integer) ' 使用字典來儲存處理後的資料
+                ' 遍歷DGV1中的每一行
+                For Each 行 As DataGridViewRow In 日報明細1_dgv.Rows
+                    ' 如果是新行則跳過
+                    If 行.IsNewRow Then Continue For
+
+                    ' 獲取包裝容器和產量的值
+                    Dim 包裝容器 As String = If(行.Cells("包裝容器").Value Is Nothing, "", 行.Cells("包裝容器").Value.ToString())
+                    Dim 產量判斷 As String = If(行.Cells("產量").Value = "", "0", 行.Cells("產量").Value.ToString)
+                    Dim 產量 As Integer = Convert.ToInt32(產量判斷)
+                    Dim 處理後包裝容器 As String = 包裝容器.Replace("/", "") ' 處理包裝容器，去掉'/'及其後的文字
+
+                    ' 檢查處理後的包裝容器是否已在字典中
+                    If 資料字典.ContainsKey(處理後包裝容器) Then
+                        資料字典(處理後包裝容器) += 產量 ' 如果已存在，將產量累加到現有的值中
+                    Else
+                        資料字典(處理後包裝容器) = 產量 ' 如果不存在，新增一個條目
                     End If
                 Next
-                '確認找到行後， 再查找列索引
-                If rowIndex <> -1 Then
-                    日報明細1_dgv.Rows(rowIndex).Cells("產量").Value = 實際產量1
-                    日報明細1_dgv.Rows(rowIndex).Cells("包裝容器").Value = 包裝容器1
-                End If
-                If rowIndex1 <> -1 Then
-                    日報明細1_dgv.Rows(rowIndex1).Cells("產量").Value = 實際產量2
-                End If
-                If rowIndex2 <> -1 Then
-                    日報明細1_dgv.Rows(rowIndex2).Cells("產量").Value = 實際產量3
-                End If
-                If 包裝rowIndex1 <> -1 Then
-                    日報明細1_dgv.Rows(包裝rowIndex1).Cells("包裝容器").Value = 包裝容器2
-                End If
-                If 包裝rowIndex2 <> -1 Then
-                    日報明細1_dgv.Rows(包裝rowIndex2).Cells("包裝容器").Value = 包裝容器3
+
+                ' 清空DGV2中的現有資料並添加所需的資料列
+                日報明細2_dgv.Rows.Clear()
+                SetDGV樣式值(日報明細2_dgv)
+                If 日報明細2_dgv.Columns.Count = 0 Then
+                    日報明細2_dgv.Columns.Add("物料料號", "物料料號")
+                    日報明細2_dgv.Columns.Add("品名", "品名")
+                    日報明細2_dgv.Columns.Add("規格", "規格")
+                    日報明細2_dgv.Columns.Add("單位", "單位")
+                    日報明細2_dgv.Columns.Add("數量", "數量")
+                    日報明細2_dgv.Columns.Add("有效日期", "有效日期")
+                    日報明細2_dgv.Columns.Add("製造日期", "製造日期")
+                    日報明細2_dgv.Columns.Add("批號", "批號")
+                    日報明細2_dgv.Columns.Add("備註", "備註")
                 End If
-            End While
 
-            Dim 資料字典 As New Dictionary(Of String, Integer) ' 使用字典來儲存處理後的資料
-            ' 遍歷DGV1中的每一行
-            For Each 行 As DataGridViewRow In 日報明細1_dgv.Rows
-                ' 如果是新行則跳過
-                If 行.IsNewRow Then Continue For
-
-                ' 獲取包裝容器和產量的值
-                Dim 包裝容器 As String = If(行.Cells("包裝容器").Value Is Nothing, "", 行.Cells("包裝容器").Value.ToString())
-                Dim 產量判斷 As String = If(行.Cells("產量").Value = "", "0", 行.Cells("產量").Value.ToString)
-                Dim 產量 As Integer = Convert.ToInt32(產量判斷)
-                Dim 處理後包裝容器 As String = 包裝容器.Replace("/", "") ' 處理包裝容器，去掉'/'及其後的文字
-
-                ' 檢查處理後的包裝容器是否已在字典中
-                If 資料字典.ContainsKey(處理後包裝容器) Then
-                    資料字典(處理後包裝容器) += 產量 ' 如果已存在，將產量累加到現有的值中
-                Else
-                    資料字典(處理後包裝容器) = 產量 ' 如果不存在，新增一個條目
+                ' 將處理後的資料加入到DGV2
+                For Each kvp As KeyValuePair(Of String, Integer) In 資料字典
+                    日報明細2_dgv.Rows.Add("", kvp.Key, "", "只", kvp.Value, "", "", "")
+                Next
+
+                If 組別 = "奶油組" Then
+                    SQL_物料領料_日報明細_讀取(日報日期, "奶油組", "泡油", "製程管制控制表_奶油組", "製程管制明細表_奶油組")
+                ElseIf 組別 = "一般油脂組" Then
+                    SQL_物料領料_日報明細_讀取(日報日期, "一般油脂組", "投料", "製程管制控製表_一般組", "製程管制明細表_一般組")
                 End If
-            Next
+                While dr.Read()
+                    Dim 原料種類 As String = dr("原料種類").ToString()
+                    Dim 原料名稱 As String = dr("原料名稱").ToString()
+                    Dim 物料料號 As String = dr.Item("物料料號").ToString()
+                    Dim 重量 As Double
+                    重量 = Convert.ToDouble(dr("實際重量"))
+                    Dim 有效日期 As String = dr("備註").ToString()
+                    If 原料種類 = "著色劑" Then
+                        日報明細2_dgv.Rows.Add(物料料號, 原料名稱, "", "g", 重量, 有效日期, "", "")
+                    Else
+                        日報明細2_dgv.Rows.Add(物料料號, 原料名稱, "", "kg", 重量, 有效日期, "", "")
+                    End If
+                End While
 
-            ' 清空DGV2中的現有資料並添加所需的資料列
-            日報明細2_dgv.Rows.Clear()
-            SetDGV樣式值(日報明細2_dgv)
-            If 日報明細2_dgv.Columns.Count = 0 Then
-                日報明細2_dgv.Columns.Add("物料料號", "物料料號")
-                日報明細2_dgv.Columns.Add("品名", "品名")
-                日報明細2_dgv.Columns.Add("規格", "規格")
-                日報明細2_dgv.Columns.Add("單位", "單位")
-                日報明細2_dgv.Columns.Add("數量", "數量")
-                日報明細2_dgv.Columns.Add("有效日期", "有效日期")
-                日報明細2_dgv.Columns.Add("製造日期", "製造日期")
-                日報明細2_dgv.Columns.Add("批號", "批號")
-                日報明細2_dgv.Columns.Add("備註", "備註")
-            End If
+                ' 新增成品入庫單編號
+                領料單編號_tb.Text = 產生新流水號("MP", "物料領料控制表", "領料單編號")
+                SQL_物料領料控制表_新增(領料單編號_tb.Text, 新增領料組別_cb.Text, 領料日期_dtp.Value.ToString("yyyy/MM/dd"), "待出庫", "待領料人",
+                               日報日期_dtp.Value.ToString("yyyy/MM/dd"))
 
-            ' 將處理後的資料加入到DGV2
-            For Each kvp As KeyValuePair(Of String, Integer) In 資料字典
-                日報明細2_dgv.Rows.Add("", kvp.Key, "", "只", kvp.Value, "", "", "")
-            Next
+                For I As Integer = 0 To 日報明細2_dgv.Rows.Count - 1
+                    明細流水號_tb.Text = 產生新流水號("MS", "物料領料明細表", "領料單明細編號")
+                    Dim 物料料號 As String = If(日報明細2_dgv.Rows(I).Cells("物料料號").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("物料料號").Value.ToString())
+                    Dim 物品名稱 As String = If(日報明細2_dgv.Rows(I).Cells("品名").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("品名").Value.ToString())
+                    Dim 物品規格 As String = If(日報明細2_dgv.Rows(I).Cells("規格").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("規格").Value.ToString())
+                    Dim 物品單位 As String = If(日報明細2_dgv.Rows(I).Cells("單位").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("單位").Value.ToString())
+                    Dim 物品數量 As String = If(日報明細2_dgv.Rows(I).Cells("數量").Value Is Nothing, "0", 日報明細2_dgv.Rows(I).Cells("數量").Value.ToString())
+                    Dim 有效日期 As String = If(日報明細2_dgv.Rows(I).Cells("有效日期").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("有效日期").Value.ToString())
 
-            If 組別 = "奶油組" Then
-                SQL_物料領料_日報明細_讀取(日報日期, "奶油組", "泡油", "製程管制控制表_奶油組", "製程管制明細表_奶油組")
-            ElseIf 組別 = "一般油脂組" Then
-                SQL_物料領料_日報明細_讀取(日報日期, "一般油脂組", "投料", "製程管制控製表_一般組", "製程管制明細表_一般組")
-            End If
-            While dr.Read()
-                Dim 原料種類 As String = dr("原料種類").ToString()
-                Dim 原料名稱 As String = dr("原料名稱").ToString()
-                Dim 物料料號 As String = dr.Item("物料料號").ToString()
-                Dim 重量 As Double
-                重量 = Convert.ToDouble(dr("實際重量"))
-                Dim 有效日期 As String = dr("備註").ToString()
-                If 原料種類 = "著色劑" Then
-                    日報明細2_dgv.Rows.Add(物料料號, 原料名稱, "", "g", 重量, 有效日期, "", "")
-                Else
-                    日報明細2_dgv.Rows.Add(物料料號, 原料名稱, "", "kg", 重量, 有效日期, "", "")
+                    ' 調用 SQL 插入方法
+                    SQL_物料領料明細表_新增(明細流水號_tb.Text, 領料單編號_tb.Text, 物料料號, 物品名稱, 物品規格, 物品單位, 物品數量, 有效日期, "", "", "", "")
+                Next
+                Set_物料領料歷史表單() : Set_物料領料明細表單()
+            Else
+                Dim ds1 As New DataSet : 日報明細1_dgv.DataSource = Nothing : ds1.Clear()
+                SetDGV樣式值(日報明細1_dgv)
+                SQL_物料領料_精製組_讀取(日報日期)
+                da.Fill(ds1) : 日報明細1_dgv.DataSource = ds1.Tables(0) : conn.Close()
+                Dim 液鹼 As Double = 0
+                Dim 硫酸 As Double = 0
+                Dim 磷酸 As Double = 0
+                Dim 白土 As Double = 0
+                Dim 檸檬酸 As Double = 0
+                Dim 高酸油 As Double = 0
+                Dim 脂肪酸 As Double = 0
+                Dim BHA As Double = 0
+                Dim 丙二醇 As Double = 0
+                Dim TBHQ20 As Double = 0
+                Dim 維他命E As Double = 0
+                Dim 柴油 As Double = 0
+
+                日報明細2_dgv.Rows.Clear()
+                SetDGV樣式值(日報明細2_dgv)
+                If 日報明細2_dgv.Columns.Count = 0 Then
+                    日報明細2_dgv.Columns.Add("物料料號", "物料料號")
+                    日報明細2_dgv.Columns.Add("品名", "品名")
+                    日報明細2_dgv.Columns.Add("規格", "規格")
+                    日報明細2_dgv.Columns.Add("單位", "單位")
+                    日報明細2_dgv.Columns.Add("數量", "數量")
+                    日報明細2_dgv.Columns.Add("有效日期", "有效日期")
+                    日報明細2_dgv.Columns.Add("製造日期", "製造日期")
+                    日報明細2_dgv.Columns.Add("批號", "批號")
+                    日報明細2_dgv.Columns.Add("備註", "備註")
                 End If
-            End While
 
-            ' 新增成品入庫單編號
-            領料單編號_tb.Text = 產生新流水號("MP", "物料領料控制表", "領料單編號")
-            SQL_物料領料控制表_新增(領料單編號_tb.Text, 新增領料組別_cb.Text, 領料日期_dtp.Value.ToString("yyyy/MM/dd"), "待出庫", "待領料人",
-                           日報日期_dtp.Value.ToString("yyyy/MM/dd"))
-
-            For I As Integer = 0 To 日報明細2_dgv.Rows.Count - 1
-                明細流水號_tb.Text = 產生新流水號("MS", "物料領料明細表", "領料單明細編號")
-                Dim 物料料號 As String = If(日報明細2_dgv.Rows(I).Cells("物料料號").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("物料料號").Value.ToString())
-                Dim 物品名稱 As String = If(日報明細2_dgv.Rows(I).Cells("品名").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("品名").Value.ToString())
-                Dim 物品規格 As String = If(日報明細2_dgv.Rows(I).Cells("規格").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("規格").Value.ToString())
-                Dim 物品單位 As String = If(日報明細2_dgv.Rows(I).Cells("單位").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("單位").Value.ToString())
-                Dim 物品數量 As String = If(日報明細2_dgv.Rows(I).Cells("數量").Value Is Nothing, "0", 日報明細2_dgv.Rows(I).Cells("數量").Value.ToString())
-                Dim 有效日期 As String = If(日報明細2_dgv.Rows(I).Cells("有效日期").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("有效日期").Value.ToString())
-
-                ' 調用 SQL 插入方法
-                SQL_物料領料明細表_新增(明細流水號_tb.Text, 領料單編號_tb.Text, 物料料號, 物品名稱, 物品規格, 物品單位, 物品數量, 有效日期, "", "", "", "")
-            Next
-            Set_物料領料歷史表單() : Set_物料領料明細表單()
 
+                For I As Integer = 0 To 日報明細1_dgv.Rows.Count - 1
+                    Dim value As Double
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("白土").Value.ToString(), value) Then
+                        白土 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("檸檬酸").Value.ToString(), value) Then
+                        檸檬酸 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("高酸油").Value.ToString(), value) Then
+                        高酸油 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("脂肪酸").Value.ToString(), value) Then
+                        脂肪酸 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("BHA").Value.ToString(), value) Then
+                        BHA += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("丙二醇").Value.ToString(), value) Then
+                        丙二醇 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("TBHQ20").Value.ToString(), value) Then
+                        TBHQ20 += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("維他命E").Value.ToString(), value) Then
+                        維他命E += value
+                    End If
+                    If Double.TryParse(日報明細1_dgv.Rows(I).Cells("柴油").Value.ToString(), value) Then
+                        柴油 += value
+                    End If
+                    加總分段(日報明細1_dgv.Rows(I).Cells("液鹼").Value, 液鹼)
+                    加總分段(日報明細1_dgv.Rows(I).Cells("硫酸").Value, 硫酸)
+                    加總分段(日報明細1_dgv.Rows(I).Cells("磷酸").Value, 磷酸)
+                    Dim 料號 As String = 日報明細1_dgv.Rows(I).Cells("原料油料號").Value.ToString()
+                    Dim 總重 As String = 日報明細1_dgv.Rows(I).Cells("總重").Value.ToString()
+                    If Not String.IsNullOrEmpty(料號) AndAlso Not String.IsNullOrEmpty(總重) Then
+                        Dim 重量 As Double
+                        If Double.TryParse(總重, 重量) Then
+                            Dim 是否已存在 As Boolean = False
+                            For j As Integer = 0 To 日報明細2_dgv.Rows.Count - 1
+                                If 日報明細2_dgv.Rows(j).Cells("物料料號").Value?.ToString() = 料號 Then
+                                    ' 如果找到相同的料號，更新重量
+                                    Dim 現有重量 As Double
+                                    If Double.TryParse(日報明細2_dgv.Rows(j).Cells("數量").Value?.ToString(), 現有重量) Then
+                                        日報明細2_dgv.Rows(j).Cells("數量").Value = 現有重量 + 重量
+                                    Else
+                                        日報明細2_dgv.Rows(j).Cells("數量").Value = 重量
+                                    End If
+                                    是否已存在 = True
+                                    Exit For
+                                End If
+                            Next
+                            If Not 是否已存在 Then
+                                加入表格(料號, 重量)
+                            End If
+                        End If
+                    End If
+                Next
+                If 液鹼 > 0 Then 加入表格("MT00000135", 液鹼)
+                If 硫酸 > 0 Then 加入表格("MT00000134", 硫酸)
+                If 磷酸 > 0 Then 加入表格("MT00000136", 磷酸)
+                If 白土 > 0 Then 加入表格("MT00000062", 白土)
+                If 檸檬酸 > 0 Then 加入表格("MT00000022", 檸檬酸)
+                If 高酸油 > 0 Then 加入表格("MT00000137", 高酸油)
+                If 脂肪酸 > 0 Then 加入表格("MT00000139", 脂肪酸)
+                If BHA > 0 Then 加入表格("MT00000125", BHA)
+                If 丙二醇 > 0 Then 加入表格("MT00000126", 丙二醇)
+                If TBHQ20 > 0 Then 加入表格("MT00000127", TBHQ20)
+                If 維他命E > 0 Then 加入表格("MT00000128", 維他命E)
+                If 柴油 > 0 Then 加入表格("MT00000138", 柴油)
+
+                For I As Integer = 0 To 日報明細1_dgv.Rows.Count - 1
+                    Dim 額外料號 As String = 日報明細1_dgv.Rows(I).Cells("額外料號").Value.ToString()
+                    Dim 額外重量 As String = 日報明細1_dgv.Rows(I).Cells("額外抗氧公斤").Value.ToString()
+                    If Not String.IsNullOrEmpty(額外料號) AndAlso Not String.IsNullOrEmpty(額外重量) Then
+                        Dim 重量 As Double
+                        If Double.TryParse(額外重量, 重量) Then
+                            Dim 是否已存在 As Boolean = False
+
+                            ' 檢查 日報明細2_dgv 是否已經有該料號
+                            For j As Integer = 0 To 日報明細2_dgv.Rows.Count - 1
+                                If 日報明細2_dgv.Rows(j).Cells("物料料號").Value?.ToString() = 額外料號 Then
+                                    ' 如果找到相同的料號，更新重量
+                                    Dim 現有重量 As Double
+                                    If Double.TryParse(日報明細2_dgv.Rows(j).Cells("數量").Value?.ToString(), 現有重量) Then
+                                        日報明細2_dgv.Rows(j).Cells("數量").Value = 現有重量 + 重量
+                                    Else
+                                        日報明細2_dgv.Rows(j).Cells("數量").Value = 重量
+                                    End If
+                                    是否已存在 = True
+                                    Exit For
+                                End If
+                            Next
+                            If Not 是否已存在 Then
+                                加入表格(額外料號, 重量)
+                            End If
+                        End If
+                    End If
+                Next
+                領料單編號_tb.Text = 產生新流水號("MP", "物料領料控制表", "領料單編號")
+                SQL_物料領料控制表_新增(領料單編號_tb.Text, 新增領料組別_cb.Text, 領料日期_dtp.Value.ToString("yyyy/MM/dd"), "待出庫", "待領料人",
+                               日報日期_dtp.Value.ToString("yyyy/MM/dd"))
+                For I As Integer = 0 To 日報明細2_dgv.Rows.Count - 1
+                    明細流水號_tb.Text = 產生新流水號("MS", "物料領料明細表", "領料單明細編號")
+                    Dim 物料料號 As String = If(日報明細2_dgv.Rows(I).Cells("物料料號").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("物料料號").Value.ToString())
+                    Dim 物品名稱 As String = If(日報明細2_dgv.Rows(I).Cells("品名").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("品名").Value.ToString())
+                    Dim 物品規格 As String = If(日報明細2_dgv.Rows(I).Cells("規格").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("規格").Value.ToString())
+                    Dim 物品單位 As String = If(日報明細2_dgv.Rows(I).Cells("單位").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("單位").Value.ToString())
+                    Dim 物品數量 As String = If(日報明細2_dgv.Rows(I).Cells("數量").Value Is Nothing, "0", 日報明細2_dgv.Rows(I).Cells("數量").Value.ToString())
+                    Dim 有效日期 As String = If(日報明細2_dgv.Rows(I).Cells("有效日期").Value Is Nothing, "", 日報明細2_dgv.Rows(I).Cells("有效日期").Value.ToString())
+
+                    ' 調用 SQL 插入方法
+                    SQL_物料領料明細表_新增(明細流水號_tb.Text, 領料單編號_tb.Text, 物料料號, 物品名稱, 物品規格, 物品單位, 物品數量, 有效日期, "", "", "", "")
+                Next
+                Set_物料領料歷史表單() : Set_物料領料明細表單()
+            End If
             ' 日報新增 第一筆 會不知道 PA10
             If PA10 Is String.Empty Then
                 Dim targetRow As DataGridViewRow = Nothing
@@ -270,6 +420,35 @@ Public Class 物料領料單
             MGB("當日無日報資料!", 1)
         End If
     End Sub
+    Private Sub 加入表格(料號 As String, ByRef 重量 As Double)
+        SQL_物料領料_精製組_物料讀取(料號)
+        While dr.Read()
+            Dim 原料種類 As String = dr("種類").ToString()
+            Dim 原料名稱 As String = dr("名稱").ToString()
+            If 原料種類 = "著色劑" Then
+                日報明細2_dgv.Rows.Add(料號, 原料名稱, "", "g", 重量, "", "", "")
+            Else
+                日報明細2_dgv.Rows.Add(料號, 原料名稱, "", "kg", 重量, "", "", "")
+            End If
+        End While
+
+    End Sub
+    Private Sub 加總分段(ByVal 欄位值 As Object, ByRef 加總變數 As Double)
+        ' 檢查欄位值是否不為空
+        If Not String.IsNullOrEmpty(欄位值?.ToString()) Then
+            ' 將欄位值分段
+            Dim 分段 As String() = 欄位值.ToString().Split(";"c)
+            ' 檢查是否有第二段且不為空
+            If 分段.Length > 1 AndAlso Not String.IsNullOrEmpty(分段(1)) Then
+                Dim 數值 As Double
+                ' 嘗試將第 2 段轉換為 Double
+                If Double.TryParse(分段(1), 數值) Then
+                    ' 加到加總變數
+                    加總變數 += 數值
+                End If
+            End If
+        End If
+    End Sub
     Private Sub Set_領料單明細表新增_物料種類_讀取()
         Dim ds1 As New DataSet : 物料分類_dgv.DataSource = Nothing : ds1.Clear()
         物料分類_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
@@ -385,7 +564,7 @@ Public Class 物料領料單
 
         ' 定義組別映射
         Dim groupMapping As New Dictionary(Of String, String) From {
-    {"0004.奶油組", "奶油組"}, {"0003.一般油脂組", "一般油脂組"}, {"0001.精緻組", "精緻組"}
+    {"0004.奶油組", "奶油組"}, {"0003.一般油脂組", "一般油脂組"}, {"0001.精製組", "精製組"}
 }
         ' 定義要更新的控件列表
         Dim controlsToUpdate As ComboBox() = {新增領料組別_cb, 新增領料組別1_cb, 領料組別_cb}

OW-ERP-SYS/05、技術管理系統/生產日報表_精製組.Designer.vb

@@ -22,9 +22,9 @@ Partial Class 生產日報表_精製組
     '請勿使用程式碼編輯器進行修改。
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.最高權限_pl = New System.Windows.Forms.Panel()
         Me.簽名檔_lb = New System.Windows.Forms.Label()
         Me.簽名檔選擇_lb = New System.Windows.Forms.Label()
@@ -54,6 +54,7 @@ Partial Class 生產日報表_精製組
         Me.前一天_bt = New System.Windows.Forms.Button()
         Me.生產日期_dtp = New System.Windows.Forms.DateTimePicker()
         Me.隱藏_pl1 = New System.Windows.Forms.Panel()
+        Me.額外料號_tb = New System.Windows.Forms.TextBox()
         Me.抗氧化劑_dgv = New System.Windows.Forms.DataGridView()
         Me.原料油_dgv = New System.Windows.Forms.DataGridView()
         Me.經理簽名編碼_tb = New System.Windows.Forms.TextBox()
@@ -179,7 +180,7 @@ Partial Class 生產日報表_精製組
         Me.最高權限_pl.Controls.Add(Me.開簽名檔_bt)
         Me.最高權限_pl.Controls.Add(Me.簽名檔_dgv)
         Me.最高權限_pl.Controls.Add(Me.暫存簽名檔圖片_pb)
-        Me.最高權限_pl.Location = New System.Drawing.Point(5, 65)
+        Me.最高權限_pl.Location = New System.Drawing.Point(12, 76)
         Me.最高權限_pl.Name = "最高權限_pl"
         Me.最高權限_pl.Size = New System.Drawing.Size(142, 184)
         Me.最高權限_pl.TabIndex = 2164
@@ -223,8 +224,8 @@ Partial Class 生產日報表_精製組
         Me.簽名檔_dgv.Name = "簽名檔_dgv"
         Me.簽名檔_dgv.ReadOnly = True
         Me.簽名檔_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle7.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.簽名檔_dgv.RowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle1.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.簽名檔_dgv.RowsDefaultCellStyle = DataGridViewCellStyle1
         Me.簽名檔_dgv.RowTemplate.Height = 24
         Me.簽名檔_dgv.Size = New System.Drawing.Size(125, 77)
         Me.簽名檔_dgv.TabIndex = 1785
@@ -491,6 +492,7 @@ Partial Class 生產日報表_精製組
         '
         '隱藏_pl1
         '
+        Me.隱藏_pl1.Controls.Add(Me.額外料號_tb)
         Me.隱藏_pl1.Controls.Add(Me.抗氧化劑_dgv)
         Me.隱藏_pl1.Controls.Add(Me.原料油_dgv)
         Me.隱藏_pl1.Controls.Add(Me.經理簽名編碼_tb)
@@ -502,16 +504,24 @@ Partial Class 生產日報表_精製組
         Me.隱藏_pl1.Controls.Add(Me.組長_lb)
         Me.隱藏_pl1.Controls.Add(Me.組長簽名檔_pb)
         Me.隱藏_pl1.Controls.Add(Me.組長日期_DTP)
-        Me.隱藏_pl1.Location = New System.Drawing.Point(218, 61)
+        Me.隱藏_pl1.Location = New System.Drawing.Point(269, 171)
         Me.隱藏_pl1.Name = "隱藏_pl1"
         Me.隱藏_pl1.Size = New System.Drawing.Size(282, 163)
         Me.隱藏_pl1.TabIndex = 2142
         Me.隱藏_pl1.Visible = False
         '
+        '額外料號_tb
+        '
+        Me.額外料號_tb.Location = New System.Drawing.Point(96, 3)
+        Me.額外料號_tb.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.額外料號_tb.Name = "額外料號_tb"
+        Me.額外料號_tb.Size = New System.Drawing.Size(86, 23)
+        Me.額外料號_tb.TabIndex = 2164
+        '
         '抗氧化劑_dgv
         '
-        DataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.抗氧化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.抗氧化劑_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         Me.抗氧化劑_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.抗氧化劑_dgv.BackgroundColor = System.Drawing.Color.White
         Me.抗氧化劑_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -527,8 +537,8 @@ Partial Class 生產日報表_精製組
         '
         '原料油_dgv
         '
-        DataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.原料油_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
         Me.原料油_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.原料油_dgv.BackgroundColor = System.Drawing.Color.White
         Me.原料油_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
@@ -1492,9 +1502,9 @@ Partial Class 生產日報表_精製組
         'Label45
         '
         Me.Label45.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.Label45.Location = New System.Drawing.Point(433, 340)
+        Me.Label45.Location = New System.Drawing.Point(433, 362)
         Me.Label45.Name = "Label45"
-        Me.Label45.Size = New System.Drawing.Size(109, 89)
+        Me.Label45.Size = New System.Drawing.Size(109, 23)
         Me.Label45.TabIndex = 2266
         Me.Label45.Text = "總重量"
         Me.Label45.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -1502,7 +1512,7 @@ Partial Class 生產日報表_精製組
         '總重量_tb
         '
         Me.總重量_tb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.總重量_tb.Location = New System.Drawing.Point(433, 428)
+        Me.總重量_tb.Location = New System.Drawing.Point(433, 384)
         Me.總重量_tb.Name = "總重量_tb"
         Me.總重量_tb.ReadOnly = True
         Me.總重量_tb.Size = New System.Drawing.Size(109, 23)
@@ -1566,24 +1576,49 @@ Partial Class 生產日報表_精製組
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(552, 662)
         Me.Controls.Add(Me.最高權限_pl)
-        Me.Controls.Add(Me.隱藏_pl1)
         Me.Controls.Add(Me.Label50)
         Me.Controls.Add(Me.Label48)
         Me.Controls.Add(Me.Label49)
         Me.Controls.Add(Me.Label47)
         Me.Controls.Add(Me.Label46)
         Me.Controls.Add(Me.合計時間_tb)
-        Me.Controls.Add(Me.總重量_tb)
-        Me.Controls.Add(Me.Label45)
         Me.Controls.Add(Me.Label44)
         Me.Controls.Add(Me.人工人數_tb)
-        Me.Controls.Add(Me.Panel2)
         Me.Controls.Add(Me.開始時間_tb)
-        Me.Controls.Add(Me.Label43)
         Me.Controls.Add(Me.結束時間_tb)
-        Me.Controls.Add(Me.抗氧化劑_tb)
         Me.Controls.Add(Me.Label42)
         Me.Controls.Add(Me.柴油P_tb)
+        Me.Controls.Add(Me.Label37)
+        Me.Controls.Add(Me.柴油K_tb)
+        Me.Controls.Add(Me.Label91)
+        Me.Controls.Add(Me.製成率_tb)
+        Me.Controls.Add(Me.Label22)
+        Me.Controls.Add(Me.柴油L_tb)
+        Me.Controls.Add(Me.Label21)
+        Me.Controls.Add(Me.表頭_lb)
+        Me.Controls.Add(Me.ISO編碼001_lb)
+        Me.Controls.Add(Me.批次_nud)
+        Me.Controls.Add(Me.批次_lb)
+        Me.Controls.Add(Me.經理日期_DTP)
+        Me.Controls.Add(Me.課長日期_DTP)
+        Me.Controls.Add(Me.製表日期_DTP)
+        Me.Controls.Add(Me.儲存_bt)
+        Me.Controls.Add(Me.審核簽名_bt)
+        Me.Controls.Add(Me.備註_tb)
+        Me.Controls.Add(Me.製表_lb)
+        Me.Controls.Add(Me.製表簽名檔_pb)
+        Me.Controls.Add(Me.課長_lb)
+        Me.Controls.Add(Me.經理_lb)
+        Me.Controls.Add(Me.經理簽名檔_pb)
+        Me.Controls.Add(Me.課長簽名檔_pb)
+        Me.Controls.Add(Me.後一天_bt)
+        Me.Controls.Add(Me.前一天_bt)
+        Me.Controls.Add(Me.生產日期_dtp)
+        Me.Controls.Add(Me.總重量_tb)
+        Me.Controls.Add(Me.Label45)
+        Me.Controls.Add(Me.Panel2)
+        Me.Controls.Add(Me.Label43)
+        Me.Controls.Add(Me.抗氧化劑_tb)
         Me.Controls.Add(Me.Label38)
         Me.Controls.Add(Me.Label39)
         Me.Controls.Add(Me.Label40)
@@ -1592,9 +1627,6 @@ Partial Class 生產日報表_精製組
         Me.Controls.Add(Me.白土1_tb)
         Me.Controls.Add(Me.液鹼1_tb)
         Me.Controls.Add(Me.磷酸1_tb)
-        Me.Controls.Add(Me.Label37)
-        Me.Controls.Add(Me.柴油K_tb)
-        Me.Controls.Add(Me.Label91)
         Me.Controls.Add(Me.Label32)
         Me.Controls.Add(Me.Label33)
         Me.Controls.Add(Me.Label34)
@@ -1610,10 +1642,6 @@ Partial Class 生產日報表_精製組
         Me.Controls.Add(Me.Label30)
         Me.Controls.Add(Me.Label23)
         Me.Controls.Add(Me.Label68)
-        Me.Controls.Add(Me.製成率_tb)
-        Me.Controls.Add(Me.Label22)
-        Me.Controls.Add(Me.柴油L_tb)
-        Me.Controls.Add(Me.Label21)
         Me.Controls.Add(Me.Label20)
         Me.Controls.Add(Me.數量5_tb)
         Me.Controls.Add(Me.Label19)
@@ -1660,25 +1688,7 @@ Partial Class 生產日報表_精製組
         Me.Controls.Add(Me.Label1)
         Me.Controls.Add(Me.品名_tb)
         Me.Controls.Add(Me.Label98)
-        Me.Controls.Add(Me.表頭_lb)
-        Me.Controls.Add(Me.ISO編碼001_lb)
-        Me.Controls.Add(Me.批次_nud)
-        Me.Controls.Add(Me.批次_lb)
-        Me.Controls.Add(Me.經理日期_DTP)
-        Me.Controls.Add(Me.課長日期_DTP)
-        Me.Controls.Add(Me.製表日期_DTP)
-        Me.Controls.Add(Me.儲存_bt)
-        Me.Controls.Add(Me.審核簽名_bt)
-        Me.Controls.Add(Me.備註_tb)
-        Me.Controls.Add(Me.製表_lb)
-        Me.Controls.Add(Me.製表簽名檔_pb)
-        Me.Controls.Add(Me.課長_lb)
-        Me.Controls.Add(Me.經理_lb)
-        Me.Controls.Add(Me.經理簽名檔_pb)
-        Me.Controls.Add(Me.課長簽名檔_pb)
-        Me.Controls.Add(Me.後一天_bt)
-        Me.Controls.Add(Me.前一天_bt)
-        Me.Controls.Add(Me.生產日期_dtp)
+        Me.Controls.Add(Me.隱藏_pl1)
         Me.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
         Me.Margin = New System.Windows.Forms.Padding(4)
         Me.Name = "生產日報表_精製組"
@@ -1834,4 +1844,5 @@ Partial Class 生產日報表_精製組
     Friend WithEvents Label48 As Label
     Friend WithEvents Label49 As Label
     Friend WithEvents Label50 As Label
+    Friend WithEvents 額外料號_tb As TextBox
 End Class

OW-ERP-SYS/05、技術管理系統/生產日報表_精製組.vb

@@ -108,13 +108,14 @@ Public Class 生產日報表_精製組
                 抗氧化劑_cb.Text = dr("額外抗氧").ToString()
                 抗氧化劑_tb.Text = dr("額外抗氧公斤").ToString()
                 柴油K_tb.Text = dr("柴油").ToString()
+                額外料號_tb.Text = dr("額外料號").ToString()
                 Dim 備註內容 As String = dr("備註").ToString()
                 Dim 分割後的備註 As String() = 備註內容.Split(New Char() {";"c}, StringSplitOptions.RemoveEmptyEntries)
                 備註_tb.Text = String.Join(Environment.NewLine, 分割後的備註)
                 有無生產排程 = True
             Else  ' 無資料，新增
                 日報流水號_tb.Text = 產生新流水號("DR", "生產日報表_精製組", "控制流水號")
-                SQL_生產日報控制表_精製組_新增(日報流水號_tb.Text, 生產日期, 批次, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "")
+                SQL_生產日報控制表_精製組_新增(日報流水號_tb.Text, 生產日期, 批次)
                 SQL_生產日報控制表_精製組_讀取(生產日期, 批次) : dr.Read()
                 日報流水號_tb.Text = dr("控制流水號").ToString
                 開始時間_tb.Text = dr("運轉開始時間").ToString : 結束時間_tb.Text = dr("運轉結束時間").ToString
@@ -165,12 +166,10 @@ Public Class 生產日報表_精製組
             數量5_tb.Text = dr("高酸油").ToString
             顯示後(dr("FCQ512").ToString, 柴油L_tb)
             For i As Integer = 0 To 原料油_dgv.Rows.Count - 1
-                If 原料油_dgv.Rows(i).Cells("原料油").Value IsNot Nothing AndAlso Not IsDBNull(原料油_dgv.Rows(i).Cells("原料油").Value) Then
-                    If 原料油_dgv.Rows(i).Cells("原料油").Value.ToString() = dr("原料油").ToString Then
-                        If dr("原料油").ToString <> "" Then
-                            品名_tb.Text = 原料油_dgv.Rows(i).Cells("成品").Value.ToString()
-                            Exit For  ' 找到後退出迴圈
-                        End If
+                If 原料油_dgv.Rows(i).Cells("成品").Value.ToString() = dr("原料油").ToString Then
+                    If dr("原料油").ToString <> "" Then
+                        品名_tb.Text = 原料油_dgv.Rows(i).Cells("原料油").Value.ToString()
+                        Exit For  ' 找到後退出迴圈
                     End If
                 End If
             Next
@@ -294,7 +293,7 @@ Public Class 生產日報表_精製組
         課長簽名編碼_tb.Text = "" : 經理簽名編碼_tb.Text = ""
         開始時間_tb.Text = "" : 結束時間_tb.Text = ""
         合計時間_tb.Text = "" : 人工人數_tb.Text = ""
-        備註_tb.Text = "" : 抗氧化劑_cb.Text = "" : 抗氧化劑_tb.Text = ""
+        備註_tb.Text = "" : 抗氧化劑_cb.Text = "" : 抗氧化劑_tb.Text = "" : 額外料號_tb.Text = ""
     End Sub
     Private Sub 儲存_bt_Click(sender As Object, e As EventArgs) Handles 儲存_bt.Click
         MGB("確 定 要 儲 存 資 料 嗎?", 2)
@@ -306,7 +305,7 @@ Public Class 生產日報表_精製組
     End Sub
     Private Sub 控制存()
         SQL_生產日報控制表_精製組_更新(日報流水號_tb.Text, 生產日期_dtp.Value.ToString("yyyy/MM/dd"), 批次_nud.Value.ToString, 開始時間_tb.Text, 結束時間_tb.Text, 合計時間_tb.Text,
-                               人工人數_tb.Text, 備註_tb.Text, BHA_tb.Text, 丙二醇_tb.Text, TBHQ_tb.Text, 維他命E_tb.Text, 抗氧化劑_cb.Text, 抗氧化劑_tb.Text, 柴油K_tb.Text)
+                               人工人數_tb.Text, 備註_tb.Text, BHA_tb.Text, 丙二醇_tb.Text, TBHQ_tb.Text, 維他命E_tb.Text, 抗氧化劑_cb.Text, 抗氧化劑_tb.Text, 柴油K_tb.Text, 額外料號_tb.Text)
     End Sub
     Private Sub LoadDataToCB(dgv As DataGridView, cb As ComboBox)
         Using ds As New DataSet()
@@ -536,4 +535,16 @@ Public Class 生產日報表_精製組
             簽名檔圖片.SizeMode = 4
         End If
     End Sub
+    Private Sub 原料油_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 抗氧化劑_cb.SelectedIndexChanged
+        If 抗氧化劑_cb.Text <> "" Then
+            For i As Integer = 0 To 原料油_dgv.Rows.Count - 1
+                If 抗氧化劑_dgv.Rows(i).Cells("名稱").Value.ToString() = 抗氧化劑_cb.Text Then
+                    額外料號_tb.Text = 抗氧化劑_dgv.Rows(i).Cells("物料料號").Value.ToString()
+                    Exit For  ' 找到後退出迴圈
+                End If
+            Next
+        Else
+            額外料號_tb.Text = ""
+        End If
+    End Sub
 End Class

OW-ERP-SYS/05、技術管理系統/製程管制紀錄表_精製組.resx

@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

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

@@ -10,8 +10,11 @@ Public Class 製程管制紀錄表_精製組
     Private 有無修改 As Boolean = False
     Private Sub 製程管制紀錄表_精製組_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Me.MdiParent = OW_ERP_SYS : Me.WindowState = 2 : Me.AutoScroll = True
+        Panel3.Width = 616
         原料油_cb.Items.Clear()
         LoadDataToCB(原料油_dgv, 原料油_cb)
+        LoadDataToCB1(原料油1_dgv, 原料_cb)
+        LoadDataToCB1(原料油1_dgv, 成品_cb)
         最高權限_pl.Height = 73 : 最高權限_pl.Width = 159
         If 登入人級別 = "00" Then : 最高權限_pl.Visible = True
         Else : 最高權限_pl.Visible = False
@@ -203,7 +206,7 @@ Public Class 製程管制紀錄表_精製組
         Dim ds1 As New DataSet : 明細表_dgv.DataSource = Nothing : ds1.Clear()
         明細表_dgv.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.EnableResizing
         明細表_dgv.ColumnHeadersHeight = 25 : 明細表_dgv.AllowUserToAddRows = False
-        明細表_dgv.RowTemplate.Height = 25
+        明細表_dgv.RowTemplate.Height = 25 : 明細表_dgv.EditMode = DataGridViewEditMode.EditOnEnter
         SQL_製程管制明細表_精製組_讀取(製程流水號_tb.Text)
         da.Fill(ds1) : 明細表_dgv.DataSource = ds1.Tables(0) : conn.Close()
 
@@ -320,9 +323,14 @@ Public Class 製程管制紀錄表_精製組
     Private Sub 儲存_bt_Click(sender As Object, e As EventArgs) Handles 儲存_bt.Click
         MGB("確 定 要 儲 存 資 料 嗎?", 2)
         If 訊息回應 = "YES" Then
-            控制存()
-            有無修改 = False
-            MGB("存檔完成!", 1)
+            If 原料油_cb.Text <> "" Then
+                控制存()
+                有無修改 = False
+                MGB("存檔完成!", 1)
+            Else
+                MGB("原料油不能為空", 1)
+            End If
+
         End If
     End Sub
     Private Sub 控制存()
@@ -424,10 +432,13 @@ Public Class 製程管制紀錄表_精製組
 
     Private Sub 刪除明細表_bt_Click(sender As Object, e As EventArgs) Handles 刪除明細表_bt.Click
         If 選擇流水號_tb.Text <> "" Then
-            明細存()
-            SQL_製程管制明細表_精製組_單項刪除(選擇流水號_tb.Text)
-            Set_明細表_讀取() : 選擇流水號_tb.Text = ""
-            MGB("明細表單項刪除成功", 1)
+            MGB("確 定 要 刪 除 單 項 資 料 嗎?", 2)
+            If 訊息回應 = "YES" Then
+                明細存()
+                SQL_製程管制明細表_精製組_單項刪除(選擇流水號_tb.Text)
+                Set_明細表_讀取() : 選擇流水號_tb.Text = ""
+                MGB("明細表單項刪除成功", 1)
+            End If
         Else
             MGB("選擇流水號不能為空!", 1)
         End If
@@ -459,15 +470,41 @@ Public Class 製程管制紀錄表_精製組
             選擇流水號_tb.Text = 明細表_dgv.Rows(e.RowIndex).Cells("明細流水號").Value.ToString
         End If
     End Sub
+    Private Sub 原料油_dgv_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles 原料油_dgv.CellClick
+        If e.RowIndex = -1 Then : Else
+            原料_cb.Text = 原料油_dgv.Rows(e.RowIndex).Cells("原料油").Value.ToString
+            成品_cb.Text = 原料油_dgv.Rows(e.RowIndex).Cells("成品").Value.ToString
+        End If
+    End Sub
     Private Sub LoadDataToCB(dgv As DataGridView, cb As ComboBox)
         Using ds As New DataSet()
             SQL_製程管制精製組_原料油_讀取()
             da.Fill(ds)
             dgv.DataSource = ds.Tables(0)
             dgv.Columns(0).ReadOnly = True
+            dgv.Columns(1).ReadOnly = True
+            dgv.Columns(2).Visible = False
+            dgv.Columns(3).Visible = False
+            cb.Items.Clear()
             cb.Items.Add("")
             For i As Integer = 0 To dgv.Rows.Count - 2
-                Dim item As String = dgv.Rows(i).Cells("原料油").Value.ToString()
+                Dim item As String = dgv.Rows(i).Cells("成品").Value.ToString()
+                cb.Items.Add(item)
+            Next
+        End Using
+        conn.Close()
+    End Sub
+    Private Sub LoadDataToCB1(dgv As DataGridView, cb As ComboBox)
+        Using ds As New DataSet()
+            SQL_製程管制精製組_原料_讀取()
+            da.Fill(ds)
+            dgv.DataSource = ds.Tables(0)
+            dgv.Columns(0).ReadOnly = True
+            dgv.Columns(1).ReadOnly = True
+
+            cb.Items.Add("")
+            For i As Integer = 0 To dgv.Rows.Count - 2
+                Dim item As String = dgv.Rows(i).Cells("名稱").Value.ToString()
                 cb.Items.Add(item)
             Next
         End Using
@@ -706,8 +743,8 @@ Public Class 製程管制紀錄表_精製組
     Private Sub 原料油_cb_SelectedIndexChanged(sender As Object, e As EventArgs) Handles 原料油_cb.SelectedIndexChanged
         If 原料油_cb.Text <> "" Then
             For i As Integer = 0 To 原料油_dgv.Rows.Count - 1
-                If 原料油_dgv.Rows(i).Cells("原料油").Value.ToString() = 原料油_cb.Text Then
-                    物料料號_tb.Text = 原料油_dgv.Rows(i).Cells("物料料號").Value.ToString()
+                If 原料油_dgv.Rows(i).Cells("成品").Value.ToString() = 原料油_cb.Text Then
+                    物料料號_tb.Text = 原料油_dgv.Rows(i).Cells("物料料號1").Value.ToString()
                     Exit For  ' 找到後退出迴圈
                 End If
             Next
@@ -715,4 +752,77 @@ Public Class 製程管制紀錄表_精製組
             物料料號_tb.Text = ""
         End If
     End Sub
+
+    Private Sub 修改_bt_MouseEnter(sender As Object, e As EventArgs) Handles 新增_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.新增_bt, "新增管制紀錄表")
+    End Sub
+    Private Sub 刪除_bt_MouseEnter(sender As Object, e As EventArgs) Handles 刪除_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.刪除_bt, "刪除管制紀錄表")
+    End Sub
+    Private Sub 儲存_bt_MouseEnter(sender As Object, e As EventArgs) Handles 儲存_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.儲存_bt, "儲存管制紀錄表")
+    End Sub
+    Private Sub 審核簽名_bt_MouseEnter(sender As Object, e As EventArgs) Handles 審核簽名_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.審核簽名_bt, "管制紀錄表 確認簽名")
+    End Sub
+    Private Sub 新增明細表_bt_MouseEnter(sender As Object, e As EventArgs) Handles 新增明細表_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.新增明細表_bt, "新增明細表一筆空白資料")
+    End Sub
+    Private Sub 儲存明細表_bt_MouseEnter(sender As Object, e As EventArgs) Handles 儲存明細表_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.儲存明細表_bt, "儲存明細表")
+    End Sub
+    Private Sub 刪除明細表_bt_MouseEnter(sender As Object, e As EventArgs) Handles 刪除明細表_bt.MouseEnter
+        ToolTip1.SetToolTip(Me.刪除明細表_bt, "明細表單項刪除")
+    End Sub
+    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
+        Panel3.Width = 259
+    End Sub
+
+    Private Sub 關閉_bt_Click(sender As Object, e As EventArgs) Handles 關閉_bt.Click
+        Panel3.Width = 616
+    End Sub
+
+    Private Sub 對應表新增_bt_Click(sender As Object, e As EventArgs) Handles 對應表新增_bt.Click
+        MGB("確 定 要 新 增 資 料 到 對 應 表 嗎?", 2)
+        If 訊息回應 = "YES" Then
+            If 原料_cb.Text <> "" AndAlso 成品_cb.Text <> "" Then
+                Dim isDuplicate As Boolean = False
+                For i As Integer = 0 To 原料油_dgv.Rows.Count - 2
+                    If 原料油_dgv.Rows(i).Cells("成品").Value.ToString() = 原料_cb.Text Then
+                        isDuplicate = True
+                        Exit For
+                    End If
+                Next
+                If isDuplicate Then
+                    MGB("成品不得重覆", 1)
+                Else
+                    SQL_製程管制精製組_對應表新增(原料_cb.Text.ToString(), 成品_cb.Text.ToString())
+                    原料_cb.Text = "" : 成品_cb.Text = ""
+                    LoadDataToCB(原料油_dgv, 原料油_cb)
+                    MGB("新增成功", 1)
+                End If
+            Else
+                MGB("原料油與成品欄位皆不能為空", 1)
+            End If
+        End If
+    End Sub
+
+    Private Sub 對應表刪除_bt_Click(sender As Object, e As EventArgs) Handles 對應表刪除_bt.Click
+        MGB("確 定 要 刪 除 對 應 表 的 資 料 嗎?", 2)
+        If 訊息回應 = "YES" Then
+            If 原料_cb.Text <> "" AndAlso 成品_cb.Text <> "" Then
+                SQL_製程管制精製組_對應表刪除(原料_cb.Text.ToString(), 成品_cb.Text.ToString())
+                原料_cb.Text = "" : 成品_cb.Text = ""
+                LoadDataToCB(原料油_dgv, 原料油_cb)
+                MGB("刪除成功", 1)
+            Else
+                MGB("原料油與成品欄位皆不能為空", 1)
+            End If
+
+        End If
+    End Sub
 End Class

OW-ERP-SYS/09、資料庫系統管理/系統使用者管理.Designer.vb

@@ -23,12 +23,12 @@ Partial Class 系統使用者管理
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim DataGridViewCellStyle7 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle8 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle9 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle10 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle11 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle12 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle5 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle6 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.CheckBox18 = New System.Windows.Forms.CheckBox()
         Me.CheckBox87 = New System.Windows.Forms.CheckBox()
         Me.CheckBox84 = New System.Windows.Forms.CheckBox()
@@ -123,7 +123,6 @@ Partial Class 系統使用者管理
         Me.CheckBox109 = New System.Windows.Forms.CheckBox()
         Me.CheckBox114 = New System.Windows.Forms.CheckBox()
         Me.CheckBox94 = New System.Windows.Forms.CheckBox()
-        Me.CheckBox71 = New System.Windows.Forms.CheckBox()
         Me.CheckBox93 = New System.Windows.Forms.CheckBox()
         Me.CheckBox92 = New System.Windows.Forms.CheckBox()
         Me.CheckBox91 = New System.Windows.Forms.CheckBox()
@@ -180,6 +179,7 @@ Partial Class 系統使用者管理
         Me.職稱_cb = New System.Windows.Forms.ComboBox()
         Me.CheckBox90 = New System.Windows.Forms.CheckBox()
         Me.部門_cb = New System.Windows.Forms.ComboBox()
+        Me.CheckBox71 = New System.Windows.Forms.CheckBox()
         Me.CheckBox47 = New System.Windows.Forms.CheckBox()
         Me.CheckBox51 = New System.Windows.Forms.CheckBox()
         Me.CheckBox52 = New System.Windows.Forms.CheckBox()
@@ -1127,15 +1127,15 @@ Partial Class 系統使用者管理
         '
         '預設權限_dgv
         '
-        DataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
-        Me.預設權限_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle7
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer))
+        Me.預設權限_dgv.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         Me.預設權限_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.預設權限_dgv.Location = New System.Drawing.Point(1234, 138)
         Me.預設權限_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.預設權限_dgv.Name = "預設權限_dgv"
         Me.預設權限_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.預設權限_dgv.RowsDefaultCellStyle = DataGridViewCellStyle8
+        DataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.預設權限_dgv.RowsDefaultCellStyle = DataGridViewCellStyle2
         Me.預設權限_dgv.RowTemplate.Height = 24
         Me.預設權限_dgv.Size = New System.Drawing.Size(126, 151)
         Me.預設權限_dgv.TabIndex = 233
@@ -1159,13 +1159,13 @@ Partial Class 系統使用者管理
         Me.CheckBox68.AutoSize = True
         Me.CheckBox68.BackColor = System.Drawing.Color.Transparent
         Me.CheckBox68.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.CheckBox68.ForeColor = System.Drawing.Color.Blue
-        Me.CheckBox68.Location = New System.Drawing.Point(257, 158)
+        Me.CheckBox68.ForeColor = System.Drawing.Color.Red
+        Me.CheckBox68.Location = New System.Drawing.Point(26, 186)
         Me.CheckBox68.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.CheckBox68.Name = "CheckBox68"
-        Me.CheckBox68.Size = New System.Drawing.Size(97, 20)
+        Me.CheckBox68.Size = New System.Drawing.Size(160, 20)
         Me.CheckBox68.TabIndex = 355
-        Me.CheckBox68.Text = "未使用-CC68"
+        Me.CheckBox68.Text = "生產日報表 精製組-CC68"
         Me.CheckBox68.UseVisualStyleBackColor = False
         '
         'CheckBox119
@@ -1201,13 +1201,13 @@ Partial Class 系統使用者管理
         Me.CheckBox67.AutoSize = True
         Me.CheckBox67.BackColor = System.Drawing.Color.Transparent
         Me.CheckBox67.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.CheckBox67.ForeColor = System.Drawing.Color.Blue
-        Me.CheckBox67.Location = New System.Drawing.Point(257, 140)
+        Me.CheckBox67.ForeColor = System.Drawing.Color.Red
+        Me.CheckBox67.Location = New System.Drawing.Point(26, 166)
         Me.CheckBox67.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.CheckBox67.Name = "CheckBox67"
-        Me.CheckBox67.Size = New System.Drawing.Size(97, 20)
+        Me.CheckBox67.Size = New System.Drawing.Size(184, 20)
         Me.CheckBox67.TabIndex = 354
-        Me.CheckBox67.Text = "未使用-CC67"
+        Me.CheckBox67.Text = "生產製程管制表 精製組-CC67"
         Me.CheckBox67.UseVisualStyleBackColor = False
         '
         'CheckBox117
@@ -1408,12 +1408,10 @@ Partial Class 系統使用者管理
         Me.Panel1.Controls.Add(Me.CheckBox116)
         Me.Panel1.Controls.Add(Me.預設權限_dgv)
         Me.Panel1.Controls.Add(Me.CheckBox120)
-        Me.Panel1.Controls.Add(Me.CheckBox68)
         Me.Panel1.Controls.Add(Me.CheckBox98)
         Me.Panel1.Controls.Add(Me.CheckBox119)
         Me.Panel1.Controls.Add(Me.CheckBox118)
         Me.Panel1.Controls.Add(Me.CheckBox101)
-        Me.Panel1.Controls.Add(Me.CheckBox67)
         Me.Panel1.Controls.Add(Me.CheckBox102)
         Me.Panel1.Controls.Add(Me.CheckBox117)
         Me.Panel1.Controls.Add(Me.CheckBox103)
@@ -1591,20 +1589,6 @@ Partial Class 系統使用者管理
         Me.CheckBox94.Text = "財務單 - 對帳表-CC94"
         Me.CheckBox94.UseVisualStyleBackColor = False
         '
-        'CheckBox71
-        '
-        Me.CheckBox71.AutoSize = True
-        Me.CheckBox71.BackColor = System.Drawing.Color.Transparent
-        Me.CheckBox71.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        Me.CheckBox71.ForeColor = System.Drawing.Color.Green
-        Me.CheckBox71.Location = New System.Drawing.Point(26, 89)
-        Me.CheckBox71.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.CheckBox71.Name = "CheckBox71"
-        Me.CheckBox71.Size = New System.Drawing.Size(121, 20)
-        Me.CheckBox71.TabIndex = 359
-        Me.CheckBox71.Text = "物料領料單-CC71"
-        Me.CheckBox71.UseVisualStyleBackColor = False
-        '
         'CheckBox93
         '
         Me.CheckBox93.AutoSize = True
@@ -2377,6 +2361,20 @@ Partial Class 系統使用者管理
         Me.部門_cb.Size = New System.Drawing.Size(124, 24)
         Me.部門_cb.TabIndex = 217
         '
+        'CheckBox71
+        '
+        Me.CheckBox71.AutoSize = True
+        Me.CheckBox71.BackColor = System.Drawing.Color.Transparent
+        Me.CheckBox71.Font = New System.Drawing.Font("微軟正黑體", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.CheckBox71.ForeColor = System.Drawing.Color.Green
+        Me.CheckBox71.Location = New System.Drawing.Point(26, 89)
+        Me.CheckBox71.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.CheckBox71.Name = "CheckBox71"
+        Me.CheckBox71.Size = New System.Drawing.Size(121, 20)
+        Me.CheckBox71.TabIndex = 359
+        Me.CheckBox71.Text = "物料領料單-CC71"
+        Me.CheckBox71.UseVisualStyleBackColor = False
+        '
         'CheckBox47
         '
         Me.CheckBox47.AutoSize = True
@@ -2510,21 +2508,21 @@ Partial Class 系統使用者管理
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.清單1_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.清單1_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle9.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        Me.清單1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle9
+        DataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle3.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        Me.清單1_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle3
         Me.清單1_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.清單1_dgv.Location = New System.Drawing.Point(1, 2)
         Me.清單1_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.清單1_dgv.Name = "清單1_dgv"
         Me.清單1_dgv.ReadOnly = True
         Me.清單1_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.清單1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle10
+        DataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.清單1_dgv.RowsDefaultCellStyle = DataGridViewCellStyle4
         Me.清單1_dgv.RowTemplate.Height = 24
         Me.清單1_dgv.Size = New System.Drawing.Size(1439, 520)
         Me.清單1_dgv.TabIndex = 1874
@@ -2683,6 +2681,8 @@ Partial Class 系統使用者管理
         Me.技術權限_tp.Controls.Add(Me.CheckBox58)
         Me.技術權限_tp.Controls.Add(Me.CheckBox52)
         Me.技術權限_tp.Controls.Add(Me.CheckBox51)
+        Me.技術權限_tp.Controls.Add(Me.CheckBox68)
+        Me.技術權限_tp.Controls.Add(Me.CheckBox67)
         Me.技術權限_tp.Location = New System.Drawing.Point(4, 28)
         Me.技術權限_tp.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.技術權限_tp.Name = "技術權限_tp"
@@ -2853,21 +2853,21 @@ Partial Class 系統使用者管理
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.清單_dgv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
         Me.清單_dgv.BackgroundColor = System.Drawing.Color.White
-        DataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
-        DataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control
-        DataGridViewCellStyle11.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
-        DataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText
-        DataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight
-        DataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText
-        Me.清單_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle11
+        DataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft
+        DataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control
+        DataGridViewCellStyle5.Font = New System.Drawing.Font("微軟正黑體", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        DataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText
+        DataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight
+        DataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText
+        Me.清單_dgv.ColumnHeadersDefaultCellStyle = DataGridViewCellStyle5
         Me.清單_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.清單_dgv.Location = New System.Drawing.Point(1, 2)
         Me.清單_dgv.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.清單_dgv.Name = "清單_dgv"
         Me.清單_dgv.ReadOnly = True
         Me.清單_dgv.RowHeadersWidth = 5
-        DataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
-        Me.清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle12
+        DataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.[True]
+        Me.清單_dgv.RowsDefaultCellStyle = DataGridViewCellStyle6
         Me.清單_dgv.RowTemplate.Height = 24
         Me.清單_dgv.Size = New System.Drawing.Size(1439, 520)
         Me.清單_dgv.TabIndex = 1859

OW-ERP-SYS/09、資料庫系統管理/系統權限預設表.Designer.vb

@@ -97,13 +97,13 @@ Partial Class 系統權限預設表
         Me.CheckBox121 = New System.Windows.Forms.CheckBox()
         Me.CheckBox122 = New System.Windows.Forms.CheckBox()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.CheckBox72 = New System.Windows.Forms.CheckBox()
         Me.CheckBox106 = New System.Windows.Forms.CheckBox()
         Me.CheckBox99 = New System.Windows.Forms.CheckBox()
         Me.CheckBox104 = New System.Windows.Forms.CheckBox()
         Me.CheckBox129 = New System.Windows.Forms.CheckBox()
         Me.CheckBox109 = New System.Windows.Forms.CheckBox()
         Me.CheckBox114 = New System.Windows.Forms.CheckBox()
-        Me.CheckBox72 = New System.Windows.Forms.CheckBox()
         Me.CheckBox110 = New System.Windows.Forms.CheckBox()
         Me.CheckBox42 = New System.Windows.Forms.CheckBox()
         Me.CheckBox62 = New System.Windows.Forms.CheckBox()
@@ -114,7 +114,6 @@ Partial Class 系統權限預設表
         Me.CheckBox73 = New System.Windows.Forms.CheckBox()
         Me.CheckBox48 = New System.Windows.Forms.CheckBox()
         Me.CheckBox105 = New System.Windows.Forms.CheckBox()
-        Me.CheckBox47 = New System.Windows.Forms.CheckBox()
         Me.CheckBox30 = New System.Windows.Forms.CheckBox()
         Me.CheckBox29 = New System.Windows.Forms.CheckBox()
         Me.CheckBox61 = New System.Windows.Forms.CheckBox()
@@ -152,6 +151,7 @@ Partial Class 系統權限預設表
         Me.CheckBox67 = New System.Windows.Forms.CheckBox()
         Me.CheckBox76 = New System.Windows.Forms.CheckBox()
         Me.CheckBox77 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox47 = New System.Windows.Forms.CheckBox()
         Me.CheckBox51 = New System.Windows.Forms.CheckBox()
         Me.CheckBox52 = New System.Windows.Forms.CheckBox()
         Me.CheckBox53 = New System.Windows.Forms.CheckBox()
@@ -1152,8 +1152,6 @@ Partial Class 系統權限預設表
         Me.Panel1.Controls.Add(Me.CheckBox121)
         Me.Panel1.Controls.Add(Me.CheckBox122)
         Me.Panel1.Controls.Add(Me.CheckBox100)
-        Me.Panel1.Controls.Add(Me.CheckBox68)
-        Me.Panel1.Controls.Add(Me.CheckBox67)
         Me.Panel1.Controls.Add(Me.CheckBox76)
         Me.Panel1.Controls.Add(Me.CheckBox77)
         Me.Panel1.Location = New System.Drawing.Point(10, 55)
@@ -1162,6 +1160,18 @@ Partial Class 系統權限預設表
         Me.Panel1.Size = New System.Drawing.Size(300, 586)
         Me.Panel1.TabIndex = 1843
         '
+        'CheckBox72
+        '
+        Me.CheckBox72.AutoSize = True
+        Me.CheckBox72.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.CheckBox72.Location = New System.Drawing.Point(299, 512)
+        Me.CheckBox72.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
+        Me.CheckBox72.Name = "CheckBox72"
+        Me.CheckBox72.Size = New System.Drawing.Size(184, 20)
+        Me.CheckBox72.TabIndex = 233
+        Me.CheckBox72.Text = "樣品採購單----1級核准-CC72"
+        Me.CheckBox72.UseVisualStyleBackColor = True
+        '
         'CheckBox106
         '
         Me.CheckBox106.AutoSize = True
@@ -1235,18 +1245,6 @@ Partial Class 系統權限預設表
         Me.CheckBox114.Text = "出貨日報表-CC114"
         Me.CheckBox114.UseVisualStyleBackColor = True
         '
-        'CheckBox72
-        '
-        Me.CheckBox72.AutoSize = True
-        Me.CheckBox72.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
-        Me.CheckBox72.Location = New System.Drawing.Point(299, 512)
-        Me.CheckBox72.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
-        Me.CheckBox72.Name = "CheckBox72"
-        Me.CheckBox72.Size = New System.Drawing.Size(184, 20)
-        Me.CheckBox72.TabIndex = 233
-        Me.CheckBox72.Text = "樣品採購單----1級核准-CC72"
-        Me.CheckBox72.UseVisualStyleBackColor = True
-        '
         'CheckBox110
         '
         Me.CheckBox110.AutoSize = True
@@ -1367,18 +1365,6 @@ Partial Class 系統權限預設表
         Me.CheckBox105.Text = "工程驗收單-CC105"
         Me.CheckBox105.UseVisualStyleBackColor = True
         '
-        'CheckBox47
-        '
-        Me.CheckBox47.AutoSize = True
-        Me.CheckBox47.ForeColor = System.Drawing.Color.Green
-        Me.CheckBox47.Location = New System.Drawing.Point(34, 66)
-        Me.CheckBox47.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
-        Me.CheckBox47.Name = "CheckBox47"
-        Me.CheckBox47.Size = New System.Drawing.Size(121, 20)
-        Me.CheckBox47.TabIndex = 329
-        Me.CheckBox47.Text = "成品入庫單-CC47"
-        Me.CheckBox47.UseVisualStyleBackColor = True
-        '
         'CheckBox30
         '
         Me.CheckBox30.AutoSize = True
@@ -1778,25 +1764,25 @@ Partial Class 系統權限預設表
         'CheckBox68
         '
         Me.CheckBox68.AutoSize = True
-        Me.CheckBox68.ForeColor = System.Drawing.Color.Olive
-        Me.CheckBox68.Location = New System.Drawing.Point(9, 185)
+        Me.CheckBox68.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.CheckBox68.Location = New System.Drawing.Point(34, 180)
         Me.CheckBox68.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
         Me.CheckBox68.Name = "CheckBox68"
-        Me.CheckBox68.Size = New System.Drawing.Size(181, 20)
+        Me.CheckBox68.Size = New System.Drawing.Size(160, 20)
         Me.CheckBox68.TabIndex = 355
-        Me.CheckBox68.Text = "物料退回工地倉儲作業-CC68"
+        Me.CheckBox68.Text = "生產日報表 精製組-CC68"
         Me.CheckBox68.UseVisualStyleBackColor = True
         '
         'CheckBox67
         '
         Me.CheckBox67.AutoSize = True
-        Me.CheckBox67.ForeColor = System.Drawing.Color.Olive
-        Me.CheckBox67.Location = New System.Drawing.Point(9, 167)
+        Me.CheckBox67.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(0, Byte), Integer))
+        Me.CheckBox67.Location = New System.Drawing.Point(34, 161)
         Me.CheckBox67.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
         Me.CheckBox67.Name = "CheckBox67"
-        Me.CheckBox67.Size = New System.Drawing.Size(157, 20)
+        Me.CheckBox67.Size = New System.Drawing.Size(184, 20)
         Me.CheckBox67.TabIndex = 354
-        Me.CheckBox67.Text = "工地倉儲領料出庫-CC67"
+        Me.CheckBox67.Text = "生產製程管制表 精製組-CC67"
         Me.CheckBox67.UseVisualStyleBackColor = True
         '
         'CheckBox76
@@ -1823,6 +1809,18 @@ Partial Class 系統權限預設表
         Me.CheckBox77.Text = "支票收支審核-CC77"
         Me.CheckBox77.UseVisualStyleBackColor = True
         '
+        'CheckBox47
+        '
+        Me.CheckBox47.AutoSize = True
+        Me.CheckBox47.ForeColor = System.Drawing.Color.Green
+        Me.CheckBox47.Location = New System.Drawing.Point(34, 66)
+        Me.CheckBox47.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3)
+        Me.CheckBox47.Name = "CheckBox47"
+        Me.CheckBox47.Size = New System.Drawing.Size(121, 20)
+        Me.CheckBox47.TabIndex = 329
+        Me.CheckBox47.Text = "成品入庫單-CC47"
+        Me.CheckBox47.UseVisualStyleBackColor = True
+        '
         'CheckBox51
         '
         Me.CheckBox51.AutoSize = True
@@ -2059,6 +2057,8 @@ Partial Class 系統權限預設表
         Me.技術權限_tp.Controls.Add(Me.CheckBox58)
         Me.技術權限_tp.Controls.Add(Me.CheckBox51)
         Me.技術權限_tp.Controls.Add(Me.CheckBox52)
+        Me.技術權限_tp.Controls.Add(Me.CheckBox67)
+        Me.技術權限_tp.Controls.Add(Me.CheckBox68)
         Me.技術權限_tp.Location = New System.Drawing.Point(4, 28)
         Me.技術權限_tp.Name = "技術權限_tp"
         Me.技術權限_tp.Padding = New System.Windows.Forms.Padding(3)

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

@@ -1988,8 +1988,19 @@ Module SQL_技術管理系統
     End Sub
     Friend Sub SQL_製程管制精製組_原料油_讀取()
         ConnOpen()
-        SQL1 = "SELECT 精製組對應表.原料油, 精製組對應表.成品, 物料規格表.物料料號
-                FROM 精製組對應表 JOIN 物料規格表 ON 精製組對應表.原料油 = 物料規格表.名稱"
+        SQL1 = "SELECT 
+                精製組對應表.原料油, 
+	            精製組對應表.成品, 
+                物料規格表1.物料料號 AS 物料料號, 
+                物料規格表2.物料料號 AS 物料料號1
+                FROM 
+                    精製組對應表 
+                JOIN 
+                    物料規格表 AS 物料規格表1 ON 精製組對應表.原料油 = 物料規格表1.名稱 
+                JOIN 
+                    物料規格表 AS 物料規格表2 ON 精製組對應表.成品 = 物料規格表2.名稱
+                WHERE 
+                    物料規格表1.種類 = N'原料油' AND 物料規格表2.種類 = N'原料油'"
         CmdSet_For_DGV()
     End Sub
     Friend Sub SQL_製程管制控制表_精製組_圖片查詢_讀取(製程流水號 As String)
@@ -2003,7 +2014,7 @@ Module SQL_技術管理系統
         ConnOpen()
         SQL1 = "SELECT        控制流水號, 生產日期, 批次,運轉開始時間, 運轉結束時間, 合計時間, 人工人數, 備註, 製表簽名編碼, 課長簽名編碼, 
                               經理簽名編碼, 製表簽名時間, 課長簽名時間, 經理簽名時間,BHA, 丙二醇, TBHQ20, 維他命E, 
-                              額外抗氧, 額外抗氧公斤, 柴油
+                              額外抗氧, 額外抗氧公斤, 柴油, 額外料號
                 FROM          生產日報表_精製組
                 WHERE         生產日期 ='" & 生產日期 & "' AND 批次 LIKE N'" & 批次 & "'"
         CmdSet_For_dr()
@@ -2015,28 +2026,22 @@ 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 String, 課長簽名編碼 As String, 經理簽名編碼 As String, 製表簽名時間 As String,
-                                              課長簽名時間 As String, 經理簽名時間 As String, BHA As String, 丙二醇 As String, TBHQ20 As String, 維他命E As String,
-                                              額外抗氧 As String, 額外抗氧公斤 As String, 柴油 As String)
+    Friend Sub SQL_生產日報控制表_精製組_新增(控制流水號 As String, 生產日期 As String, 批次 As String)
         ConnOpen()
         SQL1 = "INSERT INTO     生產日報表_精製組 (控制流水號, 生產日期,批次 ,運轉開始時間, 運轉結束時間, 合計時間, 人工人數, 備註, 製表簽名編碼, 
                                 課長簽名編碼, 經理簽名編碼, 製表簽名時間, 課長簽名時間, 經理簽名時間,BHA, 丙二醇, TBHQ20, 維他命E, 
-                            額外抗氧, 額外抗氧公斤, 柴油) 
-                VALUES          (N'" & 控制流水號 & "', N'" & 生產日期 & "',N'" & 批次 & "', N'" & 運轉開始時間 & "', N'" & 運轉結束時間 & "', N'" & 合計時間 & "', 
-                                 N'" & 人工人數 & "', N'" & 備註 & "', N'" & 製表簽名編碼 & "', N'" & 課長簽名編碼 & "', 
-                                 N'" & 經理簽名編碼 & "', N'" & 製表簽名時間 & "', N'" & 課長簽名時間 & "', N'" & 經理簽名時間 & "',
-                                 N'" & BHA & "', N'" & 丙二醇 & "', N'" & TBHQ20 & "', N'" & 維他命E & "', N'" & 額外抗氧 & "',
-                                 N'" & 額外抗氧公斤 & "', N'" & 柴油 & "')"
+                            額外抗氧, 額外抗氧公斤, 柴油,額外料號) 
+                VALUES          (N'" & 控制流水號 & "', N'" & 生產日期 & "',N'" & 批次 & "', N'', N'', N'', N'', N'', N'', N'', 
+                                 N'', N'', N'', N'',N'', N'', N'', N'', N'',N'', N'', 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, BHA As String, 丙二醇 As String, TBHQ20 As String, 維他命E 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'" & 備註 & "',  BHA = N'" & BHA & "', 丙二醇 = N'" & 丙二醇 & "', TBHQ20 = N'" & TBHQ20 & "'
-                        , 維他命E = N'" & 維他命E & "', 額外抗氧 = N'" & 額外抗氧 & "', 額外抗氧公斤 = N'" & 額外抗氧公斤 & "', 柴油 = N'" & 柴油 & "'
+                        , 維他命E = N'" & 維他命E & "', 額外抗氧 = N'" & 額外抗氧 & "', 額外抗氧公斤 = N'" & 額外抗氧公斤 & "', 柴油 = N'" & 柴油 & "',額外料號 = N'" & 額外料號 & "'
                 WHERE   (控制流水號 LIKE N'" & 控制流水號 & "') AND (生產日期 LIKE N'" & 生產日期 & "') AND (批次 LIKE N'" & 批次 & "')"
         CmdSet_For_dr()
     End Sub
@@ -2051,4 +2056,68 @@ Module SQL_技術管理系統
         SQL1 = "DELETE FROM 生產日報表_精製組 WHERE 生產日期 ='" & 生產日期 & "' AND 批次 LIKE N'" & 批次 & "'"
         CmdSet_For_dr()
     End Sub
+    Friend Sub SQL_製程管制精製組_原料_讀取()
+        ConnOpen()
+        SQL1 = "SELECT 名稱, 物料料號
+                FROM 物料規格表 WHERE 種類 ='原料油'"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_製程管制精製組_對應表新增(原料 As String, 成品 As String)
+        ConnOpen()
+        SQL1 = "INSERT INTO 精製組對應表 (原料油,成品) VALUES (N'" & 原料 & "',N'" & 成品 & "')"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_製程管制精製組_對應表刪除(原料 As String, 成品 As String)
+        ConnOpen()
+        SQL1 = "DELETE FROM 精製組對應表 WHERE 原料油 ='" & 原料 & "' AND 成品 LIKE N'" & 成品 & "'"
+        CmdSet_For_dr()
+    End Sub
+
+    Friend Sub SQL_物料領料_精製組_讀取(生產日期 As String)
+        ConnOpen()
+        SQL1 = "SELECT
+                製程管制控制表_精製組.原料油 AS 成品, 
+                製程管制控制表_精製組.料號 AS 成品料號, 
+                製程管制控制表_精製組.總重, 
+                製程管制控制表_精製組.VE208 AS 液鹼, 
+                製程管制控制表_精製組.VE226 AS 硫酸, 
+                製程管制控制表_精製組.總添加次數 AS 磷酸, 
+                製程管制控制表_精製組.總添加量 AS 白土, 
+                製程管制控制表_精製組.檸檬酸, 
+                製程管制控制表_精製組.高酸油, 
+                製程管制控制表_精製組.脂肪酸, 
+                生產日報表_精製組.BHA, 
+                生產日報表_精製組.丙二醇, 
+                生產日報表_精製組.TBHQ20, 
+                生產日報表_精製組.維他命E, 
+                生產日報表_精製組.額外抗氧, 
+                生產日報表_精製組.額外抗氧公斤, 
+                生產日報表_精製組.柴油, 
+                生產日報表_精製組.額外料號, 
+                精製組對應表.原料油 AS 原料油名稱, 
+                物料規格表.物料料號 AS 原料油料號
+                FROM 製程管制控制表_精製組
+                JOIN 生產日報表_精製組
+                    ON 製程管制控制表_精製組.申請日期 = 生產日報表_精製組.生產日期 
+                    AND 製程管制控制表_精製組.批次 = 生產日報表_精製組.批次
+                JOIN 精製組對應表
+                    ON 製程管制控制表_精製組.原料油 = 精製組對應表.成品
+                JOIN 物料規格表
+                    ON 精製組對應表.原料油 = 物料規格表.名稱
+                WHERE 製程管制控制表_精製組.申請日期 = '" & 生產日期 & "'
+                    AND 物料規格表.種類 = N'原料油'"
+        CmdSet_For_DGV()
+    End Sub
+    Friend Sub SQL_物料領料_精製組_物料讀取(料號 As String)
+        ConnOpen()
+        SQL1 = "SELECT 物料料號, 種類, 名稱
+                FROM 物料規格表
+                WHERE 物料料號='" & 料號 & "'"
+        CmdSet_For_dr()
+    End Sub
+    Friend Sub SQL_成品入庫_精製組_讀取(生產日期 As String)
+        ConnOpen()
+        SQL1 = "SELECT 原料油,料號 ,FCQ553結束,桶槽 FROM 製程管制控制表_精製組 WHERE 製程管制控制表_精製組.申請日期 = '" & 生產日期 & "'"
+        CmdSet_For_DGV()
+    End Sub
 End Module

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 = "2024101701" : Public 資料庫版本 As String
+    Public 版本 As String = "2024110601" : Public 資料庫版本 As String
     '----系統閒置----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
     Public 判斷重登, 重登確認, 主頁開啟, 首次開啟, 物料查詢, 深色風格, 不刪除檔案 As Boolean
     Public timeExit, timeExit2, timeNow, timeNow2 As Integer

OW-ERP-SYS/LoginForm1.Designer.vb

@@ -29,6 +29,7 @@ Partial Class LoginForm1
         Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
         Me.pnlTitleBar = New System.Windows.Forms.Panel()
         Me.Cancel_bt = New System.Windows.Forms.Button()
+        Me.系統登入_dgv = New System.Windows.Forms.DataGridView()
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
         Me.Panel2 = New System.Windows.Forms.Panel()
@@ -67,13 +68,12 @@ Partial Class LoginForm1
         Me.刷卡登入_ch = New System.Windows.Forms.CheckBox()
         Me.公司線路_rb = New System.Windows.Forms.RadioButton()
         Me.測試線路_rb = New System.Windows.Forms.RadioButton()
-        Me.系統登入_dgv = New System.Windows.Forms.DataGridView()
         Me.pnlTitleBar.SuspendLayout()
+        CType(Me.系統登入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel2.SuspendLayout()
         Me.Panel1.SuspendLayout()
         CType(Me.語言_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ftp清單_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.系統登入_dgv, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         '計算分流1
@@ -119,6 +119,23 @@ Partial Class LoginForm1
         Me.Cancel_bt.Text = "X"
         Me.Cancel_bt.UseVisualStyleBackColor = False
         '
+        '系統登入_dgv
+        '
+        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.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
+        Me.系統登入_dgv.BackgroundColor = System.Drawing.Color.White
+        Me.系統登入_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
+        Me.系統登入_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
+        Me.系統登入_dgv.Location = New System.Drawing.Point(501, 29)
+        Me.系統登入_dgv.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
+        Me.系統登入_dgv.Name = "系統登入_dgv"
+        Me.系統登入_dgv.RowHeadersWidth = 5
+        Me.系統登入_dgv.RowTemplate.Height = 24
+        Me.系統登入_dgv.Size = New System.Drawing.Size(218, 246)
+        Me.系統登入_dgv.TabIndex = 642
+        '
         'Timer1
         '
         Me.Timer1.Interval = 3000
@@ -577,23 +594,6 @@ Partial Class LoginForm1
         Me.測試線路_rb.Text = "測試線路"
         Me.測試線路_rb.UseVisualStyleBackColor = False
         '
-        '系統登入_dgv
-        '
-        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.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
-        Me.系統登入_dgv.BackgroundColor = System.Drawing.Color.White
-        Me.系統登入_dgv.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D
-        Me.系統登入_dgv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
-        Me.系統登入_dgv.Location = New System.Drawing.Point(501, 29)
-        Me.系統登入_dgv.Margin = New System.Windows.Forms.Padding(5, 6, 5, 6)
-        Me.系統登入_dgv.Name = "系統登入_dgv"
-        Me.系統登入_dgv.RowHeadersWidth = 5
-        Me.系統登入_dgv.RowTemplate.Height = 24
-        Me.系統登入_dgv.Size = New System.Drawing.Size(218, 246)
-        Me.系統登入_dgv.TabIndex = 642
-        '
         'LoginForm1
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -616,13 +616,13 @@ Partial Class LoginForm1
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "OW-ERP-SYS"
         Me.pnlTitleBar.ResumeLayout(False)
+        CType(Me.系統登入_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel2.ResumeLayout(False)
         Me.Panel2.PerformLayout()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
         CType(Me.語言_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ftp清單_dgv, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.系統登入_dgv, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

OW-ERP-SYS/LoginForm1.vb

@@ -168,8 +168,7 @@ Public Class LoginForm1
         ' -------------------------------------- | | --------------------------------------
         Timer1.Enabled = False
     End Sub
-    Private Sub pnlTitleBar_Paint(sender As Object, e As PaintEventArgs) Handles pnlTitleBar.Paint
-    End Sub
+
     Private Sub LoginForm1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         系統語言 = "繁體中文" : Set_語言導入() : 語言轉換讀取()
         主題_lb.Text = "OW-ERP-SYS"
@@ -567,6 +566,7 @@ Public Class LoginForm1
         If 不啟用WEB_cb.Checked = False Then : 不用WEB = False : Else : 不用WEB = True : End If
     End Sub
     Dim nOldWndLeft, nOldWndTop, nClickX, nClickY As Integer
+
     Private Sub PnlTitleBar_MouseDown(ByVal sender As System.Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles pnlTitleBar.MouseDown
         '紀錄滑鼠點選時的視窗位置與滑鼠點選位置
         nOldWndLeft = Me.Left : nOldWndTop = Me.Top : nClickX = e.X : nClickY = e.Y

OW-ERP-SYS/My Project/Resources.Designer.vb

@@ -70,6 +70,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+        '''</summary>
+        Friend ReadOnly Property _109994_removebg_preview() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("109994-removebg-preview", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
         '''</summary>

OW-ERP-SYS/My Project/Resources.resx

@@ -124,9 +124,6 @@
   <data name="test" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="buy1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\buy1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="import_left" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\import_left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -136,8 +133,11 @@
   <data name="Carton-01" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Carton-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pick_list_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\pick_list_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="PortableComputer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\PortableComputer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Cancel_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Cancel_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Hide password" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Hide password.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -178,8 +178,8 @@
   <data name="Drag-list-up-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Drag-list-up-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="SAVER" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\SAVER.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Delete_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Delete_Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -208,15 +208,9 @@
   <data name="Server" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Server.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Create-document-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Create-document-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Personnel1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Personnel1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="UP-arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\UP-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Default Programs" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Default Programs.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -229,21 +223,30 @@
   <data name="井富LOGO1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\井富LOGO1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Update_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Update_Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="check" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="L90" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\L90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="CC5" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\CC5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="home" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Confirm_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Confirm_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Go-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Go-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="receipts" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\receipts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Go-back" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Go-back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -262,9 +265,6 @@
   <data name="Save_as" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Save_as.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="encoding rules" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\encoding rules.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="list_menu" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\list_menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -298,9 +298,6 @@
   <data name="Internet" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Internet.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="CC1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\CC1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="PDF" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\PDF.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -313,8 +310,8 @@
   <data name="Hide password1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Hide password1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="井富LOGO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\井富LOGO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="buy1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\buy1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Save-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Save-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -325,11 +322,17 @@
   <data name="上一頁" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\上一頁.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Stamp-01" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Stamp-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Cancel_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Cancel_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="GarbageEmpty" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\GarbageEmpty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="CC1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\CC1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CC2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\CC2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -346,8 +349,8 @@
   <data name="setup" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\setup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="L90" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\L90.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Close" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="calendar_month" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\calendar_month.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -355,8 +358,11 @@
   <data name="Oil" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Oil.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Stamp-01" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Stamp-01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="下載" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\下載.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="UP-arrow" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\UP-arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Delete-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Delete-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -379,8 +385,8 @@
   <data name="Edit-file" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Edit-file.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GarbageEmpty" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\GarbageEmpty.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Create-document-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\Create-document-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="IDCADE" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\IDCADE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -397,34 +403,31 @@
   <data name="Edit-Win11" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\Edit-Win11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pick-list" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\pick-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="box_64x64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\box_64x64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="下載" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\下載.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="L180" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\L180.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="井富LOGO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\井富LOGO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="add_blue_cercle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\圖片\add_blue_cercle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Download" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Download.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Go-right" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Go-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="pick_list_01" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\pick_list_01.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PortableComputer" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\PortableComputer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="SAVER" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\SAVER.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Update_Image" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\Update_Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="L180" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\L180.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pick-list" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\pick-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="encoding rules" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\encoding rules.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="receipts" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\圖片\receipts.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="109994-removebg-preview" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\圖片\109994-removebg-preview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

OW-ERP-SYS/OW-ERP-SYS.Designer.vb

@@ -57,6 +57,7 @@ Partial Class OW_ERP_SYS
         Me.生產日報表_一般油脂組_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator6 = New System.Windows.Forms.ToolStripSeparator()
         Me.生產製程管制表_精緻組_tsm = New System.Windows.Forms.ToolStripMenuItem()
+        Me.生產日報表_精製組_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator()
         Me.設備點檢表_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.ISO編碼表_tsm = New System.Windows.Forms.ToolStripMenuItem()
@@ -101,6 +102,12 @@ Partial Class OW_ERP_SYS
         Me.PDF_TEST_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.TEST_FORM_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.虛擬桌_pl = New System.Windows.Forms.Panel()
+        Me.生產日報表_精製_p = New System.Windows.Forms.Panel()
+        Me.生產日報表_精製_lb = New System.Windows.Forms.Label()
+        Me.生產日報表_精製_pb = New System.Windows.Forms.PictureBox()
+        Me.製程管制表_精製_p = New System.Windows.Forms.Panel()
+        Me.製程管制表_精製_lb = New System.Windows.Forms.Label()
+        Me.製程管制表_精製_pb = New System.Windows.Forms.PictureBox()
         Me.物料領料單_p = New System.Windows.Forms.Panel()
         Me.物料領料單_lb = New System.Windows.Forms.Label()
         Me.物料領料單_pb = New System.Windows.Forms.PictureBox()
@@ -143,10 +150,13 @@ Partial Class OW_ERP_SYS
         Me.製程配方表_p = New System.Windows.Forms.Panel()
         Me.製程配方表_lb = New System.Windows.Forms.Label()
         Me.製程配方表_pb = New System.Windows.Forms.PictureBox()
-        Me.生產日報表_精製組_tsm = New System.Windows.Forms.ToolStripMenuItem()
         Me.MenuStrip.SuspendLayout()
         Me.StatusStrip1.SuspendLayout()
         Me.虛擬桌_pl.SuspendLayout()
+        Me.生產日報表_精製_p.SuspendLayout()
+        CType(Me.生產日報表_精製_pb, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.製程管制表_精製_p.SuspendLayout()
+        CType(Me.製程管制表_精製_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.物料領料單_p.SuspendLayout()
         CType(Me.物料領料單_pb, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.成品入庫單_p.SuspendLayout()
@@ -375,6 +385,12 @@ Partial Class OW_ERP_SYS
         Me.生產製程管制表_精緻組_tsm.Size = New System.Drawing.Size(209, 22)
         Me.生產製程管制表_精緻組_tsm.Text = "生產製程管制表 精製組"
         '
+        '生產日報表_精製組_tsm
+        '
+        Me.生產日報表_精製組_tsm.Name = "生產日報表_精製組_tsm"
+        Me.生產日報表_精製組_tsm.Size = New System.Drawing.Size(209, 22)
+        Me.生產日報表_精製組_tsm.Text = "生產日報表 精製組"
+        '
         'ToolStripSeparator4
         '
         Me.ToolStripSeparator4.Name = "ToolStripSeparator4"
@@ -676,6 +692,8 @@ Partial Class OW_ERP_SYS
         Me.虛擬桌_pl.BackColor = System.Drawing.Color.White
         Me.虛擬桌_pl.BackgroundImage = Global.OW_ERP_SYS.My.Resources.Resources.pink_background
         Me.虛擬桌_pl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.虛擬桌_pl.Controls.Add(Me.生產日報表_精製_p)
+        Me.虛擬桌_pl.Controls.Add(Me.製程管制表_精製_p)
         Me.虛擬桌_pl.Controls.Add(Me.物料領料單_p)
         Me.虛擬桌_pl.Controls.Add(Me.成品入庫單_p)
         Me.虛擬桌_pl.Controls.Add(Me.生產日報表_一般_p)
@@ -696,6 +714,76 @@ Partial Class OW_ERP_SYS
         Me.虛擬桌_pl.Size = New System.Drawing.Size(1344, 656)
         Me.虛擬桌_pl.TabIndex = 1775
         '
+        '生產日報表_精製_p
+        '
+        Me.生產日報表_精製_p.BackColor = System.Drawing.Color.Transparent
+        Me.生產日報表_精製_p.Controls.Add(Me.生產日報表_精製_lb)
+        Me.生產日報表_精製_p.Controls.Add(Me.生產日報表_精製_pb)
+        Me.生產日報表_精製_p.Location = New System.Drawing.Point(130, 407)
+        Me.生產日報表_精製_p.Name = "生產日報表_精製_p"
+        Me.生產日報表_精製_p.Size = New System.Drawing.Size(125, 83)
+        Me.生產日報表_精製_p.TabIndex = 1749
+        '
+        '生產日報表_精製_lb
+        '
+        Me.生產日報表_精製_lb.AutoEllipsis = True
+        Me.生產日報表_精製_lb.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.生產日報表_精製_lb.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.生產日報表_精製_lb.ForeColor = System.Drawing.Color.Red
+        Me.生產日報表_精製_lb.Location = New System.Drawing.Point(1, 50)
+        Me.生產日報表_精製_lb.Name = "生產日報表_精製_lb"
+        Me.生產日報表_精製_lb.Size = New System.Drawing.Size(123, 30)
+        Me.生產日報表_精製_lb.TabIndex = 1
+        Me.生產日報表_精製_lb.Text = "生產日報表 精製組"
+        Me.生產日報表_精製_lb.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        '生產日報表_精製_pb
+        '
+        Me.生產日報表_精製_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.生產日報表_精製_pb.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.生產日報表_精製_pb.Image = CType(resources.GetObject("生產日報表_精製_pb.Image"), System.Drawing.Image)
+        Me.生產日報表_精製_pb.Location = New System.Drawing.Point(11, 4)
+        Me.生產日報表_精製_pb.Name = "生產日報表_精製_pb"
+        Me.生產日報表_精製_pb.Size = New System.Drawing.Size(101, 45)
+        Me.生產日報表_精製_pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.生產日報表_精製_pb.TabIndex = 0
+        Me.生產日報表_精製_pb.TabStop = False
+        '
+        '製程管制表_精製_p
+        '
+        Me.製程管制表_精製_p.BackColor = System.Drawing.Color.Transparent
+        Me.製程管制表_精製_p.Controls.Add(Me.製程管制表_精製_lb)
+        Me.製程管制表_精製_p.Controls.Add(Me.製程管制表_精製_pb)
+        Me.製程管制表_精製_p.Location = New System.Drawing.Point(130, 340)
+        Me.製程管制表_精製_p.Name = "製程管制表_精製_p"
+        Me.製程管制表_精製_p.Size = New System.Drawing.Size(125, 83)
+        Me.製程管制表_精製_p.TabIndex = 1748
+        '
+        '製程管制表_精製_lb
+        '
+        Me.製程管制表_精製_lb.AutoEllipsis = True
+        Me.製程管制表_精製_lb.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.製程管制表_精製_lb.Font = New System.Drawing.Font("微軟正黑體", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(136, Byte))
+        Me.製程管制表_精製_lb.ForeColor = System.Drawing.Color.Red
+        Me.製程管制表_精製_lb.Location = New System.Drawing.Point(1, 50)
+        Me.製程管制表_精製_lb.Name = "製程管制表_精製_lb"
+        Me.製程管制表_精製_lb.Size = New System.Drawing.Size(123, 30)
+        Me.製程管制表_精製_lb.TabIndex = 1
+        Me.製程管制表_精製_lb.Text = "製程管制表 精製組"
+        Me.製程管制表_精製_lb.TextAlign = System.Drawing.ContentAlignment.TopCenter
+        '
+        '製程管制表_精製_pb
+        '
+        Me.製程管制表_精製_pb.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch
+        Me.製程管制表_精製_pb.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.製程管制表_精製_pb.Image = CType(resources.GetObject("製程管制表_精製_pb.Image"), System.Drawing.Image)
+        Me.製程管制表_精製_pb.Location = New System.Drawing.Point(11, 4)
+        Me.製程管制表_精製_pb.Name = "製程管制表_精製_pb"
+        Me.製程管制表_精製_pb.Size = New System.Drawing.Size(101, 45)
+        Me.製程管制表_精製_pb.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.製程管制表_精製_pb.TabIndex = 0
+        Me.製程管制表_精製_pb.TabStop = False
+        '
         '物料領料單_p
         '
         Me.物料領料單_p.BackColor = System.Drawing.Color.Transparent
@@ -1186,12 +1274,6 @@ Partial Class OW_ERP_SYS
         Me.製程配方表_pb.TabIndex = 0
         Me.製程配方表_pb.TabStop = False
         '
-        '生產日報表_精製組_tsm
-        '
-        Me.生產日報表_精製組_tsm.Name = "生產日報表_精製組_tsm"
-        Me.生產日報表_精製組_tsm.Size = New System.Drawing.Size(209, 22)
-        Me.生產日報表_精製組_tsm.Text = "生產日報表 精製組"
-        '
         'OW_ERP_SYS
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(10.0!, 20.0!)
@@ -1217,6 +1299,10 @@ Partial Class OW_ERP_SYS
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
         Me.虛擬桌_pl.ResumeLayout(False)
+        Me.生產日報表_精製_p.ResumeLayout(False)
+        CType(Me.生產日報表_精製_pb, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.製程管制表_精製_p.ResumeLayout(False)
+        CType(Me.製程管制表_精製_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.物料領料單_p.ResumeLayout(False)
         CType(Me.物料領料單_pb, System.ComponentModel.ISupportInitialize).EndInit()
         Me.成品入庫單_p.ResumeLayout(False)
@@ -1370,4 +1456,10 @@ Partial Class OW_ERP_SYS
     Friend WithEvents ToolStripSeparator6 As ToolStripSeparator
     Friend WithEvents 生產製程管制表_精緻組_tsm As ToolStripMenuItem
     Friend WithEvents 生產日報表_精製組_tsm As ToolStripMenuItem
+    Friend WithEvents 生產日報表_精製_p As Panel
+    Friend WithEvents 生產日報表_精製_lb As Label
+    Friend WithEvents 生產日報表_精製_pb As PictureBox
+    Friend WithEvents 製程管制表_精製_p As Panel
+    Friend WithEvents 製程管制表_精製_lb As Label
+    Friend WithEvents 製程管制表_精製_pb As PictureBox
 End Class

OW-ERP-SYS/OW-ERP-SYS.vb

@@ -94,7 +94,10 @@ Public Class OW_ERP_SYS
         If CC(51) = True Then : 捷徑名稱(捷徑數量) = "CC07" : 顯示名稱(捷徑數量) = 生產製程管制表_一般油脂_tsm.Text : 捷徑類別(捷徑數量) = "工程" : 捷徑數量 += 1 : End If
         生產日報表_一般油脂組_tsm.Visible = CC(52) : 生產日報表_一般_p.Visible = CC(52)
         If CC(52) = True Then : 捷徑名稱(捷徑數量) = "CC08" : 顯示名稱(捷徑數量) = 生產日報表_一般油脂組_tsm.Text : 捷徑類別(捷徑數量) = "工程" : 捷徑數量 += 1 : End If
-
+        生產製程管制表_精緻組_tsm.Visible = CC(67) : 製程管制表_精製_p.Visible = CC(67)
+        If CC(57) = True Then : 捷徑名稱(捷徑數量) = "CC09" : 顯示名稱(捷徑數量) = 生產製程管制表_精緻組_tsm.Text : 捷徑類別(捷徑數量) = "工程" : 捷徑數量 += 1 : End If
+        生產日報表_精製組_tsm.Visible = CC(68) : 生產日報表_精製_p.Visible = CC(68)
+        If CC(58) = True Then : 捷徑名稱(捷徑數量) = "CC10" : 顯示名稱(捷徑數量) = 生產日報表_精製組_tsm.Text : 捷徑類別(捷徑數量) = "工程" : 捷徑數量 += 1 : End If
         技術系統管理_tsm.Visible = CC(8)
         '------------------------倉儲管理系統-------------------------------------------------------------------------------------------------------------------------------------------------
         倉儲控制表_tsm.Visible = CC(46) : 倉儲控制表_p.Visible = CC(46)
@@ -206,6 +209,22 @@ Public Class OW_ERP_SYS
             If 已經放置 = 0 Then : 生產日報表_一般_p.Location = New Point(0, 0) : X已放 = 0 : Y已放 = 1 : 已經放置 += 1
             Else : 生產日報表_一般_p.Location = New Point(X已放 * 位置X, Y已放 * 位置Y) : Y已放 += 1 : 已經放置 += 1 : If Y已放 >= Y可放 Then : X已放 += 1 : Y已放 = 0 : End If : End If
         End If
+
+        If 無設定 = True Then : 製程管制表_精製_p.Visible = False
+        Else : PA20 = "CC09" : 捷徑關閉 = True : 捷徑設定()
+            If 捷徑關閉 = True Then : 製程管制表_精製_p.Visible = False : Else : 製程管制表_精製_p.Visible = True : End If : End If
+        If 製程管制表_精製_p.Visible = True Then : 段落4 = True : 製程管制表_精製_p.Size = New Point(位置X, 位置Y1)
+            If 已經放置 = 0 Then : 製程管制表_精製_p.Location = New Point(0, 0) : X已放 = 0 : Y已放 = 1 : 已經放置 += 1
+            Else : 製程管制表_精製_p.Location = New Point(X已放 * 位置X, Y已放 * 位置Y) : Y已放 += 1 : 已經放置 += 1 : If Y已放 >= Y可放 Then : X已放 += 1 : Y已放 = 0 : End If : End If
+        End If
+
+        If 無設定 = True Then : 生產日報表_精製_p.Visible = False
+        Else : PA20 = "CC10" : 捷徑關閉 = True : 捷徑設定()
+            If 捷徑關閉 = True Then : 生產日報表_精製_p.Visible = False : Else : 生產日報表_精製_p.Visible = True : End If : End If
+        If 生產日報表_精製_p.Visible = True Then : 段落4 = True : 生產日報表_精製_p.Size = New Point(位置X, 位置Y1)
+            If 已經放置 = 0 Then : 生產日報表_精製_p.Location = New Point(0, 0) : X已放 = 0 : Y已放 = 1 : 已經放置 += 1
+            Else : 生產日報表_精製_p.Location = New Point(X已放 * 位置X, Y已放 * 位置Y) : Y已放 += 1 : 已經放置 += 1 : If Y已放 >= Y可放 Then : X已放 += 1 : Y已放 = 0 : End If : End If
+        End If
         '---------倉儲---------------------------------------------------------------------------------------------------------------
         If 無設定 = True Then : 倉儲控制表_p.Visible = False
         Else : PA20 = "DC01" : 捷徑關閉 = True : 捷徑設定()
@@ -428,10 +447,22 @@ Public Class OW_ERP_SYS
         For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next
         重置() : 製程管制紀錄表_一般組.Show() : 製程管制紀錄表_一般組.BringToFront() : 虛擬桌面隱藏()
     End Sub
+    Private Sub 製程管制表_精製_pb_Click(sender As Object, e As EventArgs) Handles 製程管制表_精製_pb.Click
+        生產製程管制表_精緻組_tsm.PerformClick()
+    End Sub
+    Private Sub 製程管制表_精製_lb_Click(sender As Object, e As EventArgs) Handles 製程管制表_精製_lb.Click
+        生產製程管制表_精緻組_tsm.PerformClick()
+    End Sub
     Private Sub 生產製程管制表_精緻組_tsm_Click(sender As Object, e As EventArgs) Handles 生產製程管制表_精緻組_tsm.Click
         For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next
         重置() : 製程管制紀錄表_精製組.Show() : 製程管制紀錄表_精製組.BringToFront() : 虛擬桌面隱藏()
     End Sub
+    Private Sub 生產日報表_精製_lb_Click(sender As Object, e As EventArgs) Handles 生產日報表_精製_lb.Click
+        生產日報表_精製組_tsm.PerformClick()
+    End Sub
+    Private Sub 生產日報表_精製_pb_Click(sender As Object, e As EventArgs) Handles 生產日報表_精製_pb.Click
+        生產日報表_精製組_tsm.PerformClick()
+    End Sub
     Private Sub 生產日報表_精製組_tsm_Click(sender As Object, e As EventArgs) Handles 生產日報表_精製組_tsm.Click
         For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next
         重置() : 生產日報表_精製組.Show() : 生產日報表_精製組.BringToFront() : 虛擬桌面隱藏()
@@ -496,6 +527,8 @@ Public Class OW_ERP_SYS
 
 
 
+
+
     Private Sub 部門權限設定_tsm_Click(sender As Object, e As EventArgs) Handles 部門權限設定_tsm.Click
         For Each ChildForm As Form In Me.MdiChildren : ChildForm.Close() : Next
         重置() : 部門權限設定.Show() : 部門權限設定.BringToFront() : 虛擬桌面隱藏()

OW-ERP-SYS/OW-ERP-SYS.vbproj

@@ -723,6 +723,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="井富LOGO.ico" />
+    <None Include="圖片\109994-removebg-preview.png" />
     <None Include="圖片\receipts.png" />
     <None Include="圖片\pick-list.png" />
     <None Include="圖片\receipts_01.png" />

OW-ERP-SYS/bin/Debug/OW-ERP-SYS.xml

@@ -27,6 +27,11 @@ OW-ERP-SYS
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
 </summary>
 </member>
+<member name="P:OW_ERP_SYS.My.Resources.Resources._109994_removebg_preview">
+<summary>
+  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+</summary>
+</member>
 <member name="P:OW_ERP_SYS.My.Resources.Resources._Select">
 <summary>
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。

OW-ERP-SYS/bin/Debug/李協叡.txt

@@ -7,6 +7,8 @@ CC05
 CC06
 CC07
 CC08
+CC09
+CC10
 DC01
 DC02
 DC03

OW-ERP-SYS/obj/Debug/OW-ERP-SYS.xml

@@ -27,6 +27,11 @@ OW-ERP-SYS
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。
 </summary>
 </member>
+<member name="P:OW_ERP_SYS.My.Resources.Resources._109994_removebg_preview">
+<summary>
+  查詢類型 System.Drawing.Bitmap 的當地語系化資源。
+</summary>
+</member>
 <member name="P:OW_ERP_SYS.My.Resources.Resources._Select">
 <summary>
   查詢類型 System.Drawing.Bitmap 的當地語系化資源。