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

Fix su Spedizione

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-05-22 17:32:45 +02:00
parent af5ad5faa8
commit ad82f4afc4
6 changed files with 233 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/app_base.xml generated
View File

@ -40,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" /> <option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native> </Native>
<Profilers> <Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="true" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers> </Profilers>

4
.idea/runConfigurations/app_ime.xml generated
View File

@ -11,7 +11,7 @@
<option name="MODE" value="default_activity" /> <option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" /> <option name="CLEAR_LOGCAT" value="true" />
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
<option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> <option name="SKIP_NOOP_APK_INSTALLATIONS" value="false" />
<option name="FORCE_STOP_RUNNING_APP" value="true" /> <option name="FORCE_STOP_RUNNING_APP" value="true" />
<option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" /> <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
@ -40,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" /> <option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native> </Native>
<Profilers> <Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="true" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers> </Profilers>

2
.idea/runConfigurations/app_saporiveri.xml generated
View File

@ -40,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" /> <option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native> </Native>
<Profilers> <Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="true" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers> </Profilers>

2
.idea/runConfigurations/app_saporiveri_pv.xml generated
View File

@ -40,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" /> <option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native> </Native>
<Profilers> <Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="true" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers> </Profilers>

2
.idea/runConfigurations/app_vglimenti.xml generated
View File

@ -40,7 +40,7 @@
<option name="SHOW_OPTIMIZED_WARNING" value="true" /> <option name="SHOW_OPTIMIZED_WARNING" value="true" />
</Native> </Native>
<Profilers> <Profilers>
<option name="ADVANCED_PROFILING_ENABLED" value="true" /> <option name="ADVANCED_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" /> <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" /> <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
</Profilers> </Profilers>

29
app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java
View File

@ -5,6 +5,7 @@ import android.app.Dialog;
import androidx.databinding.ObservableArrayList; import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableField; import androidx.databinding.ObservableField;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.SpannableString; import android.text.SpannableString;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
@ -187,7 +188,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep(); defaultCodMdepOfUL = SettingsManager.i().userSession.depo.getCodMdep();
//Definizione del filtro ordine da applicare a tutti i colli generati //Definizione del filtro ordine da applicare a tutti i colli generati
Stream.of(mTestateOrdini).forEach(x -> { Stream.of(mTestateOrdini).forEach(x -> {
FiltroOrdineDTO filtro = new FiltroOrdineDTO() FiltroOrdineDTO filtro = new FiltroOrdineDTO()
@ -200,7 +200,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
}); });
//Definizione del codAnag //Definizione del codAnag
List<String> foundCodAnag = Stream.of(mTestateOrdini) List<String> foundCodAnag = Stream.of(mTestateOrdini)
.map(OrdineVenditaInevasoDTO::getCodAnagOrd) .map(OrdineVenditaInevasoDTO::getCodAnagOrd)
@ -213,7 +212,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
//Definizione del codAnag //Definizione del codAnag
List<String> foundRagSoc = Stream.of(mTestateOrdini) List<String> foundRagSoc = Stream.of(mTestateOrdini)
.map(OrdineVenditaInevasoDTO::getRagSocOrd) .map(OrdineVenditaInevasoDTO::getRagSocOrd)
@ -491,9 +489,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
} }
@ -525,7 +520,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc; if (!UtilityString.isNullOrEmpty(ean128Model.Sscc)) barcodeProd = ean128Model.Sscc;
if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin; if (!UtilityString.isNullOrEmpty(ean128Model.Gtin)) barcodeProd = ean128Model.Gtin;
if(!UtilityString.isNullOrEmpty(ean128Model.Content)) barcodeProd = ean128Model.Content; if (!UtilityString.isNullOrEmpty(ean128Model.Content))
barcodeProd = ean128Model.Content;
if (!UtilityString.isNullOrEmpty(barcodeProd)) { if (!UtilityString.isNullOrEmpty(barcodeProd)) {
@ -631,7 +627,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
.toList(); .toList();
List<PickingObjectDTO> matchPickingObjectByArt = Stream.of(pickingList) List<PickingObjectDTO> matchPickingObjectByArt = Stream.of(pickingList)
.filter(x -> //x.getNumCollo() == null && .filter(x -> //x.getNumCollo() == null &&
(listOfCodMartsInRowCollo.contains(x.getCodMart()) && !alreadyMatchedArts.contains(x.getCodMart()))) (listOfCodMartsInRowCollo.contains(x.getCodMart()) && !alreadyMatchedArts.contains(x.getCodMart())))
@ -643,7 +638,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i); PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr()) List<MtbColr> matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) && .filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList(); Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
@ -697,8 +691,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
//} //}
matchPickingObject.addAll(matchPickingObjectByArt); matchPickingObject.addAll(matchPickingObjectByArt);
@ -874,7 +866,8 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
progress, progress,
currentMtbColt, currentMtbColt,
() -> distribuisciCollo(progress, (generatedMtbColts) -> { () -> distribuisciCollo(progress, (generatedMtbColts) -> {
if(shouldPrint) printCollo(progress, generatedMtbColts, onComplete); if (shouldPrint)
printCollo(progress, generatedMtbColts, onComplete);
else { else {
postCloseOperations(generatedMtbColts, onComplete); postCloseOperations(generatedMtbColts, onComplete);
progress.dismiss(); progress.dismiss();
@ -1086,7 +1079,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
if (numCnfDaEvadere < 0) numCnfDaEvadere = 0; if (numCnfDaEvadere < 0) numCnfDaEvadere = 0;
AtomicBigDecimal qtaColEvasaInCurrentUL = new AtomicBigDecimal(); AtomicBigDecimal qtaColEvasaInCurrentUL = new AtomicBigDecimal();
AtomicBigDecimal numCnfEvasaInCurrentUL = new AtomicBigDecimal(); AtomicBigDecimal numCnfEvasaInCurrentUL = new AtomicBigDecimal();
@ -1182,8 +1174,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
} }
if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) { if (tmpPickData.getQtaCnf() != null && useQtaDaEvadere) {
@ -1215,7 +1205,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
qtaCnf = item.getMtbAart().getQtaCnf(); qtaCnf = item.getMtbAart().getQtaCnf();
} }
if(qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
if (qtaDisponibile != null && qtaDisponibile.compareTo(BigDecimal.ZERO) > 0) {
dto.setNumCnf(qtaDisponibile.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
} else if (qtaDaEvadere.compareTo(BigDecimal.ZERO) > 0) {
dto.setNumCnf(qtaDaEvadere.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue()); dto.setNumCnf(qtaDaEvadere.divide(qtaCnf, 3, RoundingMode.HALF_EVEN).setScale(0, RoundingMode.UP).intValue());
} }
@ -1301,7 +1294,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
onOrdineRowSave(item, cloneMtbColt, closeUL, !shouldPrint, progress); onOrdineRowSave(item, cloneMtbColt, closeUL, !shouldPrint, progress);
} }
private void addTipoPedanaFromArt(PickingObjectDTO item, MtbColt cloneMtbColt, boolean closeUL, Dialog progress) { private void addTipoPedanaFromArt(PickingObjectDTO item, MtbColt cloneMtbColt, boolean closeUL, Dialog progress) {
@ -1482,9 +1474,6 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO
} }
public void manualSearch() { public void manualSearch() {
BarcodeManager.disable(); BarcodeManager.disable();
DialogSimpleInputHelper.makeInputDialog(mActivity, "Inserisci il codice a barre", codice -> { DialogSimpleInputHelper.makeInputDialog(mActivity, "Inserisci il codice a barre", codice -> {