hank.chen/FIC_Solar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shanghohui-Company/SolarPower

Browse Source
This commit is contained in:
b110212000 2022-03-01 13:56:15 +08:00
commit 1ed04e15e0
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -346,3 +346,4 @@ healthchecksdb
/SolarPower/wwwroot/upload/report/20210819 /SolarPower/wwwroot/upload/report/20210819
/SolarPower/SolarPower.zip /SolarPower/SolarPower.zip
/SolarPower.zip /SolarPower.zip
/SolarPower/wwwroot/upload/report/20220227

6
solarApp/Service/procStationSvc.cs
View File

@ -228,7 +228,7 @@ namespace solarApp.Service
WHEN b.SolarType = 1 THEN a.TOTALKWH * PowerRate * c.LeaseRate WHEN b.SolarType = 1 THEN a.TOTALKWH * PowerRate * c.LeaseRate
ELSE a.TOTALKWH * PowerRate ELSE a.TOTALKWH * PowerRate
END TOTALMONEY,*/ END TOTALMONEY,*/
(KWH * PowerRate) MONEY, (a.TODAYKWH * PowerRate) MONEY,
(a.TOTALKWH * PowerRate) TOTALMONEY, (a.TOTALKWH * PowerRate) TOTALMONEY,
(KWH * CarbonRate) CARBON, round((a.TOTALKWH * CarbonRate), 4) TOTALCARBON (KWH * CarbonRate) CARBON, round((a.TOTALKWH * CarbonRate), 4) TOTALCARBON
from from
@ -269,9 +269,7 @@ namespace solarApp.Service
#endregion day #endregion day
#region month #region month
sql = @" sql = @"
delete from power_station_history_month where powerstationID = @powerStationID and left(`TIMESTAMP`, 7) = @date1 ;
INSERT INTO solar_master.power_station_history_month(PowerStationId, `TIMESTAMP`, SITEID, SITETYPE, monthKwh , TOTALKWH, KWHKWP, INSERT INTO solar_master.power_station_history_month(PowerStationId, `TIMESTAMP`, SITEID, SITETYPE, monthKwh , TOTALKWH, KWHKWP,
PR, MP, SOLARHOUR, MONEY, TOTALMONEY, CARBON, TOTALCARBON) PR, MP, SOLARHOUR, MONEY, TOTALMONEY, CARBON, TOTALCARBON)

2
solarApp/fmArchive.cs
View File

@ -319,7 +319,7 @@ namespace solarApp
private void gv_inv_detail_CellDoubleClick(object sender, DataGridViewCellEventArgs e) private void gv_inv_detail_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
{ {
if (gv_inv_detail.Columns.Count == 5) return; if (gv_inv_detail.Columns.Count == 5 || e.RowIndex == -1) return;
string inverterID = gv_inv_detail.Rows[e.RowIndex].Cells[1].Value.ToString(); string inverterID = gv_inv_detail.Rows[e.RowIndex].Cells[1].Value.ToString();
//MessageBox.Show(inverterID); //MessageBox.Show(inverterID);