未排单-纹路查询参数类型修改,获取实际大板逻辑修改

This commit is contained in:
liuzhaotian
2025-01-21 10:26:34 +08:00
parent 494cb02f28
commit f0f5ff137d
3 changed files with 10 additions and 16 deletions
@@ -87,7 +87,7 @@ public class NoPlanPlatePageReqVO extends PageParam {
@Schema(description = "纹路")
private Boolean texture;
private Integer texture;
@Schema(description = "异形")
@@ -67,7 +67,6 @@ import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.e
import static com.cf.imes.framework.common.util.json.JsonUtils.parseObject;
import static com.cf.imes.framework.common.util.json.JsonUtils.toJsonString;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.executor.enums.ErrorCodeConstants.LIST_CHANGES_ARE_PROHIBITED;
import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLAN_NOT_EXISTS;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
/**
@@ -260,7 +259,14 @@ public class PlateServiceImpl implements PlateService {
@Override
public PageResult<PlateGoodDO> getGoodsPlate(GoodsPlateFilterPageReqVO pageReqVO) {
PlanDO planDO = validatePlanExists(pageReqVO.getPlanId());
PlanDO planDO = planMapper.selectById(pageReqVO.getPlanId());
AssertUtils.notEmpty(planDO,PLAN_NOT_EXISTS);
if(planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus())){
throw exception(THIS_PLAN_PLATE_OPTIMIZE_IS_ALL);
}
if (planDO.getType().equals(PlanTypeEnum.MIXEDORDERPLAN.getType())) {
@@ -535,18 +541,5 @@ public class PlateServiceImpl implements PlateService {
}
}
private PlanDO validatePlanExists(Long id) {
PlanDO planDO = planMapper.selectById(id);
AssertUtils.notEmpty(planDO,PLAN_NOT_EXISTS);
if(planDO.getStatus().equals(PlanStatusEnum.OPENING.getStatus()) || planDO.getStatus().equals(PlanStatusEnum.OPENED.getStatus())){
throw exception(LIST_CHANGES_ARE_PROHIBITED);
}
return planDO;
}
}