Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge branch 'develop' into feature/JDK11
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
jenkins
2025-01-30 12:53:52 +01:00
parent 208b7f58e8 f9f5456bc0
commit d897ba2c20
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -48,6 +48,8 @@ import it.integry.ems_model.service.SetupGest;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.types.TypeDbObject;
import it.integry.ems_model.utility.*;
import it.integry.ems_model.utility.BarcodeEan128.Ean128Model;
import it.integry.ems_model.utility.BarcodeEan128.UtilityBarcodeEan128;
import it.integry.firebase.dto.MessageDTO;
import it.integry.firebase.dto.webpush.WebpushConfigDTO;
import it.integry.firebase.dto.webpush.WebpushNotificationDTO;
@@ -1597,9 +1599,19 @@ public class PvmService {
}
private MtbColt getColloByExternalBarcode(String barcode) throws Exception {
Ean128Model model;
try{
model = UtilityBarcodeEan128.decode(barcode.getBytes());
}catch (Exception e){
model = new Ean128Model();
}
String sql = Query.format("SELECT * FROM " + MtbColt.ENTITY +
" WHERE barcode_ul = %s", barcode);
if (!UtilityString.isNullOrEmpty(model.Sscc) && !model.Sscc.equalsIgnoreCase(barcode)) {
sql += " OR barcode_ul = " + UtilityDB.valueToString(model.Sscc);
}
return UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbColt.class);
}