Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFi...

无关风月

2024-07-30 f3cba59fc471e42936a10d8e923fd097e80cbc97

 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());
@@ -85,6 +89,7 @@
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        v.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
        v.setSupplierId(byId.getSupplierId());
        v.setSupplierName(data.getNickName());
        v.setSupplierPhone(data.getPhonenumber());
        SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
@@ -127,16 +132,19 @@
            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) {
        Long userid = SecurityUtils.getUserId();
        SlVolumeProductionRkgl slVolumeProductionRkgl=null;
        if (volumeProductionRkglDTO.getId()==null){
            SlVolumeProductionRkgl slVolumeProductionRkgl=new  SlVolumeProductionRkgl();
            new  SlVolumeProductionRkgl();
            slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
            slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
            slVolumeProductionRkgl.setAuditStatus(1);
@@ -149,24 +157,26 @@
            slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
            this.save(slVolumeProductionRkgl);
        }else{
            SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
            slVolumeProductionRkgl = this.getById(volumeProductionRkglDTO.getId());
            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);
            this.updateById(slVolumeProductionRkgl);

        }
        return slVolumeProductionRkgl.getId();
    }

    @Override
@@ -279,6 +289,8 @@
        byId.setAuditStatus(6);
        byId.setEndTime(new Date());
        this.updateById(byId);

        logClient.savelong();
    }

}