diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/RetentionDistributionListDetailDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/RetentionDistributionListDetailDTO.java index 3be7d0ec1..c65f05e17 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/RetentionDistributionListDetailDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/RetentionDistributionListDetailDTO.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class RetentionDistributionListDetailDTO extends DisStockListDetailEntity { - private String MaterialName; + private String materialName; private String materialNumber; } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index 6ab100702..c2f5bde8b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -191,7 +191,7 @@ public interface TaskQuestMapper extends BaseMapper { List selectContrastStockInfo(@Param("questNum") String questNum); - QuestDetailEntity findEntityById(@Param("questNum") String questNum,@Param("taskID") Long taskID); + QuestDetailEntity findEntityById(@Param("questNum") String questNum,@Param("taskID") Long taskId); IPage findContrastList(IPage page, @Param("param") QuestDetailDTO questDetailDTO); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 663b6b992..c6d01523e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -194,7 +194,9 @@ public class TaskQuestServiceImpl extends BaseServiceImpl { QuestDetailEntity detailEntity = buildQuestDetailEntity(taskQuest, i, user, trayEntityList); - if (detailEntity == null) return; + if (detailEntity == null) { + return; + } detailEntityList.add(detailEntity); });