Selaa lähdekoodia

Task #1372 变更令,开放复制整块(原仅可在测试环境可用),并复制变更性质数据

MaiXinRong 8 vuotta sitten
vanhempi
commit
f26f5b6e8b
3 muutettua tiedostoa jossa 8 lisäystä ja 4 poistoa
  1. 3 3
      DataModules/BGLDm.pas
  2. 0 1
      Frames/BGLFme.dfm
  3. 5 0
      Units/BGLClipboard.pas

+ 3 - 3
DataModules/BGLDm.pas

@@ -55,7 +55,8 @@ type
     cdsBGLDrawingCode: TWideStringField;
     cdsBGLApprovalCode: TWideStringField;
     cdsBGLCreatePhaseID: TIntegerField;
-    cdsBGLExecutionRate: TFloatField;
+    cdsBGLExecutionRate: TFloatField; 
+    cdsBGLBGLType: TWideStringField;
 
     cdsBGLView: TClientDataSet;
     cdsBGLViewID: TIntegerField;
@@ -68,6 +69,7 @@ type
     cdsBGLViewApprovalCode: TWideStringField;
     cdsBGLViewCreatePhaseID: TIntegerField;
     cdsBGLViewExecutionRate: TFloatField;
+    cdsBGLViewBGLType: TWideStringField;
 
     dsBGL: TDataSource;
 
@@ -94,8 +96,6 @@ type
     cdsBGBillsViewQuantity: TFloatField;
     cdsBGBillsViewTotalPrice: TFloatField;
     cdsBGBillsViewUsedQuantity: TFloatField;
-    cdsBGLBGLType: TWideStringField;
-    cdsBGLViewBGLType: TWideStringField;
     procedure cdsBGBillsViewAfterInsert(DataSet: TDataSet);
     procedure cdsBGBillsViewAfterPost(DataSet: TDataSet);
     procedure cdsBGBillsViewQuantityChange(Sender: TField);

+ 0 - 1
Frames/BGLFme.dfm

@@ -494,7 +494,6 @@ object BGLFrame: TBGLFrame
     object actnCopyBGLBlock: TAction
       Caption = #22797#21046#25972#22359
       OnExecute = actnCopyBGLBlockExecute
-      OnUpdate = actnCopyBGLBlockUpdate
     end
   end
   object dxpmBGL: TdxBarPopupMenu

+ 5 - 0
Units/BGLClipboard.pas

@@ -39,6 +39,7 @@ Type
     FDirection: string;
     FDrawingCode: string;
     FApprovalCode: string;
+    FBGLType: string;
   public
     constructor Create;
     destructor Destroy; override;
@@ -143,6 +144,7 @@ begin
   FDirection := AXmlNode.Attributes['Direction'];
   FDrawingCode := AXmlNode.Attributes['DrawingCode'];
   FApprovalCode := AXmlNode.Attributes['ApprovalCode'];
+  FBGLType := AXmlNode.Attributes['BGLType'];
 
   for i := 0 to AXmlNode.ChildNodes.Count - 1 do
   begin
@@ -164,6 +166,7 @@ begin
   AXmlNode.Attributes['Direction'] := FDirection;
   AXmlNode.Attributes['DrawingCode'] := FDrawingCode;
   AXmlNode.Attributes['ApprovalCode'] := FApprovalCode;
+  AXmlNode.Attributes['BGLType'] := FBGLType;
 
   for i:= 0 to FBGBills.Count - 1 do
     TBGBillsNode(FBGBills.Items[i]).SaveToXmlNode(AXmlNode.AddChild('BGBill'));
@@ -227,6 +230,7 @@ begin
   vBGL.FDirection := FBGLData.cdsBGLViewDirection.AsString;
   vBGL.FDrawingCode := FBGLData.cdsBGLViewDrawingCode.AsString;
   vBGL.FApprovalCode := FBGLData.cdsBGLViewApprovalCode.AsString;
+  vBGL.FBGLType := FBGLData.cdsBGLViewBGLType.AsString;
   CopyBGBills(vBGL, FBGLData.cdsBGLViewID.AsInteger);
 end;
 
@@ -375,6 +379,7 @@ begin
     cdsBGLDirection.AsString := ABGL.FDirection;
     cdsBGLDrawingCode.AsString := ABGL.FDrawingCode;
     cdsBGLApprovalCode.AsString := ABGL.FApprovalCode;
+    cdsBGLBGLType.AsString := ABGL.FBGLType;
     cdsBGLCreatePhaseID.AsInteger := TProjectData(ProjectData).ProjProperties.PhaseCount;
     cdsBGL.Post;
     PasteBGBills(ANewID, ABGL);