Se acaban de adaptar los informes de tecsitel mantenimiento y se arregla el recibir pedidos para que cuando tenga articulos no dados de alta en la aplicación lo ponga

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@729 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2008-11-04 19:18:13 +00:00
parent d7e17fd787
commit 344e568f73
26 changed files with 448 additions and 92 deletions

View File

@ -53,57 +53,57 @@
<DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource>
</DelphiCompile>
<DCCReference Include="..\Modulos\Presupuestos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Presupuestos de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form>

View File

@ -2,6 +2,7 @@ program FactuGES;
uses
// ExceptionLog,
ExceptionLog,
Forms,
Windows,
SysUtils,

View File

@ -59,10 +59,6 @@
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PluginSDK_D10R.bpl">PluginSDK for Delphi 10 (Runtime)</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -15,10 +15,6 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Left = 344
Top = 72
end
object DABINAdapter: TDABINAdapter
Left = 48
Top = 80
end
object frxRichObject1: TfrxRichObject
Left = 280
Top = 360
@ -878,7 +874,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABINAdapter
LocalDataStreamer = DABin2DataStreamer1
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Informe_Cabecera'
@ -946,7 +942,7 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteFetchEnabled = False
LocalSchema = schReport
LocalDataStreamer = DABINAdapter
LocalDataStreamer = DABin2DataStreamer1
MasterSource = DADSCabecera
MasterFields = 'ID'
DetailFields = 'ID_ALBARAN'
@ -971,4 +967,8 @@ object RptAlbaranesCliente: TRptAlbaranesCliente
Left = 344
Top = 304
end
object DABin2DataStreamer1: TDABin2DataStreamer
Left = 48
Top = 88
end
end

View File

@ -8,13 +8,12 @@ uses
uDADataTable, uDACDSDataTable, DB, uDAClasses, frxChart, frxGradient,
frxChBox, frxCross, frxOLE, frxBarcode, frxRich, uDABINAdapter, uROTypes,
uDAInterfaces, uDADataStreamer, IBCustomDataSet, IBQuery, IBDatabase,
uDAMemDataTable, frxExportPDF, FactuGES_Intf;
uDAMemDataTable, frxExportPDF, FactuGES_Intf, uDABin2DataStreamer;
type
TRptAlbaranesCliente = class(TDataModule)
DADSCabecera: TDADataSource;
DADSDetalles: TDADataSource;
DABINAdapter: TDABINAdapter;
frxRichObject1: TfrxRichObject;
frxBarCodeObject1: TfrxBarCodeObject;
frxOLEObject1: TfrxOLEObject;
@ -61,6 +60,7 @@ type
tbl_Detalles: TDAMemDataTable;
frxPDFExport1: TfrxPDFExport;
schReport: TDASchema;
DABin2DataStreamer1: TDABin2DataStreamer;
procedure DataModuleCreate(Sender: TObject);
private
FConnection: IDAConnection;
@ -146,7 +146,7 @@ begin
tbl_Cabecera.Active := True;
tbl_Detalles.Active := True;
frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
frxReport.LoadFromFile(DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme, True);
frxReport.PrepareReport(False);
finally
FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"
@ -159,6 +159,7 @@ var
dsDetail: IDADataset;
AStream: TMemoryStream;
begin
{
AStream := TMemoryStream.Create;
Result := Binary.Create;
FConnection.BeginTransaction;
@ -185,6 +186,7 @@ begin
AStream.Free;
FConnection.RollbackTransaction;
end;
}
end;
end.

View File

@ -1,5 +1,6 @@
object RptWordAlbaranCliente: TRptWordAlbaranCliente
OldCreateOrder = False
OnCreate = DataModuleCreate
Height = 262
Width = 374
object schReport: TDASchema

View File

@ -52,8 +52,6 @@ constructor TRptWordAlbaranCliente.Create(AOwner: TComponent);
begin
inherited;
FDocumento := NIL;
FPlantilla := DarRutaInformes + rptInforme;
end;
procedure TRptWordAlbaranCliente.DataModuleCreate(Sender: TObject);
@ -237,6 +235,7 @@ begin
tbl_Cabecera.Active := True;
tbl_Detalles.Active := True;
FPlantilla := DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme;
FCodigoAlbaran := AID;
ACopiaPlantilla := DarFicheroTemporal;

View File

@ -1168,8 +1168,20 @@ var
AArticulosTraslado : IBizInventario;
begin
Result := False;
if Assigned(AArticulos) then
begin
{ DesconectarTabla(AArticulos.DataTable);
repeat
if (AArticulos.ID_ARTICULO < 1) then
AArticulos.Delete;
AArticulos.First;
until (AArticulos.DataTable.Locate('ID_ARTICULO', '0', []) = false);
ConectarTabla(AArticulos.DataTable);
}
//Deshabilitamos el calculo de ID (RECID) para poderlo usar para la inserción de movimientos
AArticulos.DataTable.OnCalcFields := DeshabilitarOnCalcFields;
with AArticulos.DataTable do

View File

@ -267,7 +267,7 @@ begin
tbl_Cabecera.Active := True;
tbl_Detalles.Active := True;
frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
frxReport.LoadFromFile(DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme, True);
frxReport.PrepareReport(False);
finally
FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"

View File

@ -55,7 +55,6 @@ begin
ImprimirPrecio := False;
ImprimirRefProveedor := False;
FDocumento := NIL;
FPlantilla := DarRutaInformes + rptInforme;
end;
destructor TRptWordPedidoProveedor.Destroy;
@ -255,6 +254,7 @@ begin
tbl_Cabecera.Active := True;
tbl_Detalles.Active := True;
FPlantilla := DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme;
FCodigoPedido := AID;
if RecuperarEmpresa(tbl_Cabecera.FieldByName('ID_EMPRESA').AsInteger, tbl_Empresa) then

View File

@ -604,17 +604,18 @@ object srvPedidosProveedor: TsrvPedidosProveedor
Connection = 'IBX'
SQL =
'select V_PED_PROV_ARTICULOS.ID_PEDIDO,'#10' ARTICULOS.REFERENC' +
'IA,'#10' V_PED_PROV_ARTICULOS.ID_ARTICULO,'#10' ARTICULOS.DE' +
'SCRIPCION as CONCEPTO,'#10' V_PED_PROV_ARTICULOS.CANTIDAD_PEND' +
'IENTE as CANTIDAD,'#10' ARTICULOS_PROVEEDORES.REFERENCIA_PROV ' +
'as REFERENCIA_PROVEEDOR'#10#10'FROM V_PED_PROV_ARTICULOS'#10'LEFT JOIN ART' +
'ICULOS ON (ARTICULOS.ID = V_PED_PROV_ARTICULOS.ID_ARTICULO)'#10'LEFT' +
' JOIN PEDIDOS_PROVEEDOR ON (PEDIDOS_PROVEEDOR.ID = V_PED_PROV_AR' +
'TICULOS.ID_PEDIDO)'#10'LEFT JOIN ARTICULOS_PROVEEDORES ON ((ARTICULO' +
'S_PROVEEDORES.ID_ARTICULO = ARTICULOS.ID) AND (ARTICULOS_PROVEED' +
'ORES.ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PROVEEDOR))'#10'WHERE (V_PE' +
'D_PROV_ARTICULOS.CANTIDAD_PENDIENTE <> 0)'#10'AND (V_PED_PROV_ARTICU' +
'LOS.ID_PEDIDO = :ID)'#10
'IA,'#10' V_PED_PROV_ARTICULOS.ID_ARTICULO,'#10' COALESCE(ART' +
'ICULOS.DESCRIPCION, '#39'"Articulos no dados de alta en la aplicaci'#243 +
'n"'#39' ) as CONCEPTO,'#10' V_PED_PROV_ARTICULOS.CANTIDAD_PENDIEN' +
'TE as CANTIDAD,'#10' ARTICULOS_PROVEEDORES.REFERENCIA_PROV as ' +
'REFERENCIA_PROVEEDOR'#10#10'FROM V_PED_PROV_ARTICULOS'#10'LEFT JOIN ARTICU' +
'LOS ON (ARTICULOS.ID = V_PED_PROV_ARTICULOS.ID_ARTICULO)'#10'LEFT JO' +
'IN PEDIDOS_PROVEEDOR ON (PEDIDOS_PROVEEDOR.ID = V_PED_PROV_ARTIC' +
'ULOS.ID_PEDIDO)'#10'LEFT JOIN ARTICULOS_PROVEEDORES ON ((ARTICULOS_P' +
'ROVEEDORES.ID_ARTICULO = ARTICULOS.ID) AND (ARTICULOS_PROVEEDORE' +
'S.ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PROVEEDOR))'#10'WHERE (V_PED_P' +
'ROV_ARTICULOS.CANTIDAD_PENDIENTE <> 0)'#10'AND (V_PED_PROV_ARTICULOS' +
'.ID_PEDIDO = :ID)'#10
StatementType = stSQL
ColumnMappings = <
item

View File

@ -241,7 +241,7 @@ begin
tbl_Cabecera.Active := True;
tbl_Compensados.Active := True;
frxReport.LoadFromFile(DarRutaInformes + rptInforme, True);
frxReport.LoadFromFile(DarRutaInformes + tbl_Cabecera.FieldByName('ID_EMPRESA').AsString + '\' + rptInforme, True);
frxReport.PrepareReport(False);
finally
FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"