Commit c0cd540b authored by kravtsov's avatar kravtsov

[+] Добавлены команды directIO DIO_START_OPEN_DAY и DIO_OPEN_DAY

    DIO_START_OPEN_DAY   = 58; // start open day
    DIO_OPEN_DAY         = 59; // open day
parent 3b3c9001
......@@ -4,6 +4,16 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_470.exe
30 января 2018 21:20
[+] Добавлены команды directIO DIO_START_OPEN_DAY и DIO_OPEN_DAY
DIO_START_OPEN_DAY = 58; // start open day
DIO_OPEN_DAY = 59; // open day
*******************************************************************
OposShtrih_1.13_469.exe
......
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=468
Build=469
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=OPOS setup utility
FileVersion=1.13.0.468
FileVersion=1.13.0.469
InternalName=OPOS setup
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,469
PRODUCTVERSION 1,13,0,469
FILEVERSION 1,13,0,470
PRODUCTVERSION 1,13,0,470
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS setup utility\0"
VALUE "FileVersion", "1.13.0.469\0"
VALUE "FileVersion", "1.13.0.470\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
......@@ -105,6 +105,7 @@ begin
AddTest(TReceiptTest14);
AddTest(TReceiptTest15);
AddTest(TReceiptTest16);
AddTest(TReceiptTest17);
cbTest.ItemIndex := 0;
end;
......
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=13
Release=0
Build=473
Build=474
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=OPOS test utility
FileVersion=1.13.0.473
FileVersion=1.13.0.474
InternalName=OPOS test
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,469
PRODUCTVERSION 1,13,0,469
FILEVERSION 1,13,0,470
PRODUCTVERSION 1,13,0,470
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "OPOS test utility\0"
VALUE "FileVersion", "1.13.0.469\0"
VALUE "FileVersion", "1.13.0.470\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -758,6 +758,14 @@ type
function GetDisplayText: string; override;
end;
{ TReceiptTest17 }
TReceiptTest17 = class(TDriverTest)
public
procedure Execute; override;
function GetDisplayText: string; override;
end;
implementation
const
......@@ -4441,4 +4449,31 @@ begin
Check(FiscalPrinter.EndFiscalReceipt(True));
end;
{ TReceiptTest17 }
function TReceiptTest17.GetDisplayText: string;
begin
Result := 'Open fiscal day test';
end;
procedure TReceiptTest17.Execute;
var
pData: Integer;
pString: WideString;
begin
Check(FiscalPrinter.ResetPrinter());
pData := 0;
pString := '';
Check(FiscalPrinter.DirectIO(DIO_START_OPEN_DAY, pData, pString));
pData := 1203;
pString := '505303696069';
Check(FiscalPrinter.DirectIO(DIO_WRITE_FS_STRING_TAG, pData, pString));
pData := 0;
pString := '';
Check(FiscalPrinter.DirectIO(DIO_OPEN_DAY, pData, pString));
end;
end.
......@@ -856,6 +856,30 @@ type
procedure DirectIO(var pData: Integer; var pString: WideString); override;
end;
{ TDIOStartOpenDay }
TDIOStartOpenDay = class(TDIOHandler)
private
FPrinter: TFiscalPrinterImpl;
public
constructor CreateCommand(AOwner: TDIOHandlers; ACommand: Integer;
APrinter: TFiscalPrinterImpl);
procedure DirectIO(var pData: Integer; var pString: WideString); override;
end;
{ TDIOOpenDay }
TDIOOpenDay = class(TDIOHandler)
private
FPrinter: TFiscalPrinterImpl;
public
constructor CreateCommand(AOwner: TDIOHandlers; ACommand: Integer;
APrinter: TFiscalPrinterImpl);
procedure DirectIO(var pData: Integer; var pString: WideString); override;
end;
implementation
function BoolToStr(Value: Boolean): string;
......@@ -2562,4 +2586,34 @@ begin
Data.DocumentNumber, Data.DocumentMac]);
end;
{ TDIOStartOpenDay }
constructor TDIOStartOpenDay.CreateCommand(AOwner: TDIOHandlers;
ACommand: Integer; APrinter: TFiscalPrinterImpl);
begin
inherited Create(AOwner, ACommand);
FPrinter := APrinter;
end;
procedure TDIOStartOpenDay.DirectIO(var pData: Integer;
var pString: WideString);
begin
FPrinter.Device.Check(FPrinter.Device.FSStartOpenDay());
end;
{ TDIOOpenDay }
constructor TDIOOpenDay.CreateCommand(AOwner: TDIOHandlers;
ACommand: Integer; APrinter: TFiscalPrinterImpl);
begin
inherited Create(AOwner, ACommand);
FPrinter := APrinter;
end;
procedure TDIOOpenDay.DirectIO(var pData: Integer;
var pString: WideString);
begin
FPrinter.OpenFiscalDay;
end;
end.
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 469;
GenericServiceVersion = deviceVersion113 + 470;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,469
PRODUCTVERSION 1,13,0,469
FILEVERSION 1,13,0,470
PRODUCTVERSION 1,13,0,470
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer service\0"
VALUE "FileVersion", "1.13.0.469\0"
VALUE "FileVersion", "1.13.0.470\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -82,6 +82,8 @@ const
DIO_PRINT_BARCODE_HEX2 = 55; // print barcode data from hex 2
DIO_PRINT_CORRECTION = 56; // print correction receipt 1
DIO_PRINT_CORRECTION2 = 57; // print correction receipt 2
DIO_START_OPEN_DAY = 58; // start open day
DIO_OPEN_DAY = 59; // open day
DIO_PRINT_TEXT2 = 1000; // print text
......
......@@ -185,6 +185,7 @@ type
procedure PrintFSDocument(Number: Integer);
function FSReadDocData(var P: TFSReadDocData): Integer;
function FSReadDocument(var P: TFSReadDocument): Integer;
function FSStartOpenDay: Integer;
function IsFiscalPrinter2: Boolean;
protected
function GetMaxGraphicsWidthInBytes: Integer;
......@@ -8601,4 +8602,13 @@ begin
end;
end;
function TFiscalPrinterDevice.FSStartOpenDay: Integer;
var
Answer: string;
Command: string;
begin
Command := #$FF#$41 + IntToBin(FSysPassword, 4);
Result := ExecuteData(Command, Answer);
end;
end.
......@@ -465,6 +465,7 @@ type
procedure PrintFSDocument(Number: Integer);
function FSPrintCorrectionReceipt(var Command: TFSCorrectionReceipt): Integer;
function FSPrintCorrectionReceipt2(var Data: TFSCorrectionReceipt2): Integer;
procedure OpenFiscalDay;
property Logger: ILogFile read GetLogger;
property Printer: ISharedPrinter read GetPrinter;
......@@ -670,6 +671,8 @@ begin
TDIOPrintFSDocument.CreateCommand(FDIOHandlers, DIO_PRINT_FS_DOCUMENT, Self);
TDIOPrintCorrection.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION, Self);
TDIOPrintCorrection2.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION2, Self);
TDIOStartOpenDay.CreateCommand(FDIOHandlers, DIO_START_OPEN_DAY, Self);
TDIOOpenDay.CreateCommand(FDIOHandlers, DIO_OPEN_DAY, Self);
end;
procedure TFiscalPrinterImpl.CreateDIOHandlers1;
......@@ -736,6 +739,8 @@ begin
TDIOPrintFSDocument.CreateCommand(FDIOHandlers, DIO_PRINT_FS_DOCUMENT, Self);
TDIOPrintCorrection.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION, Self);
TDIOPrintCorrection2.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION2, Self);
TDIOStartOpenDay.CreateCommand(FDIOHandlers, DIO_START_OPEN_DAY, Self);
TDIOOpenDay.CreateCommand(FDIOHandlers, DIO_OPEN_DAY, Self);
end;
procedure TFiscalPrinterImpl.CreateDIOHandlers2;
......@@ -803,6 +808,8 @@ begin
TDIOPrintFSDocument.CreateCommand(FDIOHandlers, DIO_PRINT_FS_DOCUMENT, Self);
TDIOPrintCorrection.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION, Self);
TDIOPrintCorrection2.CreateCommand(FDIOHandlers, DIO_PRINT_CORRECTION2, Self);
TDIOStartOpenDay.CreateCommand(FDIOHandlers, DIO_START_OPEN_DAY, Self);
TDIOOpenDay.CreateCommand(FDIOHandlers, DIO_OPEN_DAY, Self);
end;
procedure TFiscalPrinterImpl.SetPrinter(APrinter: ISharedPrinter);
......@@ -2215,6 +2222,12 @@ begin
end;
end;
procedure TFiscalPrinterImpl.OpenFiscalDay;
begin
if Device.OpenFiscalDay then
PrintNonFiscalEnd;
end;
function TFiscalPrinterImpl.BeginFiscalReceipt(PrintHeader: WordBool): Integer;
begin
try
......
......@@ -458,6 +458,7 @@ type
function IsCapEnablePrint: Boolean;
function ReadFSDocument(Number: Integer): string;
procedure PrintFSDocument(Number: Integer);
function FSStartOpenDay: Integer;
property IsOnline: Boolean read GetIsOnline;
property Model: TPrinterModelRec read GetModel;
......
......@@ -12,7 +12,7 @@ unit FptrServerLib_TLB;
// ************************************************************************ //
// PASTLWTR : 1.2
// File generated on 15.01.2018 17:59:18 from Type Library described below.
// File generated on 30.01.2018 20:56:04 from Type Library described below.
// ************************************************************************ //
// Type Lib: C:\projects\OPOSShtrih\Source\SmFptrSrv\SmFptrSrv.tlb (1)
......
......@@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=12
Release=0
Build=382
Build=383
Debug=0
PreRelease=0
Special=0
......@@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=SHTRIH-M
FileDescription=Fiscal printer print server
FileVersion=1.12.0.382
FileVersion=1.12.0.383
InternalName=Fiscal printer driver
LegalCopyright=SHTRIH-M 2013
LegalTrademarks=
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,469
PRODUCTVERSION 1,13,0,469
FILEVERSION 1,13,0,470
PRODUCTVERSION 1,13,0,470
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Fiscal printer print server\0"
VALUE "FileVersion", "1.13.0.469\0"
VALUE "FileVersion", "1.13.0.470\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFptrSrv.exe\0"
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,469
PRODUCTVERSION 1,13,0,469
FILEVERSION 1,13,0,470
PRODUCTVERSION 1,13,0,470
FILEFLAGSMASK 0x3fL
FILEFLAGS 0x0L
FILEOS 0x4L
......@@ -13,7 +13,7 @@ BEGIN
BEGIN
VALUE "CompanyName", "SHTRIH-M\0"
VALUE "FileDescription", "Scale service\0"
VALUE "FileVersion", "1.13.0.469\0"
VALUE "FileVersion", "1.13.0.470\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
......@@ -295,6 +295,7 @@ type
function IsCapEnablePrint: Boolean;
function ReadFSDocument(Number: Integer): string;
procedure PrintFSDocument(Number: Integer);
function FSStartOpenDay: Integer;
property Status: TPrinterStatus read FStatus write FStatus;
property Parameters: TPrinterParameters read GetParameters;
......@@ -1715,4 +1716,9 @@ begin
Result := 0;
end;
function TMockFiscalPrinterDevice.FSStartOpenDay: Integer;
begin
Result := 0;
end;
end.
......@@ -297,6 +297,7 @@ type
function IsCapEnablePrint: Boolean;
function ReadFSDocument(Number: Integer): string;
procedure PrintFSDocument(Number: Integer);
function FSStartOpenDay: Integer;
property RecStation: TStrings read FRecStation;
property JrnStation: TStrings read FJrnStation;
......@@ -1730,4 +1731,9 @@ begin
Result := 0;
end;
function TTextFiscalPrinterDevice.FSStartOpenDay: Integer;
begin
Result := 0;
end;
end.
No preview for this file type
[releases]
current=1.13.0.469
current=1.13.0.470
last_date=2010-02-05
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment