|
@@ -38,6 +38,7 @@ type
|
|
udBeginCode: TUpDown;
|
|
udBeginCode: TUpDown;
|
|
alBatchInsertBills: TActionList;
|
|
alBatchInsertBills: TActionList;
|
|
actnInsertCol: TAction;
|
|
actnInsertCol: TAction;
|
|
|
|
+ dxpmBills: TdxBarPopupMenu;
|
|
procedure zgPositionCustomPaste(Sender: TObject; ABounds: TRect;
|
|
procedure zgPositionCustomPaste(Sender: TObject; ABounds: TRect;
|
|
ASourSheet: TZjSheet);
|
|
ASourSheet: TZjSheet);
|
|
procedure zgBillsCustomPaste(Sender: TObject; ABounds: TRect;
|
|
procedure zgBillsCustomPaste(Sender: TObject; ABounds: TRect;
|
|
@@ -84,7 +85,7 @@ procedure AddLeafBills(ABillsCompileData: TBillsCompileData; AInsertType: TInser
|
|
implementation
|
|
implementation
|
|
|
|
|
|
uses
|
|
uses
|
|
- sdDB, UtilMethods, ProjectData, MainFrm, Globals;
|
|
|
|
|
|
+ sdDB, UtilMethods, ProjectData, MainFrm, Globals, DealBillsDm;
|
|
|
|
|
|
{$R *.dfm}
|
|
{$R *.dfm}
|
|
|
|
|
|
@@ -365,8 +366,13 @@ begin
|
|
zgBills.Cells[Col, Row].Align := gaCenterLeft;
|
|
zgBills.Cells[Col, Row].Align := gaCenterLeft;
|
|
sB_Code := zgBills.Cells[Col, Row].Text;
|
|
sB_Code := zgBills.Cells[Col, Row].Text;
|
|
if sB_Code = '' then Exit;
|
|
if sB_Code = '' then Exit;
|
|
- with FBillsCompileData.BillsData do
|
|
|
|
- Rec := sddBills.Locate('B_Code', sB_Code);
|
|
|
|
|
|
+ with TProjectData(FBillsCompileData.ProjectData).DealBillsData do
|
|
|
|
+ Rec := sddDealBills.Locate('B_Code', sB_Code);
|
|
|
|
+ if not Assigned(Rec) then
|
|
|
|
+ begin
|
|
|
|
+ with FBillsCompileData.BillsData do
|
|
|
|
+ Rec := sddBills.Locate('B_Code', sB_Code);
|
|
|
|
+ end;
|
|
if Assigned(Rec) then
|
|
if Assigned(Rec) then
|
|
begin
|
|
begin
|
|
zgBills.Cells[iGclNameCol, Row].Text := Rec.ValueByName('Name').AsString;
|
|
zgBills.Cells[iGclNameCol, Row].Text := Rec.ValueByName('Name').AsString;
|