Merge branch 'master' of https://git.steerinfo.com/caol/jisco_winform_wzjl.git

MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -154,7 +154,7 @@ namespace MeterSceneLibrary
                                         */
                                         mwaf.weightType = "1";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                        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)
@@ -192,7 +192,7 @@ namespace MeterSceneLibrary
                                             {
                                                 mwaf.weightType = "0";
                                                 rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                             }
                                             // 有期限皮重权限 
                                             else if (tareCarResult.Data.Count >= 1)
@@ -226,7 +226,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
                                                                 // 只保存一次计量数据
                                                                 rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                             }
                                                             else
                                                             {
@@ -240,7 +240,7 @@ namespace MeterSceneLibrary
                                                                         // 只保存一次计量数据
                                                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                                                         PbCache.ResultMessage = "计量成功，期限皮不存在或者已过期，请留存期限皮";
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成,期限皮不存在或者已过期，请留存期限皮", PbCache.lockCarNo, PbCache.lockWgt);
+                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成,期限皮不存在或者已过期，请留存期限皮", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                                     }
                                                                     else
                                                                     {
@@ -253,6 +253,9 @@ namespace MeterSceneLibrary
                                                                         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);
                                                                     }
                                                                 }
@@ -264,7 +267,7 @@ namespace MeterSceneLibrary
                                                         mwaf.weightType = "0";
                                                         // 只保存一次计量数据
                                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                                     }
                                                 }
                                             }
@@ -335,7 +338,8 @@ namespace MeterSceneLibrary
                                             mwaf.isPreScale = "1";
 
                                             rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                            
+                                            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)
@@ -376,7 +380,7 @@ namespace MeterSceneLibrary
                                                         mwaf.weightType = "0";
 
                                                         rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
-                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                                        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 (tareCarResult.Data.Count >= 1)
@@ -416,7 +420,7 @@ namespace MeterSceneLibrary
                                                                         mwaf.weightType = "0";
 
                                                                         rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
-                                                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                                                        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
                                                                     {
@@ -435,6 +439,10 @@ namespace MeterSceneLibrary
                                                                                 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
                                                                             {
@@ -447,6 +455,9 @@ namespace MeterSceneLibrary
                                                                                 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);
                                                                             }
                                                                         }
@@ -463,7 +474,7 @@ namespace MeterSceneLibrary
                                                                 mwaf.weightType = "0";
 
                                                                 rt = saveMethod.doNet(rmScale.Data[0], firstList[0], mwaf);
-                                                                PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                                                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));
                                                             }
                                                         }
                                                     }
@@ -485,7 +496,7 @@ namespace MeterSceneLibrary
                                     {
                                         mwaf.weightType = "0";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     }
                                     else
                                     {
@@ -505,7 +516,7 @@ namespace MeterSceneLibrary
                                     {
                                         mwaf.weightType = "1";
                                         rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                        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")
                                     {
@@ -547,7 +558,7 @@ namespace MeterSceneLibrary
                                             //正常保存一次数据
                                             mwaf.weightType = "1";
                                             rt = saveMethod.doAddFirst(null, mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         else
                                         {
@@ -569,7 +580,7 @@ namespace MeterSceneLibrary
                                             mwaf.weightType = "1";
                                             mwaf.valueFlag = "0";
                                             rt = saveMethod.doAddFirst(null, mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         else
                                         {
@@ -588,7 +599,7 @@ namespace MeterSceneLibrary
                                         {
                                             //匹配结净
                                             rt = saveMethod.doNet(null, firstList[0], mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmFirst.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                            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
                                         {

MeterSceneLibrary/JISCO/OuterCarJISCO.cs

@@ -100,7 +100,7 @@ namespace MeterSceneLibrary
                             PbCache.isActual = true;
                             PbCache.isInnerCar = true;
                             rt = saveMethod.doAddFirst(null, mwaf);
-                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成",PbCache.lockCarNo,PbCache.lockWgt);
+                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成",PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2)); 
                         }
                         // 存在一条使用中的委托
                         else if (listPreScale.Count == 1 && listPreScale[0].valueFlag == "4")
@@ -137,7 +137,7 @@ namespace MeterSceneLibrary
                                     PbCache.isActual = true;
                                     PbCache.isInnerCar = true;
                                     rt = saveMethod.doAddFirst(listPreScale[0] , mwaf);
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                 }
                                 else
                                 {
@@ -150,7 +150,7 @@ namespace MeterSceneLibrary
                                         PbCache.isActual = true;
                                         PbCache.isInnerCar = true;
                                         rt = saveMethod.doAddFirst(null, mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     }
                                     // 上次净重已匹配委托 
                                     else if (lastMeterWorkCarActual.isPreScale == "1")
@@ -332,7 +332,7 @@ namespace MeterSceneLibrary
                                             PbCache.isActual = true;
                                             PbCache.isInnerCar = true;
                                             rt = saveMethod.doAddFirst(listPreScale[0], mwaf);
-                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         }
                                         
                                     }
@@ -350,7 +350,7 @@ namespace MeterSceneLibrary
                                         PbCache.isActual = true;
                                         PbCache.isInnerCar = true;
                                         rt = saveMethod.doAddFirst(listPreScale[0], mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     }
                                 }
 
@@ -363,7 +363,7 @@ namespace MeterSceneLibrary
                         else if (listPreScale.Count == 2 && listPreScale[0].valueFlag == "4" && listPreScale[1].valueFlag == "4")
                         {
                             rt = saveMethod.doAddFirst(null, mwaf);
-                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成", PbCache.lockCarNo, PbCache.lockWgt);
+                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                         }
                         // 存在多条委托
                         else if (listPreScale.Count > 1)
@@ -399,7 +399,7 @@ namespace MeterSceneLibrary
                             PbCache.isActual = true;
                             PbCache.isInnerCar = true;
                             rt = saveMethod.doAddFirst(pre, mwaf);
-                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                            PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                             PbCache.monitorResultMessage = string.Format("计量完成，车号{0}存在{1}个委托，无法自动匹配", PbCache.lockCarNo, listPreScale.Count);
                             if (res != "")
                             {
@@ -449,7 +449,7 @@ namespace MeterSceneLibrary
                                     rt.isWarn = true;
                                     rt.WarnContent = "validIsPre";
                                     rt.resultInfo += "，无委托洁净";
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，无委托洁净，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成，无委托洁净，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                     PbCache.monitorResultMessage = string.Format("计量完成，车号{0}无委托洁净", PbCache.lockCarNo, listPreScale.Count);
 
                                 }
@@ -475,7 +475,7 @@ namespace MeterSceneLibrary
                                     mwaf.isPreScale = "1";
 
                                     rt = saveMethod.doNet(listPreScale[0], rmX.Data[0], mwaf);
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                 }
                                 // 如果存在两条未使用的委托
                                 else if (listPreScale.Count == 2 && listPreScale[0].valueFlag == "1" && listPreScale[1].valueFlag == "1")
@@ -519,7 +519,7 @@ namespace MeterSceneLibrary
                                         mwaf.isPreScale = "1";
 
                                         rt = saveMethod.doNet(listPreScale[0], mwca, mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                     }
                                     // 不满足以上逻辑
                                     else
@@ -534,7 +534,7 @@ namespace MeterSceneLibrary
                                         rt.isWarn = true;
                                         rt.WarnContent = "validIsPre";
                                         rt.resultInfo += "，存在多个委托，无法自动匹配";
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                         PbCache.monitorResultMessage = string.Format("计量完成，车号{0}存在{1}个委托，无法自动匹配", PbCache.lockCarNo, listPreScale.Count);
                                     }
                                 }
@@ -582,7 +582,7 @@ namespace MeterSceneLibrary
                                     rt.isWarn = true;
                                     rt.WarnContent = "validIsPre";
                                     rt.resultInfo += "，存在多个委托，无法自动匹配";
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     PbCache.monitorResultMessage = string.Format("计量完成，车号{0}存在{1}个委托，无法自动匹配", PbCache.lockCarNo, listPreScale.Count);
                                 }
                             }
@@ -613,7 +613,7 @@ namespace MeterSceneLibrary
                                     mwaf.isPreScale = "1";
 
                                     rt = saveMethod.doNet(pts, oldCarActural, mwaf);
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
 
                                     rt.result = true;
                                     rt.resultInfo = "称重完成";
@@ -670,7 +670,7 @@ namespace MeterSceneLibrary
                                         mwaf.isPreScale = "1";
 
                                         rt = saveMethod.doNet(listPreScale[0], mwca, mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                     }
                                     // 不满足以上逻辑
                                     else
@@ -710,7 +710,7 @@ namespace MeterSceneLibrary
                                         mwaf.isPreScale = "1";
 
                                         rt = saveMethod.doNet(pts, oldCarActural, mwaf);
-                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，净重{2}，计量完成", PbCache.lockCarNo, PbCache.lockWgt, Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt));
+                                        PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，净重{2}吨，计量完成", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2), Math.Round((Math.Abs(rmX.Data[0].meterWeight.Value - PbCache.lockWgt) / 1000), 2));
                                         PbCache.monitorResultMessage = string.Format("计量完成，在洁净时仍然存在{1}个委托）", PbCache.lockCarNo, listPreScale.Count-1);
 
                                         rt.result = true;
@@ -723,7 +723,7 @@ namespace MeterSceneLibrary
                                     rt.isWarn = true;
                                     rt.WarnContent = "validIsPre";
                                     rt.resultInfo += "，存在多个委托，无法自动匹配";
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     PbCache.monitorResultMessage = string.Format("计量完成，车号{0}存在{1}个委托，无法自动匹配", PbCache.lockCarNo, listPreScale.Count);
                                 }
                                 // 存在多条未使用的委托数据
@@ -733,7 +733,7 @@ namespace MeterSceneLibrary
                                     rt.isWarn = true;
                                     rt.WarnContent = "validIsPre";
                                     rt.resultInfo += "，存在多个委托，无法自动匹配";
-                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, PbCache.lockWgt);
+                                    PbCache.LEDResultMessage = string.Format("车号{0}，重量{1}吨，计量完成，多委托无法自动匹配，请联系", PbCache.lockCarNo, Math.Round((PbCache.lockWgt / 1000), 2));
                                     PbCache.monitorResultMessage = string.Format("计量完成，车号{0}存在{1}个委托，无法自动匹配", PbCache.lockCarNo, listPreScale.Count);
                                 }
                             }