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

Merge branch 'master' into develop
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
Anthony Santoro
2025-03-25 12:25:56 +01:00
parent 080bbdaa23 6f625187a9
commit c1b0877e48
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ems-engine/src/main/java/it/integry/core/report_javabean/model/StampaEtichetteCarciofiCalibratiJavabean.java
View File

@@ -53,7 +53,6 @@ public class StampaEtichetteCarciofiCalibratiJavabean extends BaseReportJavabean
public List<Object> run(EtichettaCalibriParamsDTO dto) throws Exception {
List<Object> listEtichette = new ArrayList<>();
String sql;
EtichettaCalibriFieldsDTO baseJavaBean = new EtichettaCalibriFieldsDTO();
baseJavaBean.setBarcode_ul(dto.getBarcodeUl())
@@ -75,19 +74,19 @@ public class StampaEtichetteCarciofiCalibratiJavabean extends BaseReportJavabean
.setRow_number(0)
.setRow_total(0)
;
if (dto.getCalibro60()!=null && dto.getCalibro60() > 0) {
if (dto.getCalibro60() != null && dto.getCalibro60() > 0) {
for (int i = 0; i < dto.getCalibro60(); i++) {
EtichettaCalibriFieldsDTO javaBean = baseJavaBean.clone();
javaBean.setRow_number(i+1)
javaBean.setRow_number(i + 1)
.setRow_total(dto.getCalibro60())
.setCalibro(60);
listEtichette.add(javaBean);
}
}
if (dto.getCalibro70()!= null && dto.getCalibro70() > 0) {
if (dto.getCalibro70() != null && dto.getCalibro70() > 0) {
for (int i = 0; i < dto.getCalibro70(); i++) {
EtichettaCalibriFieldsDTO javaBean = baseJavaBean.clone();
javaBean.setRow_number(i+1)
javaBean.setRow_number(i + 1)
.setRow_total(dto.getCalibro70())
.setCalibro(70);
listEtichette.add(javaBean);
@@ -96,7 +95,7 @@ public class StampaEtichetteCarciofiCalibratiJavabean extends BaseReportJavabean
if (dto.getCalibro80() != null && dto.getCalibro80() > 0) {
for (int i = 0; i < dto.getCalibro80(); i++) {
EtichettaCalibriFieldsDTO javaBean = baseJavaBean.clone();
javaBean.setRow_number(i+1)
javaBean.setRow_number(i + 1)
.setRow_total(dto.getCalibro80())
.setCalibro(80);
listEtichette.add(javaBean);
@@ -105,13 +104,21 @@ public class StampaEtichetteCarciofiCalibratiJavabean extends BaseReportJavabean
if (dto.getCalibro90() != null && dto.getCalibro90() > 0) {
for (int i = 0; i < dto.getCalibro90(); i++) {
EtichettaCalibriFieldsDTO javaBean = baseJavaBean.clone();
javaBean.setRow_number(i+1)
javaBean.setRow_number(i + 1)
.setRow_total(dto.getCalibro90())
.setCalibro(90);
listEtichette.add(javaBean);
}
}
if (dto.getCalibro100() != null && dto.getCalibro100() > 0) {
for (int i = 0; i < dto.getCalibro100(); i++) {
EtichettaCalibriFieldsDTO javaBean = baseJavaBean.clone();
javaBean.setRow_number(i + 1)
.setRow_total(dto.getCalibro100())
.setCalibro(100);
listEtichette.add(javaBean);
}
}
return listEtichette;
}

11
ems-engine/src/main/java/it/integry/ems/order/dto/EtichettaCalibriParamsDTO.java
View File

@@ -26,6 +26,7 @@ public class EtichettaCalibriParamsDTO {
private Integer calibro70;
private Integer calibro80;
private Integer calibro90;
private Integer calibro100;
private String idAttachmentLogo;
private String activityId;
private String jbeansource;
@@ -33,8 +34,6 @@ public class EtichettaCalibriParamsDTO {
private Integer numDocProvv;
public Date getDataCollo() {
return dataCollo;
}
@@ -224,8 +223,14 @@ public class EtichettaCalibriParamsDTO {
return this;
}
public Integer getCalibro100() {
return calibro100;
}
public EtichettaCalibriParamsDTO setCalibro100(Integer calibro100) {
this.calibro100 = calibro100;
return this;
}
public String getIdAttachmentLogo() {
return idAttachmentLogo;