|
@@ -1228,10 +1228,11 @@ namespace Welling_Motor_Debug_Tool
|
|
|
bit.Save(LocalPath + "\\" + fileName + ".png");
|
|
|
|
|
|
//写入excel表格
|
|
|
- if (!System.IO.File.Exists(localInfo.ToolsPath + "\\" + "GenerateParamsFile" + "\\" + localInfo.ExcelTempleFileName))
|
|
|
+ if (System.IO.File.Exists(localInfo.ToolsPath + "\\" + "GenerateParamsFile" + "\\" + localInfo.ExcelTempleFileName)) //删除本地模板,从服务器下载最新模板
|
|
|
{
|
|
|
- myFtp.DownloadFile("Tools/GenerateParamsFile/" + localInfo.ExcelTempleFileName, localInfo.ToolsPath + "\\" + "GenerateParamsFile");
|
|
|
+ System.IO.File.Delete(localInfo.ToolsPath + "\\" + "GenerateParamsFile" + "\\" + localInfo.ExcelTempleFileName);
|
|
|
}
|
|
|
+ myFtp.DownloadFile("Tools/GenerateParamsFile/" + localInfo.ExcelTempleFileName, localInfo.ToolsPath + "\\" + "GenerateParamsFile");
|
|
|
string importExcelName = localInfo.ToolsPath + "\\" + "GenerateParamsFile" + "\\" + localInfo.ExcelTempleFileName;
|
|
|
string exportExcelName = LocalPath + "\\" + textBox_ProductName.Text + "_" + textBox_MarkCode.Text + "-" + textBox_CustomerName.Text + "-" +
|
|
|
textBox_MarkNum.Text + "_" + textBox_OtherInfo.Text + "_" + DateTime.Now.ToString("yyyy-MM-dd-HHmmss") + ".xls";
|
|
@@ -1292,8 +1293,8 @@ namespace Welling_Motor_Debug_Tool
|
|
|
row.GetCell(9).SetCellValue(lines[DicRowNum["[控制参数]"] + 15].Split(',')[1]);
|
|
|
//第6行,第2列序列号,第10列力矩传感器零点范围
|
|
|
row = sheet.GetRow(5);
|
|
|
- row.GetCell(1).SetCellValue("Same as marking");
|
|
|
- row.GetCell(9).SetCellValue(TorqueInfo[0].Split(',')[1] + " - " + TorqueInfo[0].Split(',')[2]);
|
|
|
+ row.GetCell(1).SetCellValue("Same as marking label");
|
|
|
+ row.GetCell(9).SetCellValue(TorqueInfo[0].Split(',')[1] + "-" + TorqueInfo[0].Split(',')[2]);
|
|
|
//第7行,第2列PCBA板号,第10列力矩传感器标定1范围
|
|
|
row = sheet.GetRow(6);
|
|
|
row.GetCell(1).SetCellValue(textBox_PCBA.Text);
|
|
@@ -1368,9 +1369,10 @@ namespace Welling_Motor_Debug_Tool
|
|
|
row = sheet.GetRow(23);
|
|
|
row.GetCell(1).SetCellValue(lines[DicRowNum["[整车参数]"] + 4].Split(',')[1] + " km/h");
|
|
|
row.GetCell(9).SetCellValue(MosCalInfo[42].Split(':')[1].ToString().Replace(',', '-'));
|
|
|
- //第25行,第2列推行限速
|
|
|
+ //第25行,第2列推行限速,第10列位置校准零点偏差
|
|
|
row = sheet.GetRow(24);
|
|
|
row.GetCell(1).SetCellValue(lines[DicRowNum["[整车参数]"] + 5].Split(',')[1] + " km/h");
|
|
|
+ row.GetCell(9).SetCellValue("± " + MosCalInfo[53].Split(':')[1].ToString());
|
|
|
//第26行,第2列前牙盘
|
|
|
row = sheet.GetRow(25);
|
|
|
row.GetCell(1).SetCellValue(lines[DicRowNum["[整车参数]"] + 6].Split(',')[1]);
|