winfrom提交

CarMeterSystem/App.config

@@ -5,7 +5,7 @@
 	</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" />-->

CarMeterSystem/frmMain.cs

@@ -1320,6 +1320,7 @@ namespace CarMeterSystem
 
         private void DecodeQRCode(string strCode)
         {
+            
             codeFlag = true;
             //frmOneYardToEnd frmOneYardToEnd = new frmOneYardToEnd();
             Hashtable hashTable = new Hashtable();

CarMeterSystem/frmOneYardToEnd.cs

@@ -1478,7 +1478,6 @@ namespace CarMeterSystem
 
 
                     #region 查一次是否校秤，若未校秤则不能计量
-
                     ////*
                     //if (bRelation)
                     //{

Common/cacheCls/PbCache.cs

@@ -57,6 +57,11 @@ namespace Common
         /// </summary>
         public static bool isTareWgt { get; set; }
 
+        /// <summary>
+        /// 车号数据来源(1-正常，2-扫码，3-rfid，4-车号重置)
+        /// </summary>
+        public static int carNoSource { get; set; }
+
         /// <summary>
         /// 是否打开手动选择毛皮
         /// </summary>

Common/vo/base/MeterBaseTermTareData.cs

@@ -99,5 +99,15 @@ namespace Common
 		/// 皮重数据
 		/// <summary>
 		public double? meterWeight { get; set; }
+
+		/// <summary>
+		/// 计量点区域编码
+		/// <summary>
+		public string spotAreaNo { get; set; }
+
+		/// <summary>
+		/// 计量点区域名称
+		/// <summary>
+		public string spotAreaName { get; set; }
 	}
 }

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -286,7 +286,7 @@ namespace MeterSceneLibrary
                                                     else
                                                     {
                                                         MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                        RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                        RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0",spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                         if (termTareData.Succeed)
                                                         {
                                                             if (termTareData.Data == null)
@@ -395,7 +395,7 @@ namespace MeterSceneLibrary
                                                         else
                                                         {
                                                             MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" , spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                             if (termTareData.Succeed)
                                                             {
                                                                 if (termTareData.Data == null)
@@ -529,7 +529,7 @@ namespace MeterSceneLibrary
                                                             else
                                                             {
                                                                 MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0", spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                                 if (termTareData.Succeed)
                                                                 {
                                                                     if (termTareData.Data == null)
@@ -613,7 +613,7 @@ namespace MeterSceneLibrary
                                                             else
                                                             {
                                                                 MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0", spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                                 if (termTareData.Succeed)
                                                                 {
                                                                     // 正常结净
@@ -852,7 +852,7 @@ namespace MeterSceneLibrary
                                                         else
                                                         {
                                                             MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0", spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                             if (termTareData.Succeed)
                                                             {
                                                                 // 正常结净
@@ -938,7 +938,7 @@ namespace MeterSceneLibrary
                                                             else
                                                             {
                                                                 MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0", spotAreaNo = PbCache.sportInfo.spotAreaNo });
                                                                 if (termTareData.Succeed)
                                                                 {
                                                                     meterWorkCarActualFirsts.Add(item);

MeterSceneLibrary/JISCO/InnerDoubleJISCO.cs

@@ -150,7 +150,7 @@ namespace MeterSceneLibrary
                     RESTfulResult<List<ComBaseInfo>> comBaseInfos = comBaseInfoService.doQueryBaseList(new ComBaseInfo { pBaseCode = "001048", validFlag = "1",baseName = PbCache.lockCarNo });
 
                     //查询车辆是否存在期限皮重信息
-                    RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                    RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0", spotAreaNo = PbCache.sportInfo.spotAreaNo });
 
                     List<MeterWorkCarActualFirst> firstList = rmFirst.Data;
                     //判断已选择的委托是否为1条

MeterSceneLibrary/JISCO/OuterCarJISCO.cs

@@ -73,7 +73,7 @@ namespace MeterSceneLibrary
             // 通过上次结净记录，找到该委托的签发时间
             MeterWorkCarActual lastMeterWorkCarActual = new MeterWorkCarActual();
             RESTfulResult<List<PreTrackScale>> lastPre = new RESTfulResult<List<PreTrackScale>>();
-            if (rm.Data == null && rm.Data.Count == 0)
+            if (rm.Data == null || rm.Data.Count == 0)
             {
                 lastMeterWorkCarActual = null;
                 lastPre = null;
@@ -514,7 +514,7 @@ namespace MeterSceneLibrary
                             {
                                 pre = listPreScale[0];
                             }
-                            if (listPreScale.Count == 2 && listPreScale[0].matterNo == listPreScale[1].matterNo && (listPreScale[0].receivingUintNo == listPreScale[1].forwardingUnitNo || listPreScale[0].forwardingUnitNo == listPreScale[1].receivingUintNo))
+                            if (listPreScale.Count == 2 && listPreScale[0].matterNo == listPreScale[1].matterNo && (listPreScale[0].receivingUintNo == listPreScale[1].forwardingUnitNo || listPreScale[0].forwardingUnitNo == listPreScale[1].receivingUintNo) && listPreScale[0].receivingUintNo != listPreScale[0].forwardingUnitNo && listPreScale[1].receivingUintNo != listPreScale[1].forwardingUnitNo)
                             {
                                 // 正常结净并生成两条净重数据
                                 pre = listPreScale[1];
@@ -647,7 +647,7 @@ namespace MeterSceneLibrary
                                         PbCache.voiceType = 1;
                                         PbCache.LEDResultMessage = string.Format("车号{0}，2次重量{1}吨，净重{2}吨，双委托结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                     }
-                                    else if (listPreScale[0].matterNo == listPreScale[1].matterNo && (listPreScale[0].receivingUintNo == listPreScale[1].forwardingUnitNo || listPreScale[0].forwardingUnitNo == listPreScale[1].receivingUintNo))
+                                    else if (listPreScale[0].matterNo == listPreScale[1].matterNo && (listPreScale[0].receivingUintNo == listPreScale[1].forwardingUnitNo || listPreScale[0].forwardingUnitNo == listPreScale[1].receivingUintNo) && listPreScale[0].receivingUintNo != listPreScale[0].forwardingUnitNo && listPreScale[1].receivingUintNo != listPreScale[1].forwardingUnitNo)
                                     {
                                         // 正常结净并生成两条净重数据
                                         rt = saveMethod.doNetAddTwo(listPreScale, rmX.Data[0], mwaf);