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

[ROSSOGARGANO]

Browse Source 
- fix rientro materia prima da lavorazione
This commit is contained in:
Valerio Castellana
2025-04-14 10:58:52 +02:00
parent 4459394a58
commit 8cc3a2bde0
4 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-engine/src/main/java/it/integry/ems/production/service/MesProductionServiceV2.java
View File

@@ -1307,7 +1307,11 @@ public class MesProductionServiceV2 {
CheckMaterialeBarcodeInOrdineResponseDTO response = new CheckMaterialeBarcodeInOrdineResponseDTO(); CheckMaterialeBarcodeInOrdineResponseDTO response = new CheckMaterialeBarcodeInOrdineResponseDTO();
MtbColt collo; MtbColt collo;
collo = pvmService.getColloByBarcode(dto.getBarcode(), true); try{
collo = pvmService.getColloByBarcode(dto.getBarcode(), true);
}catch (Exception e){
collo = null;
}
if (collo == null) { if (collo == null) {
boolean canCreateUlFromEan128 = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PVM", "MONITORAGGIO_LINEE_V2", "CAN_CREATE_UL_FROM_EAN"); boolean canCreateUlFromEan128 = setupGest.getSetupBoolean(multiDBTransactionManager.getPrimaryConnection(), "PVM", "MONITORAGGIO_LINEE_V2", "CAN_CREATE_UL_FROM_EAN");

18
ems-engine/src/main/java/it/integry/ems/retail/pvmRetail/service/PvmService.java
View File

@@ -2696,15 +2696,15 @@ public class PvmService {
String sql = Query.format( String sql = Query.format(
"SELECT dw_name AS module,\n" + "SELECT dw_name AS module,\n" +
" dw_colname AS authorization_name,\n" + " dw_colname AS authorization_name,\n" +
" CAST(IIF(enabled IS NULL, 1, IIF(enabled = 'S', 1, 0)) AS BIT) AS enabled,\n" + " CAST(IIF(enabled IS NULL, 1, IIF(enabled = 'S', 1, 0)) AS BIT) AS enabled,\n" +
" CAST(IIF(visible IS NULL, 1, IIF(visible = 'S', 1, 0)) AS BIT) AS visible,\n" + " CAST(IIF(visible IS NULL, 1, IIF(visible = 'S', 1, 0)) AS BIT) AS visible,\n" +
" CAST(IIF(required IS NULL, 0, IIF(required = 'S', 1, 0)) AS BIT) AS required\n" + " CAST(IIF(required IS NULL, 0, IIF(required = 'S', 1, 0)) AS BIT) AS required\n" +
"FROM stb_edit_limit\n" + "FROM stb_edit_limit\n" +
"WHERE gest_name = 'PVM'\n" + "WHERE gest_name = 'PVM'\n" +
" AND dw_name = %s\n" + " AND dw_name = %s\n" +
" AND dw_colname = %s\n" + " AND dw_colname = %s\n" +
" AND user_name = %s", " AND user_name = %s",
section, section,
authName, authName,
username username

11
ems-engine/src/main/java/it/integry/ems/retail/wms/dto/RientroMerceRequestDTO.java
View File

@@ -1,5 +1,6 @@
package it.integry.ems.retail.wms.dto; package it.integry.ems.retail.wms.dto;
import it.integry.ems_model.entity.DtbOrdt;
import it.integry.ems_model.entity.MtbColt; import it.integry.ems_model.entity.MtbColt;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -11,6 +12,7 @@ public class RientroMerceRequestDTO {
private String codMart; private String codMart;
private String partitaMag; private String partitaMag;
private BigDecimal qtaRientro; private BigDecimal qtaRientro;
private DtbOrdt order;
public MtbColt getSourceMtbColt() { public MtbColt getSourceMtbColt() {
@@ -57,4 +59,13 @@ public class RientroMerceRequestDTO {
this.qtaRientro = qtaRientro; this.qtaRientro = qtaRientro;
return this; return this;
} }
public DtbOrdt getOrder() {
return order;
}
public RientroMerceRequestDTO setOrder(DtbOrdt order) {
this.order = order;
return this;
}
} }

3
ems-engine/src/main/java/it/integry/ems/retail/wms/generic/service/WMSGenericService.java
View File

@@ -2923,6 +2923,7 @@ public class WMSGenericService {
" mtb_colr.partita_mag,\n" + " mtb_colr.partita_mag,\n" +
" mtb_colr.data_ord,\n" + " mtb_colr.data_ord,\n" +
" mtb_colr.num_ord,\n" + " mtb_colr.num_ord,\n" +
" mtb_colr.riga_ord,\n" +
" mtb_colr.partita_mag,\n" + " mtb_colr.partita_mag,\n" +
" mtb_colr.qta_cnf,\n" + " mtb_colr.qta_cnf,\n" +
" mtb_colr.gestione_rif,mtb_colr.data_collo_rif,mtb_colr.ser_collo_rif,mtb_colr.num_collo_rif,\n" + " mtb_colr.gestione_rif,mtb_colr.data_collo_rif,mtb_colr.ser_collo_rif,mtb_colr.num_collo_rif,\n" +
@@ -2940,7 +2941,7 @@ public class WMSGenericService {
" and mtb_colt.segno = -1\n" + " and mtb_colt.segno = -1\n" +
" and ({} IS NULL OR mtb_colr.partita_mag = {})\n" + " and ({} IS NULL OR mtb_colr.partita_mag = {})\n" +
"\n" + "\n" +
"GROUP BY mtb_colr.gestione, mtb_colr.data_collo, mtb_colr.num_collo, mtb_colr.ser_collo, mtb_colr.cod_mart,mtb_colr.gestione_rif,mtb_colr.data_collo_rif,mtb_colr.ser_collo_rif,mtb_colr.num_collo_rif,mtb_colr.qta_cnf, mtb_colr.partita_mag,mtb_colr.data_ord,mtb_colr.num_ord", "GROUP BY mtb_colr.gestione, mtb_colr.data_collo, mtb_colr.num_collo, mtb_colr.ser_collo, mtb_colr.cod_mart,mtb_colr.gestione_rif,mtb_colr.data_collo_rif,mtb_colr.ser_collo_rif,mtb_colr.num_collo_rif,mtb_colr.qta_cnf, mtb_colr.partita_mag,mtb_colr.data_ord,mtb_colr.num_ord,mtb_colr.riga_ord",
scarico.getDataCollo(), scarico.getSerCollo(), scarico.getNumCollo(), scarico.getGestione(), codMart, partitaMag, partitaMag); scarico.getDataCollo(), scarico.getSerCollo(), scarico.getNumCollo(), scarico.getGestione(), codMart, partitaMag, partitaMag);
MtbColr versamento = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbColr.class); MtbColr versamento = UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, MtbColr.class);
return versamento; return versamento;