SJ84
/
INT63DC_2C
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

master
CJY 2025-11-19 16:43:46 +09:00
parent ad3731b7e6
commit 1c887022ec
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
INT63DC_2C/Forms/FormMain.cs
View File

@ -8679,7 +8679,7 @@ namespace INT63DC_2C.Forms
this.Current40000ModbusData._40018_UnderRange = this.Current40000ModbusData._40018_UnderRange =
int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", ""));
if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange < int.Parse(this.CurrentProductItem.PassRange)) if (this.Current40000ModbusData._40018_UnderRange >= 0 && this.Current40000ModbusData._40018_UnderRange <= int.Parse(this.CurrentProductItem.PassRange))
{ {
try try
{ {
@ -8723,8 +8723,8 @@ namespace INT63DC_2C.Forms
this.Current40000ModbusData._40021_PassRange = this.Current40000ModbusData._40021_PassRange =
int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", ""));
if (this.Current40000ModbusData._40021_PassRange > int.Parse(this.CurrentProductItem.UnderRange) if (this.Current40000ModbusData._40021_PassRange >= int.Parse(this.CurrentProductItem.UnderRange)
&& this.Current40000ModbusData._40021_PassRange < int.Parse(this.CurrentProductItem.OverRange)) && this.Current40000ModbusData._40021_PassRange <= int.Parse(this.CurrentProductItem.OverRange))
{ {
try try
{ {
@ -8767,7 +8767,8 @@ namespace INT63DC_2C.Forms
this.Current40000ModbusData._40024_OverRange = this.Current40000ModbusData._40024_OverRange =
int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", "")); int.Parse(Helper.DoubleToString((double)floatNum, this.SystemConfig.DecimalPlaces).Replace(".", ""));
if (this.Current40000ModbusData._40024_OverRange > int.Parse(this.CurrentProductItem.PassRange) && this.Current40000ModbusData._40024_OverRange <= 99999) if (this.Current40000ModbusData._40024_OverRange >= int.Parse(this.CurrentProductItem.PassRange)
&& this.Current40000ModbusData._40024_OverRange <= 99999)
{ {
try try
{ {

2
INT63DC_2C/INT63DC_2C.csproj
View File

@ -45,7 +45,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="InModbus, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL" /> <Reference Include="InModbus, Version=2.0.8.0, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="Microsoft.WindowsCE.Forms" /> <Reference Include="Microsoft.WindowsCE.Forms" />
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SmartXCommon, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">

BIN
INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormNumKeyPad.resources
View File

Binary file not shown.

BIN
INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormPasswordKeyPad.resources
View File

Binary file not shown.

BIN
INT63DC_2C/obj/Release/INT63DC_2C.DialogForms.DialogFormYesNo.resources
View File

Binary file not shown.