Browse Source

调整bzd取存储过程排序

master
songnan.zhang 2 years ago
parent
commit
c144aa8571
  1. 6
      APP/QMAPP.Web/Web.config
  2. 2
      APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs
  3. 12
      APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
  4. 8
      APPQ5/QMAPP.WinForm/App.config
  5. 15
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
  6. 4
      APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
  7. 2
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

6
APP/QMAPP.Web/Web.config

@ -62,13 +62,13 @@
<!--<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.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" 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"/>
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" 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"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" 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.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"/>
</connectionStrings>
<!--日志组件配置开始-->

2
APPQ5/QMAPP.FJC.DAL/BZD/BZDRecorderDAL.cs

@ -403,7 +403,7 @@ namespace QMAPP.MD.DAL
{
string sqlChange = ChangeSqlByDB(sql, session);
var dt = session.GetTable(sqlChange, parameters.ToArray());
return Convert.ToInt16(dt.Rows[0].ItemArray[0]);
return Convert.ToInt32(dt.Rows[0].ItemArray[0]);
}

12
APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs

@ -459,10 +459,8 @@ namespace QMAPP.FJC.DAL.TianJin
sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] ");
sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
if (Direction == "左")
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
else
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' ");
sql.AppendFormat(" AND W.[PRINTED]='0' ");
if (!string.IsNullOrEmpty(Direction))
@ -553,10 +551,8 @@ namespace QMAPP.FJC.DAL.TianJin
sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] ");
sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) ");
sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] ");
if (Direction == "左")
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_L_ASSEMBLY_770B' ");
else
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='DP_R_ASSEMBLY_770B' ");
sql.AppendFormat($" WHERE P.[ROUTE_CODE]='{routecode}' ");
sql.AppendFormat(" AND W.[PRINTED]='0' ");

8
APPQ5/QMAPP.WinForm/App.config

@ -19,7 +19,7 @@
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<!--<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" 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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
@ -35,7 +35,7 @@
<add key="发运器具容量" value="6"/>
<add key="装配排序工序" value="ASSEMBLE_BC316"/>
<add key="先装A面" value="true"/>
<add key="052打印工位" value="GWASSEMBLE_VW371PA"/>
<!--<add key="并线发运产线" value="IPFY"/>
<add key="并线发运本体条码正则" value="^(UP|CFAA-)[a-zA-Z0-9]+$"/>
<add key="并线装配前置工序" value="IP_SWELD_4"/>
@ -220,8 +220,8 @@
<endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
<!--<endpoint address="http://10.122.213.105:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.122.213.105:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<!--<endpoint address="http://10.111.144.97:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.111.144.97:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
</client>

15
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs

@ -117,16 +117,7 @@ namespace QMAPP.WinForm.Forms.TianJin
dataPage.PageSize = int.Parse(cbListRowcount.Text);
dataPage.PageIndex = 1;
dataPage.SortExpression = " ROWVALUE ASC";
//操作开始时间
//if (string.IsNullOrEmpty(this.dtpCREATEDATESTART.Text.Trim()) == false)
//{
// searchModel.BeginTime = Convert.ToDateTime((this.dtpCREATEDATESTART.Value).ToString("yyyy-MM-dd") + " 00:00:00");
//}
////操作结束时间
//if (string.IsNullOrEmpty(this.dtpCREATEDATEEND.Text.Trim()) == false)
//{
// searchModel.EndTime = Convert.ToDateTime((this.dtpCREATEDATEEND.Value).ToString("yyyy-MM-dd") + " 23:59:59");
//}
if (cbRoutes.Text.Contains("018D"))
{
var count = Convert.ToInt32(cbListRowcount.Text) / 2;
@ -556,7 +547,7 @@ namespace QMAPP.WinForm.Forms.TianJin
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
//PrintLabel(labels);
PrintLabel(labels);
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
@ -744,7 +735,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
//PrintLabel(labels);
PrintLabel(labels);
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
//变更打印状态 0=>1

4
APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2022.12.16.01")]
[assembly: AssemblyFileVersion("2022.12.16.01")]
[assembly: AssemblyVersion("2022.12.28.01")]
[assembly: AssemblyFileVersion("2022.12.28.01")]

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

@ -65,6 +65,8 @@
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;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"/>
<!--
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>

Loading…
Cancel
Save