InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

BC316帽檐超声波一增加单一工位fis计划生产

master
dequan.zhang 2 years ago
parent
b5477355c3
commit
f95cfde5a9
4 changed files with 15 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
  2. 8
      APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
  3. 6
      APPQ5/QMAPP.WinForm/App.config
  4. 6
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

10
APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
View File

@ -38,11 +38,11 @@ namespace QMAPP.FJC.TRACING.DataValidators
//--------------------BC316帽檐超声波焊接工位----------------------------------------------------
//if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
//{
// //20230309 DQzhang 获取当前工位第一条派工单
// workorder = workorderdal.GetFirstOrderInLoc(data.WorkLocState.WORKCELL_CODE, data.MouldCode);
//}
if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
{
//20230309 DQzhang 获取当前工位第一条派工单
workorder = workorderdal.GetFirstOrderInLoc(data.WorkLocState.WORKCELL_CODE, data.MouldCode);
}
//-----------------------------------------------------------------------------------------------

8
APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
View File

@ -115,10 +115,10 @@ namespace QMAPP.FJC.TRACING.StateActions
product.PLAN_NO = workorder.ORDERPLAN_NO;
//--------------------BC316帽檐超声波焊接工位----------------------------------------------------
//if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
//{
// workorder.IsDelete = true;
//}
if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
{
workorder.IsDelete = true;
}
//-----------------------------------------------------------------------------------------------

6
APPQ5/QMAPP.WinForm/App.config
View File

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

6
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
View File

@ -64,9 +64,9 @@
<!--主数据库连接-->
<!--<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="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="maindbYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBNCSNF;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>
<add name="maindbNCSYBB" connectionString="Data Source=10.111.144.72;Initial Catalog=scCFAACDYBDY;User Id=mesreaderdcs;Password=mesreaderdcs;" providerName="System.Data.SqlClient"/>-->
@ -78,7 +78,7 @@
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" 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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
-->

Write Preview
Loading…
Cancel
Save