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-19 20:02:30 +02:00
parent 3f2aa3956c 38129b6bb7
commit fe372166ed
6 changed files with 278 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.idea/runConfigurations/Tomcat.xml generated
View File

@@ -16,12 +16,30 @@
<log_file alias="Tomcat Localhost Access Log" path="%IDEA_RUN:CATALINA_BASE%/logs/localhost_access_log.*" />
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
<RunnerSettings RunnerId="AppServerDebuggerRunner">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="JProfiler">
<option name="jreHome" value="$USER_HOME$/.jdks/openjdk-21.0.2" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="AppServerDebuggerRunner">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>

18
.idea/runConfigurations/Tomcat__FAST_.xml generated
View File

@@ -16,12 +16,30 @@
<log_file alias="Tomcat Localhost Access Log" path="%IDEA_RUN:CATALINA_BASE%/logs/localhost_access_log.*" />
<predefined_log_file enabled="true" id="Tomcat" />
<predefined_log_file enabled="true" id="Tomcat Catalina" />
<RunnerSettings RunnerId="AppServerDebuggerRunner">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="javadebug" />
</RunnerSettings>
<RunnerSettings RunnerId="JProfiler">
<option name="jreHome" value="$PROJECT_DIR$/../../../Program Files/Java/jdk1.8.0_202" />
</RunnerSettings>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="AppServerDebuggerRunner">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</STARTUP>
<SHUTDOWN>
<option name="USE_DEFAULT" value="true" />
<option name="SCRIPT" value="" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="" />
</SHUTDOWN>
</ConfigurationWrapper>
<ConfigurationWrapper VM_VAR="JAVA_OPTS" RunnerId="Cover">
<option name="USE_ENV_VARIABLES" value="true" />
<STARTUP>

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

@@ -17,6 +17,7 @@ import it.integry.ems.status.ServiceChecker;
import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
import it.integry.ems_model.config.EmsRestConstants;
import it.integry.ems_model.entity.MtbColt;
import it.integry.ems_model.types.OperationType;
import it.integry.ems_model.utility.UtilityDate;
import it.integry.ems_model.utility.UtilityString;
import org.springframework.beans.factory.annotation.Autowired;
@@ -260,16 +261,16 @@ public class MesProductionControllerV2 {
@RequestMapping(value = EmsRestConstants.PATH_MES_CREATE_UL_LAVORAZIONE_V2, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse createULLavorazione(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody MtbColt mtbColt) throws Exception {
ServiceRestResponse createULLavorazione(@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestBody CreateUDCProduzioneRequestDTO requestDto) throws Exception {
ServiceRestResponse response = ServiceRestResponse.createPositiveResponse();
response.setEntity(mesProductionService.createULLavorazione(mtbColt));
return response;
final MtbColt ulLavorazione = mesProductionService.createULLavorazione(requestDto);
ulLavorazione.setOperation(OperationType.SELECT_OBJECT);
ulLavorazione.getMtbColr().forEach(x -> x.setOperation(OperationType.SELECT_OBJECT));
return ServiceRestResponse.createPositiveResponse(ulLavorazione);
}
@RequestMapping(value = EmsRestConstants.PATH_MES_SEND_COMMAND_V2, method = RequestMethod.POST)
public @ResponseBody
ServiceRestResponse sendCommand(HttpServletRequest request,
@@ -309,13 +310,13 @@ public class MesProductionControllerV2 {
public @ResponseBody
ServiceRestResponse createFakeMtbColtToConfirm(HttpServletRequest request,
@RequestParam(CommonConstants.PROFILE_DB) String profileDB,
@RequestParam() String dataOrd,
@RequestParam() Integer numOrd,
@RequestParam() String gestione,
@RequestParam() String codJfas) throws Exception {
ServiceRestResponse response
= ServiceRestResponse.createPositiveResponse(mesProductionService.createFakeMtbColtToConfirm(dataOrd, numOrd, gestione, codJfas));
return response;
@RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate dataOrd,
@RequestParam Integer numOrd,
@RequestParam String gestione,
@RequestParam String codJfas,
@RequestParam String codMdep,
@RequestParam String codAnag) throws Exception {
return ServiceRestResponse.createPositiveResponse(mesProductionService.createFakeMtbColtToConfirm(dataOrd, numOrd, gestione, codJfas, codMdep, codAnag));
}

141
ems-engine/src/main/java/it/integry/ems/production/dto/CreateUDCProduzioneRequestDTO.java Normal file
View File

@@ -0,0 +1,141 @@
package it.integry.ems.production.dto;
import java.math.BigDecimal;
import java.time.LocalDate;
public class CreateUDCProduzioneRequestDTO {
private String codMdep;
private String codJfas;
private String codAnag;
private String posizione;
private LocalDate dataOrd;
private Integer numOrd;
private String codJcom;
private String codMart;
private BigDecimal qta;
private BigDecimal qtaCnf;
private BigDecimal numCnf;
private String partitaMag;
private int numEtich = 0;
public String getCodMdep() {
return codMdep;
}
public CreateUDCProduzioneRequestDTO setCodMdep(String codMdep) {
this.codMdep = codMdep;
return this;
}
public String getCodJfas() {
return codJfas;
}
public CreateUDCProduzioneRequestDTO setCodJfas(String codJfas) {
this.codJfas = codJfas;
return this;
}
public String getCodAnag() {
return codAnag;
}
public CreateUDCProduzioneRequestDTO setCodAnag(String codAnag) {
this.codAnag = codAnag;
return this;
}
public String getPosizione() {
return posizione;
}
public CreateUDCProduzioneRequestDTO setPosizione(String posizione) {
this.posizione = posizione;
return this;
}
public LocalDate getDataOrd() {
return dataOrd;
}
public CreateUDCProduzioneRequestDTO setDataOrd(LocalDate dataOrd) {
this.dataOrd = dataOrd;
return this;
}
public Integer getNumOrd() {
return numOrd;
}
public CreateUDCProduzioneRequestDTO setNumOrd(Integer numOrd) {
this.numOrd = numOrd;
return this;
}
public String getCodJcom() {
return codJcom;
}
public CreateUDCProduzioneRequestDTO setCodJcom(String codJcom) {
this.codJcom = codJcom;
return this;
}
public String getCodMart() {
return codMart;
}
public CreateUDCProduzioneRequestDTO setCodMart(String codMart) {
this.codMart = codMart;
return this;
}
public BigDecimal getQta() {
return qta;
}
public CreateUDCProduzioneRequestDTO setQta(BigDecimal qta) {
this.qta = qta;
return this;
}
public BigDecimal getQtaCnf() {
return qtaCnf;
}
public CreateUDCProduzioneRequestDTO setQtaCnf(BigDecimal qtaCnf) {
this.qtaCnf = qtaCnf;
return this;
}
public BigDecimal getNumCnf() {
return numCnf;
}
public CreateUDCProduzioneRequestDTO setNumCnf(BigDecimal numCnf) {
this.numCnf = numCnf;
return this;
}
public String getPartitaMag() {
return partitaMag;
}
public CreateUDCProduzioneRequestDTO setPartitaMag(String partitaMag) {
this.partitaMag = partitaMag;
return this;
}
public int getNumEtich() {
return numEtich;
}
public CreateUDCProduzioneRequestDTO setNumEtich(int numEtich) {
this.numEtich = numEtich;
return this;
}
}

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

@@ -18,9 +18,8 @@ import it.integry.ems.production.dto.*;
import it.integry.ems.report.dto.JasperDTO;
import it.integry.ems.report.dto.PairsDTO;
import it.integry.ems.retail.pvmRetail.service.PvmService;
import it.integry.ems.retail.wms.dto.CreateUDSRequestDTO;
import it.integry.ems.retail.wms.dto.CreateUDSRequestOrderDTO;
import it.integry.ems.retail.wms.dto.InsertUDSRowRequestDTO;
import it.integry.ems.retail.wms.accettazione.service.WMSAccettazioneService;
import it.integry.ems.retail.wms.dto.*;
import it.integry.ems.retail.wms.generic.dto.MvwSitArtUdcDetInventarioDTO;
import it.integry.ems.retail.wms.generic.dto.SpostaUlRequestDTO;
import it.integry.ems.retail.wms.generic.service.WMSGenericService;
@@ -106,9 +105,13 @@ public class MesProductionServiceV2 {
@Autowired
private MailTemplateService mailTemplateService;
@Autowired
private PvmService pvmService;
@Autowired
private WMSAccettazioneService wmsAccettazioneService;
@Autowired
private WMSLavorazioneService wmsLavorazioneService;
@@ -703,21 +706,58 @@ public class MesProductionServiceV2 {
}
public MtbColt createULLavorazione(MtbColt mtbColt) throws Exception {
entityProcessor.processEntity(mtbColt, multiDBTransactionManager);
public MtbColt createULLavorazione(CreateUDCProduzioneRequestDTO request) throws Exception {
ArrayList<CreateUDCRequestOrderDTO> orders = new ArrayList<CreateUDCRequestOrderDTO>() {{
add(new CreateUDCRequestOrderDTO()
.setGestione("L")
.setDataOrd(request.getDataOrd())
.setNumOrd(request.getNumOrd()));
}};
MtbColt createdUdc = wmsLavorazioneService.createUDC(new CreateUDCRequestDTO()
.setCodMdep(request.getCodMdep())
.setCodJfas(request.getCodJfas())
.setCodAnag(request.getCodAnag())
.setPosizione(request.getPosizione())
.setOrders(orders));
final InsertUDCRowResponseDTO insertUDCRowResponse = wmsAccettazioneService.insertUDCRow(new InsertUDCRowRequestDTO()
.setTargetMtbColt(createdUdc)
.setCodMart(request.getCodMart())
.setPartitaMag(request.getPartitaMag())
.setDataOrd(request.getDataOrd())
.setNumOrd(request.getNumOrd())
.setRigaOrd(0)
.setCodJcom(request.getCodJcom())
.setQtaTot(request.getQta())
.setQtaCnf(request.getQtaCnf())
.setNumCnf(request.getNumCnf()));
if (request.getNumEtich() > 0 && insertUDCRowResponse.getSavedMtbColr() != null) {
MtbColr savedMtbColr = insertUDCRowResponse.getSavedMtbColr()
.setNumEtich(request.getNumEtich());
savedMtbColr.setOperation(OperationType.UPDATE);
entityProcessor.processEntity(savedMtbColr, multiDBTransactionManager);
}
CloseUDCLavorazioneRequestDTO closeRequest = new CloseUDCLavorazioneRequestDTO();
closeRequest.setMtbColt(createdUdc);
wmsLavorazioneService.closeUDC(closeRequest);
String syncNewULLavorazione = String.format("EXEC MES_SyncNuovaULLavorazione %d, %s, %s, %d, %s;",
mtbColt.getNumCollo(),
UtilityDB.valueToString(mtbColt.getDataCollo()),
UtilityDB.valueToString(mtbColt.getGestione()),
mtbColt.getSegno(),
UtilityDB.valueToString(mtbColt.getSerCollo())
createdUdc.getNumCollo(),
UtilityDB.valueToString(createdUdc.getDataCollo()),
UtilityDB.valueToString(createdUdc.getGestione()),
createdUdc.getSegno(),
UtilityDB.valueToString(createdUdc.getSerCollo())
);
Statement storedProcedure = multiDBTransactionManager.getPrimaryConnection().createStatement();
storedProcedure.execute(syncNewULLavorazione);
return mtbColt;
return createdUdc;
}
@@ -868,46 +908,33 @@ public class MesProductionServiceV2 {
}
public MtbColt createFakeMtbColtToConfirm(String dataOrd, Integer numOrd, String gestione, String codJfas) throws
Exception {
DtbOrdt dtbOrdt = new DtbOrdt();
public MtbColt createFakeMtbColtToConfirm(LocalDate dataOrd,
Integer numOrd,
String gestione,
String codJfas,
String codMdep,
String codAnag) throws Exception {
DtbOrdt dtbOrdt = new DtbOrdt()
.setGestione(gestione)
.setNumOrd(numOrd)
.setCodJfas(codJfas)
.setDataOrd(UtilityLocalDate.localDateToDate(dataOrd));
dtbOrdt.setOperation(OperationType.SELECT_OBJECT);
dtbOrdt.setGestione(gestione);
dtbOrdt.setNumOrd(numOrd);
dtbOrdt.setCodJfas(codJfas);
dtbOrdt.setDataOrd(UtilityDate.RecognizeDate(dataOrd));
dtbOrdt = entityProcessor.processEntity(dtbOrdt, multiDBTransactionManager);
entityProcessor.processEntity(dtbOrdt, multiDBTransactionManager);
MtbColt mtbColt = new MtbColt();
mtbColt.setOperation(OperationType.INSERT);
mtbColt.setGestione("L");
mtbColt.setCodMdep(dtbOrdt.getCodMdep());
// mtbColt.setCodAnag(dtbOrdt.getCodAnag());
mtbColt.setSerCollo("/");
mtbColt.setCodJfas(codJfas);
mtbColt.setPosizione(codJfas);
mtbColt.setDataOrd(UtilityLocalDate.localDateFromDate(dtbOrdt.getDataOrd()));
mtbColt.setNumOrd(dtbOrdt.getNumOrd());
MtbColr mtbColr = new MtbColr();
mtbColr.setOperation(OperationType.INSERT);
mtbColr.setNumOrd(dtbOrdt.getNumOrd());
mtbColr.setDataOrd(UtilityLocalDate.localDateFromDate(dtbOrdt.getDataOrd()));
mtbColr.setRigaOrd(0);
mtbColr.setCodMart(dtbOrdt.getCodProd());
mtbColr.setQtaCol(BigDecimal.ZERO);
mtbColr.setNumCnf(BigDecimal.ZERO);
mtbColr.setPartitaMag(dtbOrdt.getPartitaMag());
mtbColr.setNumEtich(1);
mtbColt.setMtbColr(new ArrayList<MtbColr>());
mtbColt.getMtbColr().add(mtbColr);
entityProcessor.processEntity(mtbColt, multiDBTransactionManager);
return mtbColt;
return createULLavorazione(new CreateUDCProduzioneRequestDTO()
.setDataOrd(dataOrd)
.setNumOrd(numOrd)
.setCodMdep(codMdep)
.setCodAnag(codAnag)
.setCodJfas(codJfas)
.setPosizione(codJfas)
.setCodMart(dtbOrdt.getCodProd())
.setPartitaMag(dtbOrdt.getPartitaMag())
.setNumEtich(1)
.setQta(BigDecimal.ZERO)
.setNumCnf(BigDecimal.ZERO));
}
private RegisterSupervisorDTO getSupervisorPanelData(String codJfas) throws Exception {
@@ -1530,7 +1557,7 @@ public class MesProductionServiceV2 {
ordine.setOperation(OperationType.SELECT_OBJECT);
entityProcessor.processEntity(ordine, multiDBTransactionManager);
if(dto.isTransferRequired()){
if (dto.isTransferRequired()) {
SpostaUlRequestDTO trasferimentoRequest = new SpostaUlRequestDTO();
trasferimentoRequest
.setCodMdep(dto.getOrdine().getCodMdep())

10
ems-engine/src/main/java/it/integry/ems/retail/wms/dto/CreateUDCRequestDTO.java
View File

@@ -11,6 +11,7 @@ public class CreateUDCRequestDTO {
private String serCollo;
private String codAnag;
private String codTcol;
private String codJfas;
private String codVdes;
private String posizione;
@@ -67,6 +68,15 @@ public class CreateUDCRequestDTO {
return this;
}
public String getCodJfas() {
return codJfas;
}
public CreateUDCRequestDTO setCodJfas(String codJfas) {
this.codJfas = codJfas;
return this;
}
public String getAnnotazioni() {
return annotazioni;
}