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

1

master
张松男 6 months ago
parent
58292c8566
commit
2193b80cc8
5 changed files with 37 additions and 23 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. 24
      APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
  2. 8
      APPQ5/QMAPP.WinForm/App.config
  3. 15
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
  4. 1
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
  5. 8
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

24
APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
View File

@ -82,20 +82,20 @@ namespace QMAPP.FJC.TRACING.DAHandler
if (data.OrderPlan == null)
{
//BC316-MP4 装配首工位 进行计划强校验
//if ("AIRBAG_WELD_BC316".Contains(data.MachineCode))
//{
// // QDA3 装配1 强校验第一条计划
// var plan = new WorkOrderDAL().GetOrderInCell(data.WorkLocState.WORKCELL_CODE + "," + TYPE, 1, 1);
if ("AIRBAG_WELD_BC316".Contains(data.MachineCode))
{
// QDA3 装配1 强校验第一条计划
var plan = new WorkOrderDAL().GetOrderInCell(data.WorkLocState.WORKCELL_CODE , 1, 1);
// if (plan.Count > 0)
// {
// DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();
// data.OrderPlan = orderplandal.Get(new Entity.FIS.OrderPlan { PID = plan[0].ORDERPLANID });
if (plan.Count > 0)
{
//DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();
//data.OrderPlan = orderplandal.Get(new Entity.FIS.OrderPlan { PID = plan[0].ORDERPLANID });
// DAL.ProductionPlan.WorkOrderDAL workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
// data.OrderPlan = workorderdal.GetOneByID(plan[0].ORDERPLANID);
// }
//}
DAL.ProductionPlan.WorkOrderDAL workorderdal = new DAL.ProductionPlan.WorkOrderDAL();
data.OrderPlan = workorderdal.GetOneByID(plan[0].ORDERPLANID);
}
}
if (!string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.ORDERPLAN_PID))
{
//DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();

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

@ -213,15 +213,15 @@
<!--<endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://localhost:8938/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
<endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://localhost: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="http://10.117.133.80:8939/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.117.133.80:8939/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<!--<endpoint address="http://10.117.133.80:8939/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.117.133.80:8939/LoginService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
<endpoint address="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />

15
APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
View File

@ -2049,7 +2049,20 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
Report.FieldByName("PartCode").Value = bzd.color;//颜色
//只有BC316-MP4 的高配，需要增加4G配置的标识
if ("5CG.857.003 P AFI,5CG.857.003 P AGO,5CG.857.003 P AGI,5CG.857.003 R AFI".Contains(bzd.MATERIAL_CODE))
{
Report.FieldByName("PartCode").Value = "* IP";//颜色
}
else if ("5CG.857.003 Q AGX,5CG.857.003 Q AGZ,5CG.857.003 S AGI,5CG.857.003 S AHB,5CG.857.003 S AHD".Contains(bzd.MATERIAL_CODE))
{
Report.FieldByName("PartCode").Value = "4G IP";//颜色
}
else
{
Report.FieldByName("PartCode").Value = bzd.color;//颜色
}
//Report.FieldByName("PartCode").Value = bzd.color;//颜色
Report.DetailGrid.Recordset.Post();
}

1
APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
View File

@ -2079,6 +2079,7 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
//只有BC316-MP4 的高配，需要增加4G配置的标识
if ("5CG.857.003 P AFI,5CG.857.003 P AGO,5CG.857.003 P AGI,5CG.857.003 R AFI".Contains(bzd.MATERIAL_CODE))
{
Report.FieldByName("PartCode").Value = "* IP";//颜色

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

@ -72,19 +72,19 @@
<add name="maindb" connectionString="Data Source=10.111.144.99;Initial Catalog=ADIENT_CD_MES_20230930;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.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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"/>-->
<!--
<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_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" 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