Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge tag 'Hotfix-57' into develop

Browse Source 
Finish Hotfix-57
This commit is contained in:
Fabio Narracci
2024-04-22 17:22:06 +02:00
parent 1cb380de45 df04dba03f
commit ed35819ae5
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ems-engine/src/main/java/it/integry/ems/document/farm_mes/service/FarmMesScrofaieImportService.java
View File

@@ -51,6 +51,8 @@ public class FarmMesScrofaieImportService {
private String tipoAnag = "C";
private String trasferimento;
private String inventario;
@Autowired
private JSONObjectMapper jsonObjectMapper;
@Autowired
@@ -150,6 +152,14 @@ public class FarmMesScrofaieImportService {
return ConfigActivityRules.completeActivityId(multiDBTransactionManager.getPrimaryConnection());
}
public String getInventario() {
return inventario;
}
public void setInventario(String inventario) {
this.inventario = inventario;
}
private void getDatiProduzioneProv(TransactionSaveScrofaie transaction, String bandaProv, DettaglioProd dettProd) throws Exception {
Connection conn = multiDBTransactionManager.getPrimaryConnection();
ResultSet res;
@@ -2989,9 +2999,10 @@ public class FarmMesScrofaieImportService {
setAvanzamento("AVANZAMENTO");
setVendita("VENDITA");
setProduzione("PRODUZIONE");
setConsumi("INVENTARIO");
setConsumi("CONSUMI");
setTrasferimentoACepsite("TRASFERIMENTO_A_CESPITE");
setTrasferimento("TRASFERIMENTO");
setInventario("INVENTARIO");
}
public List<ServiceRestResponse> saveTransactionScrofaie(TransactionSaveScrofaie transaction) throws Exception {
@@ -3004,7 +3015,7 @@ public class FarmMesScrofaieImportService {
finalList = avanzamento(transaction, null);
} else if (transaction.getTransactionTypeID().compareTo(vendita) == 0) {
finalList = Vendita(transaction);
} else if (transaction.getTransactionTypeID().compareTo(consumi) == 0) {
} else if (transaction.getTransactionTypeID().compareTo(consumi) == 0 || transaction.getTransactionTypeID().compareTo(inventario) == 0) {
finalList = consumi(transaction);
} else if (transaction.getTransactionTypeID().compareTo(rilevazioneMorti) == 0) {
finalList = RilevazioneMorti(transaction);
@@ -3425,7 +3436,7 @@ public class FarmMesScrofaieImportService {
activitys.setActivityId(activityID);
arrayEntity.add(activitys);
} else if (activityTypeID.compareTo(vendita) == 0 || activityTypeID.compareTo(consumi) == 0 || activityTypeID.compareTo(trasferimentoACepsite) == 0) {
} else if (activityTypeID.compareTo(vendita) == 0 || activityTypeID.compareTo(consumi) == 0 || activityTypeID.compareTo(trasferimentoACepsite) == 0 || activityTypeID.compareTo(inventario) == 0 ) {
// -------------------------------------
// CANCELLEAZIONE ED AGGIORNAMENTO STEP
// -------------------------------------