From ba228f1ed1fae64b632f5f1b580c2dc249a3ef76 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 6 Aug 2025 17:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=BA=A7=E5=93=81=E6=8F=8F=E8=BF=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs |  2 +-
 MESWebSite/MESWebSite.csproj                  |  2 +-
 MESWebSite/Manage/Bom_MK.aspx.cs              | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs b/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
index 7c47b11..9f5f468 100644
--- a/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
+++ b/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
@@ -137,7 +137,7 @@ namespace MESWebSite.HttpHandlers
             //一个总成对应一个半成品
             BasicBLL<tb_Bom_MK> partAssembleNum = new BasicBLL<tb_Bom_MK>();
             int id_mk = int.Parse(BomID);
-            var partAssembleList = partAssembleNum.Search<tb_Bom_MK>(p => p.PartNo1 == PartNo1 && p.IsPartAssemble == 1 && p.BomID != id_mk);
+            var partAssembleList = partAssembleNum.Search<tb_Bom_MK>(p => p.PartNo1 == PartNo1 && p.IsPartAssemble == 1 && p.LineName == LineName && p.StationNo == StationNo && p.BomID != id_mk);
             if (partAssembleList != null && partAssembleList.Count == 1 && IsPartAssemble == "1")
             {
                 Response.Write(ResponseResult.Fail("一个总成只能配置一个半成品！"));
diff --git a/MESWebSite/MESWebSite.csproj b/MESWebSite/MESWebSite.csproj
index 86a2684..dee6f17 100644
--- a/MESWebSite/MESWebSite.csproj
+++ b/MESWebSite/MESWebSite.csproj
@@ -841,7 +841,7 @@
     <Content Include="HttpHandlers\XDStockAreaHandler.ashx" />
     <Content Include="HttpHandlers\ZP_MK_PlanHandler.ashx" />
     <Content Include="HttpHandlers\Bom_MKHandler.ashx" />
-    <None Include="Excel\装配Bom导入模板.xlsx" />
+    <Content Include="Excel\装配Bom导入模板.xlsx" />
     <Content Include="HttpHandlers\ConfigHandler.ashx" />
     <None Include="Properties\PublishProfiles\BBMPT1.pubxml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
diff --git a/MESWebSite/Manage/Bom_MK.aspx.cs b/MESWebSite/Manage/Bom_MK.aspx.cs
index f0be0ee..283353c 100644
--- a/MESWebSite/Manage/Bom_MK.aspx.cs
+++ b/MESWebSite/Manage/Bom_MK.aspx.cs
@@ -214,7 +214,21 @@ namespace MESWebSite.Manage
 
                             
                             md.PartNo1 = PartNo1;
-                            md.PartNo2 = PartNo2;                           
+                            md.PartNo2 = PartNo2;
+
+                            BasicBLL<tb_Product> productDesc = new BasicBLL<tb_Product>();
+                            var productDescList = productDesc.Search<tb_Product>(p => p.PartNo == PartNo1);
+                            if (productDescList != null && productDescList.Count >= 1)
+                            {
+                                md.PartDesc1 = productDescList[0].ProductName;
+                            }
+
+                            productDescList = productDesc.Search<tb_Product>(p => p.PartNo == PartNo2);
+                            if (productDescList != null && productDescList.Count >= 1)
+                            {
+                                md.PartDesc2 = productDescList[0].ProductName;
+                            }
+
                             md.LineName = LineName;
                             md.StationNo = StationNo;
                             md.LeftCount = int.Parse(LeftCount);