Merge branch 'master' of http://192.168.1.12:3000/maixinrong/measure

DataModules/BillsCompileDm.pas

@@ -677,7 +677,7 @@ procedure TBillsCompileData.sdvBillsCompileSetText(var Text: String;
 begin
   if not Assigned(AValue) then Exit;
   // 修改后数据与原数据相同则不提交
-  if AValue.AsString = Text then Exit;
+  if (AValue.AsString = Text) or ((AValue.AsFloat = 0) and (Text = '')) then Exit;
 
   CheckLockedData;
   if not Allow then Exit;

DataModules/BillsMeasureDm.pas

@@ -405,6 +405,8 @@ procedure TBillsMeasureData.sdvBillsMeasureSetText(var Text: String;
 
 begin
   if not Assigned(AValue) then Exit;
+  // 修改后数据与原数据相同则不提交
+  if (AValue.AsString = Text) or ((AValue.AsFloat = 0) and (Text = '')) then Exit;
 
   CheckLockedData;
   if not Allow then Exit;