Browse Source

搪塑称重查询界面,上次忘记提交了

master
songnan.zhang 3 years ago
parent
commit
6a0a795ed7
  1. 5
      APP/QMAPP.Web/Web.config
  2. 22
      APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs
  3. 82
      APPQ5/QMAPP.FJC.DAL/Bucket/TSWeighRecoreDAL.cs
  4. 5
      APPQ5/QMAPP.FJC.Entity/Bucket/TSWeighRecore.cs
  5. 1
      APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml
  6. 50
      APPQ5/QMAPP.FJC.Web/Controllers/TSWeighRecoreController.cs
  7. 52
      APPQ5/QMAPP.FJC.Web/Models/Bucket/TSWeighRecoreModel.cs
  8. 1
      APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj
  9. 43
      APPQ5/QMAPP.FJC.Web/Views/TSWeighRecore/TSWeighRecoreList.aspx
  10. 4
      APPQ5/QMAPP.FJC.Web/Web.config
  11. 6
      APPQ5/QMAPP.WinForm/App.config
  12. 6
      AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs
  13. 4
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

5
APP/QMAPP.Web/Web.config

@ -40,12 +40,13 @@
<!--主数据库连接-->
<!--<add name="maindb" connectionString="Data Source=USER-20180104HU;Initial Catalog=CD_MES;User Id=sa;Password=qm;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=CD_TEST;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<!--日志组件配置开始-->
<log4net>

22
APPQ5/QMAPP.FJC.BLL/Bucket/TSWeighRecoreBLL.cs

@ -140,6 +140,26 @@ namespace QMAPP.FJC.BLL.Bucket
}
}
#endregion
#region 统计
/// <summary>
/// 统计
/// </summary>
/// <param name="">信息</param>
/// <returns>删除个数</returns>
public TSWeighRecore Statistics(TSWeighRecore Info)
{
int count = 0;
try
{
return new TSWeighRecoreDAL().Statistics(Info);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
}
}

82
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 统计
/// <summary>
/// 统计
/// </summary>
/// <param name=""></param>
/// <returns>删除个数</returns>
public TSWeighRecore Statistics(TSWeighRecore Info)
{
StringBuilder sqlBuilder = new StringBuilder();
List<DataParameter> parameters = new List<DataParameter>();
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<TSWeighRecore>(sqlBuilder.ToString(), parameters.ToArray());
}
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
}
}

5
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; }
/// <summary>
/// 创建用户
@ -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; }
}
}

1
APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml

@ -553,5 +553,6 @@
<Button key="Sync" value="同步数据"/>
<Button key="Enable" value="启用"/>
<Button key="Disable" value="禁用"/>
<Button key="Statistics" value="统计"/>
</Buttons>
</Config>

50
APPQ5/QMAPP.FJC.Web/Controllers/TSWeighRecoreController.cs

@ -31,10 +31,13 @@ namespace QMAPP.FJC.Web.Controllers
{
TSWeighRecoreModel seachModel = new TSWeighRecoreModel();
if (callback == true)
{
//seachModel.BeginTime = DateTime.Now.AddDays(-5);
//seachModel.EndTime = DateTime.Now.AddDays(+1);
TryGetSelectBuffer<TSWeighRecoreModel>(out seachModel);
}
seachModel.rownumbers = false;
//seachModel.BeginTime = DateTime.Now.AddDays(-5);
//seachModel.EndTime = DateTime.Now.AddDays(+1);
seachModel.url = "/TSWeighRecore/GetList";
return View("TSWeighRecoreList", seachModel);
}
@ -73,7 +76,20 @@ namespace QMAPP.FJC.Web.Controllers
page = this.GetDataPage(seachModel);
condition = CopyToModel<TSWeighRecore, TSWeighRecoreModel>(seachModel);
#region wcf服务统一接口
try
{
var intBeginWeigh = 0;
var intEndWeigh = 0;
if (!string.IsNullOrEmpty(seachModel.BeginWeigh))
intBeginWeigh = Convert.ToInt32(seachModel.BeginWeigh);
if (!string.IsNullOrEmpty(seachModel.EndWeigh))
intEndWeigh = Convert.ToInt32(seachModel.EndWeigh);
}
catch
{
SetMessage("重量填写错误,请修改后查询!");
}
pageResult = wcfAgent.InvokeServiceFunction<DataResult<DataPage>>("TSWeighRecoreBLL_GetList", condition, page);
if (pageResult.IsSuccess == false)
{
@ -92,6 +108,32 @@ namespace QMAPP.FJC.Web.Controllers
}
}
#endregion
#region 统计
/// <summary>
/// 统计
/// </summary>
/// <returns>结果</returns>
[HttpPost]
[HandleException]
public ActionResult Statistics(TSWeighRecore model)
{
string selectKey = Request.Form["selectKey"];
ServiceAgent wcfAgent = this.GetServiceAgent();
try
{
var result = wcfAgent.InvokeServiceFunction<TSWeighRecore>(QMAPP.ServicesAgent.DictService.TSWeighRecoreBLL_Statistics.ToString(), model);
var count = Convert.ToInt32(result.Weigh);
var ERcount = result.SUM / count;
SetMessage($"总记录数:{count},平均重量:{ERcount},总重量:{result.SUM}");
return List(true);
}
catch (Exception ex)
{
throw ex;
}
}
#endregion
}
}

52
APPQ5/QMAPP.FJC.Web/Models/Bucket/TSWeighRecoreModel.cs

@ -59,7 +59,25 @@ namespace QMAPP.FJC.Web.Models.Bucket
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
public string Weigh { get; set; }
/// <summary>
/// 开始重量
/// </summary>
[Description("开始重量")]
[HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center, Hidden = true)]
public string BeginWeigh { get; set; }
/// <summary>
/// 结束重量
/// </summary>
[Description("结束重量")]
[HTMLInput(UpdateRead = false, required = true, MaxLength = 200)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center, Hidden = true)]
public string EndWeigh { get; set; }
/// <summary>
/// 创建人
/// </summary>
@ -90,22 +108,22 @@ namespace QMAPP.FJC.Web.Models.Bucket
[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss")]
public DateTime UPDATEDATE { get; set; }
///// <summary>
///// 开始时间
///// </summary>
//[Description("开始时间")]
//[HTMLInput(UpdateRead = true, MaxLength = 20)]
//[InputType(inputType.dateTimeBox)]
//[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss", Hidden = true)]
//public DateTime BeginTime { get; set; }
/// <summary>
/// 开始时间
/// </summary>
[Description("开始时间")]
[HTMLInput(UpdateRead = true, MaxLength = 20)]
[InputType(inputType.dateTimeBox)]
[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss", Hidden = true)]
public string BeginTime { get; set; }
///// <summary>
///// 结束时间
///// </summary>
//[Description("结束时间")]
//[HTMLInput(UpdateRead = true, MaxLength = 20)]
//[InputType(inputType.dateTimeBox)]
//[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss",Hidden = true)]
//public DateTime EndTime { get; set; }
/// <summary>
/// 结束时间
/// </summary>
[Description("结束时间")]
[HTMLInput(UpdateRead = true, MaxLength = 20)]
[InputType(inputType.dateTimeBox)]
[DGColumn(Sortable = true, Width = 150, DataAlign = DataAlign.center, FormatDate = "yyyy-MM-dd hh:mm:ss", Hidden = true)]
public string EndTime { get; set; }
}
}

1
APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj

@ -1429,6 +1429,7 @@
<None Include="App_Data\Excel\T_PA_SUPWELD2Exp.xlsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\an_hui_geo.json" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\ao_men_geo.json" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\bei_jing_geo.json" />

43
APPQ5/QMAPP.FJC.Web/Views/TSWeighRecore/TSWeighRecoreList.aspx

@ -6,7 +6,7 @@
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<%=Html.QPSeach(80,true) %>
<%=Html.QPSeach(100,true) %>
<table id="condiTable">
<tr>
@ -22,8 +22,41 @@
<td>
<%=Html.QC(p => p.MATERIAL_CODE)%>
</td>
<th align="right">
<%=Html.QV(p => p.PColour)%>
</th>
<td>
<%=Html.QC(p => p.PColour)%>
</td>
</tr>
<tr>
<th align="right">
<%=Html.QV(p => p.BeginWeigh)%>
</th>
<td>
<%=Html.QC(p => p.BeginWeigh)%>
</td>
<th align="right">
<%=Html.QV(p => p.EndWeigh)%>
</th>
<td>
<%=Html.QC(p => p.EndWeigh)%>
</td>
<th align="right">
<%=Html.QV(p => p.BeginTime)%>
</th>
<td>
<%=Html.QC(p => p.BeginTime)%>
</td>
<th align="right">
<%=Html.QV(p => p.EndTime)%>
</th>
<td>
<%=Html.QC(p => p.EndTime)%>
</td>
</tr>
</table>
<%=Html.QPEnd()%>
<%=Html.QPList() %>
@ -63,6 +96,9 @@
})
}
}
function Statistics() {
submitByButton("Statistics");
}
</script>
</asp:Content>
@ -71,9 +107,8 @@
<tr>
<td align="center">
<%=Html.QTButtonSearch("TSWeighRecore", "List", "List(1)", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%--<%=Html.QTButtonAdd("BucketMaterial", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonUpdate("BucketMaterial", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%>
<%=Html.QTButtonDelete("BucketMaterial", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%>
<%=Html.QTButton("Statistics", "Statistics", QMFrameWork.WebUI.IconCls.redo, "Statistics()", QMAPP.Common.Web.SystemLimit.isLimt)%>
</td>
</tr>
</table>

4
APPQ5/QMAPP.FJC.Web/Web.config

@ -31,12 +31,12 @@
<!--<add name="maindb" connectionString="Data Source=119.3.213.202.13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>
</connectionStrings>
<!--日志组件配置开始-->
<log4net>

6
APPQ5/QMAPP.WinForm/App.config

@ -5,11 +5,11 @@
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient" />
<add name="maindbBZD" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=BZD;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.99;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>
</connectionStrings>

6
AppCommon/QMAPP.ServicesAgent/ServiceEnums.cs

@ -242,6 +242,12 @@ namespace QMAPP.ServicesAgent
[Description("更新")]
AppConfigBLL_Update,
/// <summary>
/// 查询
/// </summary>
[Description("查询")]
TSWeighRecoreBLL_Statistics,
#endregion
#region

4
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@ -64,11 +64,11 @@
<!--主数据库连接-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES9;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
<add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=CdFisYbbDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->

Loading…
Cancel
Save