From f5be8c749146d73db41e3049e92b5e967eb85254 Mon Sep 17 00:00:00 2001 From: LanHeron Date: Sat, 12 Jul 2025 16:02:06 +0800 Subject: [PATCH 01/11] vault backup: 2025-07-12 16:02:06 --- SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md index 7f3e7407..3781b1d3 100644 --- a/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md +++ b/SanPinPLM/相关操作/1.0-EDM/250.Office转PDF文件-WPS集成设置.md @@ -8,7 +8,7 @@ 打开`WPS`软件，在 **任务管理器** 中查看它的进程位数 -如果进程后带有 `(32位)` 的信息，代表所安装的`WPS Office`软件是32位的，否则说明是64位的 +如果进程后带有 `(32位)` 的信息，代表所安装的 `WPS Office` 软件是32位的，否则说明是64位的 ![](assets/Pasted%20image%2020250429142402.png) From 769188913d68098346f0e058c894b66fb1803a7c Mon Sep 17 00:00:00 2001 From: LanHeron Date: Sat, 12 Jul 2025 21:25:51 +0800 Subject: [PATCH 02/11] vault backup: 2025-07-12 21:25:51 --- .obsidian/graph.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 1fe6eb7d..61bf82fd 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -39,6 +39,6 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, - "scale": 0.9549881698906871, + "scale": 0.3865410244547755, "close": true } \ No newline at end of file From 9e0dd7c6ec65af4ab3dce242b7d46623e382a98d Mon Sep 17 00:00:00 2001 From: SeedList Date: Sat, 12 Jul 2025 21:41:04 +0800 Subject: [PATCH 03/11] vault backup: 2025-07-12 21:41:04 --- .obsidian/graph.json | 66 +++++++++++++++++-------- .trash/conflict-files-obsidian-git 3.md | 17 +++++++ .trash/conflict-files-obsidian-git 4.md | 17 +++++++ .trash/conflict-files-obsidian-git 5.md | 17 +++++++ 4 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 .trash/conflict-files-obsidian-git 3.md create mode 100644 .trash/conflict-files-obsidian-git 4.md create mode 100644 .trash/conflict-files-obsidian-git 5.md diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 148e0c2d..74eb70c1 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -1,22 +1,48 @@ { - "collapse-filter": true, - "search": "", - "showTags": false, - "showAttachments": false, - "hideUnresolved": false, - "showOrphans": true, - "collapse-color-groups": true, - "colorGroups": [], - "collapse-display": true, - "showArrow": false, - "textFadeMultiplier": 0, - "nodeSizeMultiplier": 1, - "lineSizeMultiplier": 1, - "collapse-forces": true, - "centerStrength": 0.518713248970312, - "repelStrength": 10, - "linkStrength": 1, - "linkDistance": 250, - "scale": 1.0000000000000013, - "close": true + "collapse-filter": false, + "search": "", + "showTags": false, + "showAttachments": false, + "hideUnresolved": false, + "showOrphans": true, + "collapse-color-groups": false, + "colorGroups": + [ + { + "query": "path:SanPinPLM ", + "color": + { + "a": 1, + "rgb": 14048348 + } + }, + { + "query": "path:外发客户教程 ", + "color": + { + "a": 1, + "rgb": 14069084 + } + }, + { + "query": "path:设计软件使用 ", + "color": + { + "a": 1, + "rgb": 11392604 + } + } + ], + "collapse-display": false, + "showArrow": false, + "textFadeMultiplier": 0, + "nodeSizeMultiplier": 1, + "lineSizeMultiplier": 1, + "collapse-forces": false, + "centerStrength": 0.518713248970312, + "repelStrength": 10, + "linkStrength": 1, + "linkDistance": 250, + "scale": 0.3865410244547755, + "close": true } \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 3.md b/.trash/conflict-files-obsidian-git 3.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 3.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 4.md b/.trash/conflict-files-obsidian-git 4.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 4.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file diff --git a/.trash/conflict-files-obsidian-git 5.md b/.trash/conflict-files-obsidian-git 5.md new file mode 100644 index 00000000..058a9a76 --- /dev/null +++ b/.trash/conflict-files-obsidian-git 5.md @@ -0,0 +1,17 @@ +# Conflicts +Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push` +(This file will automatically be deleted before commit) +[[#Additional Instructions]] available below file list + +- Not a file: .obsidian/graph.json + +# Additional Instructions +I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text. + +```diff +<<<<<<< HEAD + File changes in local repository +======= + File changes in remote repository +>>>>>>> origin/main +``` \ No newline at end of file From 2bd51cf76ea71aa9551a7400f151404676892955 Mon Sep 17 00:00:00 2001 From: SeedList Date: Sat, 12 Jul 2025 21:46:15 +0800 Subject: [PATCH 04/11] vault backup: 2025-07-12 21:46:15 --- SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md b/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md index 13639d2b..ed5c34fd 100644 --- a/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md +++ b/SanPinPLM/相关操作/1.0-EDM/70.电子签章设置.md @@ -24,7 +24,7 @@ ## 电脑手写体签名制作 -Creo三维签名需要使用电脑手写体签名，将 `FontCreator` 软件打开 +`Creo` 三维签名需要使用电脑手写体签名，将 `FontCreator` 软件打开 第一次打开需要自己手动创建字体工程，名称只能是：`SPPLMFONT`（为了三品PLM系统能够识别） From 28dde23201bbd2e7139ead500f954c77d58a8ef1 Mon Sep 17 00:00:00 2001 From: LanHeron Date: Sat, 12 Jul 2025 21:46:25 +0800 Subject: [PATCH 05/11] vault backup: 2025-07-12 21:46:25 --- .obsidian/graph.json | 51 +------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 65e4e469..77a068e9 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -1,52 +1,4 @@ { -<<<<<<< HEAD - "collapse-filter": false, - "search": "", - "showTags": false, - "showAttachments": false, - "hideUnresolved": false, - "showOrphans": true, - "collapse-color-groups": false, - "colorGroups": - [ - { - "query": "path:SanPinPLM ", - "color": - { - "a": 1, - "rgb": 14048348 - } - }, - { - "query": "path:外发客户教程 ", - "color": - { - "a": 1, - "rgb": 14069084 - } - }, - { - "query": "path:设计软件使用 ", - "color": - { - "a": 1, - "rgb": 11392604 - } - } - ], - "collapse-display": false, - "showArrow": false, - "textFadeMultiplier": 0, - "nodeSizeMultiplier": 1, - "lineSizeMultiplier": 1, - "collapse-forces": false, - "centerStrength": 0.518713248970312, - "repelStrength": 10, - "linkStrength": 1, - "linkDistance": 250, - "scale": 0.3865410244547755, - "close": true -======= "collapse-filter": false, "search": "", "showTags": false, @@ -87,7 +39,6 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, - "scale": 0.3865410244547755, + "scale": 0.3987682013015281, "close": true ->>>>>>> origin/main } \ No newline at end of file From 4819e49f1fe6ebe5fbca3ad05972a76d6322d309 Mon Sep 17 00:00:00 2001 From: LanHeron Date: Sun, 13 Jul 2025 09:48:33 +0800 Subject: [PATCH 06/11] vault backup: 2025-07-13 09:48:33 --- .obsidian/graph.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 77a068e9..632c4f3c 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -39,6 +39,6 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, - "scale": 0.3987682013015281, + "scale": 1.0768224568218232, "close": true } \ No newline at end of file From 544a1662fb8e49e7d684c38f152fbf47e11df073 Mon Sep 17 00:00:00 2001 From: LanHeron Date: Sun, 13 Jul 2025 09:49:14 +0800 Subject: [PATCH 07/11] vault backup: 2025-07-13 09:49:14 --- .obsidian/graph.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 632c4f3c..44c623d6 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -39,6 +39,6 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, - "scale": 1.0768224568218232, + "scale": 0.7680710360518209, "close": true } \ No newline at end of file From 3f4363367bef8302ad8830cbecacd91f5b8e72ff Mon Sep 17 00:00:00 2001 From: LanHeron Date: Mon, 14 Jul 2025 09:05:31 +0800 Subject: [PATCH 08/11] vault backup: 2025-07-14 09:05:31 --- .obsidian/graph.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.obsidian/graph.json b/.obsidian/graph.json index 44c623d6..32b7ee6a 100644 --- a/.obsidian/graph.json +++ b/.obsidian/graph.json @@ -39,6 +39,6 @@ "repelStrength": 10, "linkStrength": 1, "linkDistance": 250, - "scale": 0.7680710360518209, + "scale": 0.4154066362099694, "close": true } \ No newline at end of file From ecc3eafaeefa10c627bc50bf9961573971356595 Mon Sep 17 00:00:00 2001 From: ChenTao <779256074@qq.com> Date: Mon, 14 Jul 2025 10:22:26 +0800 Subject: [PATCH 09/11] vault backup: 2025-07-14 10:22:26 --- 外发客户教程/0.基础操作教程/45.文档发布.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/外发客户教程/0.基础操作教程/45.文档发布.md b/外发客户教程/0.基础操作教程/45.文档发布.md index 87f2d39c..b62aaf97 100644 --- a/外发客户教程/0.基础操作教程/45.文档发布.md +++ b/外发客户教程/0.基础操作教程/45.文档发布.md @@ -12,7 +12,7 @@ debugInConsole: false # Print debug info in Obsidian console # 文档发布 -文档发布需要在 **企业知识库** → **文档归档区** 中选择文件进行发布，对文件右键，在 **生命周期** 中选择 **发布** +文档发布需要在 **企业知识库** → **文档归档区** 中选择文件进行发布，对文件右键，在 **生命周期** 中选择 **发布** 即可 ![image-20240902201643897](../assets/image-20240902201643897.png) From f04957c4b4d521569046273141c7ad040f44c33f Mon Sep 17 00:00:00 2001 From: DingJiaQi <3236352125@qq.com> Date: Mon, 14 Jul 2025 10:28:32 +0800 Subject: [PATCH 10/11] vault backup: 2025-07-14 10:28:32 --- .../客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md | 1 - 1 file changed, 1 deletion(-) diff --git a/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md b/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md index 0f6af237..548cf1fd 100644 --- a/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md +++ b/外发客户教程/客户特供/鑫东洁具/CAXA低版本无法使用高版本模版,该如何解决.md @@ -1,4 +1,3 @@ - ![](assets/Pasted%20image%2020250626142701.png) 问题的原因: From 5dbe3a2dde192554e6ce6cc5eddca3d8ed575023 Mon Sep 17 00:00:00 2001 From: DingJiaQi <3236352125@qq.com> Date: Mon, 14 Jul 2025 10:29:26 +0800 Subject: [PATCH 11/11] vault backup: 2025-07-14 10:29:25 --- SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md b/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md index 9e8d59c8..f88b4e3e 100644 --- a/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md +++ b/SanPinPLM/相关操作/2.0-PDM/20.产品管理基本概念.md @@ -16,7 +16,7 @@ ## 产品工作区 - 此功能位于 **产品管理** 模块之下，工程师可在 **产品工作区** 之中，创建半成品、零件等物料，将其搭建成BOM + 此功能位于 **产品管理** 模块之下，工程师可在 **产品工作区** 之中，创建半成品、零件等物料，将其搭建成`BOM` > 需要注意的是三品PLM与ERP不同，在三品PLM产品工作区中 **物料** 与 **BOM** 是同步创建出来的，也就是说在搭建BOM时，物料也就随之生成了