|
@@ -172,32 +172,9 @@ namespace CarMeterSystem
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if (PbCache.collect == null) return;
|
|
if (PbCache.collect == null) return;
|
|
|
|
|
|
|
|
- /*
|
|
|
|
|
- * 锁界面,修改图标,锁定重量,拍照,截图
|
|
|
|
|
- * 用户反馈拍照重量,截图重量与实际保存重量不一致,因此修改
|
|
|
|
|
- * by BourneCao 20220801
|
|
|
|
|
- */
|
|
|
|
|
- ucWeightCarTJXJG1.setStable(true); // 重量稳定
|
|
|
|
|
- ucWeightCarTJXJG1.setWgt(Math.Round((double)PbCache.collect.weight / 1000, 2)); // 最新重量
|
|
|
|
|
-
|
|
|
|
|
- PbCache.isLockFrm = true; // 锁界面,不可修改重量
|
|
|
|
|
PbCache.lockCarNo = PbCache.collect.carno;
|
|
PbCache.lockCarNo = PbCache.collect.carno;
|
|
|
- PbCache.lockWgt = PbCache.collect.weight;
|
|
|
|
|
- btnSave.Enabled = false;
|
|
|
|
|
-
|
|
|
|
|
- lg.WriteLog(34, "车号:"+PbCache.lockCarNo + ";重量:"+ PbCache.lockWgt + ";时间:"+DateTime.Now.ToLongTimeString());
|
|
|
|
|
-
|
|
|
|
|
- // 启动拍照
|
|
|
|
|
- if (PbCache.tempImgId == null || PbCache.tempImgId == "")
|
|
|
|
|
- {
|
|
|
|
|
- PbCache.tempImgId = Guid.NewGuid().ToString();
|
|
|
|
|
- lg.WriteLog(35, "启动拍照 车号:" + PbCache.lockCarNo + ";重量:" + PbCache.lockWgt + ";时间:" + DateTime.Now.ToLongTimeString());
|
|
|
|
|
- _ = BeginInvoke(new Action(() => { shotImage(PbCache.tempImgId+"_temp"); }));
|
|
|
|
|
- }
|
|
|
|
|
|
|
|
|
|
lg.WriteLog(15, PbCache.lockCarNo + "点击保存按钮");
|
|
lg.WriteLog(15, PbCache.lockCarNo + "点击保存按钮");
|
|
|
PreTrackScale preTrack = ucCarMeterInfoJisco1._preTrack;
|
|
PreTrackScale preTrack = ucCarMeterInfoJisco1._preTrack;
|
|
@@ -414,6 +391,25 @@ namespace CarMeterSystem
|
|
|
// btnSave.Enabled = true;
|
|
// btnSave.Enabled = true;
|
|
|
//}
|
|
//}
|
|
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
|
+ * 锁界面,修改图标,锁定重量,拍照,截图
|
|
|
|
|
+ * 用户反馈拍照重量,截图重量与实际保存重量不一致,因此修改
|
|
|
|
|
+ * by BourneCao 20220801
|
|
|
|
|
+ */
|
|
|
|
|
+ ucWeightCarTJXJG1.setStable(true); // 重量稳定
|
|
|
|
|
+ ucWeightCarTJXJG1.setWgt(Math.Round((double)PbCache.collect.weight / 1000, 2)); // 最新重量
|
|
|
|
|
+
|
|
|
|
|
+ PbCache.isLockFrm = true; // 锁界面,不可修改重量
|
|
|
|
|
+ PbCache.lockWgt = PbCache.collect.weight;
|
|
|
|
|
+ btnSave.Enabled = false;
|
|
|
|
|
+
|
|
|
|
|
+ lg.WriteLog(34, "车号:" + PbCache.lockCarNo + ";重量:" + PbCache.lockWgt + ";时间:" + DateTime.Now.ToLongTimeString());
|
|
|
|
|
+
|
|
|
|
|
+ // 启动拍照
|
|
|
|
|
+ PbCache.tempImgId = Guid.NewGuid().ToString();
|
|
|
|
|
+ lg.WriteLog(35, "启动拍照 车号:" + PbCache.lockCarNo + ";重量:" + PbCache.lockWgt + ";时间:" + DateTime.Now.ToLongTimeString());
|
|
|
|
|
+ _ = BeginInvoke(new Action(() => { shotImage(PbCache.tempImgId + "_temp"); }));
|
|
|
|
|
+
|
|
|
|
|
|
|
|
isStop = true;
|
|
isStop = true;
|
|
|
#region 酒钢业务流程判断
|
|
#region 酒钢业务流程判断
|
|
@@ -947,19 +943,19 @@ namespace CarMeterSystem
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
|
- /// 终端截图(临时截图,使用临时ID存储)
|
|
|
|
|
|
|
+ /// 摄像头截图(临时截图,使用临时ID存储)
|
|
|
/// </summary>
|
|
/// </summary>
|
|
|
public void shotImage(string tempID)
|
|
public void shotImage(string tempID)
|
|
|
{
|
|
{
|
|
|
try
|
|
try
|
|
|
{
|
|
{
|
|
|
- #region 截取图片信息
|
|
|
|
|
|
|
+ #region 截取摄像头信息
|
|
|
//*
|
|
//*
|
|
|
//最后进行截图操作
|
|
//最后进行截图操作
|
|
|
CameraShotCls cameraShot = new CameraShotCls();
|
|
CameraShotCls cameraShot = new CameraShotCls();
|
|
|
cameraShot.CapMethod(tempID);
|
|
cameraShot.CapMethod(tempID);
|
|
|
|
|
|
|
|
- lg.WriteLog(35, "完成拍照 成功标识:" + PbCache.shotSuccess.ToString() +"车号:" + PbCache.lockCarNo + ";重量:" + PbCache.lockWgt + ";时间:" + DateTime.Now.ToLongTimeString());
|
|
|
|
|
|
|
+ lg.WriteLog(35, "完成全部拍照 成功标识:" + PbCache.shotSuccess.ToString() +"车号:" + PbCache.lockCarNo + ";重量:" + PbCache.lockWgt + ";时间:" + DateTime.Now.ToLongTimeString());
|
|
|
|
|
|
|
|
//*/
|
|
//*/
|
|
|
|
|
|