winfrom提交

CarMeterSystem/Form1.cs

@@ -342,6 +342,7 @@ namespace CarMeterSystem
                     //}
                     l.WriteLog(12, "测试扫码值"+PbCache.strCode);
                     PbCache.collect.carno = sweepCodeClass.StrCode;
+                   
                     codeFlag = true;
                 }
 
@@ -579,6 +580,11 @@ namespace CarMeterSystem
                         #region 写入一次监控表，将重量/车号停留超时等信息写入
                         mwUpdate.weightStatus = PbCache.collect.weightStatus;
                         mwUpdate.msgInfo = PbCache.ResultMessage;
+                        mwUpdate.photoCar = PbCache.collect.carno;
+                        if (codeFlag)
+                        {
+                            mwUpdate.scanCar = PbCache.collect.carno;
+                        }
                         //另外初始化一次监控数据
                         RESTfulResult<string> rms = meterWorkMonitor.doUpdateWf(mwUpdate);
                         if (!rms.Succeed)

CarMeterSystem/frmOneYardToEnd.cs

@@ -58,6 +58,7 @@ namespace CarMeterSystem
         private string TrackCarNo = "";//预报车号
         private string sPreCarNo = "";//摄像头识别车号
         private string limsMsg = "";
+        
 
         private LED_Control led_controler;
 
@@ -81,6 +82,8 @@ namespace CarMeterSystem
                 {
                     led_controler = new LED_Control(PbCache.sportInfo.ledIp);
                 }
+                PbCache.mwPreFirst = new MeterWorkCarActualFirst();
+                PbCache.isPre = false;
 
                 //不显示重量
                 ucWeightCarTJXJG1.setWgtBackColor(true);
@@ -341,6 +344,7 @@ namespace CarMeterSystem
                                 ExecuteMethod em = new ExecuteMethod();
 
                                 //判断是否为外发试验性称量，预防超载或欠载（不算正常计量）（吉瑞、铁合金车辆）
+
                                 // 厂内车辆
                                 if (car.carTypeNo == "001004003")
                                 {
@@ -1063,10 +1067,10 @@ namespace CarMeterSystem
                                         bRailwayActual = false;
                                     }
                                     //厂外车辆
-                                    else if (car.carTypeNo == "001004002")
+                                    else if (car.carTypeNo == "001004002" && !PbCache.isPre)
                                     {
                                         #region 查询一次计量表中是否存在一条未结净的数据，非一车联运情况扫码两次，一车联运的话
-
+                                        
                                         RESTfulResult<List<MeterWorkCarActualFirst>> RESTfulResult = workCarActualFirstService.doQueryWf(new MeterWorkCarActualFirst { carNo = PbCache.collect.carno, valueFlag = "1" });
                                         if (RESTfulResult.Succeed)
                                         {
@@ -1118,6 +1122,10 @@ namespace CarMeterSystem
                                         #endregion
                                         bRailwayActual = false;
                                     }
+                                    else if (PbCache.isPre)
+                                    {
+                                        ucCarMeterInfoJisco1.setFormControlValue(PbCache.mwPreFirst);
+                                    }
                                 }
                                 else
                                 {
@@ -2022,6 +2030,7 @@ namespace CarMeterSystem
 
         public void setPre(MeterWorkCarActualFirst model)
         {
+            PbCache.isPre = true;
             ucCarMeterInfoJisco1.setFormControlValue(model);
         }
     }

Common/Common.csproj

@@ -93,6 +93,7 @@
     <Compile Include="DbOption\base\MeterBaseHisTareCountDService.cs" />
     <Compile Include="DbOption\base\MeterBaseMatterInfoService.cs" />
     <Compile Include="DbOption\base\MeterBaseScalePointService.cs" />
+    <Compile Include="DbOption\base\MeterBaseSpecialUnitService.cs" />
     <Compile Include="DbOption\base\MeterBaseUnitInfoService.cs" />
     <Compile Include="DbOption\scale\PreBeltScalePreService.cs" />
     <Compile Include="DbOption\scale\PreTrackNoticeService.cs" />
@@ -129,6 +130,7 @@
     <Compile Include="vo\pb\CraneScaleCollectModel.cs" />
     <Compile Include="vo\scale\PreBeltScaleForecast.cs" />
     <Compile Include="vo\scale\PreTrackNotice.cs" />
+    <Compile Include="vo\base\MeterBaseSpecialUnit.cs" />
     <Compile Include="vo\work\MeterWorkCompareSpot.cs" />
     <Compile Include="vo\work\MeterWorkCompareSpotSacle.cs" />
     <Compile Include="vo\work\MeterWorkBeltActual.cs" />

Common/DbOption/base/MeterBaseSpecialUnitService.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using com.hnshituo.core.webapp.vo;
+
+namespace Common
+{
+    public class MeterBaseSpecialUnitService
+    {
+        /// <summary>
+        /// 基础信息查询，保持MeterBaseCar
+        /// </summary>
+        /// <param name="car"></param>
+        /// <returns></returns>
+        public RESTfulResult<List<MeterBaseSpecialUnit>> doQueryCarList(MeterBaseSpecialUnit meterBaseSpecialUnit)
+        {
+            DbHelper db = new DbHelper();
+            RESTfulResult<PageList<List<MeterBaseSpecialUnit>>> rm = db.doOption<PageList<List<MeterBaseSpecialUnit>>>("meterbasespecialunits", "/list", new object[] { meterBaseSpecialUnit }, 1);
+
+            RESTfulResult<List<MeterBaseSpecialUnit>> result = new RESTfulResult<List<MeterBaseSpecialUnit>>();
+            result.Succeed = rm.Succeed;
+            result.Status = rm.Status;
+            result.Message = rm.Message;
+            result.ResultMessage = rm.ResultMessage;
+            result.Code = rm.Code;
+            if (rm.Succeed && rm.Data != null && rm.Data.list.Count > 0)
+            {
+                result.Data = rm.Data.list;
+            }
+            return result;
+        }
+    }
+}

Common/cacheCls/PbCache.cs

@@ -88,6 +88,11 @@ namespace Common
         /// </summary>
         public static double lockWgt { get; set; }
 
+        public static bool isPre = false;
+
+        
+        public static MeterWorkCarActualFirst mwPreFirst { get; set; }
+
         /// <summary>
         /// 附加重量
         /// </summary>

Common/vo/base/MeterBaseCar.cs

@@ -110,5 +110,10 @@ namespace Common
 		/// <summary>
 		public string belongUnitTypeName { get; set; }
 
+		/// <summary>
+		/// 归属单位类型名称
+		/// <summary>
+		public string usetDepartmentNo { get; set; }
+
 	}
 }