[-] Return price correction in printRecItem method

[+] Nrjavaserial library updated to version 5.2.1
shtrih-m · Jan 27, 2022 · 6150ec7 · 6150ec7
1 parent fa6c7e4
commit 6150ec7
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 9 deletions.
diff --git a/History.txt b/History.txt
@@ -5,6 +5,13 @@
   Company : SHTRIH-M www.shtrih-m.ru (495) 787-6090
   Url     : https://github.com/shtrih-m/javapos_shtrih
 
+********************************************************************************
+
+  27.01.2022
+  deviceServiceVersion = 1013639
+
+  [-] Return price correction in printRecItem method
+
 ********************************************************************************
 
   15.12.2021

diff --git a/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java b/Source/Core/src/com/shtrih/jpos/fiscalprinter/receipt/FSSalesReceipt.java
@@ -1148,6 +1148,9 @@ public void doPrintSale(long price, double quantity, long unitPrice,
                 item.setItemAmount(item.getItemAmount() + price);
             }
         }
+        if (Math.abs(price - amount) > 1) {
+            price = amount;
+        }
         if (item == null) {
             item = new FSSaleReceiptItem();
             item.setItemAmount(price);

diff --git a/Source/FiscalPrinterService/build.gradle b/Source/FiscalPrinterService/build.gradle
@@ -35,7 +35,7 @@ dependencies {
     compile 'jpos:jpos113:1.13',
             'jpos:jpos113-controls:1.13',
             'log4j:log4j:1.2.12',
-            'nrjavaserial:nrjavaserial:3.15.0',
+            'nrjavaserial:nrjavaserial-5.2.1',
             'xerces:xerces:1.0',
             'zxing:zxing:2.2',
 	    'org.usb4java:usb4java:1.2.0',

diff --git a/Source/FiscalPrinterService/nbproject/project.properties b/Source/FiscalPrinterService/nbproject/project.properties
@@ -3,7 +3,7 @@ file.reference.commons-lang3-3.2.1.jar=../lib/commons-lang3-3.2.1.jar
 file.reference.flop-programmer-0.1.0.jar=../lib/flop-programmer-0.1.0.jar
 file.reference.json-1.8.jar=../lib/json-1.8.jar
 file.reference.libusb4java-1.2.0-windows-x86_64.jar=../lib/libusb4java-1.2.0-windows-x86_64.jar
-file.reference.nrjavaserial-3.15.0.jar=../lib/nrjavaserial-3.15.0.jar
+file.reference.nrjavaserial-5.2.1.jar=../lib/nrjavaserial-5.2.1.jar
 file.reference.usb4java-1.2.0.jar=../lib/usb4java-1.2.0.jar
 file.reference.ymodem-1.0.jar=../lib/ymodem-1.0.jar
 #Wed Aug 23 10:36:21 MSK 2017
@@ -74,8 +74,8 @@ javac.classpath=\
     ${file.reference.zxing-2.2.jar}:\
     ${libs.junit_4.classpath}:\
     ${file.reference.commons-lang3-3.2.1.jar}:\
-    ${file.reference.nrjavaserial-3.15.0.jar}:\
     ${file.reference.libusb4java-1.2.0-windows-x86_64.jar}:\
+    ${file.reference.nrjavaserial-5.2.1.jar}:\
     ${file.reference.usb4java-1.2.0.jar}:\
     ${file.reference.ymodem-1.0.jar}:\
     ${file.reference.json-1.8.jar}:\

diff --git a/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java b/Source/FiscalPrinterService/src/com/shtrih/util/ServiceVersion.java
@@ -1,5 +1,5 @@
 package com.shtrih.util;
 
 public class ServiceVersion {
-    public static final String VERSION = "637-4-g5c8b71c";
+    public static final String VERSION = "638";
 }
diff --git a/Source/FiscalPrinterTest/Res/jpos.xml b/Source/FiscalPrinterTest/Res/jpos.xml
@@ -31,7 +31,7 @@
         <!-- <prop name="portName" type="String" value="COM8"/> -->
         <!--Baudrate 2400;4800;9600;19200;38400;57600;115200;230400;460800 -->
         <!--<prop name="portName" type="String" value="192.168.137.111:7778"/>-->
-        <prop name="portName" type="String" value="COM8"/>
+        <prop name="portName" type="String" value="COM3"/>
         <prop name="baudRate" type="String" value="115200"/>
         <!--Default department-->
         <prop name="department" type="String" value="0"/>
@@ -62,7 +62,7 @@
         <!-- device state polling interval in milliseconds -->
         <prop name="pollInterval" type="String" value="500"/>
         <!-- Amount coefficient -->
-        <prop name="amountFactor" type="String" value="0.01"/>
+        <prop name="amountFactor" type="String" value="1"/>
         <!-- Quantity coefficient -->
         <prop name="quantityFactor" type="String" value="1"/>
         <!-- Strings encoding -->

diff --git a/Source/FiscalPrinterTest/src/PrinterTest.java b/Source/FiscalPrinterTest/src/PrinterTest.java
@@ -1025,10 +1025,11 @@ public void printFiscalReceipt() {
             //printFiscalReceipt145_4();
             //printSalesReceipt1236();
             //printSalesReceipt1237();
-            //printSalesReceipt1238();
             //printCorrectionReceipts();
-            testCommandTimeout();
+            //testCommandTimeout();
 
+            printSalesReceiptZeroPrice();
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -4526,4 +4527,19 @@ private void testCommandTimeout() {
             e.printStackTrace();
         }
     }
-}
+
+    private void printSalesReceiptZeroPrice() {
+        try {
+            printer.resetPrinter();
+
+            printer.setFiscalReceiptType(4);
+            printer.beginFiscalReceipt(true);
+            printer.printRecItem("Test", 0, 1000000, 1, 100, "");
+            printer.printRecTotal(100, 100, "10");
+            printer.endFiscalReceipt(false);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/Source/lib/nrjavaserial-3.15.0.jar b/Source/lib/nrjavaserial-3.15.0.jar
diff --git a/Source/lib/nrjavaserial-5.2.1.jar b/Source/lib/nrjavaserial-5.2.1.jar