浏览代码

1. 推送備份

卓叡 3 个月前
父节点
当前提交
dde771eb3b

二进制
.vs/Sh-To-ERP-SYS/FileContentIndex/27ea13ec-299a-43b1-a739-3ea37a67b478.vsidx → .vs/Sh-To-ERP-SYS/FileContentIndex/166e84ee-d5d1-4a9d-85d8-abaaf91e84f3.vsidx 查看文件


二进制
.vs/Sh-To-ERP-SYS/FileContentIndex/fda23361-aeb6-4ed8-92d9-c76980af6353.vsidx → .vs/Sh-To-ERP-SYS/FileContentIndex/fdffd1ca-05c8-47dc-b7a9-2f4e20dc91ac.vsidx 查看文件


二进制
.vs/Sh-To-ERP-SYS/v17/.suo 查看文件


+ 21
- 19
.vs/Sh-To-ERP-SYS/v17/DocumentLayout.backup.json 查看文件

@@ -3,11 +3,11 @@
3 3
   "WorkspaceRootPath": "D:\\Project1\\Sh-To-ERP-SYS\\",
4 4
   "Documents": [
5 5
     {
6
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
7
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
6
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
7
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
8 8
     },
9 9
     {
10
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
10
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
11 11
       "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
12 12
     },
13 13
     {
@@ -15,8 +15,8 @@
15 15
       "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
16 16
     },
17 17
     {
18
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
19
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
18
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
19
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
20 20
     }
21 21
   ],
22 22
   "DocumentGroupContainers": [
@@ -26,11 +26,11 @@
26 26
       "DocumentGroups": [
27 27
         {
28 28
           "DockedWidth": 200,
29
-          "SelectedChildIndex": 0,
29
+          "SelectedChildIndex": 3,
30 30
           "Children": [
31 31
             {
32 32
               "$type": "Document",
33
-              "DocumentIndex": 0,
33
+              "DocumentIndex": 3,
34 34
               "Title": "\u5168\u57DF\u8B8A\u6578.vb",
35 35
               "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
36 36
               "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
@@ -39,8 +39,7 @@
39 39
               "ViewState": "AgIAAAEAAAAAAAAAAAAuwBEAAAAjAAAAAAAAAA==",
40 40
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
41 41
               "WhenOpened": "2024-08-04T10:19:01.26Z",
42
-              "IsPinned": true,
43
-              "EditorCaption": ""
42
+              "IsPinned": true
44 43
             },
45 44
             {
46 45
               "$type": "Bookmark",
@@ -52,15 +51,16 @@
52 51
             },
53 52
             {
54 53
               "$type": "Document",
55
-              "DocumentIndex": 3,
54
+              "DocumentIndex": 0,
56 55
               "Title": "\u7522\u54C1\u5EAB\u5B58\u8868.vb",
57 56
               "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
58 57
               "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
59
-              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
60
-              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
61
-              "ViewState": "AgIAAA8CAAAAAAAAAAAAwB4CAABfAAAAAAAAAA==",
58
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb*",
59
+              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb*",
60
+              "ViewState": "AgIAAEoCAAAAAAAAAAAAwFoCAAA1AAAAAAAAAA==",
62 61
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
63
-              "WhenOpened": "2024-12-23T03:13:50.175Z"
62
+              "WhenOpened": "2024-12-23T03:13:50.175Z",
63
+              "EditorCaption": ""
64 64
             },
65 65
             {
66 66
               "$type": "Document",
@@ -68,10 +68,11 @@
68 68
               "Title": "\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
69 69
               "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
70 70
               "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
71
-              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
72
-              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
71
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]*",
72
+              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]*",
73 73
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
74
-              "WhenOpened": "2024-12-23T03:09:56.789Z"
74
+              "WhenOpened": "2024-12-23T03:09:56.789Z",
75
+              "EditorCaption": " [\u8A2D\u8A08]"
75 76
             },
76 77
             {
77 78
               "$type": "Document",
@@ -81,9 +82,10 @@
81 82
               "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\LoginForm1.vb",
82 83
               "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\LoginForm1.vb",
83 84
               "RelativeToolTip": "Sh-To-ERP-SYS\\LoginForm1.vb",
84
-              "ViewState": "AgIAAJQAAAAAAAAAAAAswKUAAAAvAAAAAAAAAA==",
85
+              "ViewState": "AgIAAJMAAAAAAAAAAAAYwKAAAAAEAAAAAAAAAA==",
85 86
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
86
-              "WhenOpened": "2024-10-08T07:59:01.16Z"
87
+              "WhenOpened": "2024-10-08T07:59:01.16Z",
88
+              "EditorCaption": ""
87 89
             }
88 90
           ]
89 91
         },

+ 68
- 32
.vs/Sh-To-ERP-SYS/v17/DocumentLayout.json 查看文件

@@ -3,20 +3,28 @@
3 3
   "WorkspaceRootPath": "D:\\Project1\\Sh-To-ERP-SYS\\",
4 4
   "Documents": [
5 5
     {
6
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
7
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
6
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
7
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
8 8
     },
9 9
     {
10
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
11
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
10
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\0\u3001mymodule\\\u4E3B\u8CC7\u6599\u5EAB\\sql_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
11
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u4E3B\u8CC7\u6599\u5EAB\\sql_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
12 12
     },
13 13
     {
14
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form",
15
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
14
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
15
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
16 16
     },
17 17
     {
18
-      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
19
-      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
18
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form",
19
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}|Form"
20
+    },
21
+    {
22
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|D:\\Project1\\Sh-To-ERP-SYS\\sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
23
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\0\u3001mymodule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
24
+    },
25
+    {
26
+      "AbsoluteMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|d:\\project1\\sh-to-erp-sys\\sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}",
27
+      "RelativeMoniker": "D:0:0:{8784EEA5-83D6-40E7-99E5-2E585179323B}|Sh-To-ERP-SYS\\Sh-To-ERP-SYS.vbproj|solutionrelative:sh-to-erp-sys\\loginform1.vb||{2C015C70-C72C-11D0-88C3-00A0C9110049}"
20 28
     }
21 29
   ],
22 30
   "DocumentGroupContainers": [
@@ -26,17 +34,17 @@
26 34
       "DocumentGroups": [
27 35
         {
28 36
           "DockedWidth": 200,
29
-          "SelectedChildIndex": 5,
37
+          "SelectedChildIndex": 7,
30 38
           "Children": [
31 39
             {
32 40
               "$type": "Document",
33
-              "DocumentIndex": 1,
41
+              "DocumentIndex": 4,
34 42
               "Title": "\u5168\u57DF\u8B8A\u6578.vb",
35 43
               "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
36 44
               "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
37 45
               "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
38 46
               "RelativeToolTip": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u5168\u57DF\u8B8A\u6578.vb",
39
-              "ViewState": "AgIAAAEAAAAAAAAAAAAuwBEAAAAjAAAAAAAAAA==",
47
+              "ViewState": "AgIAAAEAAAAAAAAAAAAuwAUAAAAUAAAAAAAAAA==",
40 48
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
41 49
               "WhenOpened": "2024-08-04T10:19:01.26Z",
42 50
               "IsPinned": true,
@@ -52,38 +60,66 @@
52 60
             },
53 61
             {
54 62
               "$type": "Document",
55
-              "DocumentIndex": 3,
56
-              "Title": "\u7522\u54C1\u5EAB\u5B58\u8868.vb",
57
-              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
58
-              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
59
-              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
60
-              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
61
-              "ViewState": "AgIAAA8CAAAAAAAAAAAAwB4CAABfAAAAAAAAAA==",
63
+              "DocumentIndex": 5,
64
+              "Title": "LoginForm1.vb",
65
+              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\LoginForm1.vb",
66
+              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\LoginForm1.vb",
67
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\LoginForm1.vb",
68
+              "RelativeToolTip": "Sh-To-ERP-SYS\\LoginForm1.vb",
69
+              "ViewState": "AgIAAJMAAAAAAAAAAAAYwJwAAAAeAAAAAAAAAA==",
62 70
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
63
-              "WhenOpened": "2024-12-23T03:13:50.175Z"
71
+              "WhenOpened": "2024-10-08T07:59:01.16Z",
72
+              "EditorCaption": ""
64 73
             },
65 74
             {
66 75
               "$type": "Document",
67 76
               "DocumentIndex": 2,
68
-              "Title": "\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
69
-              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
70
-              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb",
71
-              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
72
-              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u7522\u54C1\u5EAB\u5B58\u8868.vb [\u8A2D\u8A08]",
77
+              "Title": "\u751F\u7522\u6392\u7A0B\u8868.vb",
78
+              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
79
+              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
80
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
81
+              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
82
+              "ViewState": "AgIAAMwCAAAAAAAAAAAAwOACAAARAAAAAAAAAA==",
73 83
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
74
-              "WhenOpened": "2024-12-23T03:09:56.789Z"
84
+              "WhenOpened": "2024-12-25T06:50:38.124Z",
85
+              "EditorCaption": ""
86
+            },
87
+            {
88
+              "$type": "Document",
89
+              "DocumentIndex": 1,
90
+              "Title": "SQL_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb",
91
+              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb",
92
+              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb",
93
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb",
94
+              "RelativeToolTip": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u4E3B\u8CC7\u6599\u5EAB\\SQL_\u751F\u7522\u7BA1\u7406\u7CFB\u7D71.vb",
95
+              "ViewState": "AgIAAIAAAAAAAAAAAAAawI4AAAAPAAAAAAAAAA==",
96
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
97
+              "WhenOpened": "2024-12-25T06:50:38.138Z",
98
+              "EditorCaption": ""
99
+            },
100
+            {
101
+              "$type": "Document",
102
+              "DocumentIndex": 3,
103
+              "Title": "\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
104
+              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
105
+              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb",
106
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
107
+              "RelativeToolTip": "Sh-To-ERP-SYS\\05\u3001\u5EE0\u52D9\u7BA1\u7406\u7CFB\u7D71\\\u751F\u7522\u6392\u7A0B\u8868.vb [\u8A2D\u8A08]",
108
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
109
+              "WhenOpened": "2024-12-25T07:58:24.673Z",
110
+              "EditorCaption": " [\u8A2D\u8A08]"
75 111
             },
76 112
             {
77 113
               "$type": "Document",
78 114
               "DocumentIndex": 0,
79
-              "Title": "LoginForm1.vb",
80
-              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\LoginForm1.vb",
81
-              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\LoginForm1.vb",
82
-              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\LoginForm1.vb",
83
-              "RelativeToolTip": "Sh-To-ERP-SYS\\LoginForm1.vb",
84
-              "ViewState": "AgIAAJMAAAAAAAAAAAAYwKAAAAAEAAAAAAAAAA==",
115
+              "Title": "\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb",
116
+              "DocumentMoniker": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb",
117
+              "RelativeDocumentMoniker": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb",
118
+              "ToolTip": "D:\\Project1\\Sh-To-ERP-SYS\\Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb",
119
+              "RelativeToolTip": "Sh-To-ERP-SYS\\0\u3001MyModule\\\u6A21\u7D44\\\u539F\u6599\u7DE8\u865F\u7522\u751F\u5668.vb",
120
+              "ViewState": "AgIAAGMBAAAAAAAAAAAAAHEBAAARAAAAAAAAAA==",
85 121
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003361|",
86
-              "WhenOpened": "2024-10-08T07:59:01.16Z",
122
+              "WhenOpened": "2024-12-25T08:21:08.289Z",
87 123
               "EditorCaption": ""
88 124
             }
89 125
           ]

+ 133
- 133
Sh-To-ERP-SYS/05、廠務管理系統/生產排程表.vb 查看文件

@@ -667,142 +667,142 @@ Public Class 生產排程表
667 667
                 End If
668 668
                 Dim 完工日期 As String = 完工日期_dtp.Value.ToString("yyyy/MM/dd")
669 669
 
670
-                '' 執行原料庫存檢查作業
671
-                'Dim 產品BOM編號 As String
672
-                'Dim BOM明細料號 As New Dictionary(Of String, Tuple(Of String, Decimal))
673
-                'Dim 配比流水號 As String = "" : Dim 混凝土用量 As String = "" : Dim 混凝土料號 As String = ""
674
-
675
-                ''SQL_產品BOM表_產品流水號查詢_讀取(料號_tb.Text)
676
-                'SQL_產品BOM表_產品流水號查詢_讀取(明細選擇料號)
677
-                'If dr.Read Then
678
-                '    產品BOM編號 = dr("產品流水號").ToString
679
-
680
-                '    SQL_產品BOM明細表_配比號查詢(產品BOM編號)
681
-                '    If dr.Read Then
682
-                '        配比流水號 = dr("配比流水號").ToString
683
-                '        混凝土用量 = dr("數量").ToString
684
-                '        混凝土料號 = dr("物料料號").ToString
685
-                '    End If
686
-
687
-                '    SQL_產品BOM明細表_料號查詢_讀取(產品BOM編號)
688
-                '    While dr.Read
689
-                '        ' 將 "物料料號" 作為 Key,並存放名稱和數量到 Tuple
690
-                '        Dim 物料料號 As String = dr("物料料號").ToString
691
-                '        Dim 原料名稱 As String = dr("原料名稱").ToString
692
-                '        Dim 原料數量 As Decimal = CDec(dr("數量"))
693
-                '        BOM明細料號.Add(物料料號, Tuple.Create(原料名稱, 原料數量))
694
-                '    End While
695
-                'Else
696
-                '    MGB("錯誤! 此產品找不到產品流水號。", 1)
697
-                '    Exit Sub
698
-                'End If
699
-
700
-                'Dim 砂庫存量 As Decimal = 取得水泥原料庫存量("砂")
701
-                'Dim 三分石庫存量 As Decimal = 取得水泥原料庫存量("三分石")
702
-                'Dim 六分石庫存量 As Decimal = 取得水泥原料庫存量("六分石")
703
-                'Dim 水泥庫存量 As Decimal = 取得水泥原料庫存量("水泥")
704
-                'Dim 爐石庫存量 As Decimal = 取得水泥原料庫存量("爐石")
705
-                'Dim 藥劑庫存量 As Decimal = 取得水泥原料庫存量("藥劑")
706
-
707
-                'Dim 砂用量 As Decimal = (取得水泥原料配比用量(配比流水號, "砂I") + 取得水泥原料配比用量(配比流水號, "砂II")) * CDec(混凝土用量)
708
-                'Dim 三分石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "三分石") * CDec(混凝土用量)
709
-                'Dim 六分石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "六分石") * CDec(混凝土用量)
710
-                'Dim 水泥用量 As Decimal = (取得水泥原料配比用量(配比流水號, "水泥I") + 取得水泥原料配比用量(配比流水號, "水泥II")) * CDec(混凝土用量)
711
-                'Dim 爐石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "爐石") * CDec(混凝土用量)
712
-                'Dim 藥劑用量 As Decimal = 取得水泥原料配比用量(配比流水號, "藥劑") * CDec(混凝土用量)
713
-
714
-                'If 砂用量 > 砂庫存量 Then MGB("砂庫存量不足!", 1) : Exit Sub
715
-                'If 三分石用量 > 三分石庫存量 Then MGB("三分石庫存量不足!", 1) : Exit Sub
716
-                'If 六分石用量 > 六分石庫存量 Then MGB("六分石庫存量不足!", 1) : Exit Sub
717
-                'If 水泥用量 > 水泥庫存量 Then MGB("水泥庫存量不足!", 1) : Exit Sub
718
-                'If 爐石用量 > 爐石庫存量 Then MGB("爐石庫存量不足!", 1) : Exit Sub
719
-                'If 藥劑用量 > 藥劑庫存量 Then MGB("藥劑用量不足!", 1) : Exit Sub
720
-
721
-                'Try
722
-                '    ' 遍歷 BOM明細料號 Dictionary 的每個項目進行庫存檢查
723
-                '    For Each kvp As KeyValuePair(Of String, Tuple(Of String, Decimal)) In BOM明細料號
724
-                '        Dim 料號 As String = kvp.Key
725
-                '        Dim 名稱 As String = kvp.Value.Item1
726
-                '        Dim 計算數量 As Decimal = CDec(kvp.Value.Item2) * CDec(入庫數_tb.Text)
727
-                '        Dim 新庫存編號 As String = 產生新流水號("SK", "原料庫存表", "庫存編號")
728
-
729
-                '        If 出庫作業系統.檢查庫存(新庫存編號, 料號, 計算數量.ToString) Then
730
-                '            ' 庫存充足,無需動作
731
-                '        Else
732
-                '            ' 顯示包含 "料號" 和 "名稱" 的訊息
733
-                '            MessageBox.Show("庫存不足!料號:" & 料號 & " 名稱:" & 名稱 & " 所需數量:" & 計算數量, "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning)
734
-                '        End If
735
-                '    Next
736
-
737
-                ' 所有原料充足,執行產品入庫更新
738
-                PA = 明細流水號_tb.Text : PA1 = 項次_tb.Text : PA2 = 入庫數_tb.Text
670
+                ' 執行原料庫存檢查作業
671
+                Dim 產品BOM編號 As String
672
+                Dim BOM明細料號 As New Dictionary(Of String, Tuple(Of String, Decimal))
673
+                Dim 配比流水號 As String = "" : Dim 混凝土用量 As String = "" : Dim 混凝土料號 As String = ""
674
+
675
+                'SQL_產品BOM表_產品流水號查詢_讀取(料號_tb.Text)
676
+                SQL_產品BOM表_產品流水號查詢_讀取(明細選擇料號)
677
+                If dr.Read Then
678
+                    產品BOM編號 = dr("產品流水號").ToString
679
+
680
+                    SQL_產品BOM明細表_配比號查詢(產品BOM編號)
681
+                    If dr.Read Then
682
+                        配比流水號 = dr("配比流水號").ToString
683
+                        混凝土用量 = dr("數量").ToString
684
+                        混凝土料號 = dr("物料料號").ToString
685
+                    End If
686
+
687
+                    SQL_產品BOM明細表_料號查詢_讀取(產品BOM編號)
688
+                    While dr.Read
689
+                        ' 將 "物料料號" 作為 Key,並存放名稱和數量到 Tuple
690
+                        Dim 物料料號 As String = dr("物料料號").ToString
691
+                        Dim 原料名稱 As String = dr("原料名稱").ToString
692
+                        Dim 原料數量 As Decimal = CDec(dr("數量"))
693
+                        BOM明細料號.Add(物料料號, Tuple.Create(原料名稱, 原料數量))
694
+                    End While
695
+                Else
696
+                    MGB("錯誤! 此產品找不到產品流水號。", 1)
697
+                    Exit Sub
698
+                End If
699
+
700
+                Dim 砂庫存量 As Decimal = 取得水泥原料庫存量("砂")
701
+                Dim 三分石庫存量 As Decimal = 取得水泥原料庫存量("三分石")
702
+                Dim 六分石庫存量 As Decimal = 取得水泥原料庫存量("六分石")
703
+                Dim 水泥庫存量 As Decimal = 取得水泥原料庫存量("水泥")
704
+                Dim 爐石庫存量 As Decimal = 取得水泥原料庫存量("爐石")
705
+                Dim 藥劑庫存量 As Decimal = 取得水泥原料庫存量("藥劑")
706
+
707
+                Dim 砂用量 As Decimal = (取得水泥原料配比用量(配比流水號, "砂I") + 取得水泥原料配比用量(配比流水號, "砂II")) * CDec(混凝土用量)
708
+                Dim 三分石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "三分石") * CDec(混凝土用量)
709
+                Dim 六分石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "六分石") * CDec(混凝土用量)
710
+                Dim 水泥用量 As Decimal = (取得水泥原料配比用量(配比流水號, "水泥I") + 取得水泥原料配比用量(配比流水號, "水泥II")) * CDec(混凝土用量)
711
+                Dim 爐石用量 As Decimal = 取得水泥原料配比用量(配比流水號, "爐石") * CDec(混凝土用量)
712
+                Dim 藥劑用量 As Decimal = 取得水泥原料配比用量(配比流水號, "藥劑") * CDec(混凝土用量)
713
+
714
+                If 砂用量 > 砂庫存量 Then MGB("砂庫存量不足!", 1) : Exit Sub
715
+                If 三分石用量 > 三分石庫存量 Then MGB("三分石庫存量不足!", 1) : Exit Sub
716
+                If 六分石用量 > 六分石庫存量 Then MGB("六分石庫存量不足!", 1) : Exit Sub
717
+                If 水泥用量 > 水泥庫存量 Then MGB("水泥庫存量不足!", 1) : Exit Sub
718
+                If 爐石用量 > 爐石庫存量 Then MGB("爐石庫存量不足!", 1) : Exit Sub
719
+                If 藥劑用量 > 藥劑庫存量 Then MGB("藥劑用量不足!", 1) : Exit Sub
720
+
721
+                Try
722
+                    ' 遍歷 BOM明細料號 Dictionary 的每個項目進行庫存檢查
723
+                    For Each kvp As KeyValuePair(Of String, Tuple(Of String, Decimal)) In BOM明細料號
724
+                        Dim 料號 As String = kvp.Key
725
+                        Dim 名稱 As String = kvp.Value.Item1
726
+                        Dim 計算數量 As Decimal = CDec(kvp.Value.Item2) * CDec(入庫數_tb.Text)
727
+                        Dim 新庫存編號 As String = 產生新流水號("SK", "原料庫存表", "庫存編號")
728
+
729
+                        If 出庫作業系統.檢查庫存(新庫存編號, 料號, 計算數量.ToString) Then
730
+                            ' 庫存充足,無需動作
731
+                        Else
732
+                            ' 顯示包含 "料號" 和 "名稱" 的訊息
733
+                            MessageBox.Show("庫存不足!料號:" & 料號 & " 名稱:" & 名稱 & " 所需數量:" & 計算數量, "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning)
734
+                        End If
735
+                    Next
736
+
737
+                    ' 所有原料充足,執行產品入庫更新
738
+                    PA = 明細流水號_tb.Text : PA1 = 項次_tb.Text : PA2 = 入庫數_tb.Text
739 739
                     SQL_排程表完工項目資料_更新(完工日期) : Set_排程清單() : 產品庫存表.Set_生產庫存清單()
740 740
                     PA = "" : PA1 = "" : PA2 = "" : conn.Close()
741 741
 
742
-                'Catch ex As Exception
743
-                '    MessageBox.Show("庫存檢查失敗:" & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
744
-                'End Try
745
-
746
-                'Dim 對應水泥出庫單號 As String = "" : Dim 讀取水泥出庫單 As Boolean = True
747
-                'Try
748
-                '    ' 遍歷 BOM明細料號 Dictionary 的每個項目進行庫存檢查
749
-                '    For Each kvp As KeyValuePair(Of String, Tuple(Of String, Decimal)) In BOM明細料號
750
-                '        ' 產生新出庫單號
751
-                '        Dim 新出庫單號 As String = 原料編號產生器.產生出庫單號(編號代碼.生產領料)
752
-                '        Dim 新異動單號 As String = 原料編號產生器.產生異動編號(編號代碼.生產領料)
753
-                '        Dim 料號 As String = kvp.Key
754
-                '        Dim 名稱 As String = kvp.Value.Item1
755
-                '        Dim 計算數量 As Decimal = CDec(kvp.Value.Item2) * CDec(入庫數_tb.Text)
756
-
757
-                '        ' 從表單取得輸入值
758
-                '        Dim 物料ID As String = 料號
759
-                '        Dim 出庫用途 As String = "生產領料"
760
-                '        Dim 數量 As String = 計算數量.ToString
761
-                '        Dim 領料部門 As String = "生產部"
762
-                '        Dim 出庫日期 As String = 完工日期
763
-                '        Dim 備註 As String = "NA"
764
-                '        Dim 經辦人員 As String = gUserName
765
-                '        Dim 來源單編號 As String = 明細流水號_tb.Text
766
-                '        Dim 異動類型 As String = "出庫異動"
767
-
768
-                '        If 讀取水泥出庫單 Then
769
-                '            對應水泥出庫單號 = 新出庫單號
770
-                '            讀取水泥出庫單 = False
771
-                '        End If
772
-
773
-                '        ' 執行出庫作業
774
-                '        出庫作業系統.執行出庫(新出庫單號, 物料ID, 出庫用途, 數量, 領料部門, 出庫日期, 經辦人員, 備註, 來源單編號, 新異動單號, 異動類型)
775
-
776
-                '    Next
777
-                'Catch ex As Exception
778
-                '    MessageBox.Show("原料出庫失敗:" & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
779
-                'End Try
780
-
781
-                'Dim 混凝土新號 As String
782
-                'If 砂用量 > 0 Then
783
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
784
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "砂", "", 砂用量.ToString, 對應水泥出庫單號)
785
-                'End If
786
-                'If 三分石用量 > 0 Then
787
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
788
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "三分石", "", 三分石用量.ToString, 對應水泥出庫單號)
789
-                'End If
790
-                'If 六分石用量 > 0 Then
791
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
792
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "六分石", "", 六分石用量.ToString, 對應水泥出庫單號)
793
-                'End If
794
-                'If 水泥用量 > 0 Then
795
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
796
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "水泥", "", 水泥用量.ToString, 對應水泥出庫單號)
797
-                'End If
798
-                'If 爐石用量 > 0 Then
799
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
800
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "爐石", "", 爐石用量.ToString, 對應水泥出庫單號)
801
-                'End If
802
-                'If 藥劑用量 > 0 Then
803
-                '    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
804
-                '    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "藥劑", "", 藥劑用量.ToString, 對應水泥出庫單號)
805
-                'End If
742
+                Catch ex As Exception
743
+                    MessageBox.Show("庫存檢查失敗:" & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
744
+                End Try
745
+
746
+                Dim 對應水泥出庫單號 As String = "" : Dim 讀取水泥出庫單 As Boolean = True
747
+                Try
748
+                    ' 遍歷 BOM明細料號 Dictionary 的每個項目進行庫存檢查
749
+                    For Each kvp As KeyValuePair(Of String, Tuple(Of String, Decimal)) In BOM明細料號
750
+                        ' 產生新出庫單號
751
+                        Dim 新出庫單號 As String = 原料編號產生器.產生出庫單號(編號代碼.生產領料)
752
+                        Dim 新異動單號 As String = 原料編號產生器.產生異動編號(編號代碼.生產領料)
753
+                        Dim 料號 As String = kvp.Key
754
+                        Dim 名稱 As String = kvp.Value.Item1
755
+                        Dim 計算數量 As Decimal = CDec(kvp.Value.Item2) * CDec(入庫數_tb.Text)
756
+
757
+                        ' 從表單取得輸入值
758
+                        Dim 物料ID As String = 料號
759
+                        Dim 出庫用途 As String = "生產領料"
760
+                        Dim 數量 As String = 計算數量.ToString
761
+                        Dim 領料部門 As String = "生產部"
762
+                        Dim 出庫日期 As String = 完工日期
763
+                        Dim 備註 As String = "NA"
764
+                        Dim 經辦人員 As String = gUserName
765
+                        Dim 來源單編號 As String = 明細流水號_tb.Text
766
+                        Dim 異動類型 As String = "出庫異動"
767
+
768
+                        If 讀取水泥出庫單 Then
769
+                            對應水泥出庫單號 = 新出庫單號
770
+                            讀取水泥出庫單 = False
771
+                        End If
772
+
773
+                        ' 執行出庫作業
774
+                        出庫作業系統.執行出庫(新出庫單號, 物料ID, 出庫用途, 數量, 領料部門, 出庫日期, 經辦人員, 備註, 來源單編號, 新異動單號, 異動類型)
775
+
776
+                    Next
777
+                Catch ex As Exception
778
+                    MessageBox.Show("原料出庫失敗:" & ex.Message, "錯誤", MessageBoxButtons.OK, MessageBoxIcon.Error)
779
+                End Try
780
+
781
+                Dim 混凝土新號 As String
782
+                If 砂用量 > 0 Then
783
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
784
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "砂", "", 砂用量.ToString, 對應水泥出庫單號)
785
+                End If
786
+                If 三分石用量 > 0 Then
787
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
788
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "三分石", "", 三分石用量.ToString, 對應水泥出庫單號)
789
+                End If
790
+                If 六分石用量 > 0 Then
791
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
792
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "六分石", "", 六分石用量.ToString, 對應水泥出庫單號)
793
+                End If
794
+                If 水泥用量 > 0 Then
795
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
796
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "水泥", "", 水泥用量.ToString, 對應水泥出庫單號)
797
+                End If
798
+                If 爐石用量 > 0 Then
799
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
800
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "爐石", "", 爐石用量.ToString, 對應水泥出庫單號)
801
+                End If
802
+                If 藥劑用量 > 0 Then
803
+                    混凝土新號 = 產生新流水號("DP", "混凝土庫存表", "混凝土流水號")
804
+                    SQL_混凝土配比表_新增(混凝土新號, 混凝土料號, 配比流水號, "藥劑", "", 藥劑用量.ToString, 對應水泥出庫單號)
805
+                End If
806 806
 
807 807
             End If
808 808
         Else

+ 31
- 17
Sh-To-ERP-SYS/05、廠務管理系統/產品庫存表.vb 查看文件

@@ -565,39 +565,53 @@ Public Class 產品庫存表
565 565
             ExcelWorksheet.Cells(3, 1) = "印表日期:"
566 566
             ExcelWorksheet.Cells(3, 2) = DateTime.Now.ToString("yyyy/MM/dd")
567 567
 
568
-            ' 將表頭資訊置中並合併儲存格
569
-            ExcelWorksheet.Range("A1:E1").Merge()
570
-            ExcelWorksheet.Range("A2:E2").Merge()
571
-            'ExcelWorksheet.Range("A3:E3").Merge()
572
-            ExcelWorksheet.Range("A1:E3").HorizontalAlignment = Microsoft.Office.Interop.Excel.XlHAlign.xlHAlignCenter
568
+            ' 記錄 Excel 的欄位索引
569
+            Dim excelCol As Integer = 1
573 570
 
574
-            ' 設定表頭字型
575
-            ExcelWorksheet.Range("A1").Font.Size = 16
576
-            ExcelWorksheet.Range("A1").Font.Bold = True
577
-            ExcelWorksheet.Range("A2").Font.Size = 14
578
-            ExcelWorksheet.Range("A2").Font.Bold = True
579
-
580
-            ' 匯出 DataGridView 標題列(從第 4 列開始)
571
+            ' 匯出 DataGridView 標題列(從第 4 列開始),排除料號欄位
581 572
             For i As Integer = 0 To 庫存顯示_dgv.Columns.Count - 1
582
-                ExcelWorksheet.Cells(4, i + 1) = 庫存顯示_dgv.Columns(i).HeaderText
573
+                If 庫存顯示_dgv.Columns(i).Name <> "料號" Then
574
+                    ExcelWorksheet.Cells(4, excelCol) = 庫存顯示_dgv.Columns(i).HeaderText
575
+                    excelCol += 1
576
+                End If
583 577
             Next
584 578
 
585
-            ' 匯出資料(從第 5 列開始)
579
+            ' 匯出資料(從第 5 列開始),排除料號欄位
586 580
             For i As Integer = 0 To 庫存顯示_dgv.Rows.Count - 1
581
+                excelCol = 1  ' 重置 Excel 欄位索引
587 582
                 For j As Integer = 0 To 庫存顯示_dgv.Columns.Count - 1
588
-                    ExcelWorksheet.Cells(i + 5, j + 1) = 庫存顯示_dgv.Rows(i).Cells(j).Value
583
+                    If 庫存顯示_dgv.Columns(j).Name <> "料號" Then
584
+                        ExcelWorksheet.Cells(i + 5, excelCol) = 庫存顯示_dgv.Rows(i).Cells(j).Value
585
+                        excelCol += 1
586
+                    End If
589 587
                 Next
590 588
             Next
591 589
 
590
+            ' 設定字型為「微軟正黑體」
591
+            With ExcelWorksheet.Cells.Font
592
+                .Name = "微軟正黑體"
593
+            End With
594
+
595
+            ' 將表頭資訊置中並合併儲存格
596
+            ExcelWorksheet.Range("A1:D1").Merge()
597
+            ExcelWorksheet.Range("A2:D2").Merge()
598
+            ExcelWorksheet.Range("A1:D2").HorizontalAlignment = Microsoft.Office.Interop.Excel.XlHAlign.xlHAlignCenter
599
+
600
+            ' 設定表頭字型
601
+            ExcelWorksheet.Range("A1").Font.Size = 16
602
+            ExcelWorksheet.Range("A1").Font.Bold = True
603
+            ExcelWorksheet.Range("A2").Font.Size = 14
604
+            ExcelWorksheet.Range("A2").Font.Bold = True
605
+
592 606
             ' 設定標題列格式
593
-            Dim headerRange As Range = ExcelWorksheet.Range(ExcelWorksheet.Cells(4, 1), ExcelWorksheet.Cells(4, 庫存顯示_dgv.Columns.Count))
607
+            Dim headerRange As Range = ExcelWorksheet.Range(ExcelWorksheet.Cells(4, 1), ExcelWorksheet.Cells(4, 庫存顯示_dgv.Columns.Count - 1))
594 608
             headerRange.Font.Bold = True
595 609
             headerRange.Interior.Color = RGB(200, 200, 200)  ' 灰色背景
596 610
             headerRange.Borders.LineStyle = Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous
597 611
 
598 612
             ' 設定資料區域邊框
599 613
             Dim dataRange As Range = ExcelWorksheet.Range(ExcelWorksheet.Cells(5, 1),
600
-                                                     ExcelWorksheet.Cells(庫存顯示_dgv.Rows.Count + 4, 庫存顯示_dgv.Columns.Count))
614
+                                                     ExcelWorksheet.Cells(庫存顯示_dgv.Rows.Count + 4, 庫存顯示_dgv.Columns.Count - 1))
601 615
             dataRange.Borders.LineStyle = Microsoft.Office.Interop.Excel.XlLineStyle.xlContinuous
602 616
 
603 617
             ' 自動調整欄寬

二进制
Sh-To-ERP-SYS/bin/Debug/Sh-To-ERP-SYS.exe 查看文件


二进制
Sh-To-ERP-SYS/bin/Debug/Sh-To-ERP-SYS.pdb 查看文件


二进制
Sh-To-ERP-SYS/obj/Debug/Sh-To-ERP-SYS.exe 查看文件


二进制
Sh-To-ERP-SYS/obj/Debug/Sh-To-ERP-SYS.pdb 查看文件


正在加载...
取消
保存