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

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

Browse Source
This commit is contained in:
jenkins
2025-05-21 10:54:40 +02:00
parent 39eec7d1e6 be61adb5e7
commit 756abaf60c
9 changed files with 88 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ems-core/src/main/java/it/integry/ems/service/dto/production/InsertPartitaMagRequestDTO.java
View File

@@ -1,6 +1,6 @@
package it.integry.ems.service.dto.production;
import java.util.Date;
import java.time.LocalDate;
public class InsertPartitaMagRequestDTO {
private String codMart;
@@ -9,7 +9,7 @@ public class InsertPartitaMagRequestDTO {
private String partitaMagProd;
private Date dataScad;
private LocalDate dataScad;
private String codJfas;
@@ -17,7 +17,7 @@ public class InsertPartitaMagRequestDTO {
private String gestione;
private Date dataOrd;
private LocalDate dataOrd;
private Integer numOrd;
@@ -48,11 +48,11 @@ public class InsertPartitaMagRequestDTO {
return this;
}
public Date getDataScad() {
public LocalDate getDataScad() {
return dataScad;
}
public InsertPartitaMagRequestDTO setDataScad(Date dataScad) {
public InsertPartitaMagRequestDTO setDataScad(LocalDate dataScad) {
this.dataScad = dataScad;
return this;
}
@@ -84,11 +84,11 @@ public class InsertPartitaMagRequestDTO {
return this;
}
public Date getDataOrd() {
public LocalDate getDataOrd() {
return dataOrd;
}
public InsertPartitaMagRequestDTO setDataOrd(Date dataOrd) {
public InsertPartitaMagRequestDTO setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}

72
ems-core/src/main/java/it/integry/ems/service/dto/production/OrdineLavorazioneDTO.java
View File

@@ -2,20 +2,18 @@ package it.integry.ems.service.dto.production;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import it.integry.ems.adapter.JsonDateAdapterSerializer;
import it.integry.ems_model.annotation.SqlField;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
public class OrdineLavorazioneDTO {
@SqlField(value = "data_ord_prod")
@JsonProperty("dataOrdProd")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataOrdProd;
private LocalDate dataOrdProd;
@SqlField(value = "num_ord_prod")
@JsonProperty("numOrdProd")
@@ -104,13 +102,11 @@ public class OrdineLavorazioneDTO {
@SqlField(value = "data_ord")
@JsonProperty("dataOrd")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataOrd;
private LocalDate dataOrd;
@SqlField(value = "data_cons_commessa")
@JsonProperty("dataConsCommessa")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataConsCommessa;
private LocalDate dataConsCommessa;
@SqlField(value = "flag_evaso_prod")
@JsonProperty("flagEvasoProd")
@@ -159,8 +155,7 @@ public class OrdineLavorazioneDTO {
@SqlField(value = "data_scad")
@JsonProperty("dataScad")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataScad;
private LocalDate dataScad;
@SqlField(value = "partita_mag_suggested")
@JsonProperty("partitaMagSuggested")
@@ -169,8 +164,7 @@ public class OrdineLavorazioneDTO {
@SqlField(value = "data_scad_suggested")
@JsonProperty("dataScadSuggested")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataScadSuggested;
private LocalDate dataScadSuggested;
@SqlField(value = "cod_prod")
@JsonProperty("codProd")
@@ -183,18 +177,15 @@ public class OrdineLavorazioneDTO {
@SqlField(value = "data_iniz_prod")
@JsonProperty("dataInizProd")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataInizProd;
private LocalDate dataInizProd;
@SqlField(value = "data_iniz")
@JsonProperty("dataIniz")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataIniz;
private LocalDateTime dataIniz;
@SqlField(value = "data_fine")
@JsonProperty("dataFine")
@JsonSerialize(using = JsonDateAdapterSerializer.class)
private Date dataFine;
private LocalDateTime dataFine;
@SqlField(value = "qta_prod")
@JsonProperty("qtaProd")
@@ -368,12 +359,12 @@ public class OrdineLavorazioneDTO {
@SqlField(value = "run_time_end")
@JsonProperty("runTimeEnd")
@JsonSerialize
private Date runTimeEnd;
private LocalDateTime runTimeEnd;
@SqlField("data_cons_prod_max")
@JsonProperty("dataConsProdMax")
@JsonSerialize
private Date dataConsProdMax;
private LocalDateTime dataConsProdMax;
@SqlField("id_lotto")
@JsonProperty("idLotto")
@@ -392,11 +383,12 @@ public class OrdineLavorazioneDTO {
private List<AvailableClassMercDTO> availableClassMerc;
public Date getDataOrdProd() {
public LocalDate getDataOrdProd() {
return dataOrdProd;
}
public OrdineLavorazioneDTO setDataOrdProd(Date dataOrdProd) {
public OrdineLavorazioneDTO setDataOrdProd(LocalDate dataOrdProd) {
this.dataOrdProd = dataOrdProd;
return this;
}
@@ -554,20 +546,20 @@ public class OrdineLavorazioneDTO {
return this;
}
public Date getDataOrd() {
public LocalDate getDataOrd() {
return dataOrd;
}
public OrdineLavorazioneDTO setDataOrd(Date dataOrd) {
public OrdineLavorazioneDTO setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public Date getDataConsCommessa() {
public LocalDate getDataConsCommessa() {
return dataConsCommessa;
}
public OrdineLavorazioneDTO setDataConsCommessa(Date dataConsCommessa) {
public OrdineLavorazioneDTO setDataConsCommessa(LocalDate dataConsCommessa) {
this.dataConsCommessa = dataConsCommessa;
return this;
}
@@ -653,11 +645,11 @@ public class OrdineLavorazioneDTO {
return this;
}
public Date getDataScad() {
public LocalDate getDataScad() {
return dataScad;
}
public OrdineLavorazioneDTO setDataScad(Date dataScad) {
public OrdineLavorazioneDTO setDataScad(LocalDate dataScad) {
this.dataScad = dataScad;
return this;
}
@@ -671,11 +663,11 @@ public class OrdineLavorazioneDTO {
return this;
}
public Date getDataScadSuggested() {
public LocalDate getDataScadSuggested() {
return dataScadSuggested;
}
public OrdineLavorazioneDTO setDataScadSuggested(Date dataScadSuggested) {
public OrdineLavorazioneDTO setDataScadSuggested(LocalDate dataScadSuggested) {
this.dataScadSuggested = dataScadSuggested;
return this;
}
@@ -698,29 +690,29 @@ public class OrdineLavorazioneDTO {
return this;
}
public Date getDataInizProd() {
public LocalDate getDataInizProd() {
return dataInizProd;
}
public OrdineLavorazioneDTO setDataInizProd(Date dataInizProd) {
public OrdineLavorazioneDTO setDataInizProd(LocalDate dataInizProd) {
this.dataInizProd = dataInizProd;
return this;
}
public Date getDataIniz() {
public LocalDateTime getDataIniz() {
return dataIniz;
}
public OrdineLavorazioneDTO setDataIniz(Date dataIniz) {
public OrdineLavorazioneDTO setDataIniz(LocalDateTime dataIniz) {
this.dataIniz = dataIniz;
return this;
}
public Date getDataFine() {
public LocalDateTime getDataFine() {
return dataFine;
}
public OrdineLavorazioneDTO setDataFine(Date dataFine) {
public OrdineLavorazioneDTO setDataFine(LocalDateTime dataFine) {
this.dataFine = dataFine;
return this;
}
@@ -1031,20 +1023,20 @@ public class OrdineLavorazioneDTO {
return this;
}
public Date getRunTimeEnd() {
public LocalDateTime getRunTimeEnd() {
return runTimeEnd;
}
public OrdineLavorazioneDTO setRunTimeEnd(Date runTimeEnd) {
public OrdineLavorazioneDTO setRunTimeEnd(LocalDateTime runTimeEnd) {
this.runTimeEnd = runTimeEnd;
return this;
}
public Date getDataConsProdMax() {
public LocalDateTime getDataConsProdMax() {
return dataConsProdMax;
}
public OrdineLavorazioneDTO setDataConsProdMax(Date dataConsProdMax) {
public OrdineLavorazioneDTO setDataConsProdMax(LocalDateTime dataConsProdMax) {
this.dataConsProdMax = dataConsProdMax;
return this;
}

9
ems-core/src/main/java/it/integry/ems/service/production/ProductionOrderDataHandlerService.java
View File

@@ -1,7 +1,6 @@
package it.integry.ems.service.production;
import com.annimon.stream.Stream;
import it.integry.common.var.CommonConstants;
import it.integry.ems.service.dto.production.OrdineInevasoGroupMercDTO;
import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
import it.integry.ems.settings.Model.AvailableConnectionsModel;
@@ -212,7 +211,7 @@ public class ProductionOrderDataHandlerService {
"WHERE mtb_colr.num_etich = 1 AND " +
" mtb_colr.qta_col = 0 AND " +
" mtb_colr.num_ord = " + UtilityDB.valueToString(ordineDTO.getNumOrd()) + " AND " +
" mtb_colr.data_ord = " + UtilityDB.valueDateToString(ordineDTO.getDataOrd(), CommonConstants.DATE_FORMAT_YMD) + " AND " +
" mtb_colr.data_ord = " + UtilityDB.valueToString(ordineDTO.getDataOrd()) + " AND " +
" mtb_colr.gestione = " + UtilityDB.valueToString(ordineDTO.getGestione()) + " AND " +
" mtb_colr.cod_mart = " + UtilityDB.valueToString(ordineDTO.getCodProd()) + " AND " +
" mtb_colr.partita_mag = " + UtilityDB.valueToString(ordineDTO.getPartitaMag());
@@ -318,8 +317,8 @@ public class ProductionOrderDataHandlerService {
return ordersListToReturn.stream()
.filter(x -> (UtilityString.isNullOrEmpty(flagEvaso) || UtilityString.isNull(x.getFlagOrdineEvaso(), "I").equalsIgnoreCase(flagEvaso)) &&
(startDate == null || UtilityLocalDate.localDateFromDate(x.getDataOrd()).isAfter(startDate)) &&
(endDate == null || UtilityLocalDate.localDateFromDate(x.getDataOrd()).isBefore(endDate)) &&
(startDate == null || x.getDataOrd().isAfter(startDate)) &&
(endDate == null || x.getDataOrd().isBefore(endDate)) &&
(UtilityString.isNullOrEmpty(codAnag) || x.getCodAnag().equalsIgnoreCase(codAnag)))
.collect(Collectors.toList());
}
@@ -332,7 +331,7 @@ public class ProductionOrderDataHandlerService {
}
return ordini.stream()
.filter((order) ->
UtilityLocalDate.localDateFromDate(order.getDataOrd()).isEqual(dataOrd) &&
order.getDataOrd().isEqual(dataOrd) &&
order.getGestione().equalsIgnoreCase(gestione) && order.getNumOrd() == numOrd)
.findFirst()
.orElse(null);

4
ems-engine/src/main/java/it/integry/ems/customizations/production/service/ToscaProductionService.java
View File

@@ -50,7 +50,7 @@ public class ToscaProductionService {
if (openedSteps != null) {
for (DtbOrdSteps dtbOrdStep : openedSteps) {
mesProductionServiceV2.closeStep(dtbOrdStep.getDataOrd(), dtbOrdStep.getNumOrd(), dtbOrdStep.getGestione(), codJfas, dtbOrdStep.getIdStep(), dtbOrdStep.getIdRiga());
mesProductionServiceV2.closeStep(UtilityLocalDate.localDateFromDate(dtbOrdStep.getDataOrd()), dtbOrdStep.getNumOrd(), dtbOrdStep.getGestione(), codJfas, dtbOrdStep.getIdStep(), dtbOrdStep.getIdRiga());
}
}
@@ -132,7 +132,7 @@ public class ToscaProductionService {
if (openedSteps != null) {
for (DtbOrdSteps dtbOrdStep : openedSteps) {
mesProductionServiceV2.closeStep(dtbOrdStep.getDataOrd(), dtbOrdStep.getNumOrd(), dtbOrdStep.getGestione(), codJfas, dtbOrdStep.getIdStep(), dtbOrdStep.getIdRiga());
mesProductionServiceV2.closeStep(UtilityLocalDate.localDateFromDate(dtbOrdStep.getDataOrd()), dtbOrdStep.getNumOrd(), dtbOrdStep.getGestione(), codJfas, dtbOrdStep.getIdStep(), dtbOrdStep.getIdRiga());
}
}
}

32
ems-engine/src/main/java/it/integry/ems/production/controller/MesProductionControllerV2.java
View File

@@ -8,11 +8,11 @@ import it.integry.ems.production.dto.*;
import it.integry.ems.production.service.MesProductionServiceV2;
import it.integry.ems.production.service.ProductionLineService;
import it.integry.ems.production.service.ProductionOrdersLifecycleService;
import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
import it.integry.ems.service.production.ProductionOrderDataHandlerService;
import it.integry.ems.response.EsitoType;
import it.integry.ems.response.ServiceRestResponse;
import it.integry.ems.response.StatusResponse;
import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
import it.integry.ems.service.production.ProductionOrderDataHandlerService;
import it.integry.ems.status.ServiceChecker;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.config.EmsRestConstants;
@@ -30,7 +30,6 @@ import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@RestController
@@ -179,16 +178,13 @@ public class MesProductionControllerV2 {
ServiceRestResponse openOrderSteps(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false, defaultValue = "") String codJfas,
@RequestParam String dataOrd,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate dataOrd,
@RequestParam Integer numOrd,
@RequestParam String gestioneOrd,
@RequestParam(required = false, defaultValue = "0") int hrNum,
@RequestParam(required = false) String descrizioneAttivita) throws Exception {
ServiceRestResponse response = new ServiceRestResponse(EsitoType.OK);
Date dataOrdD = UtilityDate.RecognizeDate(dataOrd);
mesProductionService.openStep(dataOrdD, numOrd, gestioneOrd, UtilityString.emptyStr2Null(codJfas), hrNum, null, descrizioneAttivita);
return response;
mesProductionService.openStep(dataOrd, numOrd, gestioneOrd, UtilityString.emptyStr2Null(codJfas), hrNum, null, descrizioneAttivita);
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_MES_CLOSE_ORDER_STEPS_V2, method = RequestMethod.GET)
@@ -196,16 +192,14 @@ public class MesProductionControllerV2 {
ServiceRestResponse closeOrderSteps(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam(required = false, defaultValue = "") String codJfas,
@RequestParam String dataOrd,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate dataOrd,
@RequestParam Integer numOrd,
@RequestParam String gestioneOrd,
@RequestParam(required = false) Integer idStep,
@RequestParam(required = false) Integer idRiga) throws Exception {
ServiceRestResponse response = new ServiceRestResponse(EsitoType.OK);
Date dataOrdD = UtilityDate.RecognizeDate(dataOrd);
mesProductionService.closeStep(dataOrdD, numOrd, gestioneOrd, UtilityString.emptyStr2Null(codJfas), idStep, idRiga);
return response;
mesProductionService.closeStep(dataOrd, numOrd, gestioneOrd, UtilityString.emptyStr2Null(codJfas), idStep, idRiga);
return ServiceRestResponse.createPositiveResponse();
}
@RequestMapping(value = EmsRestConstants.PATH_MES_UPDATE_QTA_IMMESSA_ORDER_STEPS_V2, method = RequestMethod.POST)
@@ -310,7 +304,7 @@ public class MesProductionControllerV2 {
public @ResponseBody
ServiceRestResponse createFakeMtbColtToConfirm(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dataOrd,
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dataOrd,
@RequestParam Integer numOrd,
@RequestParam String gestione,
@RequestParam String codJfas,
@@ -463,12 +457,12 @@ public class MesProductionControllerV2 {
@RequestMapping(value = "ordine/stop", method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse stopOrdineLav(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody() ChiusuraLavorazioneDTO dto) throws Exception {
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody() ChiusuraLavorazioneDTO dto) throws Exception {
try{
try {
productionOrdersLifecycleService.stopOrdineLav(dto);
}catch (Exception e){
} catch (Exception e) {
multiDBTransactionManager.rollbackAll();
throw e;
}

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

@@ -255,19 +255,19 @@ public class MesProductionServiceV2 {
return UtilityDB.executeSimpleQueryOnlyFirstRowDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdSteps.class);
}
public void openStep(Date dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum) throws Exception {
public void openStep(LocalDate dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum) throws Exception {
openStep(dataOrd, numOrd, gestioneOrd, codJfas, hrNum, null);
}
public void openStep(Date dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav) throws Exception {
public void openStep(LocalDate dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav) throws Exception {
openStep(dataOrd, numOrd, gestioneOrd, codJfas, hrNum, dataInizLav, null, null, false);
}
public void openStep(Date dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav, String descrizioneAttivita) throws Exception {
public void openStep(LocalDate dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav, String descrizioneAttivita) throws Exception {
openStep(dataOrd, numOrd, gestioneOrd, codJfas, hrNum, dataInizLav, descrizioneAttivita, null, false);
}
public void openStep(Date dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav, String descrizioneAttivita, String note, boolean skipCommit) throws Exception {
public void openStep(LocalDate dataOrd, int numOrd, String gestioneOrd, String codJfas, int hrNum, Date dataInizLav, String descrizioneAttivita, String note, boolean skipCommit) throws Exception {
String whereCondCodJfas = "";
@@ -315,14 +315,14 @@ public class MesProductionServiceV2 {
" FROM dtb_ord_steps " +
" WHERE num_ord = " + UtilityDB.valueToString(numOrd) +
" AND gestione = " + UtilityDB.valueToString(gestioneOrd) +
" AND data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) +
" AND data_ord = " + UtilityDB.valueToString(dataOrd) +
whereCondCodJfas +
" UNION ALL " +
" SELECT * " +
" FROM dtb_ord_steps " +
" WHERE num_ord = " + UtilityDB.valueToString(numOrd) +
" AND gestione = " + UtilityDB.valueToString(gestioneOrd) +
" AND data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) +
" AND data_ord = " + UtilityDB.valueToString(dataOrd) +
" ) tmp " +
" ) tmp";
@@ -339,7 +339,7 @@ public class MesProductionServiceV2 {
throw new Exception(String.format(
"Errore nella lettura della step. Gestione %s, data ord. %s, num ord. %d",
gestioneOrd,
UtilityDate.formatDate(dataOrd, CommonConstants.DATE_FORMAT_DMY),
CommonConstants.DATE_DMY_SLASHED_FORMATTER.format(dataOrd),
numOrd
));
}
@@ -359,7 +359,7 @@ public class MesProductionServiceV2 {
if (!UtilityString.isNullOrEmpty(note)) lastStep.setNote(note);
DtbOrdt order = new DtbOrdt()
.setDataOrd(dataOrd)
.setDataOrd(UtilityLocalDate.localDateToDate(dataOrd))
.setNumOrd(numOrd)
.setGestione(gestioneOrd);
// order.setDataInizProd(new Date());
@@ -465,15 +465,15 @@ public class MesProductionServiceV2 {
}
public void closeStep(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga) throws Exception {
public void closeStep(LocalDate dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga) throws Exception {
closeStep(dataOrd, numOrd, gestioneOrd, codJfas, idStep, idRiga, new Date());
}
public void closeStep(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate) throws Exception {
public void closeStep(LocalDate dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate) throws Exception {
closeStep(dataOrd, numOrd, gestioneOrd, codJfas, idStep, idRiga, closeDate, false);
}
public void closeStep(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate, Boolean skipCommit) throws Exception {
public void closeStep(LocalDate dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, Date closeDate, Boolean skipCommit) throws Exception {
String whereCondCodJfas = "";
String whereCondIdStep = "";
@@ -490,7 +490,7 @@ public class MesProductionServiceV2 {
" FROM dtb_ord_steps " +
" WHERE num_ord = " + UtilityDB.valueToString(numOrd) +
" AND gestione = " + UtilityDB.valueToString(gestioneOrd) +
" AND data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) +
" AND data_ord = " + UtilityDB.valueToString(dataOrd) +
whereCondCodJfas +
whereCondIdStep +
" AND data_fine IS NULL " +
@@ -522,7 +522,7 @@ public class MesProductionServiceV2 {
UtilityEntity.throwEntitiesException(UtilityEntity.toEntityBaseList(dtbOrdtList));
}
public void cambioFase(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, String newCodJfas) throws Exception {
public void cambioFase(LocalDate dataOrd, Integer numOrd, String gestioneOrd, String codJfas, Integer idStep, Integer idRiga, String newCodJfas) throws Exception {
String whereCondCodJfas = "";
String whereCondIdStep = "";
@@ -539,7 +539,7 @@ public class MesProductionServiceV2 {
" FROM dtb_ord_steps " +
" WHERE num_ord = " + UtilityDB.valueToString(numOrd) +
" AND gestione = " + UtilityDB.valueToString(gestioneOrd) +
" AND data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) +
" AND data_ord = " + UtilityDB.valueToString(dataOrd) +
whereCondCodJfas +
whereCondIdStep +
" AND data_fine IS NULL " +
@@ -571,12 +571,12 @@ public class MesProductionServiceV2 {
UtilityEntity.throwEntitiesException(UtilityEntity.toEntityBaseList(dtbOrdtList));
}
public void cancellaFase(Date dataOrd, Integer numOrd, String gestioneOrd, String codJfas) throws Exception {
public void cancellaFase(LocalDate dataOrd, Integer numOrd, String gestioneOrd, String codJfas) throws Exception {
String sql = "SELECT * " +
" FROM dtb_ord_steps " +
" WHERE num_ord = " + UtilityDB.valueToString(numOrd) +
" AND gestione = " + UtilityDB.valueToString(gestioneOrd) +
" AND data_ord = " + UtilityDB.valueDateToString(dataOrd, CommonConstants.DATE_FORMAT_YMD) +
" AND data_ord = " + UtilityDB.valueToString(dataOrd) +
" AND cod_jfas = " + UtilityDB.valueToString(codJfas);
List<DtbOrdSteps> stepsToDelete = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, DtbOrdSteps.class);
@@ -632,7 +632,7 @@ public class MesProductionServiceV2 {
DtbOrdt dtbOrdt = new DtbOrdt()
.setNumOrd(ordineLavorazione.getNumOrd())
.setGestione(ordineLavorazione.getGestione())
.setDataOrd(ordineLavorazione.getDataOrd());
.setDataOrd(UtilityLocalDate.localDateToDate(ordineLavorazione.getDataOrd()));
dtbOrdt.setDtbOrdSteps(new ArrayList<>());
dtbOrdt.getDtbOrdSteps().add(dtbOrdSteps);
@@ -1728,7 +1728,7 @@ public class MesProductionServiceV2 {
}
if (dto.isStartOrdine() || dto.isCloneOrdine()) {
openStep(ordine.getDataOrd(), ordine.getNumOrd(), ordine.getGestione(), dto.getCodJfas(), 0, null, null, null, true);
openStep(UtilityLocalDate.localDateFromDate(ordine.getDataOrd()), ordine.getNumOrd(), ordine.getGestione(), dto.getCodJfas(), 0, null, null, null, true);
}
multiDBTransactionManager.commitAll();
@@ -1810,7 +1810,7 @@ public class MesProductionServiceV2 {
JtbLotr jtbLotr = new JtbLotr()
.setGestione(ordine.getGestione())
.setDataOrd(ordine.getDataOrd())
.setDataOrd(UtilityLocalDate.localDateToDate(ordine.getDataOrd()))
.setNumOrd(ordine.getNumOrd())
.setIdRiga(0);
@@ -1924,7 +1924,7 @@ public class MesProductionServiceV2 {
} else {
DtbOrdt ordLav = new DtbOrdt()
.setGestione(ordine.getGestione())
.setDataOrd(ordine.getDataOrd())
.setDataOrd(UtilityLocalDate.localDateToDate(ordine.getDataOrd()))
.setNumOrd(ordine.getNumOrd());
productionService.terminaLavorazioneLinea(ordLav, groupStepDTO.getCodJfas());
@@ -2067,7 +2067,7 @@ public class MesProductionServiceV2 {
DtbOrdt dtbOrdt = new DtbOrdt()
.setGestione(ordineLav.getGestione())
.setDataOrd(ordineLav.getDataOrd())
.setDataOrd(UtilityLocalDate.localDateToDate(ordineLav.getDataOrd()))
.setNumOrd(ordineLav.getNumOrd());
DtbOrdSteps stepAttivo = getOrderOpenStepOnFase(dtbOrdt, ordineLav.getCodJfas());
@@ -2085,7 +2085,7 @@ public class MesProductionServiceV2 {
if (!UtilityBigDecimal.isNullOrZero(ordineLav.getQtaProd())) {
MtbColr mtbColrToInsert = new MtbColr()
.setCodJcom(ordineLav.getCodJcom())
.setDataOrd(UtilityLocalDate.localDateFromDate(ordineLav.getDataOrd()))
.setDataOrd(ordineLav.getDataOrd())
.setNumOrd(ordineLav.getNumOrd())
.setCodMart(ordineLav.getCodProd())
.setPartitaMag(ordineLav.getPartitaMag())
@@ -2355,7 +2355,7 @@ public class MesProductionServiceV2 {
if (dtbOrdStepsToOpen != null && !dtbOrdStepsToOpen.isEmpty()) {
for (DtbOrdSteps dtbOrdSteps : dtbOrdStepsToOpen) {
this.openStep(dtbOrdSteps.getDataOrd(), dtbOrdSteps.getNumOrd(), dtbOrdSteps.getGestione(), dtbOrdSteps.getCodJfas(), dtbOrdSteps.getHrNum(), null, null, null, true);
this.openStep(UtilityLocalDate.localDateFromDate(dtbOrdSteps.getDataOrd()), dtbOrdSteps.getNumOrd(), dtbOrdSteps.getGestione(), dtbOrdSteps.getCodJfas(), dtbOrdSteps.getHrNum(), null, null, null, true);
}
}
}

5
ems-engine/src/main/java/it/integry/ems/production/service/ProductionLineService.java
View File

@@ -1,9 +1,9 @@
package it.integry.ems.production.service;
import com.annimon.stream.Stream;
import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
import it.integry.ems.production.dto.ProdLineStatusDTO;
import it.integry.ems.service.EntityProcessor;
import it.integry.ems.service.dto.production.OrdineLavorazioneDTO;
import it.integry.ems.service.production.ProductionOrderDataHandlerService;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.entity.DtbOrdSteps;
@@ -11,6 +11,7 @@ import it.integry.ems_model.entity.JtbFasiAtt;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDB;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityLocalDate;
import it.integry.ems_model.utility.UtilityString;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -132,7 +133,7 @@ public class ProductionLineService {
List<DtbOrdSteps> openOrders = getOpenOrdersOnLine(codJfas);
if (openOrders != null && !openOrders.isEmpty()) {
for (DtbOrdSteps order : openOrders) {
mesProductionService.closeStep(order.getDataOrd(), order.getNumOrd(), order.getGestione(), codJfas, order.getIdStep(), order.getIdRiga(), closeDate);
mesProductionService.closeStep(UtilityLocalDate.localDateFromDate(order.getDataOrd()), order.getNumOrd(), order.getGestione(), codJfas, order.getIdStep(), order.getIdRiga(), closeDate);
}
}

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

@@ -33,7 +33,6 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.SimpleDateFormat;
@@ -1637,7 +1636,7 @@ public class ProductionService {
String codMart = dto.getCodMart();
String partitaMag = dto.getPartitaMag();
String partitaMagProd = UtilityString.isNull(dto.getPartitaMagProd(), partitaMag);
Date dataScad = dto.getDataScad();
LocalDate dataScad = dto.getDataScad();
StbGestSetupDet configControlloScadenzaMultipla = this.getConfigControlloScadenzaMultipla(dto.getCodJfas());
@@ -1689,7 +1688,7 @@ public class ProductionService {
.setPartitaMag(partitaMag)
.setPartitaMagProd(partitaMagProd)
.setCodMart(codMart)
.setDataScad(dataScad);
.setDataScad(UtilityLocalDate.localDateToDate(dataScad));
boolean setDescrizione = setupGest.getSetupBoolean("MTB_PARTITA_MAG", "SETUP", "SET_DESCRIZIONE_FROM_NOTE_ORDINE");
@@ -1707,7 +1706,7 @@ public class ProductionService {
DtbOrdt dtbOrdt = new DtbOrdt()
.setGestione(dto.getGestione())
.setDataOrd(dto.getDataOrd())
.setDataOrd(UtilityLocalDate.localDateToDate(dto.getDataOrd()))
.setNumOrd(dto.getNumOrd())
.setCodJfas(dto.getCodJfas())
.setPartitaMag(partitaMag);

2
ems-engine/src/main/java/it/integry/ems/retail/wms/lavorazione/service/WMSLavorazioneService.java
View File

@@ -177,7 +177,7 @@ public class WMSLavorazioneService {
if (foundInCorsoOrders.size() == 1) {
OrdineLavorazioneDTO ordineLavorazioneDTO = ordiniLavorazioneInCorso.get(0);
udsMtbColt
.setDataOrd(UtilityLocalDate.localDateFromDate(ordineLavorazioneDTO.getDataOrd()))
.setDataOrd(ordineLavorazioneDTO.getDataOrd())
.setNumOrd(ordineLavorazioneDTO.getNumOrd());
}
}