...

GK-HTRB-C16P.Upgradation/FrmUpgradation.cs

@@ -361,7 +361,7 @@ namespace GK_HTRB_C16P.Upgradation
                                             var BoardInfo = newParmdata.Rows[jp]["BoardInfo"].ToString();
                                             var Stations = Convert.ToInt32(newParmdata.Rows[jp]["SrefEnd"].ToString());
                                             //DataTable btas;
-                                            string path = CalculationAo.ThisDevConfig.AutoSavePath + isqbnt.Replace(@"/", "") + ".csv";
+                                            string path = CalculationAo.ThisDevConfig.AutoSavePath + isqbnt.Replace(@"/", "").Replace(@"\","") + ".csv";
                                             bool filexit = CsvFileUtilityDt.FileItComplete(path);
                                             DataTable stationlist = null;
                                             if (Config == "ChineseSimplified")
@@ -378,7 +378,7 @@ namespace GK_HTRB_C16P.Upgradation
                                                         ListboxLog("Absence Batch：" + path);
                                                         continue;
                                                     }
-                                                    CalculationAo.DicBoardInfo[aId] = stationDataBll.DicHeaderStationFun(CalculationAo.ThisDevConfig.ReportDisTemp, Stations,aId);
+                                                    CalculationAo.DicBoardInfo[aId] = stationDataBll.DicHeaderStationFun(CalculationAo.ThisDevConfig.ReportDisTemp, Stations, aId);
                                                     //btas = stationDataBll.Getobjectext(pid, isqb, CalculationAo.Dic_Station);
                                                     var devm = device.FirstOrDefault(x => x.Id == devid);
                                                     int newheard = CalculationAo.Thorous[aId].Snum + CalculationAo.DicBoardInfo[aId].Dlen;
@@ -389,14 +389,15 @@ namespace GK_HTRB_C16P.Upgradation
                                                         newHead[j] = strheader[j];
                                                     }
                                                     CsvFileUtilityDt.Docmentnotes(path, LotInfo, BoardInfo, isqbnt, devm.DevName, aId, EleUpper, devm.BackVol, newHead.Length, newHead);
-                                                    if (CalculationAo.ThisDevConfig.Softedition == "2.0.0.1")
-                                                        stationlist = stationDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
-                                                    else
+                                                    stationlist = stationDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
+                                                    if (stationlist == null)
                                                         stationlist = stationDataBll.GetobjectextNew(pid, DestPath, isqb, CalculationAo.DicBoardInfo[aId]);
                                                     CsvFileUtilityDt.SaveArrayToCSVFiledt<DataTable>(this, stationlist, path, CalculationAo.Thorous[aId].Snum + CalculationAo.DicBoardInfo[aId].Dlen);
                                                 }
                                                 else
                                                 {
+                                                    //if (isqbnt == "9644320\\9643953-168H-4")
+                                                    isqbnt = isqbnt.Replace(@"/", "").Replace(@"\", "");
                                                     ListboxLog("Bridg：" + path);
                                                     if (!CalculationAo.Thorous.ContainsKey(aId))
                                                     {
@@ -414,18 +415,17 @@ namespace GK_HTRB_C16P.Upgradation
                                                         newHead[j] = strheader[j];
                                                     }
                                                     CsvFileUtilityDt.Docmentnotes(path, LotInfo, BoardInfo, isqbnt, devm.DevName, aId, EleUpper, devm.BackVol, newHead.Length, newHead);
-                                                    if (CalculationAo.ThisDevConfig.Softedition == "2.0.0.1")
-                                                        stationlist = stationTbridoDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
-                                                    else
+                                                    stationlist = stationTbridoDataBll.GetobjectextOld(pid, isqb, CalculationAo.DicBoardInfo[aId]);
+                                                    if (stationlist == null)
                                                         stationlist = stationTbridoDataBll.GetobjectextNew(pid, DestPath, isqb, CalculationAo.DicBoardInfo[aId]);
-                                                    CsvFileUtilityDt.SaveArrayToCSVFiledt<DataTable>(this, stationlist, path, CalculationAo.Thorous[aId].Snum + CalculationAo.DicBoardInfo[aId].Dlen);
+                                                    CsvFileUtilityDt.SaveArrayToCSVFiledt<DataTable>(this, stationlist, path, stationlist.Columns.Count);
                                                 }
                                             }
                                             else
                                             {
                                                 ListboxLog("table：" + name + "Already exists!");
                                             }
-                                            if (CalculationAo.ThisDevConfig.Softedition == "2.0.0.1" && !File.Exists(DestPath + "Data\\" + isqb + ".db"))
+                                            if (!File.Exists(DestPath + "Data\\" + isqb + ".db"))
                                             {
                                                 if (!DirEx.Exists(DestPath + "Data"))
                                                     DirEx.CreateDir(DestPath + "Data");

GKHTRBC16P/FunMov/FrmPowerSet.cs

@@ -268,7 +268,7 @@ namespace GKHTRBC16P.FunMov
                         CalculationAo.HTRBPWR[powernum - 1, 0] = PowerV;   //当前电压值
 
                         EditVDis.Text = PowerV.ToString();
-                        PowerV = Lanyi.Instance.SendDataB(FrmMain.mainForm, 0, powernum, 00, 00, out status);//读取电流值
+                        PowerV = Lanyi.Instance.SendDataB(FrmMain.mainForm, 0, powernum, 01, 00, out status);//读取电流值
                         if (PowerV > 0)
                         {
                             CalculationAo.HTRBPWR[powernum - 1, 1] = PowerV;   //当前电流值

GKHTRBC16P/FunMov/Home_Status.cs

@@ -296,9 +296,11 @@ namespace GKHTRBC16P.FunMov
             //element2 = sysElementBll.FirstOrDefault(x => x.Passageway == CalculationAo.ThisDevConfig.Passageway && x.ClassName == "Home_Status_Tbrido" && x.ClassWhere == CalculationAo.ThisDevConfig.ComPowerNum.ToString() && x.ThisWidth == CalculationAo.ThisDevConfig.FWidth && x.ThisHeight == CalculationAo.ThisDevConfig.FHeight);
             if (element1 == null)
             {
+                element1 = sysElementBll.LastOrDefault();
+                element1.Id = element1.Id + 1;
                 UIMessageTip.ShowOk("分辨率的元素设置需要维护！");
                 LogisTrac.WriteLog(this.GetType(), "分辨率的元素设置需要维护！");
-                return;
+                //return;
             }
             uiPanel1.Height = element1.uiPanelHeight;
             uiDataGridView1.Height = element1.uiDataGridViewHeight;

GKHTRBC16P/RunLibrary/DriverBoardRefresh.cs

@@ -1341,7 +1341,7 @@ namespace GKHTRBC16P.RunLibrary
                     //if (!ComRxdData[11].ToString("X2").Equals("D1"))
                     //    Pan = "-";
                     Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, ConvertDataOpear.GetShowDouble(Vg, CalculationAo.ThisDevConfig.DataLength));
-                    Home_Status.home_Status.inVokeText(Home_Status.home_Status.Txt_direction, "");
+                    //Home_Status.home_Status.inVokeText(Home_Status.home_Status.Txt_direction, "");
                     Home_Status.home_Status.inVokeText(Home_Status.home_Status.Lastatus, ConvertDataOpear.StringRunState(CalculationAo.ThisDevConfig.Language, CalculationAo.HTRBOT[WayId, 12], tes));     //运行状态
                     Home_Status.home_Status.inVokeText(Home_Status.home_Status.LBRecCount, tes.Summary.RecordNum.ToString());
                 }