|
|
@ -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.bean.BeanUtils;
|
|
|
|
import com.op.common.core.utils.uuid.IdUtils;
|
|
|
|
import com.op.common.core.utils.uuid.IdUtils;
|
|
|
|
import com.op.common.core.web.domain.AjaxResult;
|
|
|
|
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.*;
|
|
|
|
import com.op.plan.domain.dto.ProOrderDTO;
|
|
|
|
import com.op.plan.domain.dto.ProOrderDTO;
|
|
|
|
import com.op.plan.domain.dto.SplitOrderDTO;
|
|
|
|
import com.op.plan.domain.dto.SplitOrderDTO;
|
|
|
|
import com.op.plan.mapper.*;
|
|
|
|
import com.op.plan.mapper.*;
|
|
|
|
import com.op.plan.service.IProOrderWorkorderService;
|
|
|
|
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.apache.commons.lang.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@ -22,7 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.*;
|
|
|
|
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.error;
|
|
|
|
import static com.op.common.core.web.domain.AjaxResult.success;
|
|
|
|
import static com.op.common.core.web.domain.AjaxResult.success;
|
|
|
|