森林防火 供应商管理

rentaiming

2024-07-17 4dff90ef37dd910eff7bd2eb68bff28db5f9bb4d

森林防火 供应商管理

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java

@@ -35,7 +35,7 @@
    @Resource
    private ManagementGoodsMaterialsService managementGoodsMaterialsService;
    @PostMapping("/getManagementGoodsMaterialsList")
    @ApiOperation(value = "分页获物资盘点")
    @ApiOperation(value = "分页获库存预警列表")
    public R<PageDTO<ManagementGoodsMaterialsVO>> getManagementGoodsMaterialsList(@RequestBody ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) {
        return R.ok(managementGoodsMaterialsService.getManagementGoodsMaterialsList(managementGoodsMaterialsQuery));
    }

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java

@@ -46,7 +46,7 @@
        return R.ok();
    }

    @ApiOperation("删除仓库管理")
    @ApiOperation("删除货架")
    @DeleteMapping("/{id}")
    public R<?> delStoreManagement(
            @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
@@ -68,9 +68,15 @@
    }

    @PostMapping("/getStoreManagementimgSheif")
    @ApiOperation(value = "獲取仓库管理平面圖的仓库")
    @ApiOperation(value = "获取仓库管理平面圖的仓库")
    public R<List<SlGoodsShelf>> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO) {
        return R.ok(slGoodsShelfService.getStoreManagementimgSheif(goodsShelfDTO));
    }

    @PostMapping("/getGoodsSheManagementlfList")
    @ApiOperation(value = "分页通过仓库和层数货架表管理")
    public R<List<SlGoodsShelf>> getGoodsSheManagementlfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery) {
        return R.ok(slGoodsShelfService.getGoodsSheManagementlfList(slGoodsShelfQuery));
    }

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java

@@ -1,18 +1,28 @@
package com.ruoyi.management.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlAudit;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.SlVolumeProductionZygl;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyDTO;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.SlAuditMapper;
import com.ruoyi.management.service.SlVolumeProductionZyService;
import com.ruoyi.management.service.SlVolumeProductionZyglService;
import com.ruoyi.management.service.impl.SlVolumeProductionZyServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;

/**
 * <p>
@@ -26,9 +36,54 @@
@RequestMapping("/sl-volume-production-zygl")
@Api(value = "转移管理接口", tags = "转移管理接口", description = "转移管理接口")
public class SlVolumeProductionZyglController {

    @Resource
    private SlAuditMapper slAuditMapper;

    @Resource
    private SlVolumeProductionZyglService slVolumeProductionZyglService;
    @PostMapping("/getVolumeProductionzZyglList")
    @ApiOperation(value = "分页获取转移管理")
    public R<PageDTO<VolumeProductionzZyglVO>> getslVolumeProductionCkglList(@RequestBody getslVolumeProductionCkglQuery VolumeProductionCkglQuery) {
       /* return R.ok(slVolumeProductionCkglService.getslVolumeProductionCkglList(VolumeProductionCkglQuery));*/
    public R<PageDTO<VolumeProductionzZyglVO>> getVolumeProductionzZyglList(@RequestBody SlVolumeProductionZyQuery slVolumeProductionZyQuery) {
       return R.ok(slVolumeProductionZyglService.getVolumeProductionzZyglList(slVolumeProductionZyQuery));
    }

    @PostMapping("/addsVolumeProductionzZygl")
    @ApiOperation(value = "添加/修改转移管理")
    public R addsVolumeProductionzZygl(@RequestBody SlVolumeProductionZyDTO slVolumeProductionZyDTO) {
        slVolumeProductionZyglService.addsVolumeProductionzZygl(slVolumeProductionZyDTO);
        return R.ok();
    }

    @PostMapping("/getVolumeProductionzZyglnfo")
    @ApiOperation(value = "获取转移管理详情")
    public R<VolumeProductionZyglInfoVO> getVolumeProductionzZyglnfo(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
        return R.ok(slVolumeProductionZyglService.getVolumeProductionzZyglnfo(id));
    }

    @PostMapping("/getVolumeProductionZyglnventory")
    @ApiOperation(value = "获取转移管理打印清单")
    public R<VolumeProductionZyglInventoryVO> getVolumeProductionZyglnventory(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
        return R.ok(slVolumeProductionZyglService.getVolumeProductionZyglnventory(id));
    }


    @ApiOperation("取转移管理")
    @DeleteMapping("/{id}")
    public R<?> delStoreManagement(
            @ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
        SlVolumeProductionZygl byId = slVolumeProductionZyglService.getById(id);
        byId.setPresentState(5);
        byId.setAuditStatus(7);
        slVolumeProductionZyglService.updateById(byId);

        LambdaQueryWrapper<SlAudit> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SlAudit::getType,1);
        wrapper.eq( SlAudit::getDelFlag,0);
        wrapper.eq(SlAudit::getRkId,id);
        SlAudit slAudit = slAuditMapper.selectOne(wrapper);
        slAudit.setState(6);

        return R.ok();
    }
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java

@@ -27,11 +27,15 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    @ApiModelProperty("发起人ID")
    @TableField("sys_id")
    private Long sysId;

    @ApiModelProperty("物资id")
    @TableField("materials_id")
    private Long materialsId;

    @ApiModelProperty("入库数量")
    @ApiModelProperty("入库")
    @TableField("rk_id")
    private Integer rkId;

@@ -79,13 +83,7 @@
    @TableField("state")
    private Integer state;

    @ApiModelProperty("归还数量")
    @TableField("guih_num")
    private Integer guihNum;

    @ApiModelProperty("是否匹配 1未匹配，已匹配")
    @TableField("type")
    private String type;

    @ApiModelProperty("转移管理id")
    private Long  zyglId;

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java

@@ -35,6 +35,10 @@
    @TableField("management_id")
    private Long managementId;

    @ApiModelProperty("被转移仓库ID")
    @TableField("bmanagement_id")
    private Long bmanagementId;

    @ApiModelProperty("发起时间")
    @TableField("starti_time")
    private Date startiTime;
@@ -75,9 +79,16 @@
    @TableField("reasons_refusal")
    private String reasonsRefusal;

    @ApiModelProperty("被转移仓库ID")
    @TableField("bmanagement_id")
    private Long bmanagementId;


    @ApiModelProperty("转移原因")
    private String source;

    @ApiModelProperty("附件")
    private String attachmentUrl;

    @ApiModelProperty("审批单")
    private String authorization;


}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsShelfQuery.java

@@ -17,4 +17,7 @@

    @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
    private Integer storeManagementNumber;

    @ApiModelProperty("仓库id")
    private Long storeManagementId;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java

New file
@@ -0,0 +1,29 @@
package com.ruoyi.management.domain.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("入库批次修改数据传输对象")
public class SlVolumeProductionZyDTO {
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    @ApiModelProperty("转移出仓库ID")
    private Long managementId;

    @ApiModelProperty("被转移入仓库ID")
    private Long bmanagementId;

    @ApiModelProperty("转移原因")
    private String source;

    @ApiModelProperty("附件")
    private String attachmentUrl;

    @ApiModelProperty("审批单")
    private String authorization;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyQuery.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.management.domain.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("转移管理查询传输对象")
public class SlVolumeProductionZyQuery extends BasePage {

    @ApiModelProperty("发起人名称")
    private String supplierName;

    @ApiModelProperty("发起人电话")
    private String supplierPhone;

    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
    private Integer auditStatus;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/getslVolumeProductionCkglQuery.java

@@ -8,10 +8,10 @@
@Data
@ApiModel("出库库查询传输对象")
public class getslVolumeProductionCkglQuery extends BasePage {
    @ApiModelProperty("供应商名称")
    @ApiModelProperty("发起人名称")
    private String supplierName;

    @ApiModelProperty("供应商电话")
    @ApiModelProperty("发起人电话")
    private String supplierPhone;

    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionZyVO.java

New file
@@ -0,0 +1,40 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "通过转移库管理拿出库物资的数据对象", description = "通过转移库管理物资的数据对象")
public class ManagementimgVolumeProductionZyVO {

    private Long id;

    @ApiModelProperty("物资名称")
    private String goodsMaterialsName;

    @ApiModelProperty("货架名称")
    private String goodsShelfName;

    @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
    private Integer storeManagementNumber;

    @ApiModelProperty("在库存的")
    private Long repertoryZhai;

    @ApiModelProperty("转移数量")
    @TableField("zy_num")
    private Integer zyNum;


    @ApiModelProperty("入库批次")
    private Long rkId;

    @ApiModelProperty("入库编号")
    private String rkNumber;

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglInfoVO.java

@@ -28,22 +28,17 @@
    private Date endTime;

    @ApiModelProperty("来源")
    @TableField("source")
    private String source;

    @ApiModelProperty("附件")
    @TableField("attachment")
    private String attachmentUrl;

    @ApiModelProperty("审批单")
    @TableField("authorization")
    private String authorization;

    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
    @TableField("present_state")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交，6 已出库, 7已完成， 8，已取消")
    @TableField("audit_status")
    private Integer auditStatus;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -33,6 +34,10 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Long supplierId;

    @ApiModelProperty("发起人ID")
    @TableField("sys_id")
    private Long sysId;

    @ApiModelProperty("仓库ID")
    private Long managementId;

@@ -42,6 +47,6 @@
    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已出库， 7，已取消 ，8 已完成")
    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6 已出库，7已完成， 8，已取消")
    private Integer auditStatus;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInventoryVO.java

@@ -39,5 +39,5 @@
    private String supplierName;

    @ApiModelProperty("入库数据")
    List<ManagementimgVolumeProductionCkVO> managementimgVolumeProductionRkVOList;
    List<ManagementimgVolumeProductionRkVO> managementimgVolumeProductionRkVOList;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInfoVO.java

New file
@@ -0,0 +1,51 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
@Data
@ApiModel(value = "转移管理详情", description = "转移管理详情")
public class VolumeProductionZyglInfoVO {
    private Long id;

    @ApiModelProperty("转移仓库ID")
    private Long managementId;

    @ApiModelProperty("被转移仓库ID")
    private Long bmanagementId;

    @ApiModelProperty("发起人名称")
    private String sysName;

    @ApiModelProperty("发起人电话")
    private String sysPhone;

    @ApiModelProperty("转移仓库名称")
    private String storeManagementName;

    @ApiModelProperty("被转移仓库名称")
    private String BstoreManagementName;

    @ApiModelProperty("发起时间")
    private Date startiTime;

    @ApiModelProperty("结束时间")
    private Date endTime;

    @ApiModelProperty("来源")
    private String source;

    @ApiModelProperty("附件")
    private String attachmentUrl;

    @ApiModelProperty("审批单")
    private String authorization;
    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
    private Integer auditStatus;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionZyglInventoryVO.java

New file
@@ -0,0 +1,48 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.util.List;

@Data
@ApiModel(value = "转移打印清单", description = "转移打印清单")
public class VolumeProductionZyglInventoryVO {
    private Long id;
    @ApiModelProperty("发起人名称")
    private String sysName;

    @ApiModelProperty("转移仓库名称")
    private String storeManagementName;

    @ApiModelProperty("转移仓库ID")
    private Long managementId;
    @ApiModelProperty("被转移仓库ID")

    private Long bmanagementId;

    @ApiModelProperty("被转移仓库名称")
    private String bstoreManagementName;


    @ApiModelProperty("发起时间")
    private Date startiTime;

    @ApiModelProperty("发起人电话")
    private String sysPhone;

    @ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
    private String directorName;

    @ApiModelProperty("主管id-仓库管理员选择的多个逗号隔各开")
    private String competentName;

    @ApiModelProperty("管理员id多个逗号隔各开")
    private String administratorName;

    @ApiModelProperty("转移数据")
    List<ManagementimgVolumeProductionZyVO> managementimgVolumeProductionCkVOList;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionzZyglVO.java

@@ -1,5 +1,6 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -28,6 +29,10 @@
    @JsonInclude(JsonInclude.Include.ALWAYS)
    private Date startiTime;

    @ApiModelProperty("发起人ID")
    @TableField("sys_id")
    private Long sysId;


    @ApiModelProperty("仓库ID")
    private Long managementId;

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java

@@ -30,4 +30,6 @@
   void fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO);

    List<SlGoodsShelf> getStoreManagementimgSheif(@RequestBody GoodsShelfDTO goodsShelfDTO);

    List<SlGoodsShelf> getGoodsSheManagementlfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery);
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java

@@ -1,7 +1,11 @@
package com.ruoyi.management.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * <p>
@@ -13,4 +17,5 @@
 */
public interface SlVolumeProductionZyService extends IService<SlVolumeProductionZy> {


}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java

@@ -1,7 +1,16 @@
package com.ruoyi.management.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionZygl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyDTO;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.vo.VolumeProductionZyglInfoVO;
import com.ruoyi.management.domain.vo.VolumeProductionZyglInventoryVO;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * <p>
@@ -12,5 +21,11 @@
 * @since 2024-06-25
 */
public interface SlVolumeProductionZyglService extends IService<SlVolumeProductionZygl> {
    PageDTO<VolumeProductionzZyglVO> getVolumeProductionzZyglList(@RequestBody SlVolumeProductionZyQuery slVolumeProductionZyQuery);

    void addsVolumeProductionzZygl(@RequestBody SlVolumeProductionZyDTO slVolumeProductionZyDTO);

    VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Integer id);

    VolumeProductionZyglInventoryVO getVolumeProductionZyglnventory( Integer id);
}

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

@@ -149,4 +149,19 @@
        List<SlGoodsShelf> page2 = this.list(wrapper1);
        return page2;
    }

    @Override
    public List<SlGoodsShelf> getGoodsSheManagementlfList(SlGoodsShelfQuery slGoodsShelfQuery) {
        LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
        if (slGoodsShelfQuery.getStoreManagementId()!=null){
            wrapper1.eq(SlGoodsShelf::getStoreManagementId,slGoodsShelfQuery.getStoreManagementId());
        }
        if (slGoodsShelfQuery.getStoreManagementNumber()!=null){
            wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,slGoodsShelfQuery.getStoreManagementNumber());
        }
        wrapper1.eq( SlGoodsShelf::getDelFlag,0);
        wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
        List<SlGoodsShelf> page2 = this.list(wrapper1);
        return page2;
    }
}

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

@@ -79,7 +79,7 @@
        PageDTO<VolumeProductionCkglVO> SlGoodsShelfDTO = PageDTO.of(page2, VolumeProductionCkglVO .class);
        List<VolumeProductionCkglVO> list2 = SlGoodsShelfDTO.getList();
        for(VolumeProductionCkglVO list:list2){
            SysUser data = sysUserClient.getSysUser(list.getSupplierId()).getData();
            SysUser data = sysUserClient.getSysUser(list.getSysId()).getData();
            list.setNickName(data.getNickName());
            list.setPhonenumber(data.getPhonenumber());
            SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
@@ -95,6 +95,7 @@
            SlVolumeProductionCkgl slVolumeProductionRkgl=new  SlVolumeProductionCkgl();
            slVolumeProductionRkgl.setAttachmentUrl(volumeProductionCkglDTO.getAttachmentUrl());
            slVolumeProductionRkgl.setAuthorization(volumeProductionCkglDTO.getAuthorization());
            slVolumeProductionRkgl.setSource(volumeProductionCkglDTO.getSource());
            slVolumeProductionRkgl.setAuditStatus(1);
            slVolumeProductionRkgl.setManagementId(volumeProductionCkglDTO.getManagementId());
            slVolumeProductionRkgl.setPresentState(1);
@@ -229,7 +230,6 @@
        }
        SlVolumeProductionCkgl byId = this.getById(id);
        byId.setAuditStatus(6);
        byId.setEndTime(new Date());
        this.updateById(byId);
    }


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

@@ -223,6 +223,7 @@
                rkVO.setStoreManagementNumber(rkVO.getStoreManagementNumber());
                SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
                rkVO.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
                managementList.add(rkVO);
        }
        return vo;
    }

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

@@ -1,11 +1,28 @@
package com.ruoyi.management.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionCkgl;
import com.ruoyi.management.domain.SlVolumeProductionZy;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO;
import com.ruoyi.management.mapper.SlVolumeProductionZyMapper;
import com.ruoyi.management.service.SlVolumeProductionZyService;
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.SysUserClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * <p>
 * 发起转移 服务实现类

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

@@ -1,10 +1,26 @@
package com.ruoyi.management.service.impl;

import com.ruoyi.management.domain.SlVolumeProductionZygl;
import com.ruoyi.management.mapper.SlVolumeProductionZyglMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyDTO;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlVolumeProductionZyglService;
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.SysUserClient;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -16,5 +32,176 @@
 */
@Service
public class SlVolumeProductionZyglServiceImpl extends ServiceImpl<SlVolumeProductionZyglMapper, SlVolumeProductionZygl> implements SlVolumeProductionZyglService {
    @Resource
    private SysUserClient sysUserClient;

    @Resource
    private SlStoreManagementMapper slStoreManagementMapper;

    @Resource
    private SlVolumeProductionZyglMapper slVolumeProductionZyglMapper;

    @Resource
    private SlVolumeProductionRkMapper slVolumeProductionRkMapper;

    @Resource
    private SlGoodsMaterialsMapper slGoodsMaterialsMapper;

    @Resource
    private SlGoodsShelfMapper slGoodsShelfMapper;

    @Resource
    private SlVolumeProductionZyMapper slVolumeProductionZyMapper;

    @Override
    public PageDTO<VolumeProductionzZyglVO> getVolumeProductionzZyglList(SlVolumeProductionZyQuery slVolumeProductionZyQuery) {
        Page<SlVolumeProductionZygl> page = new Page<>(slVolumeProductionZyQuery.getPageCurr(), slVolumeProductionZyQuery.getPageSize());
        getVolumeProductionRkQuery getVolume=new getVolumeProductionRkQuery();
        getVolume.setSupplierPhone(slVolumeProductionZyQuery.getSupplierPhone());
        getVolume.setSupplierName(slVolumeProductionZyQuery.getSupplierName());
        List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolume).getData();
        Set<Long> goodsSkuIdList = null;
        goodsSkuIdList = data1.stream().map(SysUser::getUserId)
                .collect(Collectors.toSet());

        LambdaQueryWrapper< SlVolumeProductionZygl> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SlVolumeProductionZygl::getPresentState,slVolumeProductionZyQuery.getPresentState());
        wrapper1.eq(SlVolumeProductionZygl::getAuditStatus,slVolumeProductionZyQuery.getAuditStatus());
        if (goodsSkuIdList.size()>0){
            wrapper1.in(SlVolumeProductionZygl::getSysId,goodsSkuIdList);
        }
        wrapper1.eq( SlVolumeProductionZygl::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionZygl::getCreateTime);
        Page<SlVolumeProductionZygl> page2 = this.page(page, wrapper1);

        PageDTO<VolumeProductionzZyglVO> SlGoodsShelfDTO = PageDTO.of(page2, VolumeProductionzZyglVO .class);
        List<VolumeProductionzZyglVO> list2 = SlGoodsShelfDTO.getList();
        for(VolumeProductionzZyglVO list:list2){
            SysUser data = sysUserClient.getSysUser(list.getSysId()).getData();
            list.setNickName(data.getNickName());
            list.setPhonenumber(data.getPhonenumber());
            SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
            list.setStoreManagementName(slStoreManagement.getStoreManagementName());

            SlStoreManagement bslStoreManagement = slStoreManagementMapper.selectById(list.getBmanagementId());
            list.setStoreManagementName(bslStoreManagement.getStoreManagementName());
        }
        return SlGoodsShelfDTO;
    }

    @Override
    public void addsVolumeProductionzZygl(SlVolumeProductionZyDTO slVolumeProductionZyDTO) {
                Long userid = SecurityUtils.getUserId();
                if (slVolumeProductionZyDTO.getId()!=null){
                    SlVolumeProductionZygl slVolumeProductionZygl=new SlVolumeProductionZygl();
                    slVolumeProductionZygl.setAttachmentUrl(slVolumeProductionZyDTO.getAttachmentUrl());
                    slVolumeProductionZygl.setAuthorization(slVolumeProductionZyDTO.getAuthorization());
                    slVolumeProductionZygl.setSource(slVolumeProductionZyDTO.getSource());
                    slVolumeProductionZygl.setManagementId(slVolumeProductionZyDTO.getManagementId());
                    slVolumeProductionZygl.setBmanagementId(slVolumeProductionZyDTO.getBmanagementId());
                    slVolumeProductionZygl.setSysId(userid);
                    slVolumeProductionZygl.setStartiTime(new Date());
                    slVolumeProductionZygl.setAuditStatus(1);
                    slVolumeProductionZygl.setPresentState(1);
                }else {
                    SlVolumeProductionZygl byId = this.getById(slVolumeProductionZyDTO.getId());
                    if (slVolumeProductionZyDTO.getSource()!=null){
                        byId.setSource(slVolumeProductionZyDTO.getSource());
                    }
                    if (slVolumeProductionZyDTO.getAttachmentUrl()!=null){
                        byId.setAttachmentUrl(slVolumeProductionZyDTO.getAttachmentUrl());
                    }
                    if (slVolumeProductionZyDTO.getAuthorization()!=null){
                        byId.setAuthorization(slVolumeProductionZyDTO.getAuthorization());
                    }
                    this.updateById(byId);
                }
    }

    @Override
    public VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Integer id) {
        SlVolumeProductionZygl byId = this.getById(id);
        VolumeProductionZyglInfoVO v= BeanUtils.copyBean(byId, VolumeProductionZyglInfoVO.class);
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        v.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SlStoreManagement bslStoreManagement = slStoreManagementMapper.selectById(byId.getBmanagementId());
        v.setBstoreManagementName(bslStoreManagement.getStoreManagementName());
        SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
        v.setSysName(data1.getNickName());
        v.setSysPhone(data1.getPhonenumber());

        return v;
    }

    @Override
    public VolumeProductionZyglInventoryVO getVolumeProductionZyglnventory(Integer id) {
        SlVolumeProductionZygl byId = this.getById(id);
        VolumeProductionZyglInventoryVO vo = new VolumeProductionZyglInventoryVO();
        SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
        vo.setSysPhone(data.getPhonenumber());
        vo.setSysName(data.getNickName());
        vo.setStartiTime(byId.getStartiTime());
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SlStoreManagement bslStoreManagement = slStoreManagementMapper.selectById(byId.getBmanagementId());
        vo.setBstoreManagementName(bslStoreManagement.getStoreManagementName());
        String directorId = slStoreManagement.getDirectorId();
        List<String> stri = Arrays.asList(directorId.split(","));
        String str1 = null;
        if (stri.size() > 0) {
            for (String str : stri) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str1 += data1.getNickName() + ",";
            }
        }
        vo.setDirectorName(str1.substring(0, str1.length() - 1));

        String competentId = slStoreManagement.getCompetentId();
        List<String> stri1 = Arrays.asList(competentId.split(","));
        String str11 = null;
        if (stri1.size() > 0) {
            for (String str : stri1) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str11 += data1.getNickName() + ",";
            }
        }
        vo.setCompetentName(str11.substring(0, str11.length() - 1));

        String administratorId = slStoreManagement.getAdministratorId();
        List<String> stri11 = Arrays.asList(administratorId.split(","));
        String str111 = null;
        if (stri11.size() > 0) {
            for (String str : stri11) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str111 += data1.getNickName() + ",";
            }
        }
        vo.setAdministratorName(str111.substring(0, str111.length() - 1));


        LambdaQueryWrapper< SlVolumeProductionZy> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(SlVolumeProductionZy::getZyglId,id);
        wrapper2.eq( SlVolumeProductionZy::getDelFlag,0);
        wrapper2.orderByDesc(SlVolumeProductionZy::getCreateTime);
        List<SlVolumeProductionZy> page2 = slVolumeProductionZyMapper.selectList(wrapper2);
        List<ManagementimgVolumeProductionZyVO> SlGoodsShelfDTO=new ArrayList<>();
        for(SlVolumeProductionZy list1:page2) {
            ManagementimgVolumeProductionZyVO list=new ManagementimgVolumeProductionZyVO();
            list.setId(list1.getId());
            list.setZyNum(list1.getZyNum());
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list1.getRkId());
            list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
            list.setRkNumber(slVolumeProductionRk.getRkNumber());
            list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());

            SlGoodsShelfDTO.add(list);
        }
        vo.setManagementimgVolumeProductionCkVOList(SlGoodsShelfDTO);
        return vo;
    }
}