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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Fabio Narracci
2024-03-28 09:07:23 +01:00
parent d822ecd017 95ed2de093
commit f799ff947a
5 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240322152820.java → ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240322152821.java
View File

@@ -3,7 +3,7 @@ package it.integry.ems.migration.model;
import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240322152820 extends BaseMigration implements MigrationModelInterface {
public class Migration_20240322152821 extends BaseMigration implements MigrationModelInterface {
@Override
public void up() throws Exception {

17
ems-core/src/main/java/it/integry/ems/migration/model/Migration_20240327144141.java Normal file
View File

@@ -0,0 +1,17 @@
package it.integry.ems.migration.model;import it.integry.ems.migration._base.BaseMigration;
import it.integry.ems.migration._base.MigrationModelInterface;
public class Migration_20240327144141 extends BaseMigration implements MigrationModelInterface{
@Override
public void up()throws Exception {
if(isHistoryDB())
return;
}
@Override
public void down()throws Exception{
}
}

9
ems-core/src/main/java/it/integry/ems_model/entity/MtbCols.java
View File

@@ -10,8 +10,9 @@ import it.integry.ems_model.annotation.Table;
import it.integry.ems_model.base.EntityBase;
import it.integry.ems_model.entity._enum.IBaseEnum;
import org.kie.api.definition.type.PropertyReactive;
import java.time.LocalDate;
import java.util.Date;
import it.integry.ems_model.annotation.FK;
@PropertyReactive
@Table(MtbCols.ENTITY)
@@ -24,7 +25,7 @@ public class MtbCols extends EntityBase {
@PK
@SqlField(value = "data_collo", nullable = false)
private Date dataCollo;
private LocalDate dataCollo;
@PK
@SqlField(value = "gestione", maxLength = 1, nullable = false)
@@ -62,11 +63,11 @@ public class MtbCols extends EntityBase {
super();
}
public Date getDataCollo() {
public LocalDate getDataCollo() {
return dataCollo;
}
public MtbCols setDataCollo(Date dataCollo) {
public MtbCols setDataCollo(LocalDate dataCollo) {
this.dataCollo = dataCollo;
return this;
}

5
ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java
View File

@@ -434,7 +434,7 @@ public class ActivityService {
" FROM stb_activity " +
" WHERE stb_activity.parent_activity_id = %s AND " +
"stb_activity.user_name = %s AND " +
"stb_activity.estimated_time = %s",
"( stb_activity.estimated_time = %s OR (stb_activity.effective_date is null AND stb_activity.activity_result_id = 'DA FARE'))",
stbActivity.getParentActivityId(),
stbActivity.getUserName(),
stbActivity.getEstimatedTime());
@@ -609,7 +609,8 @@ public class ActivityService {
.setActivityType(activityTypeId)
.setFlagTipologia("A")
.setActivityDescription(description)
.setUserCreator(userCreator);
.setUserCreator(userCreator)
.setActivityResultId("DA FARE");
entityList.add(newStbActivity);

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

@@ -319,9 +319,7 @@ public class MrpDailyMaterialReqService {
private String getElencoDepositi(MrpDailyMaterialInputDTO mrpDailyMaterialInputDTO, HashMap<String, String> setupSection) throws Exception {
String whereCondDepo = "";
if (mrpDailyMaterialInputDTO != null && mrpDailyMaterialInputDTO.getDepositi() != null && mrpDailyMaterialInputDTO.getDepositi().
size() > 0) {
if (mrpDailyMaterialInputDTO != null && mrpDailyMaterialInputDTO.getDepositi() != null && mrpDailyMaterialInputDTO.getDepositi().size() > 0) {
whereCondDepo = "mtb_depo.cod_mdep in ('" + StringUtils.join(mrpDailyMaterialInputDTO.getDepositi(), "','") + "')";
} else {
String listCodMdep = setupSection.get("LIST_COD_MDEP");