Commit 082ce681 authored by kravtsov's avatar kravtsov

[-] Исправлена ошибка обработки штрихкода маркировки табака

parent b1763b9a
......@@ -4,6 +4,13 @@
Company : SHTRIH-M, Russia, Moscow, Masterkova 4
(495) 787-60-90, www.shtrih-m.ru
*******************************************************************
OposShtrih_1.13_480.exe
15 марта 2018 12:35
[-] Исправлена ошибка обработки штрихкода маркировки табака
*******************************************************************
OposShtrih_1.13_479.exe
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
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.479\0"
VALUE "FileVersion", "1.13.0.480\0"
VALUE "InternalName", "OPOS setup \0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposConfig.exe\0"
......
[Closed Files]
File_0=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\duGS1Barcode.pas',0,1,19,3,36,0,0
File_0=SourceModule,'C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\Units\duGS1Barcode.pas',0,1,1,18,1,0,0
File_1=SourceModule,'C:\projects\OPOSShtrih\Source\SmFptrSrv\Units\oleMain.pas',0,1,1,1,1,0,0
File_2=SourceModule,'C:\projects\OPOSShtrih\Source\Shared\DriverError.pas',0,1,19,19,37,0,0
File_3=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\GS1Barcode.pas',0,1,28,25,44,0,0
File_4=SourceModule,'C:\projects\OPOSShtrih\Source\SmFiscalPrinter\Units\FiscalPrinterDevice.pas',0,1,8656,27,8671,0,0
......@@ -15,10 +15,6 @@ Count=0
EditWindowCount=0
TypeLibWindowCount=3
[C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\SmFiscalPrinterTest.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmScaleTest\SmScaleTestLib.dpr]
FormState=0
FormOnTop=0
......@@ -75,6 +71,10 @@ FormOnTop=0
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\SmFiscalPrinterTest.dpr]
FormState=0
FormOnTop=0
[C:\projects\OPOSShtrih\Test\SmFiscalPrinterTest\SmFiscalPrinterTestLib.dpr]
FormState=0
FormOnTop=0
......@@ -418,5 +418,5 @@ CompUnitPane=104
DockHostCount=0
[ActiveProject]
ActiveProject=1
ActiveProject=2
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
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.479\0"
VALUE "FileVersion", "1.13.0.480\0"
VALUE "InternalName", "OPOS test\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "OposTest.exe\0"
......
......@@ -7,7 +7,7 @@ uses
DeviceService;
const
GenericServiceVersion = deviceVersion113 + 479;
GenericServiceVersion = deviceVersion113 + 480;
implementation
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
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.479\0"
VALUE "FileVersion", "1.13.0.480\0"
VALUE "InternalName", "Fiscal printer driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmFiscalPrinter.dll\0"
......
......@@ -80,7 +80,7 @@ type
end;
const
AIItems: array [0..155] of TAIREc = (
AIItems: array [0..157] of TAIREc = (
(id: '00'; min: 18; max: 18), // Serial Shipping Container Code (SSCC)
(id: '01'; min: 14; max: 14), // Global Trade Item Number (GTIN)
(id: '02'; min: 14; max: 14), // GTIN of contained trade items
......@@ -97,7 +97,8 @@ const
(id: '18'; min: 6; max: 6), // ?
(id: '19'; min: 6; max: 6), // ?
(id: '20'; min: 2; max: 2), // Internal product variant
(id: '21'; min: 1; max: 20), // Serial number (FNC1)
//(id: '21'; min: 1; max: 20), // Serial number (FNC1) !!!
(id: '21'; min: 7; max: 7), // Serial number (FNC1)
(id: '22'; min: 1; max: 20), // Consumer product variant (FNC1)
(id: '240'; min: 1; max: 30), // Additional item identification (FNC1)
(id: '241'; min: 1; max: 30), // Customer part number
......@@ -108,6 +109,7 @@ const
(id: '253'; min: 1; max: 17), // Global Document Type Identifier (GDTI)
(id: '254'; min: 1; max: 20), // GLN extension component
(id: '255'; min: 1; max: 12), // Global Coupon Number (GCN)
(id: '291'; min: 1; max: 30), // CRC
(id: '30'; min: 8; max: 8), // Variable count of items (variable measure trade item)
(id: '310'; min: 6; max: 6), // Net weight, kilograms (variable measure trade item)
(id: '311'; min: 6; max: 6), // Length or first dimension, metres (variable measure trade item)
......@@ -228,6 +230,7 @@ const
(id: '8112'; min: 1; max: 70), // Paperless coupon code identification for use in North America (AI 8112)
(id: '8200'; min: 1; max: 70), // Extended Packaging URL
(id: '90'; min: 1; max: 30), // Information mutually agreed between trading partners
(id: '9099'; min: 8; max: 8), // Information mutually agreed between trading partners
(id: '91'; min: 1; max: 90), // Company internal information
(id: '92'; min: 1; max: 90), // Company internal information
(id: '93'; min: 1; max: 90), // Company internal information
......@@ -333,6 +336,13 @@ begin
Result := Barcode;
if Barcode = '' then Exit;
if Barcode[1] = '(' then Exit;
if Length(Barcode) = 29 then
begin
Result := '(01)' + Copy(Barcode, 1, 14) +
'(21)' + Copy(Barcode, 15, 7) +
'(291)' + Copy(Barcode, 22, Length(Barcode));
Exit;
end;
i := 1;
id := '';
......
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,13,0,479
PRODUCTVERSION 1,13,0,479
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
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.479\0"
VALUE "FileVersion", "1.13.0.480\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,479
PRODUCTVERSION 1,13,0,479
FILEVERSION 1,13,0,480
PRODUCTVERSION 1,13,0,480
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.479\0"
VALUE "FileVersion", "1.13.0.480\0"
VALUE "InternalName", "Scale driver\0"
VALUE "LegalCopyright", "SHTRIH-M \251 2013 \0"
VALUE "OriginalFilename", "SmScale.dll\0"
......
......@@ -32,11 +32,16 @@ var
Barcode: TGS1Barcode;
begin
Data := GS1DecodeBraces(Barcode2);
CheckEquals('(01)07000000000003(21)Ai1iJul291ErTuY7uj', Data, 'Data');
CheckEquals('(01)07000000000003(21)Ai1iJul(291)ErTuY7uj', Data, 'Data');
Barcode := DecodeGS1(GS1FilterTockens(GS1DecodeBraces(Barcode2)));
CheckEquals('07000000000003', Barcode.GTIN, 'Barcode.GTIN');
CheckEquals('Ai1iJul291ErTuY7uj', Barcode.Serial, 'Barcode.Serial');
CheckEquals('Ai1iJul', Barcode.Serial, 'Barcode.Serial');
Data := GS1DecodeBraces(Barcode3);
CheckEquals('(01)04606203084623(21)+A13gPh(291)-4Hi7uGl', Data, 'Data');
Barcode := DecodeGS1(GS1FilterTockens(GS1DecodeBraces(Barcode3)));
CheckEquals('04606203084623', Barcode.GTIN, 'Barcode.GTIN');
CheckEquals('+A13gPh', Barcode.Serial, 'Barcode.Serial');
end;
initialization
......
No preview for this file type
[releases]
current=1.13.0.479
current=1.13.0.480
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