From 50a86c7a522747fed7e9581cc0c52f8c6f255184 Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 6 Aug 2025 14:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=A7=9Bbom=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=B8=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E5=A4=9A=E4=B8=AA=E5=8D=8A=E6=88=90?=
 =?UTF-8?q?=E5=93=81=E9=9B=B6=E4=BB=B6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs |  4 ++++
 MESWebSite/Manage/Bom_MK.aspx                 |  1 +
 MESWebSite/Manage/Bom_MK.aspx.cs              | 24 +++++++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs b/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
index 0b49593..7c47b11 100644
--- a/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
+++ b/MESWebSite/HttpHandlers/Bom_MKHandler.ashx.cs
@@ -197,6 +197,10 @@ namespace MESWebSite.HttpHandlers
             {
                 md.IsChecked = true;
             }
+            else
+            {
+                md.IsChecked = false;
+            }
 
             var info = Request.Cookies.Get("LoginUserInfo");
             if (info != null)
diff --git a/MESWebSite/Manage/Bom_MK.aspx b/MESWebSite/Manage/Bom_MK.aspx
index 637c35d..f3c6eab 100644
--- a/MESWebSite/Manage/Bom_MK.aspx
+++ b/MESWebSite/Manage/Bom_MK.aspx
@@ -502,6 +502,7 @@
                 PrimaryID = row.BomID;
                 $('#fl_id_1').combobox('select', row.PartNo1);
                 $('#fl_id_2').combobox('select', row.PartNo2);
+                
                 if (row.IsChecked == 0) {
                     $('#IsChecked').removeAttr("checked")
                 } else {
diff --git a/MESWebSite/Manage/Bom_MK.aspx.cs b/MESWebSite/Manage/Bom_MK.aspx.cs
index 08a0904..f0be0ee 100644
--- a/MESWebSite/Manage/Bom_MK.aspx.cs
+++ b/MESWebSite/Manage/Bom_MK.aspx.cs
@@ -68,7 +68,7 @@ namespace MESWebSite.Manage
 
                     Bom_MKBLL bll = new Bom_MKBLL();
                     List<tb_Bom_MK> list = new List<tb_Bom_MK>();
-                    tb_Bom_MK md = new tb_Bom_MK();
+                   
                     
                     ProductBLL pbll = new ProductBLL();
                     LineBLL linebll = new LineBLL();
@@ -174,12 +174,22 @@ namespace MESWebSite.Manage
                                 return;
                             }
 
-                            var isPartAssembleList = partNoBindDB.Search<tb_Bom_MK>(p => p.PartNo1 == PartNo1 && p.IsPartAssemble == 1 && p.LineName == LineName && p.StationNo == StationNo);
-                            if (isPartAssembleList != null && isPartAssembleList.Count > 0)
+                            if(IsPartAssemble == "是")
                             {
-                                ClientScript.RegisterStartupScript(this.GetType(), "提示", "<script type='text/javascript'>$.messager.alert('提示', '第" + i.ToString() + "行，BOM总成零件号已存在一个半成品，不能存在多个半成品，故无法导入', 'warning');</script>");
-                                return;
-                            }
+                                var isPartAssembleList = partNoBindDB.Search<tb_Bom_MK>(p => p.PartNo1 == PartNo1 && p.IsPartAssemble == 1 && p.LineName == LineName && p.StationNo == StationNo);
+                                if (isPartAssembleList != null && isPartAssembleList.Count > 0)
+                                {
+                                    ClientScript.RegisterStartupScript(this.GetType(), "提示", "<script type='text/javascript'>$.messager.alert('提示', '第" + i.ToString() + "行，BOM总成零件号已存在一个半成品，不能存在多个半成品，故无法导入', 'warning');</script>");
+                                    return;
+                                }
+                                var isPartAssembleListExcel = list.Where(p => p.PartNo1 == PartNo1 && p.IsPartAssemble == 1 && p.LineName == LineName && p.StationNo == StationNo).ToList();
+                                if (isPartAssembleListExcel != null && isPartAssembleListExcel.Count > 0)
+                                {
+                                    ClientScript.RegisterStartupScript(this.GetType(), "提示", "<script type='text/javascript'>$.messager.alert('提示', '第" + i.ToString() + "行，同一BOM总成零件号不能存在多个半成品，故无法导入', 'warning');</script>");
+                                    return;
+                                }
+                            }                         
+
 
                             if (IsChecked != "是" && IsChecked != "否")
                             {
@@ -195,7 +205,7 @@ namespace MESWebSite.Manage
 
 
                             #endregion
-
+                            tb_Bom_MK md = new tb_Bom_MK();
                             var info = Request.Cookies.Get("LoginUserInfo");
                             if (info != null)
                             {