diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java index 2016239d..72199d5a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/PrWorkOrder.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -19,8 +20,7 @@ import java.util.Date; @Data @TableName("PR_WORK_ORDER") @Schema(description = "车间订单->视图") -@EqualsAndHashCode(callSuper = true) -public class PrWorkOrder extends BaseEntity { +public class PrWorkOrder implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java index 8638fd9c..66f04f38 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/DsTaskingMapper.java @@ -95,7 +95,8 @@ public interface DsTaskingMapper extends BaseMapper { * 读取老mes返工任务数据 * @return */ - List selectOldMesReworkTasking(); + List selectOldMesReworkTasking(@Param("startTime") Date startTime, + @Param("endTime")Date endTime); /** * 根据条件查询 新mes @@ -133,4 +134,10 @@ public interface DsTaskingMapper extends BaseMapper { List getOldMesAllPart(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("partCodeList") List partCodeList); + + /** + * 获取上一次返工任务同步时间 + * @return + */ + DsTaskingEntity getMaxReworkSyncTime(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml index cfbc25f8..ffe9923e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/mapper/TaskingMapper.xml @@ -116,6 +116,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java index 24d9af48..461dcab4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/service/impl/DsTaskingServiceImpl.java @@ -1031,9 +1031,25 @@ public class DsTaskingServiceImpl extends BaseServiceImpl reworkTasks = taskingMapper.selectOldMesReworkTasking(); + List reworkTasks = taskingMapper.selectOldMesReworkTasking(startTime,endTime); if (CollectionUtils.isEmpty(reworkTasks)) { log.info("未读取到返工任务信息");