diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java index a56982f89..eabe6f800 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/produce/pojo/entity/WorkPlan.java @@ -1,5 +1,6 @@ package org.springblade.desk.produce.pojo.entity; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; @@ -164,10 +165,12 @@ public class WorkPlan extends BaseEntity { * 实际开始 */ @Schema(description = "实际开始") + @TableField(updateStrategy = FieldStrategy.ALWAYS) private Date factStartTime; /** * 实际结束 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) @Schema(description = "实际结束") private Date factEndTime; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DisTaskingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DisTaskingServiceImpl.java index 1bba14a32..d841be575 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DisTaskingServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/DisTaskingServiceImpl.java @@ -385,7 +385,7 @@ public class DisTaskingServiceImpl extends BaseServiceImpl handoverRecords = handoverRecordService.list(Wrappers.lambdaQuery(HandoverRecord.class).eq(HandoverRecord::getWoId, workPlan.getWoId())); - if (CollectionUtils.isEmpty(handoverRecords)) { + if (CollectionUtils.isNotEmpty(handoverRecords)) { for (HandoverRecord handoverRecord : handoverRecords) { if (handoverRecord.getStatus().equals(HandoverRecord.RUN_STATUS_COMPLETE)) { handoverRecordService.returnHandoverRecord(handoverRecord.getHrCode(), handoverRecord.getPartCode(), handoverRecord.getBatchNo());