1. 导入云版文件，应导入批复编号列

2. 中间计量，计量汇总模式，记录用户输入

DataModules/ZJJLDm.pas

@@ -156,6 +156,7 @@ begin
   sddHistory.Open;
   sddHistory.AddIndex('idxID', 'ID');
   sddHistory.AddIndex('idxHistory', 'BillsID;Type;FieldName');
+  sddHistory.AddIndex('idxGatherHistory', 'BillsID;Type;B_Code;Name;Units;Price;FieldName');
 
   sdpZJJLDetail.Connection := AConnection;
   sddZJJLDetail.Open;
@@ -785,7 +786,7 @@ procedure TZJJLData.GenerateAllByB_CodeGather;
   var
     HistoryRec: TsdDataRecord;
   begin
-    HistoryRec := sddHistory.FindKey('idxHistory', VarArrayOf([AZJJL.GatherNode.ID, AZJJL.B_Code, AZJJL.Name, AZJJL.Units, AZJJL.Price, Integer(ztGclGather), AFieldName]));
+    HistoryRec := sddHistory.FindKey('idxGatherHistory', VarArrayOf([AZJJL.GatherNode.ID, Integer(ztGclGather), AZJJL.B_Code, AZJJL.Name, AZJJL.Units, AZJJL.Price, AFieldName]));
     if Assigned(HistoryRec) then
       Result := HistoryRec.ValueByName('FieldValue').AsString
     else

Units/ProjectData.pas

@@ -1252,13 +1252,13 @@ procedure TProjectData.ImportCloudTenderFile(const AFileName: string);
                 '    OrgQuantity, OrgTotalPrice, MisQuantity, MisTotalPrice, OthQuantity, OthTotalPrice,' +
                 '    CalcType,' +
                 '    DgnQuantity1, DgnQuantity2,'+
-                '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo)'+
+                '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo, ApprovalCode)'+
                 '  Select ID, ParentID, NextSiblingID,'+
                 '    Code, B_Code, Name, Units, Alias, Price, NewPrice,' +
                 '    OrgQuantity, OrgTotalPrice, MisQuantity, MisTotalPrice, OthQuantity, OthTotalPrice,' +
                 '    CalcType,' +
                 '    DgnQuantity1, DgnQuantity2,'+
-                '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo'+
+                '    Peg, DrawingCode, MemoStr, HasBookMark, MarkMemo, ApprovalCode'+
                 '  From Bills In ''%s''';
 
     sDealBillsSql = 'Insert Into DealBills Select ID, B_Code, Name, Units, Price, Quantity, TotalPrice'+