Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-14 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c

 server/src/main/java/doumeemes/service/ext/impl/WorkPlansExtServiceImpl.java

@@ -32,6 +32,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -96,7 +97,9 @@
                || Objects.isNull(workPlansSaveDTO.getNum())
                || Objects.isNull(workPlansSaveDTO.getFactoryId())
                || Objects.isNull(workPlansSaveDTO.getUnitId())
                || Objects.isNull(workPlansSaveDTO.getMaterialId())){
                || Objects.isNull(workPlansSaveDTO.getMaterialId())
                || Objects.isNull(workPlansSaveDTO.getStartDate())
                || workPlansSaveDTO.getStartDate().getTime() > workPlansSaveDTO.getPlanDate().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        WorkPlans workPlans = new WorkPlans();
@@ -172,6 +175,12 @@
                    i.setFinishUnQualifiedNum(Objects.isNull(plansExtListVO.getUnqulifiedNum())?Constants.ZERO:plansExtListVO.getUnqulifiedNum());
                    i.setFinishNum(Objects.isNull(plansExtListVO.getDoneNum())?Constants.ZERO:plansExtListVO.getDoneNum());
                }
                if (Objects.nonNull(i.getPlanDate())){
                    i.setHasExpire(DateUtil.toDateLocalDateTime(i.getPlanDate()).toLocalDate().isBefore(LocalDate.now()));
                }else {
                    i.setHasExpire(false);
                }

            });
        }
        return PageData.from(new PageInfo<>(result));
@@ -365,8 +374,14 @@
        if(Constants.formatIntegerNum(p.getNum())<=0){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划生产数量】数据错误！");
        }
        if(p.getStartDate() == null){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划开始日期】数据错误，正确格式为：yyyy-MM-dd（如2022-06-07）！");
        }
        if(p.getPlanDate() == null){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划日期】数据错误，正确格式为：yyyy-MM-dd（如2022-06-07）！");
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划结束日期】数据错误，正确格式为：yyyy-MM-dd（如2022-06-07）！");
        }
        if(p.getPlanDate().getTime() <= p.getStartDate().getTime()){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【计划开始日期】要早于【计划结束日期】！");
        }
        if(StringUtils.isBlank(p.getMaterialCode())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，第【"+(index+2)+"】行【产品编码】数据错误！");