|
|
@@ -162,6 +162,7 @@ namespace RailLocalMeter
|
|
|
List<string> lcs = strAll.Distinct().OrderBy(s => s).ToList(); //
|
|
|
|
|
|
lc.Add(AppConfigCache.channelCarNo);
|
|
|
+ lc.Add(AppConfigCache.channel);
|
|
|
foreach (string str in lcs)
|
|
|
{
|
|
|
if ($"{AppConfigCache.channel}" != str && $"{AppConfigCache.channelCarNo}" != str)
|
|
|
@@ -272,10 +273,13 @@ namespace RailLocalMeter
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
+ //******************待提交、待结净的数据界面没有显示 已上传数据界面没有清空 数据插入到库重复*****************
|
|
|
this.plMain.Invoke(new Action(() => {
|
|
|
- ucWeightT1.setWgt(Math.Round((double)CacleCls.weight / 1000, 2)); //2021年5月10日界面显示单位，调整为T
|
|
|
+ ucWeightT1.setWgt(Math.Round((double)CacleCls.weight / 1000, 2));
|
|
|
ucWeightT1.setStable(CacleCls.isWd != 1 ? true : false);
|
|
|
ucWeightT1.setExceed(CacleCls.weight > AppConfigCache.maxRange * 1000 ? false : true);
|
|
|
+ picQRed.Load($"{AppConfigCache.path}\\image\\icon\\{(CacleCls.topJg=="1"?"red": "green")}.gif");
|
|
|
+ picHRed.Load($"{AppConfigCache.path}\\image\\icon\\{(CacleCls.bottomJg == "1" ? "red" : "green")}.gif");
|
|
|
|
|
|
if (CacleCls.isWd == 0)
|
|
|
{
|
|
|
@@ -455,6 +459,17 @@ namespace RailLocalMeter
|
|
|
lockWgtImg = CacleCls.weight;
|
|
|
isVoiceDownCar = false;
|
|
|
|
|
|
+ if (CacleCls.isUploadFirstOver)
|
|
|
+ {
|
|
|
+ CacleCls.isUploadFirstOver = false;
|
|
|
+ BindTable<MeterWorkRailwayActFirst>(ultraGridLocalFirst, dataTableLocalFirst, "localFirstx");
|
|
|
+ }
|
|
|
+ if (CacleCls.isUploadNetOver)
|
|
|
+ {
|
|
|
+ CacleCls.isUploadNetOver = false;
|
|
|
+ BindTable<MeterWorkRailwayActual>(ultraGridLocalNet, dataTableLocalNet, "localNetx");
|
|
|
+ }
|
|
|
+
|
|
|
if (!CacleCls.isClear)
|
|
|
{
|
|
|
BindTable<MeterWorkRailwayActFirst>(ultraGridFirst, dataTableFirst, "firstx");
|
|
|
@@ -678,7 +693,7 @@ namespace RailLocalMeter
|
|
|
txtMsgInfo.Text = "称重保存中......";
|
|
|
|
|
|
CacleCls.isLock = true;
|
|
|
- txtCarNo.Enabled = false;
|
|
|
+ //txtCarNo.Enabled = false;
|
|
|
|
|
|
string strGuid = Guid.NewGuid().ToString();
|
|
|
|
|
|
@@ -699,7 +714,7 @@ namespace RailLocalMeter
|
|
|
firstDb.valueFlag = "2";
|
|
|
if (string.IsNullOrEmpty(firstDb.railwayNo))
|
|
|
{
|
|
|
- firstDb.railwayNo = "车号未识别";
|
|
|
+ firstDb.railwayNo = "未识别车号";
|
|
|
}
|
|
|
|
|
|
RESTfulResult<ResponseData> rt = firstService.doIdentifyWeight(firstDb, out msgInfo);
|
|
|
@@ -784,7 +799,7 @@ namespace RailLocalMeter
|
|
|
|
|
|
if (string.IsNullOrEmpty(firstDb.railwayNo))
|
|
|
{
|
|
|
- firstDb.railwayNo = "车号未识别";
|
|
|
+ firstDb.railwayNo = "未识别车号";
|
|
|
}
|
|
|
|
|
|
RESTfulResult<ResponseData> rt = firstService.add(firstDb, out msgInfo);
|
|
|
@@ -872,12 +887,17 @@ namespace RailLocalMeter
|
|
|
CacleCls.preTrackScale.format(firstDb);
|
|
|
}
|
|
|
|
|
|
+ if (string.IsNullOrEmpty(firstDb.railwayNo))
|
|
|
+ {
|
|
|
+ firstDb.railwayNo = "未识别车号";
|
|
|
+ }
|
|
|
RESTfulResult<ResponseData> rt = firstService.add(firstDb, out msgInfo);
|
|
|
if (rt.Succeed)
|
|
|
{
|
|
|
//保存成功
|
|
|
isMeasureSuccess = true;
|
|
|
- CaptionImg(rt.Data.firsts[0].actualFirstNo);
|
|
|
+ lg.WriteLog(LogType.serverLog, "准备截图");
|
|
|
+ CaptionImg(rt.Data?.firsts[0]?.actualFirstNo);
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -946,7 +966,7 @@ namespace RailLocalMeter
|
|
|
txtMsgInfo.Focus();
|
|
|
|
|
|
|
|
|
- BindTable<PreRailwayScale>(ultraGridWaitFirst, dataTableWaitFirst, "firstWait");
|
|
|
+ BindTable<MeterWorkRailwayActFirst>(ultraGridWaitFirst, dataTableWaitFirst, "firstWait");
|
|
|
BindTable<MeterWorkRailwayActual>(ultraGridWaitNet, dataTableWaitNet, "netWait");
|
|
|
BindTable<MeterWorkRailwayActFirst>(ultraGridLocalFirst, dataTableLocalFirst, "localFirst");
|
|
|
BindTable<MeterWorkRailwayActual>(ultraGridLocalNet, dataTableLocalNet, "localNet");
|
|
|
@@ -961,40 +981,49 @@ namespace RailLocalMeter
|
|
|
finally
|
|
|
{
|
|
|
CacleCls.isLock = false;
|
|
|
- txtCarNo.Enabled = true;
|
|
|
+ //txtCarNo.Enabled = true;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
private void CaptionImg(string actNo)
|
|
|
{
|
|
|
- #region 截图
|
|
|
- //屏幕截图操作
|
|
|
- //_ = BeginInvoke(new Action(() => { shotImageScreen(actNo); }));
|
|
|
-
|
|
|
- for (int i = 0; i < lc.Count(); i++)
|
|
|
+ if (!string.IsNullOrEmpty(actNo))
|
|
|
{
|
|
|
- //从_2开始，因为_1是仪表图片 2是车号快照抓拍
|
|
|
- ce.CapPic((uint)lc[i], $"{AppConfigCache.path}/imgShort/formalImg/{AppConfigCache.pointNo}_R{actNo}{(CacleCls.serverFlag?"":"_tempImg")}_{i + 2}.jpg");
|
|
|
- }
|
|
|
-
|
|
|
- foreach (Control cn in panel1.Controls)
|
|
|
- {
|
|
|
- if (cn.Name.Substring(cn.Name.Length - 1) == $"{AppConfigCache.channel}")
|
|
|
+ #region 截图
|
|
|
+ //屏幕截图操作
|
|
|
+ try
|
|
|
{
|
|
|
- if (cn is PictureBox)
|
|
|
+ for (int i = 0; i < lc.Count(); i++)
|
|
|
{
|
|
|
- Bitmap bit = new Bitmap(cn.Width, cn.Height);//实例化一个和窗体一样大的bitmap
|
|
|
- Graphics g = Graphics.FromImage(bit);
|
|
|
- g.CompositingQuality = CompositingQuality.HighQuality;//质量设为最高 HighQuality
|
|
|
- g.CopyFromScreen(panel1.Left, panel1.Top + 25, 0, 0, new Size(cn.Width, cn.Height));//保存整个窗体为图片
|
|
|
- bit.Save($"{AppConfigCache.path}/imgShort/formalImg/{AppConfigCache.pointNo}_R{actNo}{(CacleCls.serverFlag ? "" : "_tempImg")}_1.jpg");//默认保存格式为PNG，保存成jpg格式质量不是很好
|
|
|
- bit.Dispose();
|
|
|
- break;
|
|
|
+ //从_2开始，因为_1是仪表图片 2是车号快照抓拍 这后面的 i+2改为了i+1
|
|
|
+ ce.CapPic((uint)lc[i], $"{AppConfigCache.path}/imgShort/formalImg/{AppConfigCache.pointNo}_R{actNo}{(CacleCls.serverFlag ? "" : "_tempImg")}_{i + 1}.jpg");
|
|
|
}
|
|
|
+
|
|
|
+ /*
|
|
|
+ foreach (Control cn in panel1.Controls)
|
|
|
+ {
|
|
|
+ if (cn.Name.Substring(cn.Name.Length - 1) == $"{AppConfigCache.channel}")
|
|
|
+ {
|
|
|
+ if (cn is PictureBox)
|
|
|
+ {
|
|
|
+ Bitmap bit = new Bitmap(cn.Width, cn.Height);//实例化一个和窗体一样大的bitmap
|
|
|
+ Graphics g = Graphics.FromImage(bit);
|
|
|
+ g.CompositingQuality = CompositingQuality.HighQuality;//质量设为最高 HighQuality
|
|
|
+ g.CopyFromScreen(panel1.Left, panel1.Top + 25, 0, 0, new Size(cn.Width, cn.Height));//保存整个窗体为图片
|
|
|
+ bit.Save($"{AppConfigCache.path}/imgShort/formalImg/{AppConfigCache.pointNo}_R{actNo}{(CacleCls.serverFlag ? "" : "_tempImg")}_1.jpg");//默认保存格式为PNG，保存成jpg格式质量不是很好
|
|
|
+ bit.Dispose();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //*/
|
|
|
+ }
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ lg.WriteLog(LogType.SystemLog, "截图失败：" + ex.Message);
|
|
|
}
|
|
|
+ #endregion
|
|
|
}
|
|
|
- #endregion
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1091,7 +1120,6 @@ namespace RailLocalMeter
|
|
|
if (rmWaitFirstList.Succeed)
|
|
|
{
|
|
|
lm = rmWaitFirstList.Data as List<T>;
|
|
|
- flagQP = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1106,7 +1134,6 @@ namespace RailLocalMeter
|
|
|
if (rmWaitNetList.Succeed)
|
|
|
{
|
|
|
lm = rmWaitNetList.Data as List<T>;
|
|
|
- flagQP = true;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -1259,6 +1286,7 @@ namespace RailLocalMeter
|
|
|
MessageBox.Show("操作失败：" + msgInfo);
|
|
|
lg.WriteLog(LogType.serverLog, "操作失败：" + msgInfo);
|
|
|
}
|
|
|
+ BindTable<MeterWorkRailwayActFirst>(ultraGridWaitFirst, dataTableWaitFirst, "firstWait");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1294,6 +1322,7 @@ namespace RailLocalMeter
|
|
|
MessageBox.Show("操作失败：" + msgInfo);
|
|
|
lg.WriteLog(LogType.serverLog, "操作失败：" + msgInfo);
|
|
|
}
|
|
|
+ BindTable<MeterWorkRailwayActual>(ultraGridWaitNet, dataTableWaitNet, "netWait");
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1347,10 +1376,6 @@ namespace RailLocalMeter
|
|
|
[DllImport("kernel32.dll")]
|
|
|
private static extern bool SetProcessWorkingSetSize(IntPtr process, int minSize, int maxSize);
|
|
|
|
|
|
- private void cbSetFirst_CheckedChanged(object sender, EventArgs e)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
|
|
|
//刷新存储器
|
|
|
private static void FlushMemory()
|
|
|
@@ -1362,11 +1387,6 @@ namespace RailLocalMeter
|
|
|
SetProcessWorkingSetSize(Process.GetCurrentProcess().Handle, -1, -1);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- private void txtCarNo_TextChanged(object sender, EventArgs e)
|
|
|
- {
|
|
|
-
|
|
|
- }
|
|
|
#endregion
|
|
|
|
|
|
#region
|
yi eason