ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -45,7 +45,6 @@ @PostMapping("/addSlEquipment") @ApiOperation(value = "添加设备管理") public AjaxResult addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO) { slEquipmentService.addSlEquipment(slEquipmentDTO); return slEquipmentService.addSlEquipment(slEquipmentDTO); }
@@ -1,14 +1,13 @@ package com.ruoyi.management.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlGoodsMaterials; import com.ruoyi.management.domain.SlGoodsShelf; import com.ruoyi.management.domain.SlStoreManagement; import com.ruoyi.management.domain.SlStoreManagementImg; import com.ruoyi.management.domain.*; import com.ruoyi.management.domain.dto.*; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.mapper.SlVolumeProductionRkMapper; import com.ruoyi.management.service.SlGoodsShelfService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,6 +32,8 @@ @Resource private SlGoodsShelfService slGoodsShelfService; @Resource private SlVolumeProductionRkMapper slVolumeProductionRkMapper; @PostMapping("/getGoodsShelfList") @ApiOperation(value = "分页获货架表管理") @@ -43,8 +44,7 @@ @PostMapping("/addSlGoodsShelf") @ApiOperation(value = "添加/修改货架管理") public R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO) { slGoodsShelfService.addSlGoodsShelf(slGoodsShelfDTO); return R.ok(); return slGoodsShelfService.addSlGoodsShelf(slGoodsShelfDTO); } @GetMapping("/SlGoodsShelf/{id}") @@ -57,6 +57,14 @@ @DeleteMapping("/{id}") public R<?> delStoreManagement( @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id) { List<SlVolumeProductionRk> slVolumeProductionRks = slVolumeProductionRkMapper.selectList(new QueryWrapper<SlVolumeProductionRk>() .eq("shelf_id", id) .ge("repertory_zhai",0) .isNotNull("new_add_time") .eq("del_flag", "0")); if (slVolumeProductionRks.size() > 0) { return R.fail("删除失败,当前货架存有物资"); } SlGoodsShelf byId = slGoodsShelfService.getById(id); byId.setDelFlag("1"); slGoodsShelfService.updateById(byId); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -75,7 +75,13 @@ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsService.getById(list.getMaterialsId()); list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); list.setIsConsume(slGoodsMaterials.getIsConsume()); list.setErwmNum(slVolumeProductionRkService.getById(list.getScrkId()).getErwmNum()); if (list.getScrkId() != null){ SlVolumeProductionRk byId = slVolumeProductionRkService.getById(list.getScrkId()); if (byId!=null){ Integer erwmNum = byId.getErwmNum(); list.setErwmNum(erwmNum); } } } // 将list2中的数据 如果字段erwmNum为空 优先展示在前面 list2.sort((o1, o2) -> { @@ -103,7 +109,9 @@ continue; } byId1.setErwmNum(updateQrCodeNumDTO.getErwmNum()); byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum())); if (byId1.getErwmNum()>0){ byId1.setRkModel(getLetter(updateQrCodeNumDTO.getErwmNum())); } slVolumeProductionRkService.updateById(byId1); }
@@ -10,4 +10,6 @@ public class SlGoodsMaterialsSlVolumeProductionRkQuery extends BasePage { @ApiModelProperty("物资id") private Long slGoodsMaterialsid; @ApiModelProperty("仓库id") private Long id; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsShelfService.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlGoodsShelf; import com.baomidou.mybatisplus.extension.service.IService; @@ -25,7 +26,7 @@ public interface SlGoodsShelfService extends IService<SlGoodsShelf> { PageDTO<SlGoodsShelfVO> getGoodsShelfList(@RequestBody SlGoodsShelfQuery slGoodsShelfQuery); void addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO); R addSlGoodsShelf(@RequestBody SlGoodsShelfDTO slGoodsShelfDTO); SlGoodsShelfVO getSlGoodsShelfOne( Long id);
@@ -46,6 +46,9 @@ @Override public PageDTO<ManagementGoodsMaterialsVO> getManagementGoodsMaterialsList(ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) { if (managementGoodsMaterialsQuery.getStoreManagementGrade() == 0){ managementGoodsMaterialsQuery.setStoreManagementGrade(null); } LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery(); if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){ wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName()); @@ -98,7 +101,8 @@ SlGoodsMaterialsList.add(0L); wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList); } wrapper3.apply("repertory_zhai <repertory"); wrapper3.apply("repertory_zhai < repertory"); wrapper3.ne(ManagementGoodsMaterials::getRepertory,0); wrapper3.eq(ManagementGoodsMaterials::getDelFlag,0); wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime); Page<ManagementGoodsMaterials> page1 = this.page(page, wrapper3); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
@@ -42,6 +42,8 @@ @Resource private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper; @Resource private SlVolumeProductionRkMapper slVolumeProductionRkMapper; @Resource private SlVolumeProductionCkglMapper slVolumeProductionCKglMapper; @@ -71,6 +73,12 @@ Page<SlAudit> page = new Page<>(auditRecordListQuery.getPageCurr(), auditRecordListQuery.getPageSize()); LambdaQueryWrapper< SlAudit> wrapper= Wrappers.lambdaQuery(); wrapper.eq(SlAudit::getDelFlag,0); if (auditRecordListQuery.getState()!=null){ wrapper.eq(SlAudit::getState,auditRecordListQuery.getState()); } if (goodsSkuIdList.size()>0){ wrapper.in(SlAudit::getSysId,goodsSkuIdList); }else{ @@ -114,7 +122,6 @@ .like("shenh_id", data.getUserId())).stream().map(SlAuditRecord::getAuditId).collect(Collectors.toList()); wrapper.in(SlAudit::getId,auditIds); } break; } wrapper.eq(SlAudit::getType,auditRecordListQuery.getType()); @@ -139,10 +146,10 @@ } return slEquipmentVOPageDTO; } @Resource private SlStoreManagementMapper slStoreManagementMapper; @Override public void addslAudit(SlAuditDTO slAuditDTO) { LambdaQueryWrapper< SlAudit> wrapper= Wrappers.lambdaQuery(); wrapper.eq(SlAudit::getRkId,slAuditDTO.getRkId()); wrapper.eq(SlAudit::getType,slAuditDTO.getType()); @@ -163,101 +170,437 @@ slAudit.setState(1); slAudit.setCreateTime(new Date()); slAudit.setRkId(slAuditDTO.getRkId()); // 根据发起人 if (slAudit.getType()==1){ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAuditDTO.getRkId()); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(slVolumeProductionRkgl.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(",")); slAudit.setSysId(slVolumeProductionRkgl.getSysId()); slAudit.setManagementId(slVolumeProductionRkgl.getManagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionRkgl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); if (list3.contains(userid.toString())){ slVolumeProductionRkgl.setAuditStatus(4); slVolumeProductionRkgl.setPresentState(3); slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl); slAudit.setState(4); this.save(slAudit); // 主任发起 主管和管理员默认审核通过 SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(2); slAuditRecord4.setShenhTime(new Date()); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecord1.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord1); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); }else if (list2.contains(userid.toString())){ slAudit.setState(3); this.save(slAudit); slVolumeProductionRkgl.setAuditStatus(3); slVolumeProductionRkgl.setPresentState(1); slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); }else if (list1.contains(userid.toString())){ // 如果是管理员 slAudit.setState(2); this.save(slAudit); slVolumeProductionRkgl.setAuditStatus(2); slVolumeProductionRkgl.setPresentState(1); slVolumeProductionRkglMapper.updateById(slVolumeProductionRkgl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } if (!list3.contains(userid.toString()) && !list2.contains(userid.toString()) && !list1.contains(userid.toString())){ this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } } if (slAudit.getType()==2){ if (slAudit.getType()==2) { SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAuditDTO.getRkId()); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(slVolumeProductionCkgl.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(",")); slAudit.setSysId(slVolumeProductionCkgl.getSysId()); slAudit.setManagementId(slVolumeProductionCkgl.getManagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionCkgl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); if (list3.contains(userid.toString())){ slAudit.setState(4); this.save(slAudit); slVolumeProductionCkgl.setAuditStatus(4); slVolumeProductionCkgl.setPresentState(3); slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl); // 主任发起 主管和管理员默认审核通过 SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(2); slAuditRecord4.setShenhTime(new Date()); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecord1.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord1); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); }else if (list2.contains(userid.toString())){ slAudit.setState(3); this.save(slAudit); slVolumeProductionCkgl.setAuditStatus(3); slVolumeProductionCkgl.setPresentState(1); slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); }else if (list1.contains(userid.toString())){ // 如果是管理员 slAudit.setState(2); this.save(slAudit); slVolumeProductionCkgl.setAuditStatus(2); slVolumeProductionCkgl.setPresentState(1); slVolumeProductionCKglMapper.updateById(slVolumeProductionCkgl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } if (!list3.contains(userid.toString()) && !list2.contains(userid.toString()) && !list1.contains(userid.toString())){ this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } } if (slAudit.getType()==3){ if(slAuditDTO.getType() == 3){ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAuditDTO.getRkId()); slAudit.setSysId(slVolumeProductionZygl.getSysId()); slAudit.setManagementId(slVolumeProductionZygl.getManagementId()); slAudit.setZymanagementId(slVolumeProductionZygl.getBmanagementId()); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(slVolumeProductionZygl.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(",")); slAudit.setSysId(slVolumeProductionZygl.getSysId()); slAudit.setManagementId(slVolumeProductionZygl.getManagementId()); slAudit.setZymanagementId(slVolumeProductionZygl.getBmanagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionZygl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); if (list3.contains(userid.toString())){ slAudit.setState(4); this.save(slAudit); slVolumeProductionZygl.setAuditStatus(4); slVolumeProductionZygl.setPresentState(3); slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl); // 主任发起 主管和管理员默认审核通过 SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(2); slAuditRecord4.setShenhTime(new Date()); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecord1.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord1); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); }else if (list2.contains(userid.toString())){ slAudit.setState(3); this.save(slAudit); slVolumeProductionZygl.setAuditStatus(3); slVolumeProductionZygl.setPresentState(1); slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(2); slAuditRecord3.setShenhTime(new Date()); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); }else if (list1.contains(userid.toString())){ // 如果是管理员 slAudit.setState(2); this.save(slAudit); slVolumeProductionZygl.setAuditStatus(2); slVolumeProductionZygl.setPresentState(1); slVolumeProductionZyglMapper.updateById(slVolumeProductionZygl); // 如果是主管 SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getAdministratorId()); slAuditRecord2.setType(1); slAuditRecord2.setState(2); slAuditRecord2.setShenhTime(new Date()); slAuditRecord2.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord2); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } if (!list3.contains(userid.toString()) && !list2.contains(userid.toString()) && !list1.contains(userid.toString())){ this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecord.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord3=new SlAuditRecord(); slAuditRecord3.setAuditId(slAudit.getId()); slAuditRecord3.setShenhId(byId.getCompetentId()); slAuditRecord3.setType(2); slAuditRecord3.setState(1); slAuditRecord3.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord3); SlAuditRecord slAuditRecord4=new SlAuditRecord(); slAuditRecord4.setAuditId(slAudit.getId()); slAuditRecord4.setShenhId(byId.getDirectorId()); slAuditRecord4.setType(3); slAuditRecord4.setState(1); slAuditRecord4.setCreateTime(new Date()); slAuditRecordMapper.insert(slAuditRecord4); } } } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -73,6 +73,7 @@ if (slEquipmentDTO.getId()==null){ List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>() .eq("type", slEquipmentDTO.getType()) .eq("del_flag","0") .eq("equipment_num", slEquipmentDTO.getEquipmentNum())); if (!list.isEmpty()){ return AjaxResult.error("当前设备已存在相同设备编号"); @@ -82,12 +83,14 @@ slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum()); slEquipment.setType(slEquipmentDTO.getType()); slEquipment.setManagementId(slEquipmentDTO.getManagementId()); slEquipment.setCreateTime(new Date()); this.save(slEquipment); }else{ SlEquipment byId = this.getById(slEquipmentDTO.getId()); List<SlEquipment> list = this.list(new QueryWrapper<SlEquipment>() .eq("type", slEquipmentDTO.getType()) .ne("id",slEquipmentDTO.getId()) .eq("del_flag","0") .eq("equipment_num", slEquipmentDTO.getEquipmentNum())); if (!list.isEmpty()){ return AjaxResult.error("当前设备已存在相同设备编号"); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -1,8 +1,10 @@ package com.ruoyi.management.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.common.security.utils.SecurityUtils; @@ -111,8 +113,15 @@ } @Override public void addSlGoodsShelf(SlGoodsShelfDTO slGoodsShelfDTO) { public R addSlGoodsShelf(SlGoodsShelfDTO slGoodsShelfDTO) { if (slGoodsShelfDTO.getId()==null){ List<SlGoodsShelf> list = this.list(new QueryWrapper<SlGoodsShelf>() .eq("del_flag","0") .eq("store_management_id", slGoodsShelfDTO.getStoreManagementId()) .eq("goods_shelf_name", slGoodsShelfDTO.getGoodsShelfName())); if (list.size()>0){ return R.fail("添加失败，当前仓库已有相同名称货架"); } SlGoodsShelf slGoodsShelf=new SlGoodsShelf(); slGoodsShelf.setGoodsShelfName(slGoodsShelfDTO.getGoodsShelfName()); slGoodsShelf.setStoreManagementId(slGoodsShelfDTO.getStoreManagementId()); @@ -120,6 +129,14 @@ this.save(slGoodsShelf); }else{ SlGoodsShelf slGoodsShelf = this.getById(slGoodsShelfDTO.getId()); List<SlGoodsShelf> list = this.list(new QueryWrapper<SlGoodsShelf>() .ne("id", slGoodsShelfDTO.getId()) .eq("del_flag","0") .eq("store_management_id", slGoodsShelfDTO.getStoreManagementId()) .eq("goods_shelf_name", slGoodsShelfDTO.getGoodsShelfName())); if (list.size()>0){ return R.fail("添加失败，当前仓库已有相同名称货架"); } if (slGoodsShelfDTO.getGoodsShelfName()!=null){ slGoodsShelf.setGoodsShelfName(slGoodsShelfDTO.getGoodsShelfName()); } @@ -131,6 +148,7 @@ } this.updateById(slGoodsShelf); } return R.ok(); } @Override @@ -142,7 +160,7 @@ SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId()); slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId()); slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName()); slGoodsShelfVO.setStoreManagementNumber(byId.getStoreManagementNumber()); slGoodsShelfVO.setStoreManagementNumber(byId1.getStoreManagementNumber()); slGoodsShelfVO.setProvinceName(byId.getProvinceName()); slGoodsShelfVO.setProvinceCode(byId.getProvinceCode()); slGoodsShelfVO.setCityName(byId.getCityName()); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -53,13 +53,13 @@ Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize()); LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery(); if (storeManagementQuery.getStoreManagementName()!=null&&storeManagementQuery.getStoreManagementName()!=""){ wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName()); wrapper.like(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName()); } if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!=""){ wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo()); if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!="" ){ wrapper.like(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo()); } if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){ if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){ String[] split = storeManagementQuery.getStoreManagementGrade().split(","); List<Integer> arr=new ArrayList<>(); for(int i=0;i<split.length;i++){ @@ -176,18 +176,6 @@ @Override public List<SlStoreManagement> QueryStoreManagementList(QStoreManagementQuery StoreManagementQuery) { LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery(); if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){ wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode()); } if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode()); } if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){ wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode()); } if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); } wrapper.eq(SlStoreManagement::getDelFlag,0); wrapper.orderByDesc(SlStoreManagement::getCreateTime); Long userid = tokenService.getLoginUser().getUserid(); @@ -197,19 +185,72 @@ // 仓库管理员 根据仓库管理员的等级查询对应的仓库 switch (data.getRoleType()){ case 3: wrapper.ge(SlStoreManagement::getStoreManagementGrade,3); if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); }else{ wrapper.eq(SlStoreManagement::getStoreManagementGrade,3); } if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){ wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode()); }else if (StoreManagementQuery.getCountyCode()!=null){ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode()); wrapper.isNull(SlStoreManagement::getTownCode); }else if (StoreManagementQuery.getTownCode()!=null){ wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode()); }else{ wrapper.eq(SlStoreManagement::getCityCode,data.getCityCode()); wrapper.isNull(SlStoreManagement::getCountyCode); } break; case 4: wrapper.ge(SlStoreManagement::getStoreManagementGrade,4); if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); }else{ wrapper.eq(SlStoreManagement::getStoreManagementGrade,4); } if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode()); }else{ wrapper.eq(SlStoreManagement::getCountyCode,data.getCountyCode()); wrapper.isNull(SlStoreManagement::getTownCode); } break; case 5: wrapper.ge(SlStoreManagement::getStoreManagementGrade,5); if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); }else{ wrapper.eq(SlStoreManagement::getStoreManagementGrade,5); } if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){ wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode()); }else{ wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode()); } break; case 6: wrapper.eq(SlStoreManagement::getStoreManagementGrade,6); if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); }else{ wrapper.eq(SlStoreManagement::getStoreManagementGrade,6); } break; } }else { if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); } if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){ wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode()); } if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode()); } if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){ wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode()); } } } @@ -232,15 +273,23 @@ switch (data.getRoleType()){ case 3: wrapper.ge(SlStoreManagement::getStoreManagementGrade,3); wrapper.eq(SlStoreManagement::getCityCode,data.getCityCode()); break; case 4: wrapper.eq(SlStoreManagement::getCountyCode,data.getCountyCode()); wrapper.ge(SlStoreManagement::getStoreManagementGrade,4); break; case 5: wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode()); wrapper.ge(SlStoreManagement::getStoreManagementGrade,5); break; case 6: wrapper.eq(SlStoreManagement::getStoreManagementGrade,6); wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode()); break; } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -57,11 +57,26 @@ @Override public PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) { QueryWrapper<SlVolumeProductionRk> notNull = new QueryWrapper<SlVolumeProductionRk>() .eq("del_flag", "0") .isNotNull("new_add_time"); if (slGoodsMaterialsSlVolumeProductionRkQuery.getId()!=null){ notNull.eq("management_id", slGoodsMaterialsSlVolumeProductionRkQuery.getId()); } // 查询该仓库的入库记录 List<Long> collect = slVolumeProductionRkMapper.selectList(notNull ).stream().map(SlVolumeProductionRk::getId).collect(Collectors.toList()); Page<SlVolumeProductionCk> page = new Page<>(slGoodsMaterialsSlVolumeProductionRkQuery.getPageCurr(), slGoodsMaterialsSlVolumeProductionRkQuery.getPageSize()); LambdaQueryWrapper< SlVolumeProductionCk> wrapper1= Wrappers.lambdaQuery(); wrapper1.like(SlVolumeProductionCk::getMaterialsId,slGoodsMaterialsSlVolumeProductionRkQuery.getSlGoodsMaterialsid()); wrapper1.eq( SlVolumeProductionCk::getDelFlag,0); wrapper1.eq(SlVolumeProductionCk::getMaterialsId,slGoodsMaterialsSlVolumeProductionRkQuery.getSlGoodsMaterialsid()); wrapper1.eq(SlVolumeProductionCk::getDelFlag,0); wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime); if (!collect.isEmpty()){ wrapper1.in(SlVolumeProductionCk::getRkId,collect); } Page<SlVolumeProductionCk> page2 = this.page(page, wrapper1); PageDTO<ManagementimgSlVolumeProductionCkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgSlVolumeProductionCkVO.class); List<ManagementimgSlVolumeProductionCkVO> list2 = SlGoodsShelfDTO.getList(); @@ -199,6 +214,7 @@ wrapper.in("materials_id",collect1); wrapper.eq("management_id",query.getManagementId()); wrapper.eq("del_flag","0"); wrapper.isNotNull("new_add_time"); Page<SlVolumeProductionRk> page2 = slVolumeProductionRkService.page(page, wrapper); List<SlVolumeProductionRk> list = page2.getRecords(); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -232,6 +232,7 @@ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId()); Long num =slVolumeProductionRk.getRepertoryZhai()-Long.valueOf(list.getCkNum()); slVolumeProductionRk.setRepertoryZhai(num); slVolumeProductionRk.setNewAddTime("1"); slVolumeProductionRkMapper.updateById(slVolumeProductionRk); LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery(); wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId()); @@ -243,7 +244,7 @@ Long re1=repertoryZhai-Long.valueOf(list.getCkNum()); Integer num1= managementGoodsMaterials.getRepertoryChu()+list.getCkNum(); managementGoodsMaterials.setRepertoryZhai(re1); managementGoodsMaterials.setCheckNum(num1); managementGoodsMaterials.setRepertoryChu(num1); managementGoodsMaterialsMapper.updateById(managementGoodsMaterials); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -118,13 +118,14 @@ LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery(); wrapper1.eq(SlVolumeProductionRk::getMaterialsId,SlGoodsMaterialsSlVolumeProductionRkDTO.getSlGoodsMaterialsid()); wrapper1.eq( SlVolumeProductionRk::getDelFlag,0); wrapper1.eq(SlVolumeProductionRk::getManagementId,SlGoodsMaterialsSlVolumeProductionRkDTO.getId()); wrapper1.isNotNull(SlVolumeProductionRk::getNewAddTime); wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime); Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1); PageDTO<ManagementimgVolumeProductionRkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionRkVO.class); List<ManagementimgVolumeProductionRkVO> list2 = SlGoodsShelfDTO.getList(); for(ManagementimgVolumeProductionRkVO list:list2) {{ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId()); if (slGoodsMaterials!=null){ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); list.setIsConsume(slGoodsMaterials.getIsConsume()); @@ -136,8 +137,6 @@ list.setSupplierName(data.getNickName()); } } SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId()); if (slGoodsShelf!=null){ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName()); @@ -200,7 +199,6 @@ }if (a.getRkNumber()!=null){ byId.setRkNumber(a.getRkNumber()); } byId.setNewAddTime(a.getNewAddTime()); this.updateById(byId); }
@@ -1,10 +1,12 @@ package com.ruoyi.management.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.service.TokenService; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.management.domain.*; import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; @@ -20,6 +22,7 @@ import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import com.ruoyi.system.api.feignClient.LogClient; import com.ruoyi.system.api.feignClient.SysUserClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -111,17 +114,54 @@ v.setReason(byId.getReasonsRefusal()); return v; } @Autowired private TokenService tokenService; @Override public PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList(getVolumeProductionRkQuery getVolumeProductionRkQuery) { Page<SlVolumeProductionRkgl> page = new Page<>(getVolumeProductionRkQuery.getPageCurr(), getVolumeProductionRkQuery.getPageSize()); List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolumeProductionRkQuery).getData(); Set<Long> goodsSkuIdList = null; List<Long> managementIds = new ArrayList<>(); goodsSkuIdList = data1.stream().map(SysUser::getUserId) .collect(Collectors.toSet()); Long userid = tokenService.getLoginUser().getUserid(); SysUser data2 = sysUserClient.getSysUser(userid).getData(); LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery(); QueryWrapper<SlStoreManagement> storeManagementGrade = new QueryWrapper<SlStoreManagement>() .eq("del_flag", "0"); if (data2!=null){ if (!data2.getUserType().equals("00")){ // 仓库管理员 根据仓库管理员的等级查询对应的仓库 switch (data2.getRoleType()){ case 3: storeManagementGrade.ge("store_management_grade",3); managementIds = slStoreManagementMapper.selectList(storeManagementGrade).stream() .map(SlStoreManagement::getId).collect(Collectors.toList()); break; case 4: storeManagementGrade.ge("store_management_grade",4); managementIds = slStoreManagementMapper.selectList(storeManagementGrade).stream() .map(SlStoreManagement::getId).collect(Collectors.toList()); break; case 5: storeManagementGrade.ge("store_management_grade",5); managementIds = slStoreManagementMapper.selectList(storeManagementGrade).stream() .map(SlStoreManagement::getId).collect(Collectors.toList()); break; case 6: storeManagementGrade.eq("store_management_grade",6); managementIds = slStoreManagementMapper.selectList(storeManagementGrade).stream() .map(SlStoreManagement::getId).collect(Collectors.toList()); break; } } } if (!managementIds.isEmpty()){ wrapper1.in(SlVolumeProductionRkgl::getManagementId,managementIds); } if (getVolumeProductionRkQuery.getPresentState()!=null && getVolumeProductionRkQuery.getPresentState()!=0){ wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState()); } @@ -185,10 +225,9 @@ slVolumeProductionRkgl.setPresentState(3); } if (list3.contains(userid.toString())){ slVolumeProductionRkgl.setAuditStatus(1); slVolumeProductionRkgl.setAuditStatus(3); slVolumeProductionRkgl.setPresentState(4); } this.save(slVolumeProductionRkgl); }else{ slVolumeProductionRkgl = this.getById(volumeProductionRkglDTO.getId()); @@ -219,7 +258,7 @@ slVolumeProductionRkgl.setPresentState(3); } if (list3.contains(userid.toString())){ slVolumeProductionRkgl.setAuditStatus(1); slVolumeProductionRkgl.setAuditStatus(3); slVolumeProductionRkgl.setPresentState(4); } this.updateById(slVolumeProductionRkgl); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java
@@ -122,7 +122,6 @@ slVolumeProductionZygl.setPresentState(1); slVolumeProductionZyglMapper.insert(slVolumeProductionZygl); addaddSlVolumeProductionZyDTO.setId(slVolumeProductionZygl.getId()); // 新增 List<AddZYIdsDTO> rkId = addaddSlVolumeProductionZyDTO.getAddZYIdsDTOS(); for (AddZYIdsDTO m:rkId){ @@ -139,7 +138,6 @@ slVolumeProductionZy.setStoreManagementNumber(m.getStoreManagementNumber()); slVolumeProductionZy.setShelfId(m.getShelfId()); slVolumeProductionZy.setSysId(userid); slVolumeProductionZy.setRkId(m.getRkId()); if (slVolumeProductionRkgl!=null){ if (slVolumeProductionRkgl.getSupplierId()!=null){ slVolumeProductionZy.setSupplierId(Integer.valueOf(slVolumeProductionRkgl.getSupplierId().toString())); @@ -162,8 +160,10 @@ slVolumeProductionRk.setRkNumber("CD-"+simpleDateFormat.format(new Date())+ UUIDUtil.getNumberRandom(2)); slVolumeProductionRk.setRkNum(Long.valueOf(zy.getZyNum())); SlVolumeProductionRk slVolumeProductionRk2 = slVolumeProductionRkMapper.selectById(zy.getRkId()); slVolumeProductionRk.setRkPice(slVolumeProductionRk2.getRkPice()); if (slVolumeProductionRk2!=null)slVolumeProductionRk.setRkModel(slVolumeProductionRk2.getRkModel()); if (slVolumeProductionRk2!=null){ slVolumeProductionRk.setRkModel(slVolumeProductionRk2.getRkModel()); slVolumeProductionRk.setRkPice(slVolumeProductionRk2.getRkPice()); } slVolumeProductionRk.setShelfId(zy.getShelfId()); slVolumeProductionRk.setRepertoryZhai(Long.valueOf(zy.getZyNum())); slVolumeProductionRk.setCreateTime(new Date()); @@ -204,7 +204,11 @@ slVolumeProductionZy.setShelfId(m.getShelfId()); slVolumeProductionZy.setSysId(userid); slVolumeProductionZy.setRkId(m.getRkId()); slVolumeProductionZy.setSupplierId(Integer.parseInt(slVolumeProductionRkgl.getSupplierId().toString())); if (slVolumeProductionRkgl!=null){ if (slVolumeProductionRkgl.getSupplierId()!=null){ slVolumeProductionZy.setSupplierId(Integer.valueOf(slVolumeProductionRkgl.getSupplierId().toString())); } } this.save(slVolumeProductionZy); // slVolumeProductionZyQueryWrapper.eq("rk_id",z.getRkId()); // slVolumeProductionZyQueryWrapper.eq("del_flag","0"); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -364,6 +364,10 @@ // 新入库ids List<Long> collect = page2.stream().map(SlVolumeProductionZy::getScrkId).collect(Collectors.toList()); for (SlVolumeProductionZy zy : page2) { // 将入库记录确认 SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(zy.getScrkId()); slVolumeProductionRk.setNewAddTime("1"); slVolumeProductionRkMapper.updateById(slVolumeProductionRk); // 确认转移之后扣库存 SlVolumeProductionRk slVolumeProductionRk1 = slVolumeProductionRkMapper.selectById(zy.getRkId()); slVolumeProductionRk1.setRepertoryZhai(slVolumeProductionRk1.getRepertoryZhai()-Long.valueOf(zy.getZyNum())); ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml
@@ -15,9 +15,7 @@ <if test="req.isConsume != null and req.isConsume != ''"> is_consume = #{req.isConsume}, </if> <if test="req.repertory != null and req.repertory != ''"> repertory = #{req.repertory}, </if> </set> WHERE id = #{req.id} </update> ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
@@ -86,11 +86,11 @@ } if(gy.getBeginTime()!=null){ wrapper.le(SysOperLog::getOperTime, gy.getBeginTime()); wrapper.gt(SysOperLog::getOperTime, gy.getBeginTime()); } if(gy.getEndTime()!=null){ wrapper.gt(SysOperLog::getOperTime, gy.getEndTime()); wrapper.lt(SysOperLog::getOperTime, gy.getEndTime()); } wrapper.orderByDesc(SysOperLog::getOperTime); Page<SysOperLog> sysOperLogPage = operLogService.selectPage(page, wrapper);
