ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -1,12 +1,18 @@ 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.SlVolumeProductionCkgl; import com.ruoyi.management.domain.SlVolumeProductionRkgl; import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO; import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO; import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery; import com.ruoyi.management.domain.vo.*; import com.ruoyi.management.mapper.SlAuditMapper; import com.ruoyi.management.service.SlVolumeProductionCkglService; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import io.swagger.annotations.Api; @@ -15,6 +21,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.HashSet; import java.util.Set; /** * <p> @@ -30,6 +38,9 @@ public class SlVolumeProductionCkglController { @Resource private SlVolumeProductionCkglService slVolumeProductionCkglService; @Resource private SlAuditMapper slAuditMapper; @PostMapping("/getslVolumeProductionCkglList") @ApiOperation(value = "分页获取出库管理") @@ -56,4 +67,35 @@ return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglInventory(id)); } @ApiOperation("出库管理出库") @DeleteMapping("/ck/{id}") public R<?> ck(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) { slVolumeProductionCkglService.ck(id); return R.ok(); } @ApiOperation("出库管理归还") @DeleteMapping("/gh/{id}") public R<?> gh(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) { slVolumeProductionCkglService.gh(id); return R.ok(); } @ApiOperation("取消出库管理") @DeleteMapping("/{id}") public R<?> delStoreManagement( @ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) { SlVolumeProductionCkgl byId = slVolumeProductionCkglService.getById(id); byId.setPresentState(5); byId.setAuditStatus(8); slVolumeProductionCkglService.updateById(byId); LambdaQueryWrapper<SlAudit> wrapper= Wrappers.lambdaQuery(); wrapper.eq(SlAudit::getType,2); 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/controller/SlVolumeProductionRkglController.java
@@ -1,8 +1,11 @@ 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.dto.SlGoodsShelfDTO; import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; @@ -10,6 +13,7 @@ import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInventoryVO; import com.ruoyi.management.mapper.SlAuditMapper; import com.ruoyi.management.service.SlVolumeProductionRkglService; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import io.swagger.annotations.Api; @@ -34,6 +38,9 @@ @Resource private SlVolumeProductionRkglService slVolumeProductionRkglService; @Resource private SlAuditMapper slAuditMapper; @PostMapping("/getSupplierVolumeProductionRkglList") @@ -70,6 +77,14 @@ byId.setPresentState(5); byId.setAuditStatus(7); slVolumeProductionRkglService.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(); }
@@ -51,7 +51,7 @@ @TableField("update_time") private Date updateTime; @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝") @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝， 6已取消") @TableField("state") private Integer state;
@@ -67,7 +67,7 @@ @TableField("present_state") private Integer presentState; @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已完成， 7，已取消") @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6 已出库，7已完成， 8，已取消") @TableField("audit_status") private Integer auditStatus;
@@ -38,4 +38,10 @@ @ApiModelProperty("1 是非消耗，2是消耗 ") private Integer isConsume; @ApiModelProperty("归还数量") private Integer guihNum; @ApiModelProperty("是否匹配 1未匹配，已匹配") private String type; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglInfoVO.java
@@ -43,7 +43,7 @@ @TableField("present_state") private Integer presentState; @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已完成， 7，已取消") @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/service/SlVolumeProductionCkglService.java
@@ -28,4 +28,8 @@ VolumeProductionCkglInfoVO getVolumeProductionCkglnfo (Integer id); VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Integer id); void ck(Integer id); void gh(Integer id); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -78,6 +79,13 @@ if (!data.getUserType().equals(00)){ wrapper.in(SlAudit::getShenhId,userid); } List state=new ArrayList<>(); state.add(1); state.add(2); state.add(3); state.add(4); state.add(5); wrapper.eq(SlAudit::getState,state); wrapper.eq(SlAudit::getType,auditRecordListQuery.getType()); wrapper.eq( SlAudit::getDelFlag,0); wrapper.orderByDesc(SlAudit::getCreateTime); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -71,6 +71,7 @@ }else{ SlVolumeProductionCk byId = this.getById(slVolumeProductionCkDTO.getId()); byId.setCkNum(slVolumeProductionCkDTO.getCkNum()); byId.setGuihNum(slVolumeProductionCkDTO.getGuihNum()); this.updateById(byId); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -16,6 +16,7 @@ import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import com.ruoyi.system.api.feignClient.SysUserClient; import io.swagger.models.auth.In; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -49,6 +50,9 @@ @Resource private SlGoodsShelfMapper slGoodsShelfMapper; @Resource private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper; @Override public PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery) { @@ -195,4 +199,74 @@ vo.setManagementimgVolumeProductionCkVOList(SlGoodsShelfDTO); return vo; } @Override public void ck(Integer id) { LambdaQueryWrapper<SlVolumeProductionCk> wrapper1 = Wrappers.lambdaQuery(); wrapper1.eq(SlVolumeProductionCk::getCkglId, id); wrapper1.eq(SlVolumeProductionCk::getDelFlag, 0); wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime); List<SlVolumeProductionCk> page2 = slVolumeProductionCkMapper.selectList(wrapper1); for (SlVolumeProductionCk list : page2) { SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId()); Long num =slVolumeProductionRk.getRepertoryZhai()-Long.valueOf(list.getCkNum()); slVolumeProductionRk.setRepertoryZhai(num); slVolumeProductionRkMapper.updateById(slVolumeProductionRk); LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery(); wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId()); wrapper2.eq(ManagementGoodsMaterials::getManagementId,slVolumeProductionRk.getManagementId()); wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0); ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2); if (managementGoodsMaterials!=null){ Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai(); Long re1=repertoryZhai-Long.valueOf(list.getCkNum()); Integer num1= managementGoodsMaterials.getRepertoryChu()+list.getCkNum(); managementGoodsMaterials.setRepertoryZhai(re1); managementGoodsMaterials.setCheckNum(num1); managementGoodsMaterialsMapper.updateById(managementGoodsMaterials); } } SlVolumeProductionCkgl byId = this.getById(id); byId.setAuditStatus(6); byId.setEndTime(new Date()); this.updateById(byId); } @Override public void gh(Integer id) { LambdaQueryWrapper<SlVolumeProductionCk> wrapper1 = Wrappers.lambdaQuery(); wrapper1.eq(SlVolumeProductionCk::getCkglId, id); wrapper1.eq(SlVolumeProductionCk::getDelFlag, 0); wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime); List<SlVolumeProductionCk> page2 = slVolumeProductionCkMapper.selectList(wrapper1); for (SlVolumeProductionCk list : page2) { SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId()); Long num =slVolumeProductionRk.getRepertoryZhai()+Long.valueOf(list.getGuihNum()); slVolumeProductionRk.setRepertoryZhai(num); slVolumeProductionRkMapper.updateById(slVolumeProductionRk); LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery(); wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId()); wrapper2.eq(ManagementGoodsMaterials::getManagementId,slVolumeProductionRk.getManagementId()); wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0); ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2); if (managementGoodsMaterials!=null){ Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai(); Long re1=repertoryZhai+Long.valueOf(list.getGuihNum()); Integer m=managementGoodsMaterials.getCheckNum()-list.getCkNum(); Integer m1=list.getCkNum()-list.getGuihNum(); Integer m2=managementGoodsMaterials.getRepertoryYishi()+m1; managementGoodsMaterials.setRepertoryChu(m); managementGoodsMaterials.setRepertoryZhai(re1); managementGoodsMaterials.setRepertoryYishi(m2); managementGoodsMaterialsMapper.updateById(managementGoodsMaterials); } } SlVolumeProductionCkgl byId = this.getById(id); byId.setAuditStatus(7); byId.setPresentState(4); byId.setEndTime(new Date()); this.updateById(byId); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -245,8 +245,8 @@ Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai(); Long re=repertorySum+list.getRkNum(); Long re1=repertoryZhai+list.getRkNum(); managementGoodsMaterials.setRepertoryZhai(re); managementGoodsMaterials.setRepertorySum(re1); managementGoodsMaterials.setRepertorySum(re); managementGoodsMaterials.setRepertoryZhai(re1); managementGoodsMaterialsMapper.updateById(managementGoodsMaterials); }else{ ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
