winfrom修改

CarMeterSystem/App.config

@@ -6,10 +6,10 @@
 	<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.0.1: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://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>
+    <!--<add key="ServiceUrl" value="http://jgwzjl.jiugang.com/icore.icp.web/pass/systemBase/v1"/>-->
     <!--实时库地址-->
 		<add key="icoredbTcp" value="tarantool://guest@10.99.200.86:2101" />
 		<!--SFTP或者vsftp服务端连接及地址-->
@@ -32,6 +32,9 @@
 		<add key="lianDaWgt" value="200" />
 		<!--联达计量点编号-->
 		<add key="lianDaPointNo" value="00019" />
+    
+    <!--期限皮使用方式配置：车号-物料-路线（1），车号-物料-称点（2）-->
+    <add key="TareControlType" value="1" />
 
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 	</appSettings>

CarMeterSystem/frmOneYardToEnd.cs

@@ -1005,9 +1005,9 @@ namespace CarMeterSystem
 
                                 if (!string.IsNullOrEmpty(PbCache.collect.carno))
                                 {
-                                    carService.addCar(new MeterBaseCar { carNo = PbCache.collect.carno });
+                                    carService.addCar(new MeterBaseCar { carNo = PbCache.collect.carno, carTypeNo = "001004003", carTypeName = "内部" });
                                 }
-                            return;
+                                return;
                             }
                         }
                         #region 查一次是否可留期限皮，可以则显示按钮

Common/cacheCls/AppConfigCache.cs

@@ -72,5 +72,10 @@ namespace Common
         /// </summary>
         public static readonly string productType = ConfigurationManager.AppSettings["productType"].ToString().Trim();
 
+        /// <summary>
+        /// 0测试，1正式
+        /// </summary>
+        public static readonly string TareControlType = ConfigurationManager.AppSettings["TareControlType"].ToString().Trim();
+
     }
 }

Common/vo/base/MeterBaseSpotInfo.cs

@@ -159,5 +159,11 @@ namespace Common
 		/// 计量点区域名称
 		/// <summary>
 		public string spotAreaName { get; set; }
+
+		/// <summary>
+		/// 是否允许使用期限皮重
+		/// <summary>
+		public string allowedTareWeight { get; set; }
+		
 	}
 }

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -26,6 +26,8 @@ namespace MeterSceneLibrary
         // 留期限皮操作
         private MeterBaseTermTareDataService termTareDate = new MeterBaseTermTareDataService();
 
+        private MeterBaseSpotInfoService meterBaseSpotInfoService = new MeterBaseSpotInfoService();
+
         private rtInfo rt = new rtInfo();
 
         // 构建一次计量数据
@@ -211,56 +213,114 @@ namespace MeterSceneLibrary
                                                 {
                                                     if (rmT.Data != null && rmT.Data.Count > 0)
                                                     {
-                                                        // 判断收发货单位是否具有期限皮重权限
-                                                        MeterBaseUnitInfoService meterBaseUnitInfoService = new MeterBaseUnitInfoService();
-                                                        MeterBaseUnitInfo meterBaseUnitInfo = new MeterBaseUnitInfo();
-                                                        meterBaseUnitInfo.forwardingUnitName = rmScale.Data[0].forwardingUnitName;
-                                                        meterBaseUnitInfo.forwardingUnitNo = rmScale.Data[0].forwardingUnitNo;
-                                                        meterBaseUnitInfo.receivingUnitName = rmScale.Data[0].receivingUintName;
-                                                        meterBaseUnitInfo.receivingUnitNo = rmScale.Data[0].receivingUintNo;
-                                                        RESTfulResult<List<MeterBaseUnitInfo>> tareUnitResult = meterBaseUnitInfoService.doQueryWf(meterBaseUnitInfo);
-                                                        if (tareUnitResult.Succeed)
+                                                        //判断是使用车号-物料-称点，还是使用车号-物料-路线判断期限皮
+                                                        #region 车号-物料-路线
+                                                        if (AppConfigCache.TareControlType == "1")
                                                         {
-                                                            if (tareUnitResult.Data == null || tareUnitResult.Data.Count == 0)
-                                                            {
-                                                                mwaf.weightType = "0";
-                                                                // 只保存一次计量数据
-                                                                rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
-                                                            }
-                                                            else
+                                                            // 判断收发货单位是否具有期限皮重权限
+                                                            MeterBaseUnitInfoService meterBaseUnitInfoService = new MeterBaseUnitInfoService();
+                                                            MeterBaseUnitInfo meterBaseUnitInfo = new MeterBaseUnitInfo();
+                                                            meterBaseUnitInfo.forwardingUnitName = rmScale.Data[0].forwardingUnitName;
+                                                            meterBaseUnitInfo.forwardingUnitNo = rmScale.Data[0].forwardingUnitNo;
+                                                            meterBaseUnitInfo.receivingUnitName = rmScale.Data[0].receivingUintName;
+                                                            meterBaseUnitInfo.receivingUnitNo = rmScale.Data[0].receivingUintNo;
+                                                            RESTfulResult<List<MeterBaseUnitInfo>> tareUnitResult = meterBaseUnitInfoService.doQueryWf(meterBaseUnitInfo);
+                                                            if (tareUnitResult.Succeed)
                                                             {
-                                                                MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                                RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
-                                                                if (termTareData.Succeed)
+                                                                if (tareUnitResult.Data == null || tareUnitResult.Data.Count == 0)
                                                                 {
-                                                                    if (termTareData.Data == null)
+                                                                    mwaf.weightType = "0";
+                                                                    // 只保存一次计量数据
+                                                                    rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                }
+                                                                else
+                                                                {
+                                                                    MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
+                                                                    RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                    if (termTareData.Succeed)
                                                                     {
-                                                                        mwaf.weightType = "0";
-                                                                        // 只保存一次计量数据
-                                                                        rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                                                        PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                        if (termTareData.Data == null)
+                                                                        {
+                                                                            mwaf.weightType = "0";
+                                                                            // 只保存一次计量数据
+                                                                            rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
+                                                                            PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                            // 存在使用期限皮重权限，并使用期限皮重洁净
+                                                                            List<string> l = new List<string>();
+                                                                            l.Add("create");
+                                                                            //给一次数据匹配委托
+                                                                            EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                                                            mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                            mwaf.isPreScale = "1";
+                                                                            mwaf.weightType = "0";
+
+                                                                            PbCache.ResultMessage = "计量成功，期限皮结净";
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                            rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                        }
                                                                     }
-                                                                    else
+                                                                }
+                                                            }
+                                                        }
+                                                        #endregion
+                                                        #region 车号-物料-称点
+                                                        if (AppConfigCache.TareControlType == "2")
+                                                        {
+                                                            // 判断称点是否具有期限皮重权限
+                                                            MeterBaseSpotInfo meterBaseSpotInfo = new MeterBaseSpotInfo();
+                                                            meterBaseSpotInfo.baseSpotNo = PbCache.sportInfo.baseSpotNo;
+                                                            meterBaseSpotInfo.allowedTareWeight = "1";
+                                                            RESTfulResult<List<MeterBaseSpotInfo>> tareSpotResult = meterBaseSpotInfoService.doQueryWf(meterBaseSpotInfo);
+                                                            if (tareSpotResult.Succeed)
+                                                            {
+                                                                if (tareSpotResult.Data == null || tareSpotResult.Data.Count == 0)
+                                                                {
+                                                                    mwaf.weightType = "0";
+                                                                    // 只保存一次计量数据
+                                                                    rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                }
+                                                                else
+                                                                {
+                                                                    MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
+                                                                    RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                    if (termTareData.Succeed)
                                                                     {
-                                                                        // 存在使用期限皮重权限，并使用期限皮重洁净
-                                                                        List<string> l = new List<string>();
-                                                                        l.Add("create");
-                                                                        //给一次数据匹配委托
-                                                                        EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
-                                                                        mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
-                                                                        mwaf.isPreScale = "1";
-                                                                        mwaf.weightType = "0";
-
-                                                                        PbCache.ResultMessage = "计量成功，期限皮结净";
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
-
-                                                                        rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                        if (termTareData.Data == null)
+                                                                        {
+                                                                            mwaf.weightType = "0";
+                                                                            // 只保存一次计量数据
+                                                                            rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
+                                                                            PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                        }
+                                                                        else
+                                                                        {
+                                                                            // 存在使用期限皮重权限，并使用期限皮重洁净
+                                                                            List<string> l = new List<string>();
+                                                                            l.Add("create");
+                                                                            //给一次数据匹配委托
+                                                                            EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                                                            mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                            mwaf.isPreScale = "1";
+                                                                            mwaf.weightType = "0";
+
+                                                                            PbCache.ResultMessage = "计量成功，期限皮结净";
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                            rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                        }
                                                                     }
                                                                 }
                                                             }
                                                         }
+                                                        #endregion
                                                     }
                                                     else
                                                     {
@@ -399,70 +459,142 @@ namespace MeterSceneLibrary
                                                             // 存在使用期限皮重权限，并使用期限皮重洁净
                                                             if (rmT.Data != null && rmT.Data.Count > 0)
                                                             {
-                                                                // 判断收发货单位是否具有期限皮重权限
-                                                                MeterBaseUnitInfoService meterBaseUnitInfoService = new MeterBaseUnitInfoService();
-                                                                MeterBaseUnitInfo meterBaseUnitInfo = new MeterBaseUnitInfo();
-                                                                meterBaseUnitInfo.forwardingUnitName = rmScale.Data[0].forwardingUnitName;
-                                                                meterBaseUnitInfo.forwardingUnitNo = rmScale.Data[0].forwardingUnitNo;
-                                                                meterBaseUnitInfo.receivingUnitName = rmScale.Data[0].receivingUintName;
-                                                                meterBaseUnitInfo.receivingUnitNo = rmScale.Data[0].receivingUintNo;
-                                                                meterBaseUnitInfo.allowedTareWeight = "1";
-                                                                RESTfulResult<List<MeterBaseUnitInfo>> tareUnitResult = meterBaseUnitInfoService.doQueryWf(meterBaseUnitInfo);
-                                                                if (tareUnitResult.Succeed)
+                                                                //判断是使用车号-物料-称点，还是使用车号-物料-路线判断期限皮
+                                                                #region 车号-物料-路线
+                                                                if (AppConfigCache.TareControlType == "1")
                                                                 {
-                                                                    if (tareUnitResult.Data == null || tareUnitResult.Data.Count == 0)
+                                                                    // 判断收发货单位是否具有期限皮重权限
+                                                                    MeterBaseUnitInfoService meterBaseUnitInfoService = new MeterBaseUnitInfoService();
+                                                                    MeterBaseUnitInfo meterBaseUnitInfo = new MeterBaseUnitInfo();
+                                                                    meterBaseUnitInfo.forwardingUnitName = rmScale.Data[0].forwardingUnitName;
+                                                                    meterBaseUnitInfo.forwardingUnitNo = rmScale.Data[0].forwardingUnitNo;
+                                                                    meterBaseUnitInfo.receivingUnitName = rmScale.Data[0].receivingUintName;
+                                                                    meterBaseUnitInfo.receivingUnitNo = rmScale.Data[0].receivingUintNo;
+                                                                    meterBaseUnitInfo.allowedTareWeight = "1";
+                                                                    RESTfulResult<List<MeterBaseUnitInfo>> tareUnitResult = meterBaseUnitInfoService.doQueryWf(meterBaseUnitInfo);
+                                                                    if (tareUnitResult.Succeed)
                                                                     {
-                                                                        // 正常结净
-                                                                        //给一次数据匹配委托
-                                                                        EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
-                                                                        mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
-                                                                        mwaf.isPreScale = "1";
-                                                                        mwaf.weightType = "0";
-
-                                                                        rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                        if (tareUnitResult.Data == null || tareUnitResult.Data.Count == 0)
+                                                                        {
+                                                                            // 正常结净
+                                                                            //给一次数据匹配委托
+                                                                            EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
+                                                                            mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                            mwaf.isPreScale = "1";
+                                                                            mwaf.weightType = "0";
+
+                                                                            rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                        }
+                                                                        else
+                                                                        {
+
+                                                                            MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
+                                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                            if (termTareData.Succeed)
+                                                                            {
+                                                                                if (termTareData.Data == null)
+                                                                                {
+                                                                                    // 正常结净
+                                                                                    //给一次数据匹配委托
+                                                                                    EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
+                                                                                    mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                                    mwaf.isPreScale = "1";
+                                                                                    mwaf.weightType = "0";
+
+                                                                                    rt = saveMethod.doTermTareNet(rmScale.Data[0], firstList[0], mwaf);
+
+                                                                                    PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
+                                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                    // 存在使用期限皮重权限，并使用期限皮重洁净
+                                                                                    List<string> l = new List<string>();
+                                                                                    l.Add("create");
+                                                                                    //给一次数据匹配委托
+                                                                                    EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                                                                    mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                                    mwaf.isPreScale = "1";
+                                                                                    mwaf.weightType = "0";
+
+                                                                                    PbCache.ResultMessage = "计量成功，期限皮结净";
+                                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                                    rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                                }
+                                                                            }
+                                                                        }
                                                                     }
-                                                                    else
+                                                                }
+                                                                #endregion
+                                                                #region 车号-物料-称点
+                                                                if (AppConfigCache.TareControlType == "2")
+                                                                {
+                                                                    // 判断收发货单位是否具有期限皮重权限
+                                                                    // 判断称点是否具有期限皮重权限
+                                                                    MeterBaseSpotInfo meterBaseSpotInfo = new MeterBaseSpotInfo();
+                                                                    meterBaseSpotInfo.baseSpotNo = PbCache.sportInfo.baseSpotNo;
+                                                                    meterBaseSpotInfo.allowedTareWeight = "1";
+                                                                    RESTfulResult<List<MeterBaseSpotInfo>> tareSpotResult = meterBaseSpotInfoService.doQueryWf(meterBaseSpotInfo);
+                                                                    if (tareSpotResult.Succeed)
                                                                     {
-
-                                                                        MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
-                                                                        RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
-                                                                        if (termTareData.Succeed)
+                                                                        if (tareSpotResult.Data == null || tareSpotResult.Data.Count == 0)
+                                                                        {
+                                                                            // 正常结净
+                                                                            //给一次数据匹配委托
+                                                                            EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
+                                                                            mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                            mwaf.isPreScale = "1";
+                                                                            mwaf.weightType = "0";
+
+                                                                            rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                        }
+                                                                        else
                                                                         {
-                                                                            if (termTareData.Data == null)
-                                                                            {
-                                                                                // 正常结净
-                                                                                //给一次数据匹配委托
-                                                                                EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
-                                                                                mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
-                                                                                mwaf.isPreScale = "1";
-                                                                                mwaf.weightType = "0";
-
-                                                                                rt = saveMethod.doTermTareNet(rmScale.Data[0], firstList[0], mwaf);
-
-                                                                                PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
-                                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
 
-                                                                            }
-                                                                            else
+                                                                            MeterBaseTermTareDataService meterBaseTermTareDataService = new MeterBaseTermTareDataService();
+                                                                            RESTfulResult<MeterBaseTermTareData> termTareData = meterBaseTermTareDataService.doQueryPageWf(new MeterBaseTermTareData { carNo = PbCache.lockCarNo, valueFlag = "0" });
+                                                                            if (termTareData.Succeed)
                                                                             {
-                                                                                // 存在使用期限皮重权限，并使用期限皮重洁净
-                                                                                List<string> l = new List<string>();
-                                                                                l.Add("create");
-                                                                                //给一次数据匹配委托
-                                                                                EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
-                                                                                mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
-                                                                                mwaf.isPreScale = "1";
-                                                                                mwaf.weightType = "0";
-
-                                                                                PbCache.ResultMessage = "计量成功，期限皮结净";
-                                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
-
-                                                                                rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                                if (termTareData.Data == null)
+                                                                                {
+                                                                                    // 正常结净
+                                                                                    //给一次数据匹配委托
+                                                                                    EntityBase<PreTrackScale> entityBase3 = new EntityBase<PreTrackScale>();
+                                                                                    mwaf = entityBase3.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                                    mwaf.isPreScale = "1";
+                                                                                    mwaf.weightType = "0";
+
+                                                                                    rt = saveMethod.doTermTareNet(rmScale.Data[0], firstList[0], mwaf);
+
+                                                                                    PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
+                                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或者已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                                }
+                                                                                else
+                                                                                {
+                                                                                    // 存在使用期限皮重权限，并使用期限皮重洁净
+                                                                                    List<string> l = new List<string>();
+                                                                                    l.Add("create");
+                                                                                    //给一次数据匹配委托
+                                                                                    EntityBase<PreTrackScale> entityBase1 = new EntityBase<PreTrackScale>();
+                                                                                    mwaf = entityBase1.format<MeterWorkCarActualFirst>(rmScale.Data[0], mwaf);
+                                                                                    mwaf.isPreScale = "1";
+                                                                                    mwaf.weightType = "0";
+
+                                                                                    PbCache.ResultMessage = "计量成功，期限皮结净";
+                                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+
+                                                                                    rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
+                                                                                }
                                                                             }
                                                                         }
                                                                     }
                                                                 }
+                                                                #endregion
                                                             }
                                                             else
                                                             {