diff --git a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityString.java b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityString.java index f6b5320595..2527d4e591 100644 --- a/ems-core/src/main/java/it/integry/ems_model/utility/UtilityString.java +++ b/ems-core/src/main/java/it/integry/ems_model/utility/UtilityString.java @@ -20,7 +20,6 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -@SuppressWarnings("serial") public class UtilityString { //private static final Logger logger = LogManager.getLogger(); @@ -487,6 +486,10 @@ public class UtilityString { return emptyStr2Null(s); } + public static String emsNullIfBlank(String s) { + return nullIfBlank(s) == null ? EmsRestConstants.NULL : s; + } + public static int toExcelColumnIndex(String columnName) { columnName = columnName.toUpperCase(); int value = 0; diff --git a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java index cd8fb50bd1..8a5b69d739 100644 --- a/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java +++ b/ems-engine/src/main/java/it/integry/ems/retail/wms/generic/dto/articolo/ArticoloDTO.java @@ -1,7 +1,10 @@ package it.integry.ems.retail.wms.generic.dto.articolo; +import it.integry.common.var.CommonConstants; import it.integry.ems_model.annotation.SqlField; +import it.integry.ems_model.config.EmsRestConstants; import it.integry.ems_model.entity.MtbAart; +import it.integry.ems_model.utility.UtilityString; import java.math.BigDecimal; @@ -284,26 +287,26 @@ public class ArticoloDTO { return this; } - public MtbAart toMtbAart(){ + public MtbAart toMtbAart() { MtbAart articolo = new MtbAart(); articolo .setCodMart(codMart) .setDescrizione(descrizione) .setUntMis(untMis) - .setBarCode(barcode) + .setBarCode(UtilityString.emsNullIfBlank(barcode)) .setQtaCnf(qtaCnf) .setCodAliq(codAliq) .setArticoloComposto(articoloComposto) .setDescrizioneEstesa(descrizioneEstesa) .setNote(note) - .setPosizione(posizione) + .setPosizione(UtilityString.emsNullIfBlank(posizione)) .setCodMgrp(codMgrp) .setCodMsfa(codMsfa) .setCodMsgr(codMsgr) .setCodMstp(codMstp) .setCodMtip(codMtip) .setFlagStato(flagStato ? "A" : "I") - .setCodBarreImb(barcodeImballo) + .setCodBarreImb(UtilityString.emsNullIfBlank(barcodeImballo)) .setDiacod(diacod) .setFlagQtaCnfFissa(flagQtaCnfFissa ? "S" : "N") .setIdArtEqui(idArtEqui)