diff --git a/.gitignore b/.gitignore index e17a702..b7a412d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,25 @@ /.vs/LargeSquareOne/CopilotIndices/17.13.449.12402 /.vs/LargeSquareOne/FileContentIndex /.vs/LargeSquareOne/v17 +/JinYuan.ControlCenter/bin/Debug +/.vs/LargeSquareOne/CopilotIndices/17.14.1091.29919 +/JinYuan.ControlCenter/obj/Debug +/JinYuan.DAL/bin/Debug +/JinYuan.DAL/obj/Debug +/JinYuan.Helper/bin/Debug +/JinYuan.Helper/obj/Debug +/JinYuan.MES/bin/Debug +/JinYuan.MES/obj/Debug +/JinYuan.Models/bin/Debug +/JinYuan.Models/obj/Debug +/JinYuan.Models/obj/Release/.NETFramework,Version=v4.7.2.AssemblyAttributes.cs +/JinYuan.VirtualDataLibrary/bin/Debug +/JinYuan.VirtualDataLibrary/obj/Debug +/JinYuan.Helper/obj/Release +/LargeSquareOne/bin/Debug/Config/表格 +/LargeSquareOne/bin/Debug/Assts +/JinYuan.Models/obj/Release +/JinYuan.VirtualDataLibrary/obj/Release +/LargeSquareOne/bin/Debug +/LargeSquareOne/obj/Debug +/packages diff --git a/LargeSquareOne/FrmMain.cs b/LargeSquareOne/FrmMain.cs index 5f95ae1..45e7861 100644 --- a/LargeSquareOne/FrmMain.cs +++ b/LargeSquareOne/FrmMain.cs @@ -198,12 +198,13 @@ namespace LargeSquareOne CommonMethods.mesConfig.InPutStationMesUrl = IniConfigHelper.ReadIniData("MES配置", "产品进站", "0"); CommonMethods.mesConfig.EquProcessProcessParamMesUrl = IniConfigHelper.ReadIniData("MES配置", "产品过程加工参数", "0"); CommonMethods.mesConfig.ResultProcessParamMesUrl = IniConfigHelper.ReadIniData("MES配置", "产品结果加工参数", "0"); - CommonMethods.mesConfig.OkNgParamMesUrl = IniConfigHelper.ReadIniData("MES配置", "分档参数", "0"); + //CommonMethods.mesConfig.OkNgParamMesUrl = IniConfigHelper.ReadIniData("MES配置", "分档参数", "0"); CommonMethods.mesConfig.OutStationMesUrl = IniConfigHelper.ReadIniData("MES配置", "产品出站", "0"); CommonMethods.mesConfig.AlarmCurrencyMesUrl = IniConfigHelper.ReadIniData("MES配置", "设备报警", "0"); CommonMethods.mesConfig.StatusMesUrl = IniConfigHelper.ReadIniData("MES配置", "设备状态", "0"); CommonMethods.mesConfig.WattrMeterUrl = IniConfigHelper.ReadIniData("MES配置", "能耗", "0"); CommonMethods.mesConfig.CollectData = IniConfigHelper.ReadIniData("MES配置", "风速仪", "0"); + CommonMethods.mesConfig.GradingMesUrl = IniConfigHelper.ReadIniData("MES配置", "分档参数", "0"); //CommonMethods.ProdDRFIDNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDRFIDNgQty", "0")); //CommonMethods.ProdDXNgQty = Convert.ToInt32(IniConfigHelper.ReadIniData("统计计数", "ProdDXNgQty", "0")); diff --git a/LargeSquareOne/bin/Debug/Config/Configure.ini b/LargeSquareOne/bin/Debug/Config/Configure.ini new file mode 100644 index 0000000..abe9ef8 --- /dev/null +++ b/LargeSquareOne/bin/Debug/Config/Configure.ini @@ -0,0 +1,88 @@ +[Ϣ] +Զ=False +Զ¼=False +޲Զ=False +ʱ=3 +޲Զлؽ=True +лؽʱ=1 +ʾ=1 +ˢģʽ=False +MES/MESģʽл=False +ȡMES=True +̺߳ʱ־=False +Ƿȡ=1 +Ƿ洢Cģ=1 +ۼ=1 +ǿOK/NGģʽл=False + +[MES] +=60J +߱=MW-602 +豸=602VIM01 +ܵ=1,2 +ҹཻʱ=20:30:00 +MES־·=D:\APILog +洢IPַ=192.168.2.108 +Grading1=K71 +Grading2=K70 +Grading3=K79 +Grading4=K78 +Grading5=K888 +Grading6=K89 +ԱȨУ=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/formation/section/arrival/bz +Ʒ̼ӹ=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/eve/pm/formation-section/bz +豸=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 +=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data +ֵ=http://10.22.160.141/core/api/public/eve/pm/eqm/new/grading +guid=22bd9dc0-9f1f-40c4-86cf-bae5c5a0031c +DeviceState=4 +run_AlarmMark=0 +run_IdleMark=1 + +[ͳƼ] +LastHour=1030 +LastResetTime=0 +LastTotalOldNum=360 +LastOkOldNum=358 +ProdAllQty=0 +ProdOKQty=0 +ProdDRFIDNgQty=0 +ProdDXNgQty=0 +ProdGRFIDNgQty=0 +ProdYLZNgQty=0 + +[] +AntiDustAirSpeedCount=25 +AntiDustAirSpeed1=FSY-2A-001 +AntiDustAirSpeed2=FSY-2A-002 +AntiDustAirSpeed3=FSY-2A-003 +AntiDustAirSpeed4=FSY-2A-004 +AntiDustAirSpeed5=FSY-2A-005 +AntiDustAirSpeed6=FSY-2A-006 +AntiDustAirSpeed7=FSY-2A-007 +AntiDustAirSpeed8=FSY-2A-008 +AntiDustAirSpeed9=FSY-2A-009 +AntiDustAirSpeed10=FSY-2A-010 +AntiDustAirSpeed11=FSY-2A-011 +AntiDustAirSpeed12=FSY-2A-012 +AntiDustAirSpeed13=FSY-2A-013 +AntiDustAirSpeed14=FSY-2A-014 +AntiDustAirSpeed15=FSY-2A-015 +AntiDustAirSpeed16=FSY-2A-016 +AntiDustAirSpeed17=FSY-2A-017 +AntiDustAirSpeed18=FSY-2A-018 +AntiDustAirSpeed19=FSY-2A-019 +AntiDustAirSpeed20=FSY-2A-020 +AntiDustAirSpeed21=FSY-2A-021 +AntiDustAirSpeed22=FSY-2A-022 +AntiDustAirSpeed23=FSY-2A-023 +AntiDustAirSpeed24=FSY-2A-024 +AntiDustAirSpeed25=FSY-2A-025 diff --git a/LargeSquareOne/bin/Debug/Config/Device.ini b/LargeSquareOne/bin/Debug/Config/Device.ini new file mode 100644 index 0000000..6668344 --- /dev/null +++ b/LargeSquareOne/bin/Debug/Config/Device.ini @@ -0,0 +1,4 @@ +[豸] +IPַ=127.0.0.1 +˿ں=9600 +PLC=OmronFinsTcp_HSL diff --git a/LargeSquareOne/bin/Debug/Config/Device.xlsx b/LargeSquareOne/bin/Debug/Config/Device.xlsx new file mode 100644 index 0000000..c5d26eb Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/Device.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx new file mode 100644 index 0000000..27f8f2b Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak new file mode 100644 index 0000000..16f347f Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/FdConfig.xlsx.bak differ diff --git a/LargeSquareOne/bin/Debug/Config/Group - 副本.xlsx b/LargeSquareOne/bin/Debug/Config/Group - 副本.xlsx new file mode 100644 index 0000000..4a62585 Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/Group - 副本.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/Group.xlsx b/LargeSquareOne/bin/Debug/Config/Group.xlsx new file mode 100644 index 0000000..8c299fc Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/Group.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/Variable - 副本.xlsx b/LargeSquareOne/bin/Debug/Config/Variable - 副本.xlsx new file mode 100644 index 0000000..047523f Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/Variable - 副本.xlsx differ diff --git a/LargeSquareOne/bin/Debug/Config/Variable.xlsx b/LargeSquareOne/bin/Debug/Config/Variable.xlsx new file mode 100644 index 0000000..04a533d Binary files /dev/null and b/LargeSquareOne/bin/Debug/Config/Variable.xlsx differ