Merge branch '10.1.0' of http://192.168.1.41:3000/SmartCost/SmartCost into 10.1.0

Common/ScFileArchiverConsts.pas

@@ -61,7 +61,7 @@ const
   // 版本基线（EXE与文件同步）（用于限制此版本号之前的exe打开本文件）
   {$IFDEF _ScGuangDong}
   // 2023-02-23 广东版新增功能，需要限制旧版本，这里分开
-  ConstLineVersion = '10.1.4.0';
+  ConstLineVersion = '10.1.5.0';
   {$ELSE}
   ConstLineVersion = '10.1.3.321';
   {$ENDIF}

DPRs/CSL/SmartCost_GuangDong.dof

@@ -114,8 +114,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=10
 MinorVer=4
-Release=613
-Build=72
+Release=612
+Build=73
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=广东公路造价编审系统
-FileVersion=10.4.613.72
+FileVersion=10.4.612.73
 InternalName=SmartCost
 LegalCopyright=版权所有(C) 珠海纵横创新软件有限公司 2003-2014。保留所有权利。
 LegalTrademarks=SmartCost
@@ -136,6 +136,7 @@ ProductVersion=9
 Comments=
 [Excluded Packages]
 c:\program files (x86)\borland\delphi7\Bin\DBWEBXPRT.BPL=Borland Web Wizard Package
+D:\Work\Delphi\SmartCost\Components\Lib\BackupTools_d7.bpl=Components for Backup
 [HistoryLists\hlConditionals]
 Count=7
 Item0=_ScYS2007;_ScGuangDong;_ScEncrypt1;_ScGDProjectProfessional1;_ScOnline1;_ScFixedBills1

MainModule/UI/ScSearchAndReplaceView.dfm

@@ -62,7 +62,7 @@ object frmSearchAndReplace: TfrmSearchAndReplace
         Align = alBottom
         Alignment = taLeftJustify
         BevelOuter = bvNone
-        Caption = #21512#35745#65306
+        Caption = #12304#37329#39069#21512#35745#12305
         Color = clWindow
         TabOrder = 1
       end
@@ -81,7 +81,7 @@ object frmSearchAndReplace: TfrmSearchAndReplace
         Height = 422
         Options = [goRangeSelect, goRowSizing, goColSizing, goCellNotMaintainData, goFixedRowShowNo, goFixedColShowNo, goAlwaysShowSelection]
         OptionsEx = []
-        ColCount = 7
+        ColCount = 8
         RowCount = 20
         ShowGridLine = False
         DefaultColWidth = 73
@@ -103,7 +103,7 @@ object frmSearchAndReplace: TfrmSearchAndReplace
         Align = alBottom
         Alignment = taLeftJustify
         BevelOuter = bvNone
-        Caption = #37327#20215#21512#35745#65306
+        Caption = #12304#37329#39069#21512#35745#12305
         Color = clWindow
         TabOrder = 1
       end
@@ -793,12 +793,12 @@ object frmSearchAndReplace: TfrmSearchAndReplace
     Left = 232
     Top = 231
     Data = {
-      B30A00009619E0BD01000000180000000C000000000003000000B30A08536572
+      EF0A00009619E0BD01000000180000000C000000000003000000EF0A08536572
       69616C4E6F0400010000000000024944040001000000000006425F436F646502
-      004A000000290007535542545950450200490001000005574944544802000200
+      004A0000002A0007535542545950450200490001000005574944544802000200
       FE01075355425459504502004900010000075355425459504502004900010000
-      0753554254595045020049000900576964655465787400075355425459504502
-      0049000100000753554254595045020049000100000753554254595045020049
+      0753554254595045020049000100000753554254595045020049000900576964
+      6554657874000753554254595045020049000100000753554254595045020049
       0001000007535542545950450200490001000007535542545950450200490001
       0000075355425459504502004900010000075355425459504502004900010000
       0753554254595045020049000100000753554254595045020049000100000753
@@ -814,11 +814,11 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       5950450200490001000007535542545950450200490001000007535542545950
       4502004900010000075355425459504502004900010000075355425459504502
       0049000100000753554254595045020049000100000753554254595045020049
-      0001000007535542545950450200490001000004436F646501004A0000002900
-      0753554254595045020049000100000557494454480200020064000753554254
-      5950450200490001000007535542545950450200490001000007535542545950
-      4502004900090057696465546578740007535542545950450200490001000007
-      5355425459504502004900010000075355425459504502004900010000075355
+      0001000007535542545950450200490001000007535542545950450200490001
+      000004436F646501004A0000002A000753554254595045020049000100000557
+      4944544802000200640007535542545950450200490001000007535542545950
+      4502004900010000075355425459504502004900010000075355425459504502
+      0049000900576964655465787400075355425459504502004900010000075355
       4254595045020049000100000753554254595045020049000100000753554254
       5950450200490001000007535542545950450200490001000007535542545950
       4502004900010000075355425459504502004900010000075355425459504502
@@ -834,11 +834,11 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       0100000753554254595045020049000100000753554254595045020049000100
       0007535542545950450200490001000007535542545950450200490001000007
       5355425459504502004900010000075355425459504502004900010000075355
-      425459504502004900010000044E616D6502004A000000290007535542545950
-      4502004900010000055749445448020002000001075355425459504502004900
-      0100000753554254595045020049000100000753554254595045020049000900
-      5769646554657874000753554254595045020049000100000753554254595045
-      0200490001000007535542545950450200490001000007535542545950450200
+      4254595045020049000100000753554254595045020049000100000753554254
+      59504502004900010000044E616D6502004A0000002A00075355425459504502
+      0049000100000557494454480200020000010753554254595045020049000100
+      0007535542545950450200490001000007535542545950450200490001000007
+      5355425459504502004900090057696465546578740007535542545950450200
       4900010000075355425459504502004900010000075355425459504502004900
       0100000753554254595045020049000100000753554254595045020049000100
       0007535542545950450200490001000007535542545950450200490001000007
@@ -854,14 +854,14 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       5459504502004900010000075355425459504502004900010000075355425459
       5045020049000100000753554254595045020049000100000753554254595045
       0200490001000007535542545950450200490001000007535542545950450200
-      4900010000085175616E74697479080004000000000009556E69745072696365
-      08000400000000000A546F74616C507269636508000400000000000449734D45
-      020003000000000005556E69747302004A000000290007535542545950450200
-      490001000005574944544802000200FE01075355425459504502004900010000
-      0753554254595045020049000100000753554254595045020049000900576964
-      6554657874000753554254595045020049000100000753554254595045020049
-      0001000007535542545950450200490001000007535542545950450200490001
-      0000075355425459504502004900010000075355425459504502004900010000
+      4900010000075355425459504502004900010000075355425459504502004900
+      010000075355425459504502004900010000085175616E746974790800040000
+      00000009556E6974507269636508000400000000000A546F74616C5072696365
+      08000400000000000449734D45020003000000000005556E69747302004A0000
+      002A0007535542545950450200490001000005574944544802000200FE010753
+      5542545950450200490001000007535542545950450200490001000007535542
+      5459504502004900010000075355425459504502004900090057696465546578
+      7400075355425459504502004900010000075355425459504502004900010000
       0753554254595045020049000100000753554254595045020049000100000753
       5542545950450200490001000007535542545950450200490001000007535542
       5459504502004900010000075355425459504502004900010000075355425459
@@ -876,9 +876,11 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       4502004900010000075355425459504502004900010000075355425459504502
       0049000100000753554254595045020049000100000753554254595045020049
       0001000007535542545950450200490001000007535542545950450200490001
-      00000E44657369676E5175616E74697479080004000000010007535542545950
-      450200490006004D6F6E6579000B44657369676E507269636508000400000001
-      0007535542545950450200490006004D6F6E6579000000}
+      0000075355425459504502004900010000075355425459504502004900010000
+      0753554254595045020049000100000753554254595045020049000100000E44
+      657369676E5175616E7469747908000400000001000753554254595045020049
+      0006004D6F6E6579000B44657369676E50726963650800040000000100075355
+      42545950450200490006004D6F6E6579000000}
     object cdsBillsSerialNo: TIntegerField
       FieldName = 'SerialNo'
     end
@@ -1190,6 +1192,24 @@ object frmSearchAndReplace: TfrmSearchAndReplace
         ReadOnly = True
       end
       item
+        Title.Caption = #21333#20215
+        Title.CaptionAcrossCols = '1'
+        Title.Font.Charset = GB2312_CHARSET
+        Title.Font.Color = clWindowText
+        Title.Font.Height = -12
+        Title.Font.Name = #23435#20307
+        Title.Font.Style = []
+        Alignment = taRightJustify
+        Font.Charset = GB2312_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -12
+        Font.Name = #23435#20307
+        Font.Style = []
+        FieldName = 'UnitPrice'
+        Width = 50
+        ReadOnly = True
+      end
+      item
         Title.Caption = #22522#20215
         Title.CaptionAcrossCols = '1'
         Title.Font.Charset = GB2312_CHARSET
@@ -1308,6 +1328,10 @@ object frmSearchAndReplace: TfrmSearchAndReplace
         Name = 'AdjustState'
         DataType = ftWideString
         Size = 255
+      end
+      item
+        Name = 'UnitPrice'
+        DataType = ftFloat
       end>
     IndexDefs = <>
     Params = <>
@@ -1315,7 +1339,7 @@ object frmSearchAndReplace: TfrmSearchAndReplace
     Left = 232
     Top = 272
     Data = {
-      830100009619E0BD010000001800000011000000000003000000830102494404
+      950100009619E0BD010000001800000012000000000003000000950102494404
       00010000000000054C69624944040001000000000004436F646501004A000000
       01000557494454480200020064000B42696C6C734974656D4944040001000000
       0000084D61736B4E616D6501004A000000010005574944544802000200640004
@@ -1327,7 +1351,7 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       03000000000009426173655072696365080004000000000007556E6974466565
       01004A000000010005574944544802000200280008546F74616C466565080004
       00000000000B41646A757374537461746502004A000000010005574944544802
-      000200FE010000}
+      000200FE0109556E6974507269636508000400000000000000}
     object cdsRationsID: TIntegerField
       FieldName = 'ID'
       ProviderFlags = [pfInUpdate, pfInWhere, pfInKey]
@@ -1387,6 +1411,9 @@ object frmSearchAndReplace: TfrmSearchAndReplace
       FieldName = 'AdjustState'
       Size = 255
     end
+    object cdsRationsUnitPrice: TFloatField
+      FieldName = 'UnitPrice'
+    end
   end
   object zdGLJ: TZjGridDBA
     Columns = <

MainModule/UI/ScSearchAndReplaceView.pas

@@ -151,6 +151,7 @@ type
     cdsRationsUnitFee: TWideStringField;
     cdsRationsTotalFee: TFloatField;
     cdsRationsAdjustState: TWideStringField;
+    cdsRationsUnitPrice: TFloatField;
     procedure cdsRationsTypeGetText(Sender: TField; var Text: String;
       DisplayText: Boolean);
     procedure zgRationsMouseDown(Sender: TObject; Button: TMouseButton;
@@ -611,13 +612,14 @@ var
   sdRation: TScRationRecord;
   sFiledValue: String;
   vGLJ: TScGLJRecord;
-  fSumT: Double;
+  fSumT, fSumQ: Double;
 begin
   try
     Screen.Cursor := crHourGlass;
     cdsRations.DisableControls;
 
     fSumT := 0;
+    fSumQ := 0;
     for I := 0 to FProject.Rations.sdsRations.RecordCount - 1 do
     begin
       sdRation := TScRationRecord(FProject.Rations.sdsRations[I]);
@@ -645,6 +647,10 @@ begin
         cdsRationsMaskName.AsString := sdRation.MaskName.AsString;
         cdsRationsUnit.AsString := ConvertUnitStr(sdRation.Units.AsString);
         cdsRationsQuantity.AsFloat := sdRation.Quantity.AsFloat;
+        if rbCountPrice.Checked or rbDevices.Checked then
+          cdsRationsUnitPrice.AsFloat := sdRation.UnitDirectFee.AsFloat
+        else
+          cdsRationsUnitPrice.AsFloat := sdRation.BuildingUnitPrice.AsFloat;
         cdsRationsType.AsInteger := sdRation.RationType.AsInteger;
         cdsRationsCodeForReport.AsString := sdRation.CodeForReport.AsString;
         cdsRationsSerialNo.AsInteger := sdRation.SerialNo.AsInteger;
@@ -667,20 +673,21 @@ begin
 
 
         fSumT := fSumT + sdRation.BuildingFee.AsFloat;
+        fSumQ := fSumQ + sdRation.Quantity.AsFloat;
       end;
     end;
     cdsRations.First;
 
-    if (rbCountPrice.Checked or rbDevices.Checked) then
-    begin
-      pnlSumRation.Visible := True;
-      pnlSumRation.Caption := Format('¡¾½ð¶îºÏ¼Æ¡¿%g', [fSumT]);
-    end
-    else
-    begin
-      pnlSumRation.Visible := False;
-    end;
-
+//    if (rbCountPrice.Checked or rbDevices.Checked) then
+//    begin
+//      pnlSumRation.Visible := True;
+//      pnlSumRation.Caption := Format('¡¾½ð¶îºÏ¼Æ¡¿%g', [fSumT]);
+//    end
+//    else
+//    begin
+//      pnlSumRation.Visible := False;
+//    end;
+    pnlSumRation.Caption := Format('¡¾½ð¶îºÏ¼Æ¡¿%g ¡¾ÊýÁ¿ºÏ¼Æ¡¿%g', [fSumT, fSumQ]);
   finally
     cdsRations.EnableControls;
     Screen.Cursor := crDefault;