SoftwareGroup/602_WGJ
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MES对接

Browse Source
This commit is contained in:
a88359121
2025-07-28 11:12:06 +08:00
parent 3b8de36d39
commit c45e3622af
13 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LargeSquareOne/App.config
+2 -2
View File
@@ -5,8 +5,8 @@
</startup>
<connectionStrings>
<add name="connDbType" connectionString="SqlServer" />
<!--<add name="connString" connectionString="Server=.;DataBase=LargeSquareOne;Uid=jyzdh;Pwd=eve123456" />-->
<add name="connString" connectionString="Server=ZCDEEPSEAI;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />
<add name="connString" connectionString="Server=localhost;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />
<!--<add name="connString" connectionString="Server=ZCDEEPSEAI;DataBase=LargeSquareOne;Uid=sa;Pwd=123" />-->
<add name="connString2" connectionString="Server=192.168.2.108;DataBase=HBG_CupDataTurnover;Uid=jyzdh;Pwd=eve123456" />
<add name="connString3" connectionString="Server=localhost;DataBase=ProConfigDB;User Id=jypz;Password=eve123456;Persist Security Info=true;Allow Zero Datetime=true;Character Set=utf8;" />
</connectionStrings>
LargeSquareOne/Config/Configure.ini
+11 -11
View File
@@ -12,7 +12,7 @@ MES/
线程耗时日志保存=False
是否获取服务器数据=1
是否存储C模块数据=1
卷芯条码计数=1
外观检测条码计数=1
强制OK/正常NG模式切换=False
[MES配置]
@@ -23,16 +23,16 @@ MES/
白夜班交替时间=20:30:00
MES日志保存路径=D:\APILog
存储服务器IP地址=192.168.2.108
员工权限校验=http://10.22.160.1/core/api/public/equipment/base/user/login/verify
设备参数设定值请求=http://10.22.160.1/core/api/public/param/setting/request
设备参数设定值变更=http://10.22.160.1/core/api/public/param/setting/change
产品进站=http://10.22.160.1/core/api/public/in/station/process/currency
产品过程加工参数=http://10.22.160.1/core/api/public/product/process/param/new/process
产品结果加工参数=http://10.22.160.1/core/api/public/product/process/param/new/result
产品出站=http://10.22.160.1/core/api/public/out/station/process/turn/equip
设备报警=http://10.22.160.1/core/api/public/equipment/alarm/currency
设备状态=http://10.22.160.1/core/api/public/eve/pm/eqm/run/status/operation
能耗=http://10.22.160.1/core/api/public/eve/pm/energy/consumption/collection/submit
员工权限校验=http://10.22.160.141/core/api/public/equipment/base/user/login/verify
设备参数设定值请求=http://10.22.160.141/core/api/public/param/setting/request
设备参数设定值变更=http://10.22.160.141/core/api/public/param/setting/change
产品进站=http://10.22.160.141/core/api/public/in/station/process/currency
产品过程加工参数=http://10.22.160.141/core/api/public/product/process/param/new/process
产品结果加工参数=http://10.22.160.141/core/api/public/product/process/param/new/result
产品出站=http://10.22.160.141/core/api/public/out/station/process/turn/equip
设备报警=http://10.22.160.141/core/api/public/equipment/alarm/currency
设备状态=http://10.22.160.141/core/api/public/eve/pm/eqm/run/status/operation
能耗=http://10.22.160.141/core/api/public/eve/pm/energy/consumption/collection/submit
风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data
guid=55e9ca41-814c-43a4-9e7e-34324548ade7
DeviceState=1
LargeSquareOne/FrmDataMonitor.cs
+1 -1
View File
@@ -348,7 +348,7 @@ namespace LargeSquareOne
}
#region 显示卷芯上料数据
#region 显示外观检测上料数据
/// <summary>
/// 显示上料
/// </summary>
LargeSquareOne/FrmHistory.cs
+4 -4
View File
@@ -18,8 +18,8 @@ namespace LargeSquareOne
{
InitializeComponent();
this.cmb_SelectType.Items.Add("卷芯进站");
this.cmb_SelectType.Items.Add("卷芯出站");
this.cmb_SelectType.Items.Add("外观检测进站");
this.cmb_SelectType.Items.Add("外观检测出站");
this.cmb_SelectType.SelectedIndex = 0;
this.dtp_Start.Value = DateTime.Now.AddHours(-2.0f);
@@ -40,11 +40,11 @@ namespace LargeSquareOne
private void btn_Query_Click(object sender, EventArgs e)
{
string str = this.cmb_SelectType.Text;
if (string.Compare(str, "卷芯进站") == 0)
if (string.Compare(str, "外观检测进站") == 0)
{
this.cmb_SelectType.SelectedIndex = 0;
}
else if (string.Compare(str, "卷芯出站") == 0)
else if (string.Compare(str, "外观检测出站") == 0)
{
this.cmb_SelectType.SelectedIndex = 1;
}
LargeSquareOne/FrmLogin.cs
+1 -2
View File
@@ -75,8 +75,7 @@ namespace LargeSquareOne
CommonMethods.LoginOut = false;
//存储用户对象
CommonMethods.currentAdmin = sysAdmin;
CommonMethods.IsLoginOk = true;
CommonMethods.IsLoginOk = true;
}
}
LargeSquareOne/FrmMain.cs
+1 -1
View File
@@ -155,7 +155,7 @@ namespace LargeSquareOne
CommonMethods.mesConfig.IsGet_Server = IniConfigHelper.ReadIniData("配置信息", "是否获取服务器数据", "1") == "1" ? true : false;
CommonMethods.sysConfig.OKSwitching = Convert.ToBoolean(IniConfigHelper.ReadIniData("配置信息", "强制OK/正常NG模式切换", "False"));
CommonMethods.mesConfig.IsGet_3C = IniConfigHelper.ReadIniData("配置信息", "是否存储C模块数据", "1") == "1" ? true : false;
CommonMethods.mesConfig._卷芯条码计数 = Convert.ToInt32(IniConfigHelper.ReadIniData("配置信息", "卷芯条码计数", "false"));
CommonMethods.mesConfig._外观检测条码计数 = Convert.ToInt32(IniConfigHelper.ReadIniData("配置信息", "外观检测条码计数", "false"));
CommonMethods.mesConfig.siteCode = IniConfigHelper.ReadIniData("MES配置", "工厂代码", "false");
CommonMethods.mesConfig.lineCode = IniConfigHelper.ReadIniData("MES配置", "产线编号", "false");