Merge branch 'master' of http://dev.ccwin-in.com:3000/ruoxing.wang/BBMPT1

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("一个总成只能配置一个半成品！"));

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" />

MESWebSite/Manage/Bom_MK.aspx.cs

@@ -215,6 +215,20 @@ namespace MESWebSite.Manage
                             
                             md.PartNo1 = PartNo1;
                             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);