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

Finish v1.37.01(409)

Browse Source
This commit is contained in:
Giuseppe Scorrano 2024-01-15 13:36:43 +01:00
commit 6022cfea1f
12 changed files with 185 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.idea/deploymentTargetDropDown.xml generated
View File

@ -2,6 +2,22 @@
<project version="4">
<component name="deploymentTargetDropDown">
<value>
<entry key="Prod_Android.WMS.app">
<State>
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="20119B1E55" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2024-01-15T11:45:15.850312500Z" />
</State>
</entry>
<entry key="app">
<State />
</entry>

4
app/build.gradle
View File

@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
android {
def appVersionCode = 407
def appVersionName = '1.36.14'
def appVersionCode = 409
def appVersionName = '1.37.01'
signingConfigs {
release {

12
app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
View File

@ -86,7 +86,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
.setTitleText(R.string.free_picking)
.setTitleIcon(R.drawable.ic_dashboard_picking_libero)
.setDrawerIcon(R.drawable.ic_black_barcode_scanner)
.setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
.setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_picking, GestioneEnum.VENDITA, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
.addItem(new MenuItem()
.setID(R.id.nav_resi_cliente)
@ -122,7 +122,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
.setTitleText(R.string.free_lav_picking)
.setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
.setDrawerIcon(R.drawable.ic_black_barcode_scanner)
.setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
.setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.free_lav_picking, GestioneEnum.LAVORAZIONE, SettingsManager.iDB().isFlagAskClienteInPickingLibero(), false)))
.addItem(new MenuItem()
.setID(R.id.nav_prod_posizionamento_da_ord)
@ -171,6 +171,14 @@ public class MenuConfiguration extends BaseMenuConfiguration {
.setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
.setDrawerIcon(R.drawable.ic_black_external)
.setFragmentFactory(ProdVersamentoMaterialeInBufferFragment::newInstance))
.addItem(new MenuItem()
.setID(R.id.nav_prod_versamento_su_ordine)
.setCodMenu("MG068")
.setTitleText(R.string.prod_versamento_su_ordine_title_fragment)
.setTitleIcon(R.drawable.ic_dashboard_prod_versamento_su_ord)
.setDrawerIcon(R.drawable.ic_black_external)
.setFragmentFactory(() -> PickingLiberoFragment.newInstance(R.string.prod_versamento_su_ordine_title_fragment, GestioneEnum.LAVORAZIONE, false, true)))
).addGroup(
new MenuGroup()
.setGroupText(R.string.internal_handling)

31
app/src/main/java/it/integry/integrywmsnative/core/utility/UtilitySHA1.java Normal file
View File

@ -0,0 +1,31 @@
package it.integry.integrywmsnative.core.utility;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
public class UtilitySHA1 {
public static String getSha1Hex(String clearString)
{
try
{
MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
messageDigest.update(clearString.getBytes(StandardCharsets.UTF_8));
byte[] bytes = messageDigest.digest();
StringBuilder buffer = new StringBuilder();
for (byte b : bytes)
{
buffer.append(Integer.toString((b & 0xff) + 0x100, 16).substring(1));
}
return buffer.toString();
}
catch (Exception ignored)
{
ignored.printStackTrace();
return null;
}
}
}

8
app/src/main/java/it/integry/integrywmsnative/gest/contab_doc_interni/edit_form/DocInterniEditFormViewModel.java
View File

@ -22,8 +22,10 @@ import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingL
import it.integry.integrywmsnative.core.rest.model.Ean128Model;
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.rest.model.documento.DocumentoArtDTO;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityDate;
import it.integry.integrywmsnative.core.utility.UtilitySHA1;
import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ArtDTO;
import it.integry.integrywmsnative.gest.contab_doc_interni.dto.CheckFornitoreDTO;
import it.integry.integrywmsnative.gest.contab_doc_interni.dto.ColloDTO;
@ -201,8 +203,12 @@ public class DocInterniEditFormViewModel {
private SaveDTO getSaveDto() {
SqlMtbColt document = this.getDocument();
String UUID = SettingsManager.i().getUserSession().getDeviceId() + "-" + document.getId();
UUID = UtilitySHA1.getSha1Hex(UUID);
SaveDTO saveDTO = new SaveDTO();
saveDTO.setUUID(String.valueOf(document.getId()));
saveDTO.setUUID(UUID);
saveDTO.setIdDisp("1");
saveDTO.setGestione(document.getGestione());
saveDTO.setCodMdep(document.getCodMdep());

8
app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java
View File

@ -8,6 +8,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.StringRes;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.core.content.ContextCompat;
import androidx.databinding.DataBindingUtil;
@ -93,10 +94,11 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
// Required empty public constructor
}
public static PickingLiberoFragment newInstance(GestioneEnum gestioneEnum, boolean askCliente, boolean askLineaProd) {
public static PickingLiberoFragment newInstance(@StringRes int title, GestioneEnum gestioneEnum, boolean askCliente, boolean askLineaProd) {
PickingLiberoFragment fragment = new PickingLiberoFragment();
Bundle args = new Bundle();
args.putInt("title", title);
args.putString("gestione", gestioneEnum.getText());
args.putBoolean("askCliente", askCliente);
args.putBoolean("askLineaProd", askLineaProd);
@ -108,7 +110,6 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
@Override
public void onCreateActionBar(AppCompatTextView titleText, Context context) {
mToolbarTitleText = titleText;
mToolbarTitleText.setText(context.getText(R.string.free_picking_title_fragment).toString());
}
@Override
@ -119,6 +120,9 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme
mCurrentGestione = GestioneEnum.fromString(getArguments().getString("gestione"));
mAskCliente = getArguments().getBoolean("askCliente");
mAskLineaProd = getArguments().getBoolean("askLineaProd");
mToolbarTitleText.setText(getText(getArguments().getInt("title")).toString());
}

10
app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_linea_prod/DialogAskLineaProdView.java
View File

@ -75,6 +75,7 @@ public class DialogAskLineaProdView extends BaseDialogFragment implements Dialog
alertDialog.setCanceledOnTouchOutside(isCancelable());
alertDialog.setOnShowListener(this);
alertDialog.setOnDismissListener(this);
return alertDialog;
}
@ -102,6 +103,13 @@ public class DialogAskLineaProdView extends BaseDialogFragment implements Dialog
@Override
public void onProductionLineSelected(String codJfas) {
this.onComplete.run(codJfas);
dismiss();
requireActivity().runOnUiThread(this::dismiss);
}
@Override
public void onDismiss(@NonNull DialogInterface dialog) {
BarcodeManager.removeCallback(mBarcodeScannerIstanceID);
super.onDismiss(dialog);
}
}

56
app/src/main/res/drawable/ic_dashboard_prod_versamento_su_ord.xml Normal file
View File

@ -0,0 +1,56 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path
android:pathData="M440,52.86h-77.9l-20.3,405.3h117.3L440,52.86z"
android:fillColor="#BF360C"/>
<path
android:pathData="M352.5,244.86h-42.7v-64l-128,64v-64l-128,64v213.3h298.7V244.86z"
android:fillColor="#E64A19"/>
<path
android:pathData="M96.5,287.56h42.7v42.7H96.5V287.56z"
android:fillColor="#FFC107"/>
<path
android:pathData="M181.8,287.56h42.7v42.7h-42.7V287.56z"
android:fillColor="#FFC107"/>
<path
android:pathData="M267.2,287.56h42.7v42.7h-42.7V287.56z"
android:fillColor="#FFC107"/>
<path
android:pathData="M96.5,372.86h42.7v42.7H96.5V372.86z"
android:fillColor="#FFC107"/>
<path
android:pathData="M181.8,372.86h42.7v42.7h-42.7V372.86z"
android:fillColor="#FFC107"/>
<path
android:pathData="M267.2,372.86h42.7v42.7h-42.7V372.86z"
android:fillColor="#FFC107"/>
<path
android:pathData="M194.35,50.39l-51.17,7.68c0.85,5.66 -3.07,10.91 -8.68,11.75c-5.61,0.84 -10.91,-3.07 -11.75,-8.68l-51.17,7.68c-11.27,1.69 -19.1,12.28 -17.41,23.55l24.56,163.69c1.69,11.27 12.28,19.1 23.55,17.41l122.78,-18.43c11.27,-1.69 19.1,-12.28 17.41,-23.55L217.9,67.74C216.22,56.52 205.63,48.69 194.35,50.39z"
android:fillColor="#455A64"/>
<path
android:pathData="M222.76,239.64L99.98,258.06c-3.07,0.46 -5.44,-1.29 -5.9,-4.36L69.51,90.01c-0.46,-3.07 1.29,-5.44 4.36,-5.9l122.78,-18.43c3.07,-0.46 5.44,1.29 5.9,4.36l24.56,163.69C227.59,236.85 225.83,239.18 222.76,239.64z"
android:fillColor="#FFFFFF"/>
<path
android:pathData="M143.18,58.06c0.85,5.66 -3.07,10.91 -8.68,11.75c-5.61,0.84 -10.91,-3.07 -11.75,-8.68l-35.83,5.38L90,86.99c0.85,5.66 6.14,9.52 11.75,8.68l71.6,-10.75c5.66,-0.85 9.52,-6.14 8.68,-11.75l-3.07,-20.48L143.18,58.06z"
android:fillColor="#90A4AE"/>
<path
android:pathData="M129.89,39.12c-11.27,1.69 -19.1,12.28 -17.41,23.55c1.69,11.27 12.28,19.1 23.55,17.41s19.1,-12.28 17.41,-23.55C151.75,45.25 141.16,37.43 129.89,39.12zM134.5,69.81c-5.66,0.85 -10.91,-3.07 -11.75,-8.68c-0.84,-5.61 3.07,-10.91 8.68,-11.75s10.91,3.07 11.75,8.68C144.02,63.68 140.16,68.96 134.5,69.81z"
android:fillColor="#90A4AE"/>
<path
android:pathData="M177.94,129.2l-39.13,52.95l-24.79,-18.79l-10.88,14.73l39.92,29.07l49.57,-67.07L177.94,129.2z"
android:fillColor="#2958B7"/>
<path
android:pathData="M244.48,302.31l34.54,7.54"
android:fillColor="#00BCD4"/>
<path
android:pathData="M279.08,309.86"
android:fillColor="#00BCD4"/>
<path
android:pathData="M244.48,302.31c8.49,-38.92 -17.51,-77.83 -58.05,-86.67l7.25,-33.22c59.55,12.99 97.84,70.16 85.35,127.43l30.23,6.59L249,364.24l-34.87,-68.55L244.48,302.31L244.48,302.31"
android:strokeWidth="10"
android:fillColor="#6DBE45"
android:strokeColor="#FFFFFF"/>
</vector>

1
app/src/main/res/values-it/strings.xml
View File

@ -335,6 +335,7 @@
<string name="prod_ordine_lavorazione_title_fragment">Picking da ordine</string>
<string name="prod_versamento_materiale_title_fragment">Versamento materiale</string>
<string name="prod_versamento_materiale_in_buffer_title_fragment">Versamento materiale in buffer</string>
<string name="prod_versamento_su_ordine_title_fragment">Versamento su ordine</string>
<string name="prod_recupero_materiale_title_fragment">Recupero materiale</string>
<string name="please_select_an_item">Seleziona un elemento per continuare</string>

1
app/src/main/res/values/config.xml
View File

@ -27,6 +27,7 @@
<item name="nav_prod_ordine_produzione" type="id" />
<item name="nav_prod_versamento_materiale" type="id" />
<item name="nav_prod_versamento_materiale_in_buffer" type="id" />
<item name="nav_prod_versamento_su_ordine" type="id" />
<item name="nav_prod_ordine_lavorazione" type="id" />
<item name="nav_prod_recupero_materiale" type="id" />
<item name="nav_pv_ordini_acquisto" type="id" />

1
app/src/main/res/values/strings.xml
View File

@ -339,6 +339,7 @@
<string name="prod_ordine_lavorazione_title_fragment">Manufacture picking</string>
<string name="prod_versamento_materiale_title_fragment">Deposit raw material</string>
<string name="prod_versamento_materiale_in_buffer_title_fragment">Deposit raw material in buffer</string>
<string name="prod_versamento_su_ordine_title_fragment">Deposit by order</string>
<string name="prod_recupero_materiale_title_fragment">Recover raw material</string>
<string name="please_select_an_item">Please select an item before proceed</string>

45
ext_sources/ICONS/ic_dashboard_prod_versamento_su_ord.svg Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 28.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<style type="text/css">
.st0{fill:#BF360C;}
.st1{fill:#E64A19;}
.st2{fill:#FFC107;}
.st3{fill:#455A64;}
.st4{fill:#FFFFFF;}
.st5{fill:#90A4AE;}
.st6{fill:#2958B7;}
.st7{fill:#00BCD4;}
.st8{fill:#6DBE45;stroke:#FFFFFF;stroke-width:10;stroke-miterlimit:10;}
</style>
<g id="surface1">
<path class="st0" d="M440,52.86h-77.9l-20.3,405.3h117.3L440,52.86z"/>
<path class="st1" d="M352.5,244.86h-42.7v-64l-128,64v-64l-128,64v213.3h298.7V244.86z"/>
<path class="st2" d="M96.5,287.56h42.7v42.7H96.5V287.56z"/>
<path class="st2" d="M181.8,287.56h42.7v42.7h-42.7V287.56z"/>
<path class="st2" d="M267.2,287.56h42.7v42.7h-42.7V287.56z"/>
<path class="st2" d="M96.5,372.86h42.7v42.7H96.5V372.86z"/>
<path class="st2" d="M181.8,372.86h42.7v42.7h-42.7V372.86z"/>
<path class="st2" d="M267.2,372.86h42.7v42.7h-42.7V372.86z"/>
</g>
<g id="surface1_00000177443818906770147140000015548886240397629374_">
<path class="st3" d="M194.35,50.39l-51.17,7.68c0.85,5.66-3.07,10.91-8.68,11.75c-5.61,0.84-10.91-3.07-11.75-8.68l-51.17,7.68
c-11.27,1.69-19.1,12.28-17.41,23.55l24.56,163.69c1.69,11.27,12.28,19.1,23.55,17.41l122.78-18.43
c11.27-1.69,19.1-12.28,17.41-23.55L217.9,67.74C216.22,56.52,205.63,48.69,194.35,50.39z"/>
<path class="st4" d="M222.76,239.64L99.98,258.06c-3.07,0.46-5.44-1.29-5.9-4.36L69.51,90.01c-0.46-3.07,1.29-5.44,4.36-5.9
l122.78-18.43c3.07-0.46,5.44,1.29,5.9,4.36l24.56,163.69C227.59,236.85,225.83,239.18,222.76,239.64z"/>
<path class="st5" d="M143.18,58.06c0.85,5.66-3.07,10.91-8.68,11.75c-5.61,0.84-10.91-3.07-11.75-8.68l-35.83,5.38L90,86.99
c0.85,5.66,6.14,9.52,11.75,8.68l71.6-10.75c5.66-0.85,9.52-6.14,8.68-11.75l-3.07-20.48L143.18,58.06z"/>
<path class="st5" d="M129.89,39.12c-11.27,1.69-19.1,12.28-17.41,23.55c1.69,11.27,12.28,19.1,23.55,17.41s19.1-12.28,17.41-23.55
C151.75,45.25,141.16,37.43,129.89,39.12z M134.5,69.81c-5.66,0.85-10.91-3.07-11.75-8.68c-0.84-5.61,3.07-10.91,8.68-11.75
s10.91,3.07,11.75,8.68C144.02,63.68,140.16,68.96,134.5,69.81z"/>
<path class="st6" d="M177.94,129.2l-39.13,52.95l-24.79-18.79l-10.88,14.73l39.92,29.07l49.57-67.07L177.94,129.2z"/>
</g>
<g id="surface1_1_">
<path class="st7" d="M244.48,302.31l34.54,7.54"/>
<path class="st7" d="M279.08,309.86"/>
<path class="st8" d="M244.48,302.31c8.49-38.92-17.51-77.83-58.05-86.67l7.25-33.22c59.55,12.99,97.84,70.16,85.35,127.43
l30.23,6.59L249,364.24l-34.87-68.55L244.48,302.31L244.48,302.31"/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB