Browse Source

winfrom提交

duyong 3 năm trước cách đây
mục cha
commit
818201e14a
3 tập tin đã thay đổi với 10 bổ sung10 xóa
  1. 3 3
      CarMeterSystem/App.config
  2. 4 4
      CarMeterSystem/frmMain.cs
  3. 3 3
      CarMeterSystem/frmOneYardToEnd.cs

+ 3 - 3
CarMeterSystem/App.config

@@ -15,8 +15,8 @@
     <!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--<add key="ServiceUrl" value="http://10.130.1.2/icore.icp.web/pass/systemBase/v1"/>-->
     <!--实时库地址-->
-    <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:21019" />
-    <add key="icoredbTcp2" value="tarantool://guest@10.130.1.3:2101" />
+    <add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
+    <add key="icoredbTcp2" value="tarantool://guest@10.130.1.3:21019" />
     <!--<add key="icoredbTcp" value="tarantool://guest@10.130.1.3:2101" />-->
     <!--SFTP或者vsftp服务端连接及地址-->
 		<add key="fip" value="192.168.185.238" />
@@ -33,7 +33,7 @@
 		<!--毛皮差值验证(单位kg)-->
 		<add key="differenceWgt" value="400" />
 		<!--进入测试界面还是正式界面 0测试,1正式,2一码到底测试,3判稳测试工具-->
-		<add key="productType" value="0" />
+		<add key="productType" value="1" />
 		<!--联达比较重量-->
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->

+ 4 - 4
CarMeterSystem/frmMain.cs

@@ -95,7 +95,7 @@ namespace CarMeterSystem
         private List<ucBusinessType> lu = new List<ucBusinessType>();
 
         private bool isVoiceDownCar = false;//车上人员请下车播放一次
-        private bool isShowFrmWelcome = false; //是否显示欢迎界面
+        private bool isShowFrmWelcome = true; //是否显示欢迎界面
 
         private bool isOpened = false;//是否已经打开了扫码计量界面
 
@@ -442,8 +442,8 @@ namespace CarMeterSystem
             //num++;
 
             //e.carno = "湘G88888";
-            e.weight = 23580;
-            e.weightStatus = 0;
+            //e.weight = 23580;
+            //e.weightStatus = 0;
 
             //if (num < 20)
             //{
@@ -926,7 +926,7 @@ namespace CarMeterSystem
                                 if (!PbCache.monitorResult.valid_park_status && validParkStatuConfig == "true")
                                 {
                                     iCountPark++;
-                                    if (iCountPark > 9)
+                                    if (iCountPark > 9 && !string.IsNullOrEmpty(PbCache.collect.carno))
                                     {
                                         PbCache.ResultMessage = "车辆超出秤台,请调整车位"; //btnSave_Click
                                         //重量稳定,且对射验证不合格

+ 3 - 3
CarMeterSystem/frmOneYardToEnd.cs

@@ -261,7 +261,7 @@ namespace CarMeterSystem
                     setMsg(PbCache.ResultMessage);
                     return;
                 }
-                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && !PbCache.monitorResult.valid_park_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true")
+                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && !PbCache.monitorResult.valid_park_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true" && !string.IsNullOrEmpty(PbCache.collect.carno))
                 {
                     //重量稳定,且对射验证不合格
                     vicPlayClass.GetVoicePlay("车辆超出秤台,请调整车位", PbCache.collect.carno);
@@ -272,7 +272,7 @@ namespace CarMeterSystem
                     setMsg(PbCache.ResultMessage);
                     return;
                 }
-                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && PbCache.monitorResult.valid_frontInfraredRay_right_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true")
+                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && PbCache.monitorResult.valid_frontInfraredRay_right_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true" && !string.IsNullOrEmpty(PbCache.collect.carno))
                 {
                     //重量稳定,且光栅不合格
                     vicPlayClass.GetVoicePlay("车辆超出秤台,请调整车位", PbCache.collect.carno);
@@ -283,7 +283,7 @@ namespace CarMeterSystem
                     setMsg(PbCache.ResultMessage);
                     return;
                 }
-                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && PbCache.monitorResult.valid_frontInfraredRay_left_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true")
+                else if ((PbCache.collect.weightStatus == 0 || localWeightStatus == true) && PbCache.monitorResult.valid_frontInfraredRay_left_status && PbCache.monitor.validParkStatus == "1" && validParkStatuConfig == "true" && !string.IsNullOrEmpty(PbCache.collect.carno))
                 {
                     //重量稳定,且光栅不合格
                     vicPlayClass.GetVoicePlay("车辆超出秤台,请调整车位", PbCache.collect.carno);