diff --git a/LargeSquareOne/Config/Configure.ini b/LargeSquareOne/Config/Configure.ini index b091887..46440b6 100644 --- a/LargeSquareOne/Config/Configure.ini +++ b/LargeSquareOne/Config/Configure.ini @@ -26,7 +26,7 @@ MES 员工权限校验=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.2/core/api/public/formation/section/arrival +产品进站=http://10.22.160.2/core/api/public/formation/section/arrival/bz 产品过程加工参数=http://10.22.160.1/core/api/public/product/process/param/new/process 产品结果加工参数=http://10.22.160.3/core/api/public/product/process/param/new/result 产品出站=http://10.22.160.1/core/api/public/eve/pm/formation-section/bz @@ -37,9 +37,9 @@ MES 风速仪=https://iot.eveportal.com:9470/eve_api/ems/iot/upload_device_collect_data 分档参数=http://10.22.160.1/core/api/public/eve/pm/eqm/new/grading 安全设备状态=http://10.22.161.62:804/device-status -guid=a270c7d2-9cbd-4739-9a0b-0709b5813332 -DeviceState=1 -run_AlarmMark=0 +guid=4d38bbab-8d31-4946-8584-524ee6cb1045 +DeviceState=3 +run_AlarmMark=1 run_IdleMark=0 [统计计数] diff --git a/LargeSquareOne/Config/Device.ini b/LargeSquareOne/Config/Device.ini index 6668344..31f6175 100644 --- a/LargeSquareOne/Config/Device.ini +++ b/LargeSquareOne/Config/Device.ini @@ -1,4 +1,4 @@ [设备参数] -IP地址=127.0.0.1 +IP地址=192.168.1.50 端口号=9600 PLC类型=OmronFinsTcp_HSL diff --git a/LargeSquareOne/Config/FdConfig.xlsx b/LargeSquareOne/Config/FdConfig.xlsx index 17a4569..61591e2 100644 Binary files a/LargeSquareOne/Config/FdConfig.xlsx and b/LargeSquareOne/Config/FdConfig.xlsx differ diff --git a/LargeSquareOne/Config/Group.xlsx b/LargeSquareOne/Config/Group.xlsx index a70b064..8c299fc 100644 Binary files a/LargeSquareOne/Config/Group.xlsx and b/LargeSquareOne/Config/Group.xlsx differ diff --git a/LargeSquareOne/Config/Variable.xlsx b/LargeSquareOne/Config/Variable.xlsx index e2697d0..6fb9b6a 100644 Binary files a/LargeSquareOne/Config/Variable.xlsx and b/LargeSquareOne/Config/Variable.xlsx differ diff --git a/LargeSquareOne/LargeSquareOne.csproj b/LargeSquareOne/LargeSquareOne.csproj index e0c399d..3af93a3 100644 --- a/LargeSquareOne/LargeSquareOne.csproj +++ b/LargeSquareOne/LargeSquareOne.csproj @@ -417,6 +417,8 @@ PreserveNewest + + diff --git a/LargeSquareOne/LargeSquareOne.csproj.user b/LargeSquareOne/LargeSquareOne.csproj.user index 78c201e..ea14450 100644 --- a/LargeSquareOne/LargeSquareOne.csproj.user +++ b/LargeSquareOne/LargeSquareOne.csproj.user @@ -1,7 +1,7 @@ - ShowAllFiles + ProjectFiles publish\