From b01a30a6d184494c235c1701f839be3cdf8683af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=AF=97=E6=B4=A5?= <2723065175@qq.com>
Date: Thu, 8 Aug 2024 02:40:49 +0000
Subject: [PATCH] =?UTF-8?q?!2969=20=E4=BC=98=E5=8C=96:=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E6=9D=90=E8=B4=A8=E6=97=B6,=E6=9D=90=E8=B4=A8=E9=94=81?=
 =?UTF-8?q?=E5=AE=9A=E5=90=8E,=E6=9D=BF=E6=9D=90=E6=96=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B8=8D=E8=B7=9F=E9=9A=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/UI/Components/ApplyGoodInfo.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/UI/Components/ApplyGoodInfo.tsx b/src/UI/Components/ApplyGoodInfo.tsx
index 4fa4abcf2..e15a0ce02 100644
--- a/src/UI/Components/ApplyGoodInfo.tsx
+++ b/src/UI/Components/ApplyGoodInfo.tsx
@@ -5,6 +5,9 @@ import { PhysicalMaterialRecord } from '../../DatabaseServices/PhysicalMaterialR
 
 export function ApplyGoodInfo(en: Board, material: PhysicalMaterialRecord)
 {
+    //切换材质时,材质锁定后,材料信息不跟随修改
+    if (en.Material != material.Id && (en.Material?.Object as PhysicalMaterialRecord)?.IsMaterialLock)
+        return;
     en.BoardProcessOption[EBoardKeyList.BrMat] = material.GoodsInfo.name;
     en.BoardProcessOption[EBoardKeyList.Color] = material.GoodsInfo.color;
     en.BoardProcessOption[EBoardKeyList.Mat] = material.GoodsInfo.material;