diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml
index d2795e0..064d720 100644
--- a/APP/QMAPP.Web/App_Data/Menu.xml
+++ b/APP/QMAPP.Web/App_Data/Menu.xml
@@ -453,8 +453,14 @@
+
-
+
-
diff --git a/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs
new file mode 100644
index 0000000..6737879
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.BLL/BZD/BarCodeReplaceBLL.cs
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.BLL;
+
+using QMFrameWork.Data;
+
+using QMAPP.Entity;
+using QMFrameWork.Log;
+using System.Data;
+using QMAPP.MD.Entity;
+using QMAPP.MD.DAL;
+using QMAPP.FJC.Entity.BZD;
+using QMAPP.FJC.DAL.BZD;
+
+namespace QMAPP.FJC.BLL.BZD
+{
+ ///
+ /// 模块名称:条码替换记录
+ /// 作 者:张松男
+ /// 编写日期:2022年11月07日
+ ///
+ public class BarCodeReplaceBLL : BaseBLL
+ {
+
+ #region 获取信息
+ ///
+ /// 获取信息
+ ///
+ /// 条件
+ /// 信息
+ public DataResult Get(BarCodeReplace model)
+ {
+ DataResult result = new DataResult();
+ try
+ {
+ result.Result = new BarCodeReplaceDAL().Get(model);
+ }
+ catch (Exception ex)
+ {
+ result.IsSuccess = false;
+ result.Msg = Resource.SystemException;
+ throw ex;
+ }
+ result.IsSuccess = true;
+ return result;
+ }
+
+ #endregion
+
+ #region 获取列表(分页)
+ ///
+ /// 获取列表
+ ///
+ /// 条件
+ /// 数据页
+ /// 数据页
+ public DataResult GetList(BarCodeReplace condition, DataPage page)
+ {
+ DataResult result = new DataResult();
+ try
+ {
+ //获取物料信息列表
+ DataPage dataPage = new BarCodeReplaceDAL().GetList(condition, page);
+
+ result.Result = dataPage;
+ }
+ catch (Exception ex)
+ {
+ result.IsSuccess = false;
+ result.Msg = Resource.SystemException;
+ throw ex;
+ }
+ result.IsSuccess = true;
+ return result;
+
+ }
+ ///
+ /// 获取全部条码格式规则
+ ///
+ ///
+ public List GetAllList(string str)
+ {
+ return new BarCodeReplaceDAL().GetAllList();
+ }
+ #endregion
+
+ #region 插入信息
+ ///
+ /// 插入信息(单表)
+ ///
+ /// 信息
+ /// 插入行数
+ public DataResult Insert(BarCodeReplace info)
+ {
+ DataResult result = new DataResult();
+ try
+ {
+ //基本信息
+ info.PID = Guid.NewGuid().ToString();
+ info.CREATEDATE = DateTime.Now;
+ info.FLGDEL = "0";
+ BarCodeReplaceDAL cmdDAL = new BarCodeReplaceDAL();
+ result.Result = new BarCodeReplaceDAL().Insert(info);
+ result.IsSuccess = true;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 更新信息
+ ///
+ /// 更新信息
+ ///
+ /// 信息
+ /// 更新行数
+ public DataResult Update(BarCodeReplace info)
+ {
+ DataResult result = new DataResult();
+ try
+ {
+ info.FLGDEL = "0";
+ result.Result = new BarCodeReplaceDAL().Update(info);
+ result.IsSuccess = true;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 删除
+ ///
+ /// 删除信息
+ ///
+ /// 主键串
+ /// 删除个数
+ public DataResult Delete(string strs)
+ {
+ int count = 0;
+ DataResult result = new DataResult();
+ string[] list = strs.Split(":".ToCharArray());
+ try
+ {
+ foreach (string str in list)
+ {
+ count += this.DeleteBarcodeRules(new BarCodeReplace { PID = str });
+ }
+ result.Result = count;
+ result.IsSuccess = true;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ ///
+ /// 删除信息
+ ///
+ /// 信息
+ /// 删除个数
+ public int DeleteBarcodeRules(BarCodeReplace info)
+ {
+ try
+ {
+ return new BarCodeReplaceDAL().Delete(info);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 导出数据
+ ///
+ /// 获取导出的数据
+ ///
+ /// 查询条件
+ /// 数据
+ public DataTable GetExportData(BarCodeReplace info)
+ {
+ try
+ {
+ return new BarCodeReplaceDAL().GetExportData(info);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
index f90278e..2da4584 100644
--- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
+++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj
@@ -110,6 +110,7 @@
+
diff --git a/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs
new file mode 100644
index 0000000..7bd42a0
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplaceDAL.cs
@@ -0,0 +1,255 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMAPP.MD.Entity;
+using QMFrameWork.Data;
+using System.Data;
+using QMAPP.Entity;
+using QMAPP.FJC.Entity.BZD;
+
+namespace QMAPP.FJC.DAL.BZD
+{
+ ///
+ /// 模块名称:条码替换记录
+ /// 作 者:张松男
+ /// 编写日期:2022年11月07日
+ ///
+ public class BarCodeReplaceDAL
+ {
+
+ #region 获取信息
+ ///
+ /// 获取信息
+ ///
+ /// 条件
+ /// *信息
+ public BarCodeReplace Get(BarCodeReplace info)
+ {
+ try
+ {
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ //获取信息
+ info = session.Get(info);
+ }
+ return info;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ #endregion
+
+ #region 获取列表
+ ///
+ /// 获取列表
+ ///
+ /// 条件
+ /// 数据页
+ /// 数据页
+ public DataPage GetList(BarCodeReplace condition, DataPage page)
+ {
+ string sql = null;
+ List parameters = new List();
+ try
+ {
+ sql = this.GetQuerySql(condition, ref parameters);
+ //分页关键字段及排序
+ page.KeyName = "PID";
+ if (string.IsNullOrEmpty(page.SortExpression))
+ page.SortExpression = "CREATEDATE DESC";
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ // 对应多种数据库
+ //string sqlChange = this.ChangeSqlByDB(sql, session);
+ page = session.GetDataPage(sql, parameters.ToArray(), page);
+ }
+ return page;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ ///
+ /// 获取全部规则
+ ///
+ ///
+ public List GetAllList()
+ {
+ try
+ {
+ string sql = "SELECT * FROM [T_AW_BarCodeReplace]";
+ List parameters = new List();
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ return session.GetList(sql, parameters.ToArray()).ToList();
+ }
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 获取查询语句
+ ///
+ /// 获取查询语句
+ ///
+ /// 查询条件
+ /// 参数
+ /// 查询语句
+ private string GetQuerySql(BarCodeReplace condition, ref List parameters)
+ {
+ StringBuilder sqlBuilder = new StringBuilder();
+ StringBuilder whereBuilder = new StringBuilder();
+ try
+ {
+ //构成查询语句//[PID],[MPID],[barcodeFist],[Company_code],[Vehicle_type],[MATERIALCODDE],[configColor],[CREATEUSER],[CREATEDATE],[FLGDEL]
+ sqlBuilder.Append("SELECT * ");
+ sqlBuilder.Append("FROM [T_AW_BarCodeReplace] ");
+ whereBuilder.Append(" AND FLGDEL<> '1' ");
+ //查询条件
+
+ ////查询条件
+ if (string.IsNullOrEmpty(condition.NewProductCode) == false)
+ {
+ whereBuilder.Append(" AND NewProductCode LIKE @NewProductCode ");
+ parameters.Add(new DataParameter { ParameterName = "NewProductCode", DataType = DbType.String, Value = "%" + condition.NewProductCode + "%" });
+ }
+ if (string.IsNullOrEmpty(condition.OldProductCode) == false)
+ {
+ whereBuilder.Append(" AND OldProductCode LIKE @OldProductCode ");
+ parameters.Add(new DataParameter { ParameterName = "OldProductCode", DataType = DbType.String, Value = "%" + condition.OldProductCode + "%" });
+ }
+
+
+ if (whereBuilder.Length > 0)
+ {
+ sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4));
+ }
+ return sqlBuilder.ToString();
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 获取导出的数据
+ ///
+ /// 获取导出的数据
+ ///
+ /// 查询条件
+ /// 数据
+ public DataTable GetExportData(BarCodeReplace info)
+ {
+ DataTable dt = null;
+ string sql = null;
+ List parameters = new List();
+ try
+ {
+ //构成查询语句
+ sql = this.GetQuerySql(info, ref parameters);
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ dt = session.GetTable(sql, parameters.ToArray());
+ dt.TableName = "BarCodeReplace";
+ }
+ return dt;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 插入信息
+ ///
+ /// 插入信息(单表)
+ ///
+ /// 信息
+ /// 插入行数
+ public int Insert(BarCodeReplace info)
+ {
+ int count = 0;
+ try
+ {
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ //插入基本信息
+ count = session.Insert(info);
+ }
+ return count;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 更新信息
+ ///
+ /// 更新信息
+ ///
+ ///
+ /// 更新行数
+ public int Update(BarCodeReplace info)
+ {
+ int count = 0;
+ try
+ {
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ //更新基本信息
+ count = session.Update(info);
+ }
+ return count;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ #region 逻辑删除
+ ///
+ /// 逻辑删除信息
+ ///
+ ///
+ /// 删除个数
+ public int Delete(BarCodeReplace info)
+ {
+ StringBuilder sqlBuilder = new StringBuilder();
+ List parameters = new List();
+ int count = 0;
+ try
+ {
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ //删除基本信息
+ sqlBuilder.Append("UPDATE T_AW_BarCodeReplace ");
+ sqlBuilder.Append("SET FLGDEL = '1' ");
+ sqlBuilder.Append("WHERE PID = @PID ");
+ parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID });
+ count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray());
+ }
+ return count;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ #endregion
+
+ }
+}
diff --git a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
index 673e01e..3678c15 100644
--- a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
+++ b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj
@@ -103,6 +103,7 @@
+
diff --git a/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs
new file mode 100644
index 0000000..a06a5d1
--- /dev/null
+++ b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplace.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using QMFrameWork.Data.Attributes;
+using QMAPP.Entity;
+using System.ComponentModel;
+using System.Data;
+
+namespace QMAPP.FJC.Entity.BZD
+{
+ ///
+ /// 模块名称:条码替换记录
+ /// 作 者:张松男
+ /// 编写日期:2022年11月07日
+ ///
+ [DBTable(TableName = "T_AW_BarCodeReplace")]
+ public class BarCodeReplace : BaseEntity
+ {
+ ///
+ /// 主键
+ ///
+ [DBColumn(ColumnName = "PID", DataType = DbType.String, IsKey = true)]
+ public string PID { get; set; }
+
+ ///
+ /// 新条码
+ ///
+ [DBColumn(ColumnName = "NewProductCode", DataType = DbType.String)]
+ public string NewProductCode { get; set; }
+
+ ///
+ /// 旧条码
+ ///
+ [DBColumn(ColumnName = "OldProductCode", DataType = DbType.String)]
+ public string OldProductCode { get; set; }
+
+
+ ///
+ /// 创建日期
+ ///
+ [DBColumn(ColumnName = "CREATEDATE", DataType = DbType.DateTime)]
+ public DateTime CREATEDATE { get; set; }
+
+
+ ///
+ /// 有效标志
+ ///
+ [DBColumn(ColumnName = "FLGDEL", DataType = DbType.String)]
+ public string FLGDEL { get; set; }
+ }
+}
diff --git a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
index 475c9fc..f550968 100644
--- a/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
+++ b/APPQ5/QMAPP.FJC.Entity/QMAPP.FJC.Entity.csproj
@@ -97,6 +97,7 @@
+
diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
index f49ce8f..07dbf1e 100644
--- a/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
@@ -456,6 +456,14 @@
导出
+
-
-
-