duyong 3 роки тому
батько
коміт
a0a5ca1bb2

+ 2 - 2
CarMeterSystem/App.config

@@ -5,13 +5,13 @@
 	</startup>
 	<appSettings>
 		<!--<add key="ServiceUrl" value="http://127.0.0.1:9004/v1" />-->
-    <add key="ServiceUrl" value="http://10.104.4.105:9004/v1" />
+    <!--<add key="ServiceUrl" value="http://10.104.4.105:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://192.168.216.143:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://192.168.137.136:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://10.104.0.1:9004/v1" />-->
     <!--<add key="ServiceUrl" value="http://192.168.107.60:8888/icore.icp.winform/pass/jlcar"/>-->
     <!--<add key="ServiceUrl" value="http://192.168.185.29/icore.icp.winform/pass/jlcar"/>-->
-    <!--<add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>-->
+    <add key="ServiceUrl" value="http://10.99.81.20/icore.icp.web/pass/systemBase/v1"/>
     <!--<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"/>-->
     <!--实时库地址-->

+ 1 - 1
CarMeterSystem/frmOneYardToEnd.cs

@@ -452,7 +452,7 @@ namespace CarMeterSystem
                                     led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, PbCache.LEDResultMessage);
                                 }
                                 isStop = false;
-                                //return;
+                                return;
                             }
                             else
                             {

+ 7 - 7
MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -677,13 +677,13 @@ namespace MeterSceneLibrary
                                 // 重量类型为皮重
                                 if (list[0].weightTypeNo == "001033002")
                                 {
-                                    //if (PbCache.lockWgt > 25)
-                                    //{
-                                    //    rt = saveMethod.doError(string.Format("当前重量:{0},请确认是否为皮重", PbCache.lockWgt));
-                                    //    PbCache.voiceType = 26;
-                                    //    PbCache.LEDResultMessage = string.Format("当前重量:{0},请确认是否为皮重", PbCache.lockWgt);
-                                    //    return rt;
-                                    //}
+                                    if (PbCache.lockWgt > 25)
+                                    {
+                                        rt = saveMethod.doError(string.Format("当前重量:{0},请确认是否为皮重", PbCache.lockWgt));
+                                        PbCache.voiceType = 26;
+                                        PbCache.LEDResultMessage = string.Format("当前重量:{0},请确认是否为皮重", PbCache.lockWgt);
+                                        return rt;
+                                    }
 
                                     // 历史皮重验证
                                     rt = saveMethod.validHisTare(list[0].weightTypeNo);