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

Merge branch 'master' into develop
All checks were successful
IntegryManagementSystem_Multi/pipeline/head This commit looks good
Details

Browse Source 
# Conflicts:
#	ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java
This commit is contained in:
Valerio Castellana
2024-11-12 15:15:26 +01:00
parent 09f1e648c2 a22d98ecf1
commit 602a80bb37
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ems-engine/src/main/java/it/integry/ems/customizations/sales/service/ToscaSalesService.java
View File

@@ -177,10 +177,10 @@ public class ToscaSalesService {
.setRagSoc(ragSoc.length() >= 40 ? ragSoc.substring(0, 39) : ragSoc)
.setNote(ragSoc)
.setDiacod(order.getCounterPNr())
.setOperation(OperationType.INSERT);
.setOperation(OperationType.INSERT_OR_UPDATE);
VtbClie clie = new VtbClie();
clie.setOperation(OperationType.INSERT);
clie.setOperation(OperationType.INSERT_OR_UPDATE);
gtbAnag.setVtbClie(clie);
entityProcessor.processEntity(gtbAnag, true, multiDBTransactionManager);
order.setCodAnag(gtbAnag.getCodAnag());

3
ems-engine/src/main/java/it/integry/ems/production/service/ProductionService.java
View File

@@ -1519,6 +1519,7 @@ public class ProductionService {
public void attribuzioneCostoMaterialiLavorazione(Date dataIniz, Date dataFine, String codProd, String partitaMag, String codJcom) throws Exception {
String codDtipLav = setupGest.getSetup(multiDBTransactionManager.getPrimaryConnection(), "W_PORDI_RC", "SETUP_DOCUMENTI", "COD_DTIP_CAR");
String codDtipLavTerzi = setupGest.getSetup(multiDBTransactionManager.getPrimaryConnection(), "DATI_AZIENDA", "CONTO_LAVORO", "COD_DTIP_CLAV");
//cerco tutti i documenti di lavorazione creati nel periodo selezionato
String sql = "SELECT dtb_docr.*\n" +
"FROM dtb_docr\n" +
@@ -1526,7 +1527,7 @@ public class ProductionService {
" dtb_docr.data_doc = dtb_doct.data_doc AND dtb_docr.ser_doc = dtb_doct.ser_doc AND\n" +
" dtb_docr.num_doc = dtb_doct.num_doc AND dtb_docr.cod_mart = dtb_doct.cod_prod\n" +
"WHERE dtb_doct.data_doc BETWEEN " + UtilityDB.valueToString(dataIniz) + " AND " + UtilityDB.valueToString(dataFine) + "\n" +
" AND dtb_doct.cod_dtip = " + UtilityDB.valueToString(codDtipLav) + "\n" +
" AND dtb_doct.cod_dtip in (" + UtilityDB.valueToString(codDtipLav) + " , "+UtilityDB.valueToString(codDtipLavTerzi)+")\n" +
" AND (" + UtilityDB.valueToString(codProd) + " IS NULL OR dtb_doct.cod_prod = " + UtilityDB.valueToString(codProd) + ")\n" +
" AND (" + UtilityDB.valueToString(codJcom) + " IS NULL OR dtb_doct.cod_jcom = " + UtilityDB.valueToString(codJcom) + ")\n" +
" AND (" + UtilityDB.valueToString(partitaMag) + " IS NULL OR dtb_doct.partita_mag = " + UtilityDB.valueToString(partitaMag) + ")";