Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Popup_InfoArticolo

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
This commit is contained in:
Giuseppe Scorrano 2023-03-16 12:24:09 +01:00
commit a1d8e98dfe
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android { android {
def appVersionCode = 350 def appVersionCode = 352
def appVersionName = '1.32.10' def appVersionName = '1.32.12'
signingConfigs { signingConfigs {
release { release {

30
app/src/main/java/it/integry/integrywmsnative/gest/inventario/picking/PickingInventarioViewModel.java
View File

@ -93,24 +93,24 @@ public class PickingInventarioViewModel extends ViewModel {
var barcodeList = new ArrayList<String>(); var barcodeList = new ArrayList<String>();
barcodeList.add(itemToUpdate.getScanCodBarre()); barcodeList.add(itemToUpdate.getScanCodBarre());
var matchedArtOpt = availableInventarioArts.stream() var matchedArt = availableInventarioArts.stream()
.filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart())) .filter(x -> itemToUpdate.getCodMart() != null && x.getCodMart().contains(itemToUpdate.getCodMart()))
.findFirst(); .findFirst()
.orElse(null);
MtbAart articolo = null; MtbAart articolo;
if (canAddUnknownItems) { if (canAddUnknownItems && matchedArt == null) {
var matchedArt = matchedArtOpt.orElse(new InventarioArtDTO() matchedArt = new InventarioArtDTO()
.setBarcode(barcodeList) .setBarcode(barcodeList)
.setFlagQtaCnfFissa(true) .setFlagQtaCnfFissa(true)
.setPlu(false) .setPlu(false)
.setUntMis(itemToUpdate.getUntMis()) .setUntMis(itemToUpdate.getUntMis())
.setQtaCnf(itemToUpdate.getQtaConf())); .setQtaCnf(itemToUpdate.getQtaConf());
}
if (matchedArt != null) {
articolo = matchedArt.toMtbAart() articolo = matchedArt.toMtbAart()
.setFlagTracciabilita("N"); .setFlagTracciabilita("N");
}
if (articolo != null) {
dispatchRowEdit(articolo, itemToUpdate); dispatchRowEdit(articolo, itemToUpdate);
} else } else
this.sendError(new NoResultFromBarcodeException(itemToUpdate.getScanCodBarre())); this.sendError(new NoResultFromBarcodeException(itemToUpdate.getScanCodBarre()));
@ -151,19 +151,19 @@ public class PickingInventarioViewModel extends ViewModel {
var barcodeList = new ArrayList<String>(); var barcodeList = new ArrayList<String>();
barcodeList.add(barcodeProd); barcodeList.add(barcodeProd);
var matchedArtOpt = availableInventarioArts.stream() var matchedArt = availableInventarioArts.stream()
.filter(x -> x.getBarcode().contains(barcodeProd)) .filter(x -> x.getBarcode().contains(barcodeProd))
.findFirst(); .findFirst()
.orElse(null);
InventarioArtDTO matchedArt = null;
if (canAddUnknownItems) { if (canAddUnknownItems && matchedArt == null) {
matchedArt = matchedArtOpt.orElse(new InventarioArtDTO() matchedArt = new InventarioArtDTO()
.setBarcode(barcodeList) .setBarcode(barcodeList)
.setFlagQtaCnfFissa(true) .setFlagQtaCnfFissa(true)
.setPlu(false) .setPlu(false)
.setUntMis("PZ") .setUntMis("PZ")
.setQtaCnf(BigDecimal.ONE)); .setQtaCnf(BigDecimal.ONE);
} }