duyong 3 gadi atpakaļ
vecāks
revīzija
a893290e71

+ 3 - 3
CarMeterSystem/App.config

@@ -4,8 +4,8 @@
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
 	</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://127.0.0.1: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" />-->
@@ -33,7 +33,7 @@
 		<!--毛皮差值验证(单位kg)-->
 		<add key="differenceWgt" value="400" />
 		<!--进入测试界面还是正式界面 0测试,1正式,2一码到底测试,3判稳测试工具-->
-		<add key="productType" value="1" />
+		<add key="productType" value="0" />
 		<!--联达比较重量-->
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->

+ 1 - 1
MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -174,7 +174,7 @@ namespace MeterSceneLibrary
                     // 查已选择的委托
                     RESTfulResult<List<PreTrackScale>> rmScale = preTrackScaleService.doQueryByFlag(new PreTrackScale { carNo = PbCache.lockCarNo, lineDesc = "1" });
 
-                    if (rmScale.Succeed && rmScale.Data.Count == 1)
+                    if (rmScale.Succeed && rmScale.Data.Count == 1 && list[0].weightTypeNo == "001033001")
                     {
                         // 重量类型为期限皮重
                         if (list[0].weightTypeNo == "001033003")

+ 1 - 1
MeterSceneLibrary/JISCO/InnerDoubleJISCO.cs

@@ -154,7 +154,7 @@ namespace MeterSceneLibrary
 
                     List<MeterWorkCarActualFirst> firstList = rmFirst.Data;
                     //判断已选择的委托是否为1条
-                    if (rmScale.Succeed && rmScale.Data.Count == 1)
+                    if (rmScale.Succeed && rmScale.Data.Count == 1 && list[0].weightTypeNo == "001033001")
                     {
                         mwaf.weightType = "0";