Aggiunte qta_proposta e giacenza in system note degli ordini di acquisto pv

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java

@@ -19,7 +19,7 @@ import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
 import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 8, exportSchema = false)
+@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class, SqlMtbColt.class, SqlMtbColr.class}, version = 9, exportSchema = false)
 @TypeConverters({
         DateConverter.class,
         BigDecimalConverter.class

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java

@@ -6,7 +6,10 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import org.json.JSONObject;
+
 import java.math.BigDecimal;
+import java.util.HashMap;
 
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 
@@ -202,6 +205,14 @@ public class ArticoloGriglia {
         this.newNoPromo = newNoPromo;
     }
 
+    public String generateSystemNote() {
+        HashMap<String, String> pairs = new HashMap<>();
+        pairs.put("qta_proposta", String.valueOf(qtaProposta));
+        pairs.put("giacenza", String.valueOf(giacenza));
+
+        return new JSONObject(pairs).toString();
+    }
+
     public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
         ArticoloOrdine articolo = new ArticoloOrdine();
 
@@ -222,6 +233,7 @@ public class ArticoloGriglia {
         articolo.setQtaPrevistaVendita(BigDecimal.valueOf(this.getQtaPrevistaVendita()));
         articolo.setQtaProposta(BigDecimal.valueOf(this.getQtaProposta()));
         articolo.setNewNoPromo(this.isNewNoPromo());
+        articolo.setSystemNote(generateSystemNote());
 
         articolo.setQtaOrd(0);
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java

@@ -70,6 +70,9 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "new_no_promo")
     private boolean newNoPromo;
 
+    @ColumnInfo(name = "system_note")
+    private String systemNote;
+
     @Ignore
     private int ggScadenza = 0;
 
@@ -266,4 +269,12 @@ public class ArticoloOrdine {
         this.bgTint = bgTint;
         return this;
     }
+
+    public String getSystemNote() {
+        return systemNote;
+    }
+
+    public void setSystemNote(String systemNote) {
+        this.systemNote = systemNote;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/PVOrdiniAcquistoRESTConsumer.java

@@ -136,7 +136,6 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
                 });
 
 
-
     }
 
     private ArtDTO convertArtToDTO(ArticoloOrdine art, int rigaOrd) {
@@ -147,6 +146,7 @@ public class PVOrdiniAcquistoRESTConsumer extends _BaseRESTConsumer {
         dto.setDescrizione(art.getDescrizione());
         dto.setDataInsD(art.getDataIns());
         dto.setUntMis(art.getUntMis());
+        dto.setSystemNote(art.getSystemNote());
         dto.setQta(BigDecimal.valueOf(art.getQtaOrd()));
         dto.setQtaCnf(BigDecimal.valueOf(art.getQtaCnf()));
         dto.setColli(BigDecimal.ZERO);

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditViewModel.java

@@ -163,6 +163,7 @@ public class PVOrdineAcquistoEditViewModel {
                             articolo.setMerceDaRic(artGrid.getMerceDaRic());
                             articolo.setNewNoPromo(artGrid.isNewNoPromo());
                             articolo.setFlagQtaMultipla(artGrid.getFlagQtaMultipla());
+                            articolo.setSystemNote(artGrid.generateSystemNote());
 
                             onSuccess.run(articolo);
                         } else {

app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dto/ArtDTO.java

@@ -28,6 +28,8 @@ public class ArtDTO {
 
     private String dataScad;
 
+    private String systemNote;
+
     public Integer getRigaOrd() {
         return rigaOrd;
     }
@@ -63,6 +65,7 @@ public class ArtDTO {
     public String getDataIns() {
         return dataIns;
     }
+
     public Date getDataInsD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataIns());
     }
@@ -70,6 +73,7 @@ public class ArtDTO {
     public void setDataIns(String dataIns) {
         this.dataIns = dataIns;
     }
+
     public void setDataInsD(Date dataIns) {
         setDataIns(UtilityDate.formatDate(dataIns, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
     }
@@ -122,6 +126,7 @@ public class ArtDTO {
     public void setDataScad(String dataScad) {
         this.dataScad = dataScad;
     }
+
     public Date getDataScadD() {
         return UtilityDate.recognizeDateWithExceptionHandler(getDataScad());
     }
@@ -130,5 +135,12 @@ public class ArtDTO {
         setDataScad(UtilityDate.formatDate(dataScad, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH));
     }
 
-
+    public String getSystemNote() {
+        return systemNote;
+    }
+
+    public ArtDTO setSystemNote(String systemNote) {
+        this.systemNote = systemNote;
+        return this;
+    }
 }