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

111

master
张松男 2 months ago
parent
96a4cf9292
commit
930608f702
4 changed files with 13 additions and 29 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. 6
      APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs
  2. 3
      APPQ5/QMAPP.FJC.DAL/Operation/PbomItemDAL.cs
  3. 22
      APPQ5/QMAPP.WinForm/App.config
  4. 11
      APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs

6
APPMD/QMAPP.MD.DAL/ProcessRouteDAL.cs
View File

@ -850,8 +850,12 @@ namespace QMAPP.MD.DAL
parameters.Add(new DataParameter("bomcode", bomcode));
parameters.Add(new DataParameter("workcellcode", workcellcode));
var workcellcode2 = "";
if (!workcellcode.Contains("336"))
workcellcode2 = workcellcode.Substring(0, 3) + "304_" + workcellcode.Substring(3, workcellcode.Length - 3);
else
workcellcode2 = workcellcode;
var workcellcode2 = workcellcode.Substring(0, 3) + "304_" + workcellcode.Substring(3, workcellcode.Length - 3);
parameters.Add(new DataParameter("workcellcode2", workcellcode2));
using (var session = AppDataFactory.CreateMainSession())

3
APPQ5/QMAPP.FJC.DAL/Operation/PbomItemDAL.cs
View File

@ -29,7 +29,8 @@ namespace QMAPP.FJC.DAL.Operation
{
try
{
string sql = $"SELECT * FROM [T_MD_PBOM_ITEM] where MATERIAL_CODE = '{MATERIAL_CODE}'";
//20240812 线束自动填充 张松男 336产线 线束的 CREATEDATE 要比装饰条的时间靠前
string sql = $"SELECT * FROM [T_MD_PBOM_ITEM] where MATERIAL_CODE = '{MATERIAL_CODE}' order by CREATEDATE";
List<DataParameter> parameters = new List<DataParameter>();
using (IDataSession session = AppDataFactory.CreateMainSession())
{

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

@ -3,18 +3,8 @@
<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.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.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->
<!--
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_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="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
</connectionStrings>
@ -30,7 +20,7 @@
<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]+$"/>
@ -221,15 +211,7 @@
<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="net.tcp://10.111.144.94:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />
<endpoint address="net.tcp://127.0.0.1:4444/OpcService" binding="netTcpBinding" bindingConfiguration="NetTcpBinding_IOpcService" contract="ServiceOpc.IOpcService" name="NetTcpBinding_IOpcService" />

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

@ -895,15 +895,12 @@ namespace QMAPP.WinForm.Forms.Operation
this.txtCode.Text = "";
//PlaySound.PlaySounds.Play(@okSoundPath);
if (!"770,018,278,304".Contains(productCode.Substring(0, 3)))
if (File.Exists(@okSoundPath))
{
if(File.Exists(@okSoundPath))
{
System.Media.SoundPlayer media = new System.Media.SoundPlayer(@okSoundPath);
media.Play();
}
System.Media.SoundPlayer media = new System.Media.SoundPlayer(@okSoundPath);
media.Play();
}
if (this.lblLock.Tag.ToString().Equals("0"))
{

Write Preview
Loading…
Cancel
Save