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

11

master
张松男 8 months ago
parent
04ab768a5f
commit
6d069bdddf
6 changed files with 66 additions and 87 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. 82
      APPQ5/QMAPP.WinForm/App.config
  2. 19
      APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs
  3. 19
      APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
  4. 2
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs
  5. 19
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm_316.cs
  6. 12
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

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

@ -3,50 +3,14 @@
<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="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.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="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="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.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;" 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="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=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;User Id=sa;Password=Microsoft@2021;" 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.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"/>
-->
<!--<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=.;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"/>-->
</connectionStrings>
@ -57,11 +21,18 @@
<add key="发运器具容量" value="6"/>
<add key="装配排序工序" value="ASSEMBLE_BC316"/>
<add key="先装A面" value="true"/>
<add key="052打印工位" value="GWASSEMBLE_VW371PA"/>
<add key="052打印工位" value="ASSEMBLE_BC316"/>
<add key="052打印条码规则371" value="^IP\d{4}$"/>
<add key="052打印条码规则316" value="^BCD382V[0-9]{15}$"/>
<add key="产线信息" value="BC316MP4"/>
<!--<add key="并线发运产线" value="IPFY"/>
<add key="并线发运本体条码正则" value="^(UP|CFAA-)[a-zA-Z0-9]+$"/>
<add key="并线装配前置工序" value="IP_SWELD_4"/>
--><!--设备编号,设备名称,工位编号,产线编号--><!--
-->
<!--设备编号,设备名称,工位编号,产线编号-->
<!--
<add key="并线装配基础信息" value="4A-AE0001;VW331 IP 装配夹具;IP_ASSEMBLY;BORAIPASSY"/>-->
<!--装配排序 end-->
@ -179,7 +150,7 @@
<add key="SleepSecond2" value="3" />
<add key="RefreshTime" value="52" />
<add key="LoginName" value="dcsnf" />
<add key="UpperBarcodeLen" value="22" />
<add key="UpperBarcodeLen" value="20" />
<add key="LowerBarcodeLen" value="5" />
<add key="PlaceFirstPositionCode" value="FirstPosition" />
<add key="PlaceFirstPositionType" value="False" />
@ -240,31 +211,20 @@
</bindings>
<client>
<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="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
-->
<endpoint address="net.tcp://10.111.144.97:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
<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.110:8938/GeneralService.svc" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.111.144.110: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.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://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
<!--<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://10.111.144.94: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="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />-->
</client>
</system.serviceModel>
<startup useLegacyV2RuntimeActivationPolicy="true">

19
APPQ5/QMAPP.WinForm/Forms/DisPatch/DPShipment.cs
View File

@ -1483,11 +1483,20 @@ namespace QMAPP.WinForm.Forms.DisPatch
}
else
{
PlaySound.PlaySounds.Play(@errorSoundPath);
lberror.Text = "未查询到该产品零件信息:" + Code + "。";
//清理文本框
ArragetxtCode();
return;
product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
if (product != null)
{
Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
}
else
{
PlaySound.PlaySounds.Play(@errorSoundPath);
lberror.Text = "未查询到该产品零件信息:" + Code + "。";
//清理文本框
ArragetxtCode();
return;
}
}
#region 校验是否有重复的扫过的条码

19
APPQ5/QMAPP.WinForm/Forms/DisPatch/FrmPlace.cs
View File

@ -1527,7 +1527,7 @@ namespace QMAPP.WinForm.Forms.DisPatch
if (System.Text.RegularExpressions.Regex.IsMatch(Code, "^BCP"))
{
//BCP开头的是BC316-MP4的包覆件
product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
}
else
{
@ -1540,10 +1540,19 @@ namespace QMAPP.WinForm.Forms.DisPatch
}
else
{
Alert("未查询到该产品零件信息:" + Code + "。");
//清理文本框
ArragetxtCode();
return;
product = agent.InvokeServiceFunction<Product>(QMAPP.ServicesAgent.FrmPlaceManage.FrmPlaceBLL_GetProductByAssembleCodeMP4.ToString(), Code);
if (product != null)
{
Code = string.IsNullOrEmpty(product.MAINCODE) ? product.PRODUCTCODE : product.MAINCODE;
}
else
{
Alert("未查询到该产品零件信息:" + Code + "。");
//清理文本框
ArragetxtCode();
return;
}
}
#region 校验是否有重复的扫过的条码

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

@ -895,7 +895,7 @@ namespace QMAPP.WinForm.Forms.Operation
this.txtCode.Text = "";
//PlaySound.PlaySounds.Play(@okSoundPath);
if (!"770,018,278".Contains(productCode.Substring(0, 3)))
if (!"770,018,278,304".Contains(productCode.Substring(0, 3)))
{
if(File.Exists(@okSoundPath))
{

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

@ -108,6 +108,8 @@ namespace QMAPP.WinForm.Forms.Operation
private string _AutoMachineCode = string.Empty; //自动扫码的配置设备编号
private string _Line = string.Empty; //自动扫码的配置设备编号
private string _firstBoxA = "true";
private int _containCount = 6;
@ -135,6 +137,7 @@ namespace QMAPP.WinForm.Forms.Operation
_052printWorkloc = System.Configuration.ConfigurationManager.AppSettings["052打印工位"];
_371BiaoPiBarCodeRegex = System.Configuration.ConfigurationManager.AppSettings["052打印条码规则371"];
_316BiaoPiBarCodeRegex = System.Configuration.ConfigurationManager.AppSettings["052打印条码规则316"];
_Line = System.Configuration.ConfigurationManager.AppSettings["产线信息"];
string firstA = System.Configuration.ConfigurationManager.AppSettings["先装A面"]?.Trim();
_firstBoxA = string.IsNullOrEmpty(firstA) == true ? "true" : firstA.ToLower();
@ -749,9 +752,13 @@ namespace QMAPP.WinForm.Forms.Operation
List<FJC.Entity.ProductionPlan.WorkOrder> list1 =
this.dgvPlan.DataSource as List<FJC.Entity.ProductionPlan.WorkOrder>;
var PbomItem = _agent.InvokeServiceFunction<List<PbomItem>>(B9IPCService.PbomItemBLL_Get.ToString(), result.MATERIAL_CODE);
var bom = tBMat.Text.Substring(tBMat.Text.ToString().Length - 5, 5).Replace(" ","");
PbomItem = PbomItem.Where(p => p.PBOM_CODE.Contains(bom)).ToList();
var BomCodes = "";
if (PbomItem != null && PbomItem.Count > 0)
{
BomCodes = PbomItem[0].PBOM_CODE;
var SSS = _agent.InvokeServiceFunction<Bom>(B9IPCService.PbomItemBLL_GetBom.ToString(), BomCodes);
@ -819,17 +826,11 @@ namespace QMAPP.WinForm.Forms.Operation
#region 20220429 QDZhang BC316装车排序起始号记录
//if (result.Success)
if (result.Actions.Count>0)
if (string.IsNullOrEmpty(_Line))
{
if (fisPlanTable.Rows.Count > 0)
{
int initNo = 0;
int.TryParse(fisPlanRow["No"].ToString(), out initNo);
if (!cboxSort.Checked)
initNo = 0;
WorkOrderBLL.SaveStartIndex(initNo);
}
}
#endregion

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

@ -62,28 +62,28 @@
</appSettings>
<connectionStrings>
<!--主数据库连接-->
<!--
<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="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.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.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"/>

Write Preview
Loading…
Cancel
Save