winfrom提交

CarMeterSystem/frmOneYardToEnd.cs

@@ -867,7 +867,7 @@ namespace CarMeterSystem
                                 lg.WriteLog(14, "车号：" + PbCache.collect.carno + "；远程计量完成后，保存按钮隐藏！");
                                 if (!txtMsgInfo.Text.Contains("称重完成") && PbCache.monitor.isTakeOver == "2")
                                 {
-                                    txtMsgInfo.Text = "司秤工正在远程计量，请等待处理！！";
+                                    txtMsgInfo.Text = "正在远程计量，请等待处理！！";
                                 }
                                 if (!txtMsgInfo.Text.Contains("称重完成") && !string.IsNullOrEmpty(PbCache.monitor.isOverWgt))
                                 {
@@ -948,7 +948,7 @@ namespace CarMeterSystem
                         }
                     }
                     if (PbCache.collect.weightStatus == 0 && !PbCache.monitorResult.valid_park_status)
-                    {
+                    {6
                         //重量稳定，且对射验证不合格
                         if (!isPlayCalibVoice)
                         {
@@ -963,6 +963,7 @@ namespace CarMeterSystem
                         if (!isPlayOvertimeVoice && !PbCache.isLockFrm)
                         {
                             vicPlayClass.GetVoicePlay("停留超时", PbCache.collect.carno);
+                            led_controler.setStaticLineMsg(PbCache.sportInfo.ledIp, "车号未注册，请联系处理");
                             //txtMsgInfo.Text = "您的车辆已停留超过三分钟，遇到操作问题请点击【语音求助】联系司秤工处理或继续进行自助计量！";
                             isPlayOvertimeVoice = true;
                             return;
@@ -1084,7 +1085,6 @@ namespace CarMeterSystem
                                     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)
                                         {
@@ -1235,8 +1235,8 @@ namespace CarMeterSystem
                             // 如果计量点配置中，设置了秤点计量类型为智能计量（下秤），验证扫码信息是否与识别车号一致。
                             // 如果为是，自动保存
                             //3秒后自动执行保存方法
-                            //Thread.Sleep(3000);
-                            //this.btnSave.PerformClick();
+                            Thread.Sleep(3000);
+                            this.btnSave.PerformClick();
                         }
                         else if (PbCache.monitor.validMatClick == "0")
                         {

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -123,7 +123,7 @@ namespace MeterSceneLibrary
                         {}
                         else
                         {
-                            rt = saveMethod.doError("该车为特殊车辆，需要确认重量");
+                            rt = saveMethod.doError(string.Format("当前重量{0}吨，请确认重量", PbCache.lockWgt));
                             PbCache.LEDResultMessage = string.Format("当前重量{0}吨，请确认重量", PbCache.lockWgt);
                             PbCache.voiceType = 12;
                             return rt;
@@ -185,7 +185,7 @@ namespace MeterSceneLibrary
                                         mwaf.weightType = "1";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                         PbCache.voiceType = 1;
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     }
                                     // 重量类型为皮重且在皮重误差外
                                     else if (list[0].weightTypeNo == "001033002" && PbCache.monitorResult.valid_wgt == false && listMonitor.Data[0].validWgt == "1")
@@ -283,7 +283,7 @@ namespace MeterSceneLibrary
                                                         // 只保存一次计量数据
                                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                                         PbCache.voiceType = 1;
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                     }
                                                     else
                                                     {
@@ -293,7 +293,7 @@ namespace MeterSceneLibrary
                                                             // 只保存一次计量数据
                                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                                             PbCache.voiceType = 1;
-                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                         }
                                                         else
                                                         {
@@ -310,7 +310,7 @@ namespace MeterSceneLibrary
                                                                     PbCache.voiceType = 15;
                                                                     PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
                                                                     PbCache.monitorResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成，期限皮不存在或已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                 }
                                                                 else
                                                                 {
@@ -326,7 +326,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo += "，期限皮结净";
                                                                     PbCache.voiceType = 16; 
                                                                     PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                 }
                                                             }
                                                         }
@@ -406,7 +406,7 @@ namespace MeterSceneLibrary
                                                         // 只保存一次计量数据
                                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                                         PbCache.voiceType = 1;
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                     }
                                                     else
                                                     {
@@ -416,7 +416,7 @@ namespace MeterSceneLibrary
                                                             // 只保存一次计量数据
                                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                                             PbCache.voiceType = 1;
-                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                         }
                                                         else
                                                         {
@@ -433,7 +433,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo += "，期限皮不存在或者已过期，请留存期限皮";
                                                                     PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
                                                                     PbCache.monitorResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，期限皮不存在或已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成，期限皮不存在或已过期请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                 }
                                                                 else
                                                                 {
@@ -449,7 +449,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo += "，期限皮结净";
                                                                     PbCache.voiceType = 16;
                                                                     PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                 }
                                                             }
                                                         }
@@ -464,7 +464,7 @@ namespace MeterSceneLibrary
                                             // 只保存一次计量数据
                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                             PbCache.voiceType = 1;
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                     }
                                 }
@@ -570,7 +570,7 @@ namespace MeterSceneLibrary
                                                         rt.resultInfo = "之前存在一个未结净的毛重";
                                                         PbCache.voiceType = 11;
                                                         PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                         PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                         rt.isWarn = true;
                                                         rt.WarnContent = "validWgt";
@@ -584,7 +584,7 @@ namespace MeterSceneLibrary
                                                             rt.resultInfo = "之前存在一个未结净的毛重";
                                                             PbCache.voiceType = 11;
                                                             PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                             PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                             rt.isWarn = true;
                                                             rt.WarnContent = "validWgt";
@@ -602,7 +602,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo = "期限皮过期，之前存在一个未结净的毛重";
                                                                     PbCache.voiceType = 17;
                                                                     PbCache.ResultMessage = "期限皮过期，之前存在一个未结净的毛重";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                     PbCache.monitorResultMessage = "期限皮过期，之前存在一个未结净的毛重";
                                                                     rt.isWarn = true;
                                                                     rt.WarnContent = "validWgt";
@@ -620,7 +620,7 @@ namespace MeterSceneLibrary
                                                                     mwaf.weightType = "0";
                                                                     PbCache.voiceType = 16;
                                                                     PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                     rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
                                                                     rt.resultInfo += "，期限皮结净";
                                                                 }
@@ -712,7 +712,7 @@ namespace MeterSceneLibrary
                                                         rt.resultInfo = "之前存在一个未结净的毛重";
                                                         PbCache.voiceType = 11;
                                                         PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                         PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                         rt.isWarn = true;
                                                         rt.WarnContent = "validWgt";
@@ -726,7 +726,7 @@ namespace MeterSceneLibrary
                                                             rt.resultInfo = "之前存在一个未结净的毛重";
                                                             PbCache.voiceType = 11;
                                                             PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                             PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                             rt.isWarn = true;
                                                             rt.WarnContent = "validWgt";
@@ -744,7 +744,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo = "期限皮过期，之前存在一个未结净的毛重";
                                                                     PbCache.voiceType = 17;
                                                                     PbCache.ResultMessage = "期限皮过期，之前存在一个未结净的毛重";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                     PbCache.monitorResultMessage = "期限皮过期，之前存在一个未结净的毛重";
                                                                     rt.isWarn = true;
                                                                     rt.WarnContent = "validWgt";
@@ -762,7 +762,7 @@ namespace MeterSceneLibrary
                                                                     mwaf.weightType = "0";
                                                                     PbCache.voiceType = 16;
                                                                     PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                     rt = saveMethod.doNetTermTare(rmScale.Data[0], mwaf);
                                                                     rt.resultInfo += "，期限皮结净";
                                                                 }
@@ -780,7 +780,7 @@ namespace MeterSceneLibrary
                                             rt.resultInfo = "之前存在一个未结净的毛重";
                                             PbCache.voiceType = 11;
                                             PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                             PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                             rt.isWarn = true;
                                             rt.WarnContent = "validWgt";
@@ -832,7 +832,7 @@ namespace MeterSceneLibrary
 
                                             rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
                                             PbCache.voiceType = 13;
-                                            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));
+                                            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 (list[0].weightTypeNo == "001033002" && PbCache.monitorResult.valid_wgt == false && listMonitor.Data[0].validWgt == "1")
@@ -930,7 +930,7 @@ namespace MeterSceneLibrary
                                                                 rt.resultInfo = "之前存在一个未结净的毛重";
                                                                 PbCache.voiceType = 11;
                                                                 PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                 PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                                 rt.isWarn = true;
                                                                 rt.WarnContent = "validWgt";
@@ -944,7 +944,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo = "之前存在一个未结净的毛重";
                                                                     PbCache.voiceType = 11;
                                                                     PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                     PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                                     rt.isWarn = true;
                                                                     rt.WarnContent = "validWgt";
@@ -962,7 +962,7 @@ namespace MeterSceneLibrary
                                                                             rt.resultInfo = "期限皮过期，之前存在一个未结净的毛重";
                                                                             PbCache.voiceType = 17;
                                                                             PbCache.ResultMessage = "期限皮过期，之前存在一个未结净的毛重";
-                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                             PbCache.monitorResultMessage = "期限皮过期，之前存在一个未结净的毛重";
                                                                             rt.isWarn = true;
                                                                             rt.WarnContent = "validWgt";
@@ -980,7 +980,7 @@ namespace MeterSceneLibrary
                                                                             mwaf.weightType = "0";
                                                                             PbCache.voiceType = 16;
                                                                             PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                             rt = saveMethod.doNetTermTare(scales.Data[0], mwaf);
                                                                             rt.resultInfo += "，期限皮结净";
                                                                         }
@@ -1072,7 +1072,7 @@ namespace MeterSceneLibrary
                                                                 rt.resultInfo = "之前存在一个未结净的毛重";
                                                                 PbCache.voiceType = 11;
                                                                 PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                 PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                                 rt.isWarn = true;
                                                                 rt.WarnContent = "validWgt";
@@ -1086,7 +1086,7 @@ namespace MeterSceneLibrary
                                                                     rt.resultInfo = "之前存在一个未结净的毛重";
                                                                     PbCache.voiceType = 11;
                                                                     PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                     PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                                     rt.isWarn = true;
                                                                     rt.WarnContent = "validWgt";
@@ -1104,7 +1104,7 @@ namespace MeterSceneLibrary
                                                                             rt.resultInfo = "期限皮过期，之前存在一个未结净的毛重";
                                                                             PbCache.voiceType = 17;
                                                                             PbCache.ResultMessage = "期限皮过期，之前存在一个未结净的毛重";
-                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，期限皮过期，之前存在一个未结净的毛重", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                             PbCache.monitorResultMessage = "期限皮过期，之前存在一个未结净的毛重";
                                                                             rt.isWarn = true;
                                                                             rt.WarnContent = "validWgt";
@@ -1122,7 +1122,7 @@ namespace MeterSceneLibrary
                                                                             mwaf.weightType = "0";
                                                                             PbCache.voiceType = 16;
                                                                             PbCache.ResultMessage = "计量完成，期限皮结净";
-                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
+                                                                            PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，计量完成期限皮结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(PbCache.lockWgt - termTareData.Data.meterWeight.Value) / 1000), 2));
                                                                             rt = saveMethod.doNetTermTare(scales.Data[0], mwaf);
                                                                             rt.resultInfo += "，期限皮结净";
                                                                         }
@@ -1140,7 +1140,7 @@ namespace MeterSceneLibrary
                                                     rt.resultInfo = "之前存在一个未结净的毛重";
                                                     PbCache.voiceType = 11;
                                                     PbCache.ResultMessage = "之前存在一个未结净的毛重";
-                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                                    PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在一个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                     PbCache.monitorResultMessage = "之前存在一个未结净的毛重";
                                                     rt.isWarn = true;
                                                     rt.WarnContent = "validWgt";
@@ -1231,7 +1231,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
                                                                 PbCache.voiceType = 1;
                                                                 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));
+                                                                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
                                                             {
@@ -1245,7 +1245,7 @@ namespace MeterSceneLibrary
                                                                     mwaf.weightType = "0";
                                                                     PbCache.voiceType = 1;
                                                                     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));
+                                                                    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
                                                                 {
@@ -1263,7 +1263,7 @@ namespace MeterSceneLibrary
                                                                         rt = saveMethod.doTermTareNet(rmScale.Data[0], mwaf, firstList[0]);
                                                                         rt.resultInfo += "，留存期限皮成功";
                                                                         PbCache.ResultMessage = "计量成功，留存期限皮成功";
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                                                         //if (termTareData.Data == null)
                                                                         //{
                                                                         // 正常结净
@@ -1389,7 +1389,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
                                                                 PbCache.voiceType = 1;
                                                                 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));
+                                                                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
                                                             {
@@ -1403,7 +1403,7 @@ namespace MeterSceneLibrary
                                                                     mwaf.weightType = "0";
                                                                     PbCache.voiceType = 1;
                                                                     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));
+                                                                    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
                                                                 {
@@ -1421,7 +1421,7 @@ namespace MeterSceneLibrary
                                                                         rt = saveMethod.doTermTareNet(rmScale.Data[0], mwaf, firstList[0]);
                                                                         rt.resultInfo += "，留存期限皮成功";
                                                                         PbCache.ResultMessage = "计量成功，留存期限皮成功";
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                                                         //if (termTareData.Data == null)
                                                                         //{
                                                                         // 正常结净
@@ -1468,7 +1468,7 @@ namespace MeterSceneLibrary
                                                     mwaf.weightType = "0";
                                                     PbCache.voiceType = 1;
                                                     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));
+                                                    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));
                                                 }
                                             }
                                         }
@@ -1504,7 +1504,7 @@ namespace MeterSceneLibrary
                                         mwaf.weightType = "1";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                         PbCache.voiceType = 1;
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     }
                                     else if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033001")
                                     {
@@ -1513,7 +1513,7 @@ namespace MeterSceneLibrary
                                         PbCache.voiceType = 11;
                                         rt.resultInfo = string.Format("之前存在{0}个未结净的毛重", firstList.Count);
                                         PbCache.ResultMessage = string.Format("之前存在{0}个未结净的毛重", firstList.Count);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，之前存在{2}个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), firstList.Count);
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，毛重{1}吨，之前存在{2}个未结净的毛重，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), firstList.Count);
                                         PbCache.monitorResultMessage = string.Format("之前存在{0}个未结净的毛重", firstList.Count);
                                         rt.isWarn = true;
                                         rt.WarnContent = "validWgt";
@@ -1577,7 +1577,7 @@ namespace MeterSceneLibrary
                                             mwaf.valueFlag = "0";
                                             PbCache.voiceType = 1;
                                             rt = saveMethod.doAddFirst(null, mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         else
                                         {
@@ -1678,7 +1678,7 @@ namespace MeterSceneLibrary
                                                             mwaf.weightType = "0";
                                                             PbCache.voiceType = 1;
                                                             rt = saveMethod.doNet(scales.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));
+                                                            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
                                                         {
@@ -1691,7 +1691,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
                                                                 PbCache.voiceType = 1;
                                                                 rt = saveMethod.doNet(scales.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));
+                                                                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
                                                             {
@@ -1710,7 +1710,7 @@ namespace MeterSceneLibrary
                                                                     rt = saveMethod.doTermTareNet(scales.Data[0], firstList[0], mwaf);
                                                                     rt.resultInfo += "，留存期限皮成功";
                                                                     PbCache.ResultMessage = "计量成功，留存期限皮成功";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                                                     //if (termTareData.Data == null)
                                                                     //{
                                                                     //    // 正常结净
@@ -1837,7 +1837,7 @@ namespace MeterSceneLibrary
                                                             mwaf.weightType = "0";
                                                             PbCache.voiceType = 1;
                                                             rt = saveMethod.doNet(scales.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));
+                                                            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
                                                         {
@@ -1850,7 +1850,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
                                                                 PbCache.voiceType = 1;
                                                                 rt = saveMethod.doNet(scales.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));
+                                                                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
                                                             {
@@ -1869,7 +1869,7 @@ namespace MeterSceneLibrary
                                                                     rt = saveMethod.doTermTareNet(scales.Data[0], firstList[0], mwaf);
                                                                     rt.resultInfo += "，留存期限皮成功";
                                                                     PbCache.ResultMessage = "计量成功，留存期限皮成功";
-                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                                                    PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，净重{2}吨，留存期限皮成功", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                                                     //if (termTareData.Data == null)
                                                                     //{
                                                                     //    // 正常结净
@@ -1918,7 +1918,7 @@ namespace MeterSceneLibrary
                                                 mwaf.weightType = "0";
                                                 PbCache.voiceType = 1;
                                                 rt = saveMethod.doNet(scales.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));
+                                                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
@@ -2170,7 +2170,7 @@ namespace MeterSceneLibrary
                                             PbCache.voiceType = 9;
                                             PbCache.ResultMessage = "计量成功，留存期限皮成功";
                                             PbCache.monitorResultMessage = string.Format("计量成功，留存期限皮成功");
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         else if (countTerm == firstList.Count)
                                         {
@@ -2183,7 +2183,7 @@ namespace MeterSceneLibrary
                                             mwaf.weightType = "0";
                                             PbCache.voiceType = 1;
                                             rt = saveMethod.doNet(scales.Data[0], firstList[0], mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，存在多个毛重未结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，净重{2}吨，存在多个毛重未结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(firstList[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                             PbCache.monitorResultMessage = string.Format("车号{0}有{1}条未结净的毛重；", PbCache.lockCarNo,firstList.Count-1);
                                         }
                                         else
@@ -2192,7 +2192,7 @@ namespace MeterSceneLibrary
                                             PbCache.voiceType = 11;
                                             rt.resultInfo += "，存在多个毛重未结净";
                                             PbCache.ResultMessage = "计量成功，存在多个毛重未结净";
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，存在多个毛重未结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，皮重{1}吨，计量完成，存在多个毛重未结净", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                             PbCache.monitorResultMessage = string.Format("车号{0}使用期限皮同时结净{1}条毛重数据，还有{2}条未结净的毛重；", PbCache.lockCarNo, firstList.Count - countTerm,countTerm);
                                         }
                                     }