duyong 3 лет назад
Родитель
Сommit
59b4c1e80b
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      MeterSceneLibrary/JISCO/InnerCarJISCO.cs

+ 3 - 3
MeterSceneLibrary/JISCO/InnerCarJISCO.cs

@@ -357,7 +357,7 @@ namespace MeterSceneLibrary
                                     {
                                     {
                                         // 历史皮重验证
                                         // 历史皮重验证
                                         rt = saveMethod.validHisTare2(list[0].weightTypeNo);
                                         rt = saveMethod.validHisTare2(list[0].weightTypeNo);
-                                        if (PbCache.monitorResult.valid_wgt == false && listMonitor.Data[0].validWgt == "1")
+                                        if (PbCache.monitorResult.valid_wgt == false || listMonitor.Data[0].validWgt == "0")
                                         {
                                         {
                                             //判断称点是否允许期限皮重
                                             //判断称点是否允许期限皮重
                                             if (PbCache.sportInfo.allowedTareWeight == "1")
                                             if (PbCache.sportInfo.allowedTareWeight == "1")
@@ -677,7 +677,7 @@ namespace MeterSceneLibrary
                                     //多条一次记录下判断是否全为毛重,是全部结净
                                     //多条一次记录下判断是否全为毛重,是全部结净
                                     if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033002")
                                     if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033002")
                                     {
                                     {
-                                        if (PbCache.monitorResult.valid_wgt == false && listMonitor.Data[0].validWgt == "1")
+                                        if (PbCache.monitorResult.valid_wgt == true || listMonitor.Data[0].validWgt == "0")
                                         {
                                         {
                                             mwaf.weightType = "1";
                                             mwaf.weightType = "1";
                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
@@ -698,7 +698,7 @@ namespace MeterSceneLibrary
                                     }
                                     }
                                     else if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033001")
                                     else if (firstList[firstList.Count - 1].weightType == "0" && list[0].weightTypeNo == "001033001")
                                     {
                                     {
-                                        if (PbCache.monitorResult.valid_wgt == false && listMonitor.Data[0].validWgt == "1")
+                                        if (PbCache.monitorResult.valid_wgt == false || listMonitor.Data[0].validWgt == "0")
                                         {
                                         {
                                             mwaf.weightType = "0";
                                             mwaf.weightType = "0";
                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);
                                             rt = saveMethod.doAddFirst(rmScale.Data[0], mwaf);