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

Merge branch 'develop' into feature/OrdiniAcquisto_PV

Browse Source 
# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	.idea/codeStyles/Project.xml
#	.idea/dbnavigator.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/runConfigurations/app.xml
This commit is contained in:
Valerio Castellana 2019-10-25 18:30:36 +02:00
commit fdc8d19bda
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/dbnavigator.xml generated
View File

@ -2,7 +2,7 @@
<project version="4"> <project version="4">
<component name="DBNavigator.Project.DataEditorManager"> <component name="DBNavigator.Project.DataEditorManager">
<record-view-column-sorting-type value="BY_INDEX" /> <record-view-column-sorting-type value="BY_INDEX" />
<value-preview-text-wrapping value="true" /> <value-preview-text-wrapping value="false" />
<value-preview-pinned value="false" /> <value-preview-pinned value="false" />
</component> </component>
<component name="DBNavigator.Project.DataExportManager"> <component name="DBNavigator.Project.DataExportManager">

6
app/src/main/java/it/integry/integrywmsnative/core/model/StbGestSetup.java
View File

@ -12,7 +12,7 @@ public class StbGestSetup extends EntityBase{
private String flagSync; private String flagSync;
private String queryDefault; private String queryDefault;
private String flagUserView; private String flagUserView;
private Date dataModifica; private String dataModifica;
private String modificatoDa; private String modificatoDa;
private String flagSetupDepo; private String flagSetupDepo;
private String flagSetupUserWeb; private String flagSetupUserWeb;
@ -93,11 +93,11 @@ public class StbGestSetup extends EntityBase{
return this; return this;
} }
public Date getDataModifica() { public String getDataModifica() {
return dataModifica; return dataModifica;
} }
public StbGestSetup setDataModifica(Date dataModifica) { public StbGestSetup setDataModifica(String dataModifica) {
this.dataModifica = dataModifica; this.dataModifica = dataModifica;
return this; return this;
} }

6
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java
View File

@ -85,4 +85,10 @@ public class UtilityNumber {
return floatValue; return floatValue;
} }
public static float truncateToDecimal(float v, int i) {
int delta = 10*i;
return ((int)v*delta)/delta;
}
} }

2
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
View File

@ -346,7 +346,7 @@ public class DialogInputQuantity {
} }
if(quantityDTO.numCnf.get(false) == null) { if(quantityDTO.numCnf.get(false) == null) {
float numCnf = (float) Math.ceil(quantityDTO.qtaTot.get() / quantityDTO.qtaCnf.get()); float numCnf = (float) Math.ceil(UtilityNumber.truncateToDecimal(quantityDTO.qtaTot.get() / quantityDTO.qtaCnf.get(),3));
if(numCnf < 1) numCnf = 1; if(numCnf < 1) numCnf = 1;
quantityDTO.numCnf.set(numCnf); quantityDTO.numCnf.set(numCnf);
} }