1. 分包汇总，工程量清单，不匹配单价

2. 导入分包汇总，工程量清单，不匹配单价

SubTenderGatherGcl/stgGatherGclCacheData.pas

@@ -282,8 +282,8 @@ begin
   begin
     vGcl := TstgGatherGcl(FGatherGcls.Items[i]);
     bMatch := (vGcl.B_Code = ARec.B_Code.AsString) and (vGcl.Name = ARec.Name.AsString)
-      and (vGcl.Units = ARec.Units.AsString)
-      and (CommonRoundTo(vGcl.Price - ARec.Price.AsFloat, -6) = 0);
+      and (vGcl.Units = ARec.Units.AsString);
+      //and (CommonRoundTo(vGcl.Price - ARec.Price.AsFloat, -6) = 0);
     if bMatch then
     begin
       Result := vGcl;

SubTenderGatherGcl/stgGclSubGatherFile.pas

@@ -228,8 +228,9 @@ procedure TstgGclSubGatherFileImportor.ImportGatherData(
       if (vNode.HasChildren) then Continue;
       if (vNode.Rec.B_Code.AsString = ARec.ValueByName('B_Code').AsString) and
          (vNode.Rec.Name.AsString = ARec.ValueByName('Name').AsString) and
-         (vNode.Rec.Units.AsString = ARec.ValueByName('Units').AsString) and
-         (CommonRoundTo(vNode.Rec.Price.AsFloat - ARec.ValueByName('Price').AsFloat, -6) = 0) then
+         (vNode.Rec.Units.AsString = ARec.ValueByName('Units').AsString) then
+         //(vNode.Rec.Units.AsString = ARec.ValueByName('Units').AsString) and
+         //(CommonRoundTo(vNode.Rec.Price.AsFloat - ARec.ValueByName('Price').AsFloat, -6) = 0) then
       begin
         Result := vNode;
         Break;
@@ -386,8 +387,9 @@ procedure TstgGclSubGatherFileExcelImportor.LoadGatherData(
       if (vNode.HasChildren) then Continue;
       if (vNode.Rec.B_Code.AsString = AB_Code) and
          (vNode.Rec.Name.AsString = AName) and
-         (vNode.Rec.Units.AsString = AUnits) and
-         (CommonRoundTo(vNode.Rec.Price.AsFloat - APrice, -6) = 0) then
+         (vNode.Rec.Units.AsString = AUnits) then
+         //(vNode.Rec.Units.AsString = AUnits) and
+         //(CommonRoundTo(vNode.Rec.Price.AsFloat - APrice, -6) = 0) then
       begin
         Result := vNode;
         Break;