diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java similarity index 99% rename from op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java index 5a1accf0..7dfdce5b 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepare.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDTO.java @@ -14,7 +14,7 @@ import java.util.Date; * @author Open Platform * @date 2023-08-03 */ -public class MesPrepare extends BaseEntity { +public class MesPrepareDTO extends BaseEntity { private static final long serialVersionUID = 1L; /** 备料单id */ diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java similarity index 98% rename from op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java rename to op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java index 091f7a40..d8c48f20 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetail.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/MesPrepareDetailDTO.java @@ -14,7 +14,7 @@ import java.util.Date; * @author Open Platform * @date 2023-08-04 */ -public class MesPrepareDetail extends BaseEntity { +public class MesPrepareDetailDTO extends BaseEntity { private static final long serialVersionUID = 1L; /** ID */ diff --git a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java index d6281d60..50eddafa 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/mapper/ProOrderWorkorderMapper.java @@ -3,7 +3,7 @@ package com.op.plan.mapper; import com.op.plan.domain.ProOrder; import com.op.plan.domain.ProOrderWorkorder; import com.op.system.api.domain.dto.BaseBomComponentDTO; -import com.op.system.api.domain.dto.MesPrepare; +import com.op.system.api.domain.dto.MesPrepareDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -121,7 +121,7 @@ public interface ProOrderWorkorderMapper { */ int deleteProOrderWorkorderByOrderId(String id); - void createPrepare(MesPrepare mesPrepare); + void createPrepare(MesPrepareDTO mesPrepareDTO); ProOrder getOrderCodeById(String workorderId); diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index 88a04434..5892426c 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -6,15 +6,11 @@ import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.bean.BeanUtils; import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.web.domain.AjaxResult; -import com.op.common.security.utils.SecurityUtils; import com.op.plan.domain.*; import com.op.plan.domain.dto.ProOrderDTO; import com.op.plan.domain.dto.SplitOrderDTO; import com.op.plan.mapper.*; import com.op.plan.service.IProOrderWorkorderService; -import com.op.system.api.domain.dto.BaseBomComponentDTO; -import com.op.system.api.domain.dto.BaseBomDTO; -import com.op.system.api.domain.dto.MesPrepare; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; -import java.util.stream.Collectors; import static com.op.common.core.web.domain.AjaxResult.error; import static com.op.common.core.web.domain.AjaxResult.success;