代码提交 bug解决

无关风月

2024-08-27 b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java

@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.feignClient.LogClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;

@@ -57,6 +58,9 @@
    @Resource
    private  ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;

    @Resource
    private LogClient logClient;

    @Override
    public PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
        Page<SlVolumeProductionRkgl> page = new Page<>(supplierVolumeProductionRkglQuery.getPageCurr(), supplierVolumeProductionRkglQuery.getPageSize());
@@ -81,15 +85,30 @@
    @Override
    public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Long id) {
        SlVolumeProductionRkgl byId = this.getById(id);
        // 根据仓库id 查询仓库管理员
        VolumeProductionRkgInfoVO v=BeanUtils.copyBean(byId, VolumeProductionRkgInfoVO.class);
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        v.setZhuren(slStoreManagement.getDirectorId());
        v.setZhuguan(slStoreManagement.getCompetentId());
        v.setGuanliyuan(slStoreManagement.getAdministratorId());
        v.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
        v.setSupplierName(data.getNickName());
        v.setSupplierPhone(data.getPhonenumber());
        SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
        v.setSysName(data1.getNickName());
        v.setSysPhone(data1.getPhonenumber());
        if (byId.getSupplierId()!=null){
            SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
            if (data!=null){
                v.setSupplierName(data.getNickName());
                v.setSupplierPhone(data.getPhonenumber());
            }
        }
        v.setSupplierId(byId.getSupplierId());
        if (byId.getSysId()!=null){
            SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
            if (data1!=null){
                v.setSysName(data1.getNickName());
                v.setSysPhone(data1.getPhonenumber());
            }
        }
        v.setAuthorization(byId.getAuthorizationUrl());
        v.setReason(byId.getReasonsRefusal());
        return v;
    }

@@ -103,10 +122,10 @@
                .collect(Collectors.toSet());

        LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
        if (getVolumeProductionRkQuery.getPresentState()!=0&&getVolumeProductionRkQuery.getPresentState()!=null){
        if (getVolumeProductionRkQuery.getPresentState()!=null && getVolumeProductionRkQuery.getPresentState()!=0){
            wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
        }
        if (getVolumeProductionRkQuery.getAuditStatus()!=0&&getVolumeProductionRkQuery.getAuditStatus()!=null) {
        if (getVolumeProductionRkQuery.getAuditStatus()!=null && getVolumeProductionRkQuery.getAuditStatus()!=0) {
            wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus, getVolumeProductionRkQuery.getAuditStatus());
        }
        if (goodsSkuIdList.size()>0){
@@ -117,9 +136,8 @@
            wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
        }
        wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
        wrapper1.orderByDesc(SlVolumeProductionRkgl::getStartiTime);
        Page<SlVolumeProductionRkgl> page2 = this.page(page, wrapper1);

        PageDTO<SupplierVolumeProductionRkglVO> SlGoodsShelfDTO = PageDTO.of(page2, SupplierVolumeProductionRkglVO.class);
        List<SupplierVolumeProductionRkglVO> list2 = SlGoodsShelfDTO.getList();
        for(SupplierVolumeProductionRkglVO list:list2){
@@ -127,46 +145,87 @@
            list.setNickName(data.getNickName());
            list.setPhonenumber(data.getPhonenumber());
            SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
            list.setStoreManagementName(slStoreManagement.getStoreManagementName());
            if (slStoreManagement!=null){
                list.setStoreManagementName(slStoreManagement.getStoreManagementName());
            }
        }
        return SlGoodsShelfDTO;
    }

    @Override
    public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
    public Long addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(volumeProductionRkglDTO.getManagementId());
        String directorId = slStoreManagement.getDirectorId();
        String competentId = slStoreManagement.getCompetentId();
        String administratorId = slStoreManagement.getAdministratorId();
        Long userid = SecurityUtils.getUserId();
        List<String> list1 = Arrays.asList(administratorId.split(","));
        List<String> list2 = Arrays.asList(competentId.split(","));
        List<String> list3 = Arrays.asList(directorId.split(","));
        SlVolumeProductionRkgl slVolumeProductionRkgl=null;
        if (volumeProductionRkglDTO.getId()==null){
            SlVolumeProductionRkgl slVolumeProductionRkgl=new  SlVolumeProductionRkgl();
            slVolumeProductionRkgl = new  SlVolumeProductionRkgl();
            slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
            slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
            slVolumeProductionRkgl.setAuditStatus(1);
            slVolumeProductionRkgl.setManagementId(volumeProductionRkglDTO.getManagementId());
            slVolumeProductionRkgl.setAuditStatus(1);
            slVolumeProductionRkgl.setPresentState(1);
            slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
            slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
            slVolumeProductionRkgl.setStartiTime(new Date());
            slVolumeProductionRkgl.setSysId(userid);
            slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
            // 如果发起人是主任 主管 或 管理员
            if (list1.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(2);
            }
            if (list2.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(3);
            }
            if (list3.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(4);
            }

            this.save(slVolumeProductionRkgl);
        }else{
            SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
            slVolumeProductionRkgl = this.getById(volumeProductionRkglDTO.getId());
            slVolumeProductionRkgl.setPresentState(1);
            slVolumeProductionRkgl.setAuditStatus(1);
            if (volumeProductionRkglDTO.getSource()!=null){
                byId.setSource(volumeProductionRkglDTO.getSource());
                slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
            }
            if (volumeProductionRkglDTO.getRemark()!=null){
                byId.setRemark(volumeProductionRkglDTO.getRemark());
                slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
            }
            if (volumeProductionRkglDTO.getSupplierId()!=null){
                byId.setSupplierId(volumeProductionRkglDTO.getSupplierId());
                slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
            }
            if (volumeProductionRkglDTO.getAttachmentUrl()!=null){
                byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
                slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
            }
            if (volumeProductionRkglDTO.getAuthorization()!=null){
                byId.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
                slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
            }
            this.updateById(byId);
            // 如果发起人是主任 主管 或 管理员
            if (list1.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(2);
            }
            if (list2.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(3);
            }
            if (list3.contains(userid.toString())){
                slVolumeProductionRkgl.setAuditStatus(1);
                slVolumeProductionRkgl.setPresentState(4);
            }
            this.updateById(slVolumeProductionRkgl);

        }
        return slVolumeProductionRkgl.getId();
    }

    @Override
@@ -247,6 +306,8 @@
        wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
        List<SlVolumeProductionRk> page2 = slVolumeProductionRkMapper.selectList(wrapper1);
        for (SlVolumeProductionRk list : page2) {
            list.setNewAddTime("1");
            list.setSmerwmNum(list.getErwmNum());
            LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
            wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId());
            wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
@@ -270,15 +331,19 @@
                managementGoodsMaterials1.setGoodsMaterialsId(list.getMaterialsId());
                managementGoodsMaterials1.setRepertoryZhai(list.getRkNum());
                managementGoodsMaterials1.setRepertorySum(list.getRkNum());
                managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
                managementGoodsMaterials1.setCreateTime(new Date());
                managementGoodsMaterials1.setRepertory(slGoodsMaterials.getRepertory());
                managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
            }
            slVolumeProductionRkMapper.updateById(list);
        }
        SlVolumeProductionRkgl byId = this.getById(id);
        byId.setPresentState(4);
        byId.setAuditStatus(6);
        byId.setEndTime(new Date());
        this.updateById(byId);

        logClient.savelong();
    }

}