diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml
index 0f186fb..f82189c 100644
--- a/APP/QMAPP.Web/App_Data/MainPower.xml
+++ b/APP/QMAPP.Web/App_Data/MainPower.xml
@@ -159,6 +159,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index 1d07c93..d47ae3c 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -45,9 +45,9 @@
-
+
-
+
diff --git a/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs
index 5dbd6e7..5058339 100644
--- a/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/BZD/BarCodeReplacementDAL.cs
@@ -123,30 +123,32 @@ namespace QMAPP.MD.DAL
try
{
if (condition.BeginTime == Convert.ToDateTime("0001/1/1 00:00:00"))
- condition.BeginTime = DateTime.Now.AddDays(-5);
+ condition.BeginTime = DateTime.Now.AddDays(-1);
if (condition.EndTime == Convert.ToDateTime("0001/1/1 00:00:00"))
+
+
condition.EndTime = DateTime.Now;
//构成查询语句
- sqlBuilder.Append("select PID,Type,ProductCode,CreateTime,CreateUser ");
- sqlBuilder.Append("FROM T_AW_BarCode_Replacement ");
+ sqlBuilder.Append("select b.PID,b.Type,b.ProductCode,m.MAINCODE as 'BZDBarcode',m.MATERIAL_CODE as 'BZDMaterial_Code',t.MATERIAL_NAME as 'BZDMaterial_CodeName',b.CreateTime,b.CreateUser ");
+ sqlBuilder.Append("from T_AW_BarCode_Replacement as b left join T_AW_MAIN as m on b.ProductCode = m.EPIDERMISCODE LEFT JOIN T_MD_MATERIAL as t on m.MATERIAL_CODE = t.MATERIAL_CODE ");
//查询条件
//查询条件
if (string.IsNullOrEmpty(condition.ProductCode) == false)
{
- whereBuilder.Append(" AND ProductCode like @ProductCode ");
+ whereBuilder.Append(" AND b.ProductCode like @ProductCode ");
parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = "%" + condition.ProductCode + "%" });
}
//查询条件
if (string.IsNullOrEmpty(condition.Type) == false)
{
- whereBuilder.Append(" AND Type like @Type ");
+ whereBuilder.Append(" AND b.Type like @Type ");
parameters.Add(new DataParameter { ParameterName = "Type", DataType = DbType.String, Value = "%" + condition.Type + "%" });
}
- whereBuilder.Append($" AND CreateTime >= '{condition.BeginTime}' and CreateTime <= '{condition.EndTime}' ");
+ whereBuilder.Append($" AND b.CreateTime >= '{condition.BeginTime}' and b.CreateTime <= '{condition.EndTime}' ");
if (whereBuilder.Length > 0)
{
diff --git a/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs
index a6c0879..54deec5 100644
--- a/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs
+++ b/APPQ5/QMAPP.FJC.Entity/BZD/BarCodeReplacement.cs
@@ -35,6 +35,21 @@ namespace QMAPP.FJC.Entity.BZD
[DBColumn(ColumnName = "ProductCode", DataType = DbType.String)]
public string ProductCode { get; set; }
+ ///
+ /// BZD条码
+ ///
+ public string BZDBarcode { get; set; }
+
+ ///
+ /// 总成零件号
+ ///
+ public string BZDMaterial_Code { get; set; }
+
+ ///
+ /// 总成零件名称
+ ///
+ public string BZDMaterial_CodeName { get; set; }
+
///
/// 新增时间
///
diff --git a/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs b/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs
index 85e6f0a..c31b502 100644
--- a/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs
+++ b/APPQ5/QMAPP.FJC.Web/Models/BZD/BarCodeReplacementModel.cs
@@ -40,6 +40,33 @@ namespace QMAPP.FJC.Web.Models.BZD
[DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string ProductCode { get; set; }
+ ///
+ /// BZD条码
+ ///
+ [Description("BZD条码")]
+ [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
+ public string BZDBarcode { get; set; }
+
+ ///
+ /// 总成零件号
+ ///
+ [Description("总成零件号")]
+ [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
+ public string BZDMaterial_Code { get; set; }
+
+ ///
+ /// 总成零件名称
+ ///
+ [Description("总成零件名称")]
+ [HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
+ [InputType(inputType.text)]
+ [DGColumn(frozenColumns = true, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
+ public string BZDMaterial_CodeName { get; set; }
+
///
/// 创建时间
///
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index bd4d744..1038834 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -36,9 +36,9 @@
-
+
-
+
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index ab80015..fced174 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -75,8 +75,8 @@
-->
-
-
+