diff --git a/BatCharging.Model/客户端发送/CMD1103.cs b/BatCharging.Model/客户端发送/CMD1103.cs index 04489af..eb9005a 100644 --- a/BatCharging.Model/客户端发送/CMD1103.cs +++ b/BatCharging.Model/客户端发送/CMD1103.cs @@ -29,7 +29,7 @@ namespace BatCharging.Model /// 费率1 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate1 { get; set; } + public uint rate1 { get; set; } #endregion 1 #region 2 @@ -53,7 +53,7 @@ namespace BatCharging.Model /// 费率2 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate2 { get; set; } + public uint rate2 { get; set; } #endregion 2 #region 3 @@ -77,7 +77,7 @@ namespace BatCharging.Model /// 费率3 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate3 { get; set; } + public uint rate3 { get; set; } #endregion 3 #region 4 @@ -101,7 +101,7 @@ namespace BatCharging.Model /// 费率4 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate4 { get; set; } + public uint rate4 { get; set; } #endregion 4 #region 5 @@ -125,7 +125,7 @@ namespace BatCharging.Model /// 费率5 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate5 { get; set; } + public uint rate5 { get; set; } #endregion 5 #region 6 @@ -149,7 +149,7 @@ namespace BatCharging.Model /// 费率6 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate6 { get; set; } + public uint rate6 { get; set; } #endregion 6 #region 7 @@ -173,7 +173,7 @@ namespace BatCharging.Model /// 费率7 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate7 { get; set; } + public uint rate7 { get; set; } #endregion 7 #region 8 @@ -197,7 +197,7 @@ namespace BatCharging.Model /// 费率8 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate8 { get; set; } + public uint rate8 { get; set; } #endregion 8 #region 9 @@ -221,7 +221,7 @@ namespace BatCharging.Model /// 费率9 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate9 { get; set; } + public uint rate9 { get; set; } #endregion 9 #region 10 @@ -245,7 +245,7 @@ namespace BatCharging.Model /// 费率10 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate10 { get; set; } + public uint rate10 { get; set; } #endregion 10 #region 11 @@ -269,7 +269,7 @@ namespace BatCharging.Model /// 费率11 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate11 { get; set; } + public uint rate11 { get; set; } #endregion 11 #region 12 @@ -293,7 +293,7 @@ namespace BatCharging.Model /// 费率12 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// - public int rate12 { get; set; } + public uint rate12 { get; set; } #endregion 12 } } diff --git a/BatCharging.Service/发送方法/ChargerSendCMD.cs b/BatCharging.Service/发送方法/ChargerSendCMD.cs index 6e0bfe6..3bad6f8 100644 --- a/BatCharging.Service/发送方法/ChargerSendCMD.cs +++ b/BatCharging.Service/发送方法/ChargerSendCMD.cs @@ -1436,7 +1436,7 @@ namespace BatCharging.Service public byte[] SendRCMD1103(out APDUModel APDUModel, CMD1103 CMD) { - byte[] result = null; + byte[] result; APDUModel model = new APDUModel(); model.OriginDomain1 = 0xAA; diff --git a/Monitor.ChargeTest/FrmChargeResult.cs b/Monitor.ChargeTest/FrmChargeResult.cs index 61e0603..d9cb4d1 100644 --- a/Monitor.ChargeTest/FrmChargeResult.cs +++ b/Monitor.ChargeTest/FrmChargeResult.cs @@ -449,9 +449,6 @@ namespace Monitor.ChargeTest /// private void button1_Click(object sender, EventArgs e) { - - - CmnChargerParam._CHR00TCPCLIENT.Send1101(); } /// @@ -462,8 +459,23 @@ namespace Monitor.ChargeTest private void button2_Click(object sender, EventArgs e) { CMD1103 cMD1103 = new CMD1103(); - - + cMD1103.startHour1 = 00; + cMD1103.startMinute1 = 00; + cMD1103.startHour1 = 10; + cMD1103.endHour1 = 30; + cMD1103.rate1 = 120; + + cMD1103.startHour2 = 10; + cMD1103.startMinute2 = 30; + cMD1103.startHour2 = 20; + cMD1103.endHour2 = 00; + cMD1103.rate2 = 100; + + cMD1103.startHour3 = 20; + cMD1103.startMinute3 = 00; + cMD1103.startHour3 = 24; + cMD1103.endHour3 = 00; + cMD1103.rate3 = 160; CmnChargerParam._CHR00TCPCLIENT.Send1103(cMD1103); }