From dffae46e531bc4f1a727cdb85a23e0a15b3b0b2c Mon Sep 17 00:00:00 2001
From: zhouhongjun <565221961@qq.com>
Date: Wed, 16 Jul 2025 17:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0mes=E7=B1=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs | 12 +++--
MESClassLibrary/EFModel/BBMPT.Context.cs | 2 +-
MESClassLibrary/EFModel/BBMPT.edmx | 58 +++++++++++-----------
MESClassLibrary/EFModel/BBMPT.edmx.diagram | 2 +-
MESClassLibrary/EFModel/tb_Bom_MK.cs | 2 +-
5 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs b/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
index 673e144..2adc99b 100644
--- a/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
+++ b/MESClassLibrary/BLL/BasicInfo/Bom_MKBLL.cs
@@ -60,9 +60,13 @@ namespace MESClassLibrary.BLL.BasicInfo
//}
//初始化要更新的字段
- string[] proNames = new string[2];
+ string[] proNames = new string[6];
proNames[0] = "PartNo1";
proNames[1] = "PartNo2";
+ proNames[2] = "LineName";
+ proNames[3] = "StationNo";
+ proNames[4] = "IsChecked";
+ proNames[5] = "IsPartAssemble";
//必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
//如果没有初始化必填字段，更新会报错
@@ -102,7 +106,7 @@ namespace MESClassLibrary.BLL.BasicInfo
/// 查询全部信息分页
///
///
- public string SearchInfoAll(string page, string pagesize, string partNo1, string partNo2, string placeName)
+ public string SearchInfoAll(string page, string pagesize, string partNo1, string partNo2, string lineName)
{
try
{
@@ -121,9 +125,9 @@ namespace MESClassLibrary.BLL.BasicInfo
list = list.Where(p => p.PartNo2 != null && p.PartNo2.Contains(partNo2) ).ToList();
}
- if (!String.IsNullOrEmpty(placeName))
+ if (!String.IsNullOrEmpty(lineName))
{
- list = list.Where(p => p.PlaceName != null && p.PlaceName.Contains(placeName)).ToList();
+ list = list.Where(p => p.LineName != null && p.LineName.Contains(lineName)).ToList();
}
if (list.Count > 0)
diff --git a/MESClassLibrary/EFModel/BBMPT.Context.cs b/MESClassLibrary/EFModel/BBMPT.Context.cs
index 7b9b865..d8dbedc 100644
--- a/MESClassLibrary/EFModel/BBMPT.Context.cs
+++ b/MESClassLibrary/EFModel/BBMPT.Context.cs
@@ -195,7 +195,7 @@ namespace MESClassLibrary.EFModel
public virtual DbSet t_XD_ProductType { get; set; }
public virtual DbSet W_XD_Product_del { get; set; }
public virtual DbSet t_XD_StockArea { get; set; }
- public virtual DbSet tb_Bom_MK { get; set; }
public virtual DbSet tb_ZP_MK_Plan { get; set; }
+ public virtual DbSet tb_Bom_MK { get; set; }
}
}
diff --git a/MESClassLibrary/EFModel/BBMPT.edmx b/MESClassLibrary/EFModel/BBMPT.edmx
index b2a1c18..c8ab5f7 100644
--- a/MESClassLibrary/EFModel/BBMPT.edmx
+++ b/MESClassLibrary/EFModel/BBMPT.edmx
@@ -662,7 +662,7 @@
-
+
@@ -3591,8 +3591,8 @@
-
+
@@ -6081,19 +6081,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -6114,6 +6101,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -8754,20 +8754,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -8789,6 +8775,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/MESClassLibrary/EFModel/BBMPT.edmx.diagram b/MESClassLibrary/EFModel/BBMPT.edmx.diagram
index 1233514..d945138 100644
--- a/MESClassLibrary/EFModel/BBMPT.edmx.diagram
+++ b/MESClassLibrary/EFModel/BBMPT.edmx.diagram
@@ -173,8 +173,8 @@
-
+
diff --git a/MESClassLibrary/EFModel/tb_Bom_MK.cs b/MESClassLibrary/EFModel/tb_Bom_MK.cs
index 8143218..fbecd76 100644
--- a/MESClassLibrary/EFModel/tb_Bom_MK.cs
+++ b/MESClassLibrary/EFModel/tb_Bom_MK.cs
@@ -19,7 +19,7 @@ namespace MESClassLibrary.EFModel
public string PartNo2 { get; set; }
public string UserID { get; set; }
public Nullable IsChecked { get; set; }
- public string PlaceName { get; set; }
+ public string LineName { get; set; }
public Nullable IsPartAssemble { get; set; }
public string StationNo { get; set; }
}