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

1

master
张松男 8 months ago
parent
757024e582
commit
58292c8566
6 changed files with 51 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
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
  2. 2
      APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs
  3. 16
      APPQ5/QMAPP.FJC.TRACING/DAHandler/DataAcquirer.cs
  4. 13
      APPQ5/QMAPP.WinForm/App.config
  5. 16
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
  6. 8
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

1
APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
View File

@ -4591,6 +4591,7 @@ namespace QMAPP.FJC.BLL.Operation
var conditionPParameter = new ProcessParameter var conditionPParameter = new ProcessParameter
{ {
WORKCELL_CODE = condition.WORKCELL_CODE, WORKCELL_CODE = condition.WORKCELL_CODE,
MACHINECODDE = condition.MACHINECODDE
}; };

2
APPQ5/QMAPP.FJC.DAL/Operation/MainOperationDAL.cs
View File

@ -1819,7 +1819,7 @@ from T_AW_MAINOPERATION where 1=1 ";
sqlBuilder.Append(") tt "); sqlBuilder.Append(") tt ");
sqlBuilder.Append(" LEFT JOIN T_QM_USER O ON O.[USERID] = tt.[CREATEUSER]"); sqlBuilder.Append(" LEFT JOIN T_QM_USER O ON O.[USERID] = tt.[CREATEUSER]");
sqlBuilder.AppendFormat(" LEFT JOIN {0} P ON tt.[PID]=P.[MOID]", condition.PARATABLENAME); sqlBuilder.AppendFormat(" LEFT JOIN {0} P ON tt.[PRODUCTCODE]=P.[PRODUCTCODE]", condition.PARATABLENAME);
sqlBuilder.AppendFormat(" WHERE ROWINDEX BETWEEN {0} AND {1}", Convert.ToString(page.PageSize * (page.PageIndex - 1) + 1), Convert.ToString(page.PageSize * page.PageIndex)); sqlBuilder.AppendFormat(" WHERE ROWINDEX BETWEEN {0} AND {1}", Convert.ToString(page.PageSize * (page.PageIndex - 1) + 1), Convert.ToString(page.PageSize * page.PageIndex));
//#endregion //#endregion
//sqlBuilder.Clear().Append( " select abc.*,p.RESTTHICKNESS,o.USERNAME from ( select top 20 ROW_NUMBER() OVER (ORDER BY M.OPERATEDDATE DESC ) AS ROWINDEX,* from [T_AW_MAINOPERATION] M WHERE M.CREATEDATE >= '2012-01-01' AND M.CREATEDATE <= '2016-01-01' AND M.PROCESSTYPE = 6) abc left join " //sqlBuilder.Clear().Append( " select abc.*,p.RESTTHICKNESS,o.USERNAME from ( select top 20 ROW_NUMBER() OVER (ORDER BY M.OPERATEDDATE DESC ) AS ROWINDEX,* from [T_AW_MAINOPERATION] M WHERE M.CREATEDATE >= '2012-01-01' AND M.CREATEDATE <= '2016-01-01' AND M.PROCESSTYPE = 6) abc left join "

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

@ -10,6 +10,7 @@ using QMAPP.BLL;
using QMAPP.MD.DAL; using QMAPP.MD.DAL;
using QMAPP.FJC.Entity.Basic; using QMAPP.FJC.Entity.Basic;
using QMFrameWork.Log; using QMFrameWork.Log;
using QMAPP.FJC.DAL.ProductionPlan;
namespace QMAPP.FJC.TRACING.DAHandler namespace QMAPP.FJC.TRACING.DAHandler
{ {
@ -80,6 +81,21 @@ namespace QMAPP.FJC.TRACING.DAHandler
if (data.OrderPlan == null) 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 (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);
// }
//}
if (!string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.ORDERPLAN_PID)) if (!string.IsNullOrWhiteSpace(data.WorkLocState.CurrentState.ORDERPLAN_PID))
{ {
//DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL(); //DAL.FIS.OrderPlanDAL orderplandal = new DAL.FIS.OrderPlanDAL();

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

@ -3,14 +3,14 @@
<connectionStrings> <connectionStrings>
<!--主数据库连接--> <!--主数据库连接-->
<add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" providerName="System.Data.SqlClient"/> <add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=sa;Password=Password01;" 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="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"/>
<add name="maindbBC316_MP4" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>--> <add name="maindbBC316_MP4" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" 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> </connectionStrings>
@ -213,13 +213,16 @@
<endpoint address="http://localhost:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" /> <!--<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/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/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.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="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" /> <endpoint address="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />

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

@ -2079,7 +2079,23 @@ namespace QMAPP.WinForm.Forms.Operation
Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码 Report.FieldByName("FullBarCode").Value = e052BarCode;//总装条码
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";//颜色
WriteFile("ZSN, ReadFetchRecordBox PartCode：* IP", @"D:\MES\Log");
}
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";//颜色
WriteFile("ZSN, ReadFetchRecordBox PartCode：4G IP", @"D:\MES\Log");
}
else
{
Report.FieldByName("PartCode").Value = bzd.color;//颜色 Report.FieldByName("PartCode").Value = bzd.color;//颜色
WriteFile("ZSN, ReadFetchRecordBox PartCode："+ bzd.color, @"D:\MES\Log");
}
Report.DetailGrid.Recordset.Post(); Report.DetailGrid.Recordset.Post();
} }

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="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="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="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="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="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="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.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.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"/> <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