diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 0357f34..8f958f7 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -40,12 +40,13 @@ - + - + + diff --git a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs index f8451e2..1fa19ee 100644 --- a/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs @@ -140,6 +140,26 @@ namespace QMAPP.FJC.BLL.Bucket } } #endregion - + + #region 统计 + + /// + /// 统计 + /// + /// 信息 + /// 删除个数 + public TSWeighRecore Statistics(TSWeighRecore Info) + { + int count = 0; + try + { + return new TSWeighRecoreDAL().Statistics(Info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs index b3f3102..a9cbfb2 100644 --- a/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs @@ -154,6 +154,33 @@ namespace QMAPP.FJC.DAL.Bucket whereBuilder.Append(" AND MATERIAL_CODE = @MATERIAL_CODE"); parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = condition.MATERIAL_CODE }); } + if (string.IsNullOrEmpty(condition.PColour) == false) + { + whereBuilder.Append(" AND PColour = @PColour"); + parameters.Add(new DataParameter { ParameterName = "PColour", DataType = DbType.String, Value = condition.PColour }); + } + if (!string.IsNullOrEmpty(condition.BeginWeigh)) + { + whereBuilder.Append(" AND Weigh >= @BeginWeigh"); + parameters.Add(new DataParameter { ParameterName = "BeginWeigh", DataType = DbType.String, Value = condition.BeginWeigh }); + } + + if (!string.IsNullOrEmpty(condition.EndWeigh)) + { + whereBuilder.Append(" AND Weigh <= @EndWeigh"); + parameters.Add(new DataParameter { ParameterName = "EndWeigh", DataType = DbType.String, Value = condition.EndWeigh }); + } + var sss = DateTime.MinValue.ToString(); + if (condition.BeginTime != DateTime.MinValue) + { + whereBuilder.Append(" AND CREATEDATE >= @BeginTime"); + parameters.Add(new DataParameter { ParameterName = "BeginTime", DataType = DbType.String, Value = condition.BeginTime }); + } + if (condition.EndTime != DateTime.MinValue) + { + whereBuilder.Append(" AND CREATEDATE <= @EndTime"); + parameters.Add(new DataParameter { ParameterName = "EndTime", DataType = DbType.String, Value = condition.EndTime }); + } //查询条件 if (whereBuilder.Length > 0) { @@ -259,8 +286,59 @@ namespace QMAPP.FJC.DAL.Bucket } #endregion - - + + #region 统计 + /// + /// 统计 + /// + /// + /// 删除个数 + public TSWeighRecore Statistics(TSWeighRecore Info) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //删除基本信息 + sqlBuilder.Append("select sum([Weigh]) as 'SUM',count(*) as 'Weigh' from T_AW_TSWeighRecore "); + sqlBuilder.Append("WHERE 1 = 1 "); + if (Info.BeginTime != DateTime.MinValue) + sqlBuilder.Append($" and CREATEDATE >= '{Info.BeginTime}' "); + if (Info.EndTime != DateTime.MinValue) + sqlBuilder.Append($" and CREATEDATE <= '{Info.EndTime}' "); + if (string.IsNullOrEmpty(Info.ProductCode) == false) + { + sqlBuilder.Append($" AND ProductCode = '{Info.ProductCode}'"); + } + if (string.IsNullOrEmpty(Info.MATERIAL_CODE) == false) + { + sqlBuilder.Append($" AND MATERIAL_CODE = '{Info.MATERIAL_CODE}'"); + } + if (string.IsNullOrEmpty(Info.PColour) == false) + { + sqlBuilder.Append($" AND PColour = '{Info.PColour}'"); + } + if (!string.IsNullOrEmpty(Info.BeginWeigh)) + { + sqlBuilder.Append($" AND Weigh >= '{Info.BeginWeigh}'"); + } + if (!string.IsNullOrEmpty(Info.EndWeigh)) + { + sqlBuilder.Append($" AND Weigh <= {Info.EndWeigh}"); + } + return session.Get(sqlBuilder.ToString(), parameters.ToArray()); + + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs b/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs index f103fad..1565e21 100644 --- a/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs +++ b/APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs @@ -51,6 +51,9 @@ namespace QMAPP.MD.Entity.Bucket [Description("重量")] [DBColumn(ColumnName = "Weigh", DataType = DbType.String)] public string Weigh { get; set; } + public string BeginWeigh { get; set; } + public string EndWeigh { get; set; } + public int SUM { get; set; } /// /// 创建用户 @@ -80,5 +83,7 @@ namespace QMAPP.MD.Entity.Bucket [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.String)] public string UPDATEDATE { get; set; } + public DateTime EndTime { get; set; } + public DateTime BeginTime { get; set; } } } diff --git a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml index 380ba35..3258920 100644 --- a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml +++ b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml @@ -553,5 +553,6 @@