diff --git a/SjMes/PunchAssemble/BBMPT.sln b/SjMes/PunchAssemble/BBMPT.sln
new file mode 100644
index 0000000..b46ee13
--- /dev/null
+++ b/SjMes/PunchAssemble/BBMPT.sln
@@ -0,0 +1,42 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.8.34330.188
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MESClassLibrary", "MESClassLibrary\MESClassLibrary.csproj", "{867989D8-6837-41DC-9BF1-4658F5D6CFEF}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0D128182-FB8C-4E0B-A42F-DF3767E4DE39}"
+ ProjectSection(SolutionItems) = preProject
+ 数据结构修改记录.txt = 数据结构修改记录.txt
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PunchAndWeld", "PunchAndWeld\PunchAndWeld.csproj", "{D6371D99-5220-4A51-A72C-966FB4BFCD2C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {867989D8-6837-41DC-9BF1-4658F5D6CFEF}.Release|x86.ActiveCfg = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D6371D99-5220-4A51-A72C-966FB4BFCD2C}.Release|x86.ActiveCfg = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {52EF8F7E-6AC9-4400-82F1-31F70143C867}
+ EndGlobalSection
+EndGlobal
diff --git a/SjMes/PunchAssemble/MESClassLibrary/App.config b/SjMes/PunchAssemble/MESClassLibrary/App.config
new file mode 100644
index 0000000..f80c656
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/App.config
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs
new file mode 100644
index 0000000..e7ffbd1
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonRecordBLL.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.Andon;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.Andon
+{
+ public class AndonButtonRecordBLL
+ {
+ AndonButtonRecordDAL da=new AndonButtonRecordDAL();
+
+ public bool InsertInfo(AndonRecordModel md)
+ {
+ try
+ {
+ return da.InsertInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool UpdateInfo(AndonRecordModel md)
+ {
+ try
+ {
+ return da.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs
new file mode 100644
index 0000000..9aa1828
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/Andon/AndonButtonTypeBLL.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
+using MESClassLibrary.DAL.Andon;
+
+namespace MESClassLibrary.BLL.Andon
+{
+ public class AndonButtonTypeBLL
+ {
+ public DataTable SearchInfoByName(string buttonName)
+ {
+ try
+ {
+ AndonButtonTypeDAL da = new AndonButtonTypeDAL();
+
+ return da.SearchInfoByName(buttonName);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs
new file mode 100644
index 0000000..3621ab5
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicBLL.cs
@@ -0,0 +1,178 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL
+{
+ public class BasicBLL where T : class, new()
+ {
+ BaseDAL db = new BaseDAL();
+ /// 新增信息
+ public bool AddInfo(T md)
+ {
+ try
+ {
+ if (db.Add(md) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ /// 修改信息
+ public bool UpdateInfo(T md, params string[] proNames)
+ {
+ try
+ {
+ //T u = new T() { uId = 1, uLoginName = "asdfasdf" };
+ if (db.Modify(md, proNames) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ /// 删除信息
+ public bool DelInfo(T md)
+ {
+ try
+ {
+ if (db.Del(md) > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ public List SearchInfo(int page, int pagesize, out int total)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.CreateEqual("IsUseing", 1)).ToList();
+ total = list.Count;
+ int Skipcount = (page - 1) * pagesize;
+ return list.Skip(Skipcount).Take(pagesize).ToList();
+ }
+ catch (Exception ex)
+ {
+ total = 0;
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public List SearchInfoByKey(string keyname, object keyvalue)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.CreateEqual(keyname, keyvalue)).ToList();
+ return list;
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+
+ public List SearchInfoContains(string keyname, string keyvalue)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.GetContains(keyname, keyvalue)).ToList();
+ return list;
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+
+
+
+ public List SearchInfoAll(int page, int pagesize, out int total)
+ {
+ try
+ {
+ var list = db.GetListBy(LambdaHelper.True()).ToList();
+ total = list.Count;
+ int Skipcount = (page - 1) * pagesize;
+ return list.Skip(Skipcount).Take(pagesize).ToList();
+ }
+ catch (Exception ex)
+ {
+ total = 0;
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public T SearchInfoByID(string ID)
+ {
+ try
+ {
+ var list = db.Find(ID);
+ return list;
+ }
+ catch (Exception ex)
+ {
+ return null;
+ }
+
+ }
+ public List SearchAllInfo()
+ {
+ try
+ {
+ return db.GetListBy(LambdaHelper.True()).ToList();
+ }
+ catch (Exception ex)
+ {
+ //LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public List SearchInfoByTime(string cname, DateTime stime, DateTime etime)
+ {
+ try
+ {
+ IQueryable list = db.GetListBy(LambdaHelper.CreateCompareToLater(cname, stime)).AsQueryable();
+ list = list.Where(LambdaHelper.CreateCompareToEarlier(cname, etime));
+ return list.ToList();
+ }
+ catch (Exception)
+ {
+ return new List();
+ //return null;
+ }
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
new file mode 100644
index 0000000..7a2f8f6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BadInjectionBLL.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BadInjectionBLL
+ {
+ BadInjectionDAL db=new BadInjectionDAL();
+
+ public bool Add_Info(BadInjectionModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchByCode(string code)
+ {
+ try
+ {
+ return db.SearchByCode(code);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
new file mode 100644
index 0000000..1f46252
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BarCodeBLL.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BarCodeBLL
+ {
+ BarCodeDAl db = new BarCodeDAl();
+
+ public DataTable SearchInfoByStock(string StockNo)
+ {
+ try
+ {
+ return db.SearchInfoByStock(StockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Add_Info(BarCodeModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchInfo(string stationNo)
+ {
+ try
+ {
+ return db.SearchInfo(stationNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoAll()
+ {
+ try
+ {
+ return db.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCode()
+ {
+ try
+ {
+ return db.SearchBarCode();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCodeByOne(string OneBarCode)
+ {
+ try
+ {
+ return db.SearchBarCodeByOne(OneBarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchBarCodeByTwo(string BarCode)
+ {
+ try
+ {
+ return db.SearchBarCodeByTwo(BarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchSerialNoByBarCode(string Code)
+ {
+ try
+ {
+ return db.SearchSerialNoByBarCode(Code);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByBarCode(string BarCode)
+ {
+ try
+ {
+ return db.SearchInfoByBarCode(BarCode);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Update_Info(BarCodeModel md)
+ {
+ try
+ {
+ return db.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool DelBarCode(BarCodeModel md)
+ {
+ try
+ {
+ return db.DelBarCode(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchOneBarCode(string barCode,int a)
+ {
+ try
+ {
+ return db.SearchOneBarCode(barCode,a);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
new file mode 100644
index 0000000..3ee0387
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BomBLL.cs
@@ -0,0 +1,271 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class BomBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Bom md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PartNo1", md.PartNo1);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.BomID != md.BomID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Bom md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PartNo1 == md.PartNo1 && p.BomID != md.BomID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "PartNo1";
+ proNames[1] = "PartNo2";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Bom md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string partNo1)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(partNo1))
+ {
+ list = list.Where(p => p.PartNo1.Contains(partNo1)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ List modelList = new List();
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ BomModel dm = Tool.Mapper(item);
+ var info = s_list.FirstOrDefault(p => p.PartNo == item.PartNo1);
+ if (info != null)
+ {
+ dm.ProductName1 = info.ProductName;
+ }
+
+ var info2 = s_list.FirstOrDefault(p => p.PartNo == item.PartNo2);
+ if (info2 != null)
+ {
+ dm.ProductName2 = info2.ProductName;
+ }
+
+ modelList.Add(dm);
+ }
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Bom SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public DataTable SearchBom(string PartNo)
+ {
+ BomDAL dal=new BomDAL();
+ try
+ {
+ return dal.SearchBom(PartNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable Search(string partNo1, string partNo2)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.Search(partNo1, partNo2);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool AddInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool updateInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.updateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool DelInfo(BomModel md)
+ {
+ BomDAL dal = new BomDAL();
+ try
+ {
+ return dal.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
new file mode 100644
index 0000000..89d654a
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/BucketInfoBLL.cs
@@ -0,0 +1,184 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class BucketInfoBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("BucketCode", md.BucketCode);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.BucketCode == md.BucketCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "BucketCode";
+ proNames[1] = "BucketName";
+ proNames[2] = "IsUsing";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_BucketInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string BucketCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(BucketCode))
+ {
+ list = list.Where(p => p.BucketCode.Contains(BucketCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_BucketInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.BucketCode+"--"+ item.BucketName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
new file mode 100644
index 0000000..9267efd
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/CheckItemBLL.cs
@@ -0,0 +1,198 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class CheckItemBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string CheckContent, string DeviceID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(DeviceID))
+ {
+ list = list.Where(p => p.DeviceID == DeviceID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(CheckContent))
+ {
+ list = list.Where(p => p.CheckContent.Contains(CheckContent)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ CheckItemModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.DeviceID == item.DeviceID);
+ if (info != null)
+ {
+ dm.DeviceName = info.DeviceName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_CheckItem md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("CheckContent", md.CheckContent);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.DeviceID.Equals(md.DeviceID)).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_CheckItem md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.CheckContent == md.CheckContent && p.DeviceID == md.DeviceID && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "DeviceID";
+ proNames[1] = "CheckContent";
+ proNames[2] = "CheckVersion";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_CheckItem md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+
+ public string GetTreeData(string deviceID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ BasicBLL li_db = new BasicBLL();
+ List trlist = new List();
+ TreeModel tr = new TreeModel();
+ tr.id = "-1";
+ tr.text = "点检项";
+ tr.state = "open";
+ var li_list = li_db.SearchAllInfo().Where(p => p.DeviceID.Equals(deviceID)).ToList();
+ var queryData = from a in li_list
+ select new ChildTreeModel
+ {
+ id = a.ID,
+ text = a.CheckContent
+ };
+ List clist = queryData.ToList();
+ if (clist.Count > 0)
+ {
+ tr.children = clist;
+ trlist.Add(tr);
+ }
+ jsonStr = JSONTools.ScriptSerialize>(trlist);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
new file mode 100644
index 0000000..4245237
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ColorBLL.cs
@@ -0,0 +1,214 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using MESClassLibrary.DAL.BasicInfo;
+
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class ColorBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Color md)
+ {
+ try
+ {
+ //var list = db.SearchInfoByKey("ColorCode", md.ColorCode);//判断是否有重复数据
+ //if (list != null)
+ //{
+ // if (list.Where(p => p.ID != md.ID).Count() > 0)
+ // {
+ // return false;
+ // }
+
+ //}
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Color md)
+ {
+ try
+ {
+ //var list = db.SearchAllInfo().Where(p => p.ColorCode == md.ColorCode && p.ID != md.ID).ToList();//判断是否有重复数据
+ //if (list.Count > 0)
+ //{
+ // return false;
+ //}
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "ColorCode";
+ proNames[1] = "ColorNo";
+ proNames[2] = "ColorQQCode";
+ proNames[3] = "Des";
+ proNames[4] = "ColorDQCode";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Color md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize,string ColorCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(ColorCode))
+ {
+ list = list.Where(p => p.ColorCode.Contains(ColorCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Color SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().Select(p=>p.Des).Distinct().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item;
+ md.valueField = item;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public DataTable SearchAll()
+ {
+ ColorDAL da = new ColorDAL();
+ try
+ {
+ return da.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchByName(string color)
+ {
+ ColorDAL da = new ColorDAL();
+ try
+ {
+ return da.SearchByName(color);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
new file mode 100644
index 0000000..1e7b3f0
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DefectBLL.cs
@@ -0,0 +1,181 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DefectBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DefectName, string LineID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(LineID))
+ {
+ list = list.Where(p => p.LineID == LineID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(DefectName))
+ {
+ list = list.Where(p => p.DefectName.Contains(DefectName)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ DefectModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.LineID == item.LineID);
+ if (info != null)
+ {
+ dm.LineName = info.LineName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Defect md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("DefectName", md.DefectName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Defect md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DefectName == md.DefectName && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "LineID";
+ proNames[1] = "DefectName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Defect md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+
+ public DataTable SearchInfo(string LineID)
+ {
+ DefectDAL da=new DefectDAL();
+ try
+ {
+ return da.SearchInfoAll(LineID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
new file mode 100644
index 0000000..281c860
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeptBLL.cs
@@ -0,0 +1,144 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DeptBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DeptName)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(DeptName))
+ {
+ list = list.Where(p => p.DeptName.Contains(DeptName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(TA_DEPT md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("LineName", md.DeptName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.GUID != md.GUID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(TA_DEPT md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DeptName == md.DeptName && p.GUID != md.GUID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "DeptCode";
+ proNames[1] = "DeptName";
+ proNames[2] = "Remark";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(TA_DEPT md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
new file mode 100644
index 0000000..4b9d94c
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/DeviceBLL.cs
@@ -0,0 +1,251 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class DeviceBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string DeviceNo, string StationID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID == StationID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(DeviceNo))
+ {
+ list = list.Where(p => p.DeviceNo.Contains(DeviceNo)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List StationList = new List();
+ BasicBLL pl_db = new BasicBLL();
+ var pl_list = pl_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ DeviceModel dm = Tool.Mapper(item);
+ var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (info != null)
+ {
+ dm.StationNo = info.StationNo;
+ }
+ StationList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = StationList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+
+
+ public string SearchInfoByID(string DeviceID) {
+ try
+ {
+ string jsonStr = "[]";
+ tb_Device info = db.SearchInfoByID(DeviceID);
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Device md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("DeviceNo", md.DeviceNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.DeviceID != md.DeviceID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Device md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.DeviceNo == md.DeviceNo && p.DeviceID != md.DeviceID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[6];
+ proNames[0] = "StationID";
+ proNames[1] = "DeviceNo";
+ proNames[2] = "DeviceName";
+ proNames[3] = "FixNo";
+ proNames[4] = "Des";
+ proNames[5] = "DeviceModel";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Device md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public string QueryForComboboxByLineID(string fl_id)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ if (fl_id != null && fl_id != "")
+ {
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo().Where(p => p.LineID == fl_id).ToList();//判断是否有重复数据
+ if (s_list.Count > 0)
+ {
+ string[] arr = s_list.Select(p => p.StationID).ToArray();
+ list = list.Where(p => arr.Contains(p.StationID)).ToList();
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ }
+ return "";
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ public string QueryForComboboxByStationID(string fl_id)
+ {
+ try
+ {
+ string jsonStr = "[]";
+
+ if (fl_id != null && fl_id != "")
+ {
+ var list = db.SearchAllInfo().Where(p => p.StationID == fl_id).ToList();//判断是否有重复数据
+ foreach (var item in list)
+ {
+ item.DeviceName = item.DeviceNo + "----" + item.DeviceName;
+ }
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ return "";
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
new file mode 100644
index 0000000..68ec1a7
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/FactoryBLL.cs
@@ -0,0 +1,148 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class FactoryBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string FactoryName)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+
+ if (!String.IsNullOrEmpty(FactoryName))
+ {
+ list = list.Where(p => p.FactoryName.Contains(FactoryName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Factory md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("FactoryName", md.FactoryName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.FactoryID != md.FactoryID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Factory md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.FactoryName == md.FactoryName && p.FactoryID != md.FactoryID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "FactoryName";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Factory md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
new file mode 100644
index 0000000..096c2fe
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ImgVideoBLL.cs
@@ -0,0 +1,141 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ImgVideoBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ImgVideo md)
+ {
+ try
+ {
+
+ var list = db.SearchInfoByKey("fileName", md.fileName);//判断是否有重复数据
+ if (list != null)
+ {
+ return false;
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ImgVideo md)
+ {
+ try
+ {
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "fileUrl";
+ proNames[1] = "fileName";
+ proNames[2] = "UpdateTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ImgVideo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = ef.tb_ImgVideo.OrderByDescending(p=>p.CreateTime).ToList();
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_ImgVideo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
new file mode 100644
index 0000000..31fc881
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/InjectionPlanBLL.cs
@@ -0,0 +1,391 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Data;
+using System.Data.SqlClient;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class InjectionPlanBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+ InjectionPlanDAL dal = new InjectionPlanDAL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[8];
+ proNames[0] = "StationID";
+ proNames[1] = "BeginTime";
+ proNames[2] = "StockNo";
+ proNames[3] = "PlanCount";
+ proNames[4] = "EndTime";
+ proNames[5] = "PlanDate";
+ proNames[6] = "RealCycle";
+ proNames[7] = "PartNo";
+
+
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_InjectionPlan md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stationID, string stockNo)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo().Where(p => p.IsFinish != 1).ToList();
+ if (!String.IsNullOrEmpty(stationID))
+ {
+ list = list.Where(p => p.StationID.Equals(stationID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ list = list.OrderBy(p => p.BeginTime).ToList();
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL station_db = new BasicBLL();
+ var station_list = station_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ InjectionPlanModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ dm.ProductName = product_info.ProductName;
+ }
+
+ var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (station_info != null)
+ {
+ dm.StationNo = station_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string SearchInfoAll2(string page, string pagesize, string stationID, string stockNo, string StartTime, string EndTime)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ total = dal.SearchByTimeCount(stationID, stockNo, StartTime, EndTime);
+ DataTable dt = dal.SearchByTime(Convert.ToInt32(page), Convert.ToInt32(pagesize), stationID, stockNo, StartTime, EndTime);
+
+ List list = Tool.ConvertTo(dt).ToList();
+
+ //List list = ef.tb_InjectionPlan.Where(p => DateTime.Parse(p.BeginTime) >= stime && DateTime.Parse(p.EndTime) <= etime).ToList();
+
+
+ if (!String.IsNullOrEmpty(stationID))
+ {
+ list = list.Where(p => p.StationID.Equals(stationID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ list = list.OrderBy(p => p.BeginTime).ToList();
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL station_db = new BasicBLL();
+ var station_list = station_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ InjectionPlanModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ dm.ProductName = product_info.ProductName;
+ }
+
+ var station_info = station_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (station_info != null)
+ {
+ dm.StationNo = station_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+ public bool UpdateInfo2(tb_InjectionPlan md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "workClass";
+ proNames[1] = "JK_Weight";
+ proNames[2] = "Waste_Weight";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_InjectionPlan SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public String GetEndTime(tb_InjectionPlan md)
+ {
+ try
+ {
+ BasicBLL Plastic_db = new BasicBLL();
+
+ var info = from c in Plastic_db.SearchAllInfo()
+ where c.StockNo == md.StockNo && c.StationID == md.StationID && c.IsBackup == 1
+ select c.CycleTime;
+
+ if (info.FirstOrDefault() != null)
+ {
+ double seconds = Convert.ToDouble(info.FirstOrDefault().Value) * Convert.ToDouble(md.PlanCount);
+ return Convert.ToDateTime(md.BeginTime).AddSeconds(seconds).ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ return md.BeginTime;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public DataTable SearchInfoByName(string StationID)
+ {
+ try
+ {
+ return dal.SearchPlanByStation(StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ public DataTable NextSearchInfoByName(string StationID)
+ {
+ try
+ {
+ return dal.NextSearchPlanByStation(StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool UpdateFinish(InjectionPlanModel md)
+ {
+ InjectionPlanDAL dal = new InjectionPlanDAL();
+ try
+ {
+ return dal.UpdateFinish(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+
+ public string GetStartTime(string StationID)
+ {
+
+ var bf = db.SearchInfoByKey("StationID", StationID).OrderByDescending(p => p.EndTime).FirstOrDefault();
+ if (bf != null)
+ {
+ return bf.EndTime;
+ }
+
+ return "";
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
new file mode 100644
index 0000000..58d9540
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/LineBLL.cs
@@ -0,0 +1,170 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class LineBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string LineName, string PlaceID, string userID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ //数据权限
+ //BasicBLL userdb = new BasicBLL();
+ //T_Sys_Users user = userdb.SearchInfoByID(userID);
+ //List list = db.SearchInfoContains("LineName", user.Department);
+
+ if (!String.IsNullOrEmpty(PlaceID))
+ {
+ list = list.Where(p => p.PlaceID == PlaceID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(LineName))
+ {
+ list = list.Where(p => p.LineName.Contains(LineName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ LineModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.PlaceID == item.PlaceID);
+ if (info != null)
+ {
+ dm.PlaceName = info.PlaceName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Line md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("LineName", md.LineName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.LineID != md.LineID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Line md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.LineName == md.LineName && p.LineID != md.LineID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "PlaceID";
+ proNames[1] = "LineName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Line md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
new file mode 100644
index 0000000..a38c035
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/MachineBLL.cs
@@ -0,0 +1,184 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class MachineBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Machine md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("MachineNo", md.MachineNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.MachineID != md.MachineID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Machine md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.MachineNo == md.MachineNo && p.MachineID != md.MachineID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "MachineNo";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Machine md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string machineNo)
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(machineNo))
+ {
+ list = list.Where(p => p.MachineNo.Contains(machineNo)).ToList();
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Machine SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ //下拉框查询方法
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
new file mode 100644
index 0000000..17797de
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelInfoBLL.cs
@@ -0,0 +1,208 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ModelInfoBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("ModelNo", md.ModelNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.ModelNo == md.ModelNo && p.ID != md.ID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[14];
+ proNames[0] = "ModelName";
+ proNames[1] = "ModelNo";
+ proNames[2] = "PermanentAssetsNo";
+ proNames[3] = "Tonnage";
+ proNames[4] = "ServiceLife";
+ proNames[5] = "Supplier";
+ proNames[6] = "PartWeight";
+ proNames[7] = "InjectionPeriod";
+ proNames[8] = "LocatingRingSize";
+ proNames[9] = "OutForm";
+ proNames[10] = "ModelWeight";
+ proNames[11] = "RunnerForm";
+ proNames[12] = "ModelCavityNo";
+ proNames[13] = "ModelSize";
+
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ModelInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string ModelNo)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(ModelNo))
+ {
+ list = list.Where(p => p.ModelNo.Contains(ModelNo)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_ModelInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().OrderBy(p => p.ModelNo).ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.ModelName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+
+
+ }
+
+ //public DataTable SearchAll()
+ //{
+ // ColorDAL da = new ColorDAL();
+ // try
+ // {
+ // return da.SearchInfoAll();
+ // }
+ // catch (Exception ex)
+ // {
+ // LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ // return null;
+ // }
+ //}
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
new file mode 100644
index 0000000..199d30b
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ModelUpdateBLL.cs
@@ -0,0 +1,137 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class ModelUpdateBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddUpdateInfo(tb_Model_Update md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Model_Update md)
+ {
+ try
+ {
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "Purpose";
+ proNames[1] = "State";
+ proNames[2] = "Supplier";
+ proNames[3] = "Remarks";
+ proNames[4] = "AddTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Model_Update md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string ModelID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchInfoByKey("ModelID", ModelID).OrderByDescending(p => p.AddTime).ToList();
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Model_Update SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
new file mode 100644
index 0000000..20e13c6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/OperatorBLL.cs
@@ -0,0 +1,185 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.Model;
+using MESClassLibrary.DAL.BasicInfo;
+using System.Data;
+using System.Data.SqlClient;
+using System.Reflection;
+using MESClassLibrary.EFModel;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class OperatorBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ OperatorDAL dal = new OperatorDAL();
+
+ public DataTable SearchInfoByName(string OperatorName, string StationID)
+ {
+ try
+ {
+ return dal.SearchInfoByName(OperatorName, StationID);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+
+ public DataTable SearchInfoByNameAndPsw(string OperatorName, string StationID, string psw)
+ {
+ try
+ {
+ return dal.SearchInfoByNameAndPsw(OperatorName, StationID, psw);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string OperatorName, string StationID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID.Equals(StationID)).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(OperatorName))
+ {
+ list = list.Where(p => p.OperatorName.Contains(OperatorName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List StationList = new List();
+ BasicBLL pl_db = new BasicBLL();
+ var pl_list = pl_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ OperatorModel dm = Tool.Mapper(item);
+ var info = pl_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (info != null)
+ {
+ dm.StationNo = info.StationNo;
+ }
+ StationList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = StationList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Operator md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("OperatorNo", md.OperatorNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.OperatorID != md.OperatorID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Operator md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.OperatorNo == md.OperatorNo && p.OperatorID != md.OperatorID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "StationID";
+ proNames[1] = "OperatorNo";
+ proNames[2] = "OperatorName";
+ proNames[3] = "OperatorPsw";
+ proNames[4] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Operator md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
new file mode 100644
index 0000000..830fe66
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PaintInfoBLL.cs
@@ -0,0 +1,335 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+
+ public class PaintInfoBLL
+ {
+ BasicBLL dbPB = new BasicBLL();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PaintCode", md.PaintCode);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ID != md.ID && p.IsUsing == 1).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PaintCode == md.PaintCode && p.ID != md.ID && p.IsUsing == 1).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "PaintCode";
+ proNames[1] = "PaintName";
+ proNames[2] = "PaintModel";
+ //proNames[3] = "UnitCode";
+ proNames[3] = "CarModelCode";
+ proNames[4] = "IsUsing";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_PaintInfo md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string PaintCode)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(PaintCode))
+ {
+ list = list.Where(p => p.PaintCode.Contains(PaintCode)).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_PaintInfo SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+
+ List sl = new List();
+
+ foreach (var item in list)
+ {
+ SelectModel md = new SelectModel();
+ md.textField = item.PaintCode + "--" + item.PaintName;
+ md.valueField = item.ID;
+ sl.Add(md);
+ }
+
+ jsonStr = JSONTools.ScriptSerialize(sl);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+
+
+ public string SearchRelation(string page, string pagesize, string PaintID, string BucketID)
+ {
+
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+
+
+ List list = dbPB.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(PaintID))
+ {
+ list = list.Where(p => p.PaintID == PaintID).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(BucketID))
+ {
+ list = list.Where(p => p.BucketID == BucketID).ToList();
+ }
+
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ List modelList = new List();
+
+ #region 联查
+ BasicBLL PaintInfo_db = new BasicBLL();
+ var PaintInfo_list = PaintInfo_db.SearchAllInfo();
+
+ BasicBLL BucketInfo_db = new BasicBLL();
+ var BucketInfo_list = BucketInfo_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ Paint_BucketModel dm = Tool.Mapper(item);
+ var PaintInfo_info = PaintInfo_list.FirstOrDefault(p => p.ID == item.PaintID);
+ if (PaintInfo_info != null)
+ {
+ dm.PaintCode = PaintInfo_info.PaintCode;
+ dm.PaintName = PaintInfo_info.PaintName;
+ }
+
+ var BucketInfo_info = BucketInfo_list.FirstOrDefault(p => p.ID == item.BucketID);
+ if (BucketInfo_info != null)
+ {
+ dm.BucketCode = BucketInfo_info.BucketCode;
+ dm.BucketName = BucketInfo_info.BucketName;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+ return dbPB.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ var list = dbPB.SearchAllInfo().Where(p => p.PaintID == md.PaintID && p.ID != md.ID && p.BucketID == md.BucketID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "PaintID";
+ proNames[1] = "BucketID";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return dbPB.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ public bool DeleteRelation(tb_Paint_Bucket md)
+ {
+ try
+ {
+ List ef = dbPB.SearchInfoByKey("ID", md.ID);
+ if (ef!=null && ef.Count>0)
+ {
+ return dbPB.DelInfo(ef.First());
+ }
+ return false;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
new file mode 100644
index 0000000..52b4c86
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlaceBLL.cs
@@ -0,0 +1,165 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class PlaceBLL
+ {
+ BasicBLL db = new BasicBLL();
+ ///
+ /// 查询信息
+ ///
+ ///
+ public string SearchInfo(string page, string pagesize, string PlaceName, string FactoryID)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(FactoryID))
+ {
+ list = list.Where(p => p.FactoryID == FactoryID).ToList();//按条件分页查询
+ }
+
+ if (!String.IsNullOrEmpty(PlaceName))
+ {
+ list = list.Where(p => p.PlaceName.Contains(PlaceName)).ToList();//按条件分页查询
+ }
+
+ if (list.Count > 0)
+ {
+ total = list.Count;
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+ #region 联查
+ List ModelList = new List();
+ BasicBLL p_db = new BasicBLL();
+ var p_list = p_db.SearchAllInfo().ToList();
+ foreach (var item in list)
+ {
+ PlaceModel dm = Tool.Mapper(item);
+ var info = p_list.FirstOrDefault(p => p.FactoryID == item.FactoryID);
+ if (info != null)
+ {
+ dm.FactoryName = info.FactoryName;
+ }
+ ModelList.Add(dm);
+ }
+ #endregion
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = ModelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+
+
+ }
+ ///
+ /// 添加信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool AddInfo(tb_Place md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("PlaceName", md.PlaceName);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.PlaceID != md.PlaceID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ /// 生产线模型对象
+ ///
+ public bool UpdateInfo(tb_Place md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.PlaceName == md.PlaceName && p.PlaceID != md.PlaceID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[3];
+ proNames[0] = "FactoryID";
+ proNames[1] = "PlaceName";
+ proNames[2] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ /// 删除生产线信息
+ public bool DelInfo(tb_Place md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public string GetComboboxData()
+ {
+ try
+ {
+ string jsonStr = "[]";
+ var list = db.SearchAllInfo().ToList();//判断是否有重复数据
+ jsonStr = JSONTools.ScriptSerialize>(list);
+ return jsonStr;
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs
new file mode 100644
index 0000000..83d91b4
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/PlasticBLL.cs
@@ -0,0 +1,238 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class PlasticBLL
+ {
+ BBMPTEntities ef = new BBMPTEntities();
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Plastic md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("StationID", md.StationID);//判断是否有重复数据
+ if (list != null && list.Count > 0)
+ {
+ if (list.Where(p => p.StockNo.Equals(md.StockNo)).Count() > 0)
+ {
+ return false;
+ }
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Plastic md)
+ {
+ try
+ {
+
+ //初始化要更新的字段
+ string[] proNames = new string[5];
+ proNames[0] = "CycleTime";
+ proNames[1] = "StationID";
+ proNames[2] = "IsBackup";
+ proNames[3] = "Weight";
+ proNames[4] = "OpenDebugTime";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Plastic md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stockNo, string partNo, string StationID)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo != null && p.StockNo.Contains(stockNo)).ToList();
+ }
+
+ if (!String.IsNullOrEmpty(StationID))
+ {
+ list = list.Where(p => p.StationID.Equals(StationID)).ToList();
+ }
+
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+
+
+
+ #region 联查
+ BasicBLL product_db = new BasicBLL();
+ var product_list = product_db.SearchAllInfo();
+
+ BasicBLL machine_db = new BasicBLL();
+ var machine_list = machine_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ PlasticModel dm = Tool.Mapper(item);
+ var product_info = product_list.FirstOrDefault(p => p.StockNo == item.StockNo);
+ if (product_info != null)
+ {
+ dm.PartNo = product_info.PartNo;
+ }
+
+ var machine_info = machine_list.FirstOrDefault(p => p.StationID == item.StationID);
+ if (machine_info != null)
+ {
+ dm.StationNo = machine_info.StationNo;
+ }
+
+ modelList.Add(dm);
+ }
+ #endregion
+
+ if (!String.IsNullOrEmpty(partNo))
+ {
+ modelList = modelList.Where(p => p.PartNo != null && p.PartNo.Contains(partNo)).ToList();
+ }
+
+ total = modelList.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ modelList = modelList.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception)
+ {
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Plastic SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+
+ public string QueryForCombobox(string StationID)
+ {
+ try
+ {
+
+ var info = from m in ef.tb_Plastic
+ join s in ef.tb_Product on m.StockNo equals s.StockNo into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where m.StationID == StationID
+ select new { c_id = grp.StockNo, c_text = grp.PartNo + "--" + grp.ProductName, c_name = grp.StockNo + "--" + grp.ProductName };
+
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
new file mode 100644
index 0000000..99ce043
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductBLL.cs
@@ -0,0 +1,443 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Data;
+using System.Data.SqlClient;
+using MESClassLibrary.DAL.BasicInfo;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_Product md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("StockNo", md.StockNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ProductID != md.ProductID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_Product md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.StockNo == md.StockNo && p.ProductID != md.ProductID && p.ProductID != md.ProductID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[10];
+ proNames[0] = "ProductTypeID";
+ proNames[1] = "PartName";
+ proNames[2] = "ProductName";
+ proNames[3] = "ColorName";
+ proNames[4] = "PartNo";
+ proNames[5] = "Rows";
+ proNames[6] = "Cols";
+ proNames[7] = "Layers";
+ proNames[8] = "Des";
+ proNames[9] = "isImport";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ md.PicturePath = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_Product md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize, string stockNo, string productTypeID, string productName, string partNo)
+ {
+ try
+ {
+
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchAllInfo();
+
+ if (!String.IsNullOrEmpty(stockNo))
+ {
+ list = list.Where(p => p.StockNo != null && p.StockNo.Contains(stockNo)).ToList();
+ }
+ if (!String.IsNullOrEmpty(productTypeID))
+ {
+ list = list.Where(p => p.ProductTypeID.Equals(productTypeID)).ToList();
+ }
+ if (!String.IsNullOrEmpty(productName))
+ {
+ list = list.Where(p => p.ProductName != null && p.ProductName.Contains(productName)).ToList();
+ }
+ if (!String.IsNullOrEmpty(partNo))
+ {
+ list = list.Where(p => p.PartNo != null && p.PartNo.Contains(partNo)).ToList();
+ }
+ List modelList = new List();
+ if (list.Count > 0)
+ {
+ total = list.Count;
+
+ int Skipcount = (Convert.ToInt32(page) - 1) * Convert.ToInt32(pagesize);
+ list = list.Skip(Skipcount).Take(Convert.ToInt32(pagesize)).ToList();
+
+
+ #region 联查
+ BasicBLL s_db = new BasicBLL();
+ var s_list = s_db.SearchAllInfo();
+
+ foreach (var item in list)
+ {
+ ProductModel dm = Tool.Mapper(item);
+ var info = s_list.FirstOrDefault(p => p.ProductTypeID == item.ProductTypeID);
+ if (info != null)
+ {
+ dm.ProductTypeName = info.ProductTypeName;
+ }
+ modelList.Add(dm);
+ }
+ #endregion
+
+
+
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = modelList;
+ jsonStr = JSONTools.ScriptSerialize>(md);
+ }
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息
+ ///
+ ///
+ public List SearchAll()
+ {
+ try
+ {
+ var s_list = db.SearchAllInfo().ToList();
+ return s_list;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ ///
+ /// 根据ID查询信息
+ ///
+ ///
+ ///
+ public tb_Product SearchInfoByID(string id)
+ {
+ try
+ {
+ return db.SearchInfoByID(id);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ public string GetComboboxData(string productTypeNo, string productTypeNo1)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ BasicBLL productTypeDB = new BasicBLL();
+
+ if (productTypeNo1 != "")
+ {
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into
+ val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo || grp.ProductTypeNo == productTypeNo1
+ select new {m.PartNo, PartName = m.PartNo + "----" + m.ProductName};
+ jsonStr = JSONTools.ScriptSerialize(info);
+ }
+ else
+ {
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into
+ val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { m.PartNo, PartName = m.PartNo + "----" + m.ProductName };
+ jsonStr = JSONTools.ScriptSerialize(info);
+ }
+
+
+
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ public string GetComboboxProduct(string productTypeNo)
+ {
+ try
+ {
+
+ BasicBLL productTypeDB = new BasicBLL();
+
+
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { m.ProductID, m.ProductName };
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+
+
+ public string GetComboboxDataForStockNo(string productTypeNo)
+ {
+ try
+ {
+
+ BasicBLL productTypeDB = new BasicBLL();
+
+ var info = from m in db.SearchAllInfo().ToList()
+ join s in productTypeDB.SearchAllInfo().ToList() on m.ProductTypeID equals s.ProductTypeID into val2Grp
+ from grp in val2Grp.DefaultIfEmpty()
+ where grp.ProductTypeNo == productTypeNo
+ select new { c_id = m.StockNo, c_text = m.PartNo + "--" + m.ProductName, c_name = m.StockNo + "--" + m.ProductName, c_name2 = m.PartNo };
+ string jsonStr = "[]";
+ jsonStr = JSONTools.ScriptSerialize(info);
+ return jsonStr;
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return "";
+ }
+ }
+
+ public DataTable SearchInfoByType(string type, string stationNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByType(type, stationNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoAllByType(string type)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoAllByType(type);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByName(string productName, string ProductTypeNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByName(productName, ProductTypeNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchInfoByPartNo(string partNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByPartNo(partNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public DataTable SearchIsImportByStockNo(string stockNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchIsImportByStockNo(stockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ public DataTable SearchInfoByProductName(string ProductName)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByProductName(ProductName);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool UpdatePDF(string id, string fileName)
+ {
+ try
+ {
+ tb_Product md = new tb_Product();
+ md.ProductID = id;
+ md.PicturePath = fileName;
+
+ //初始化要更新的字段
+ string[] proNames = new string[1];
+ proNames[0] = "PicturePath";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchInfoAll()
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoAll();
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+
+
+ public DataTable SearchInfoByStock(string StockNo)
+ {
+ ProductDAL da = new ProductDAL();
+ try
+ {
+ return da.SearchInfoByStock(StockNo);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs
new file mode 100644
index 0000000..c7490c6
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductOfInjectionBLL.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.Model;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductOfInjectionBLL
+ {
+ ProductOfInjectionDAL db=new ProductOfInjectionDAL();
+
+ public bool Add_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public DataTable SearchCountByInfo(string station, string date, string classname, string StockNo,string partno)
+ {
+ try
+ {
+ return db.SearchCountByInfo(station,date,classname,StockNo,partno);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+ }
+
+ public bool Update_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.UpdateInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool UpdateBad_Info(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.UpdteBadInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+
+ public bool updateProductCount(ProductOfInjectionModel md)
+ {
+ try
+ {
+ return db.updateProductCount(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+ }
+ }
+}
diff --git a/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs
new file mode 100644
index 0000000..2896c0e
--- /dev/null
+++ b/SjMes/PunchAssemble/MESClassLibrary/BLL/BasicInfo/ProductTypeBLL.cs
@@ -0,0 +1,182 @@
+using MESClassLibrary.BLL.Log;
+using MESClassLibrary.DAL.BasicInfo;
+using MESClassLibrary.EFModel;
+using MESClassLibrary.Model;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MESClassLibrary.BLL.BasicInfo
+{
+ public class ProductTypeBLL
+ {
+ BasicBLL db = new BasicBLL();
+
+ ///
+ /// 新增信息
+ ///
+ ///
+ ///
+ public bool AddInfo(tb_ProductType md)
+ {
+ try
+ {
+ var list = db.SearchInfoByKey("ProductTypeNo", md.ProductTypeNo);//判断是否有重复数据
+ if (list != null)
+ {
+ if (list.Where(p => p.ProductTypeID != md.ProductTypeID).Count() > 0)
+ {
+ return false;
+ }
+
+ }
+
+ return db.AddInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+ ///
+ /// 修改信息
+ ///
+ ///
+ ///
+ public bool UpdateInfo(tb_ProductType md)
+ {
+ try
+ {
+ var list = db.SearchAllInfo().Where(p => p.ProductTypeNo == md.ProductTypeNo && p.ProductTypeID != md.ProductTypeID).ToList();//判断是否有重复数据
+ if (list.Count > 0)
+ {
+ return false;
+ }
+
+ //初始化要更新的字段
+ string[] proNames = new string[2];
+ proNames[0] = "ProductTypeName";
+ proNames[1] = "Des";
+
+ //必填字段初始化，如果不需要更新必填字段则设置为空即可，时间类型无需初始化
+ //如果没有初始化必填字段，更新会报错
+ //md.Des = "";
+
+ return db.UpdateInfo(md, proNames);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 删除信息
+ ///
+ ///
+ ///
+ ///
+ public bool DeleteInfo(tb_ProductType md)
+ {
+ try
+ {
+ return db.DelInfo(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return false;
+ }
+
+ }
+
+ ///
+ /// 查询全部信息分页
+ ///
+ ///
+ public string SearchInfoAll(string page, string pagesize)
+ {
+ try
+ {
+ string jsonStr = "[]";
+ int total = 0;//总行数
+ List list = db.SearchInfoAll(Convert.ToInt32(page), Convert.ToInt32(pagesize), out total);//按分页查询
+ JsonDataModel md = new JsonDataModel();
+ md.total = total.ToString();
+ md.rows = list;
+ return JSONTools.ScriptSerialize(md);
+ }
+ catch (Exception ex)
+ {
+ LogErrBLL.AddInfo(ex.ToString(), MethodBase.GetCurrentMethod());
+ return null;
+ }
+
+ }
+
+ ///