产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
liding
4 天以前 0047f8ce5986c577e6b887403dd24ea884c9ce4b 
 src/main/java/com/ruoyi/approve/service/impl/ApproveProcessServiceImpl.java


@@ -16,8 +16,6 @@


import com.ruoyi.approve.vo.ApproveGetAndUpdateVo;


import com.ruoyi.approve.vo.ApproveProcessVO;


import com.ruoyi.common.enums.FileNameType;


import com.ruoyi.common.utils.OrderUtils;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.other.service.impl.TempFileServiceImpl;


import com.ruoyi.project.system.domain.SysDept;


import com.ruoyi.project.system.domain.SysNotice;


@@ -32,25 +30,20 @@


import com.ruoyi.sales.pojo.CommonFile;


import com.ruoyi.sales.pojo.ShippingInfo;


import com.ruoyi.sales.service.impl.CommonFileServiceImpl;


import lombok.AllArgsConstructor;


import lombok.RequiredArgsConstructor;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.context.annotation.Lazy;


import org.springframework.data.redis.core.StringRedisTemplate;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;


import org.springframework.util.StringUtils;




import java.io.IOException;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.LocalDate;


import java.time.LocalDateTime;


import java.time.format.DateTimeFormatter;


import java.util.ArrayList;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


import java.util.stream.Collectors;




@@ -125,6 +118,10 @@


                .collect(Collectors.toList())


                .get(0)


                .getNickName());


        approveProcess.setStorageType(approveProcessVO.getStorageType());


        approveProcess.setInventoryReview(approveProcessVO.isInventoryReview());


        approveProcess.setInventoryReview(approveProcessVO.isInventoryReview());


        approveProcess.setRecordId(approveProcessVO.getRecordId());


        // 设置状态为重新提交


        if (approveProcessVO.getId() != null) {


            ApproveProcess approveProcess1 = approveProcessMapper.selectById(approveProcessVO.getId());


@@ -441,6 +438,8 @@


                return "发货审批";


            case 8:


                return "危险作业审批";


            case 9:


                return "入库审批";


        }


        return null;


    }