ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -60,7 +60,7 @@ } @PostMapping("/getVolumeProductionRkgCode") @ApiOperation(value = "获取入库管理打印清单") @ApiOperation(value = "获取入库管理二维码") public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) { return R.ok(slVolumeProductionRkService.getVolumeProductionRkgCode(volumeProductionRkgCodeQuery)); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
@@ -1,10 +1,21 @@ package com.ruoyi.management.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.dto.VolumeProductionRkgCodeQuery; import com.ruoyi.management.domain.dto.VolumeProductionZygCodeQuery; import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO; import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO; import com.ruoyi.management.service.SlVolumeProductionZyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> @@ -19,4 +30,12 @@ @Api(value = "发起转移接口", tags = "发起转移接口", description = "发起转移接口") public class SlVolumeProductionZyController { @Resource private SlVolumeProductionZyService slVolumeProductionZyService; @PostMapping("/getVolumeProductionzyCode") @ApiOperation(value = "获取转移管理二维码") public R<PageDTO<getVolumeProductionzyCodeVO>> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) { return R.ok(slVolumeProductionZyService.getVolumeProductionzyCode(volumeProductionZygCodeQuery)); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java
@@ -86,4 +86,8 @@ @ApiModelProperty("转移管理id") private Long zyglId; @ApiModelProperty("转移管理新生成入库编号") private Long scrkId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/VolumeProductionZygCodeQuery.java
New file @@ -0,0 +1,20 @@ 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 VolumeProductionZygCodeQuery extends BasePage { @ApiModelProperty("转移管理主表id") private Long VolumeProductionzylId; @ApiModelProperty("仓库层数 1代表一层,2代表两层,3代表三层") private Integer storeManagementNumber; @ApiModelProperty("货架id") private Long shelfId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/getVolumeProductionzyCodeVO.java
New file @@ -0,0 +1,27 @@ 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 getVolumeProductionzyCodeVO { private Long id; @ApiModelProperty("物资名称") private String goodsMaterialsName; @ApiModelProperty("1 是非消耗,2是消耗 ") private Integer isConsume; @ApiModelProperty("转移数量") private Integer zyNum; @ApiModelProperty("二维码数量") @TableField("erwm_num") private Integer erwmNum; @ApiModelProperty("转移管理新生成入库编号") private Long scrkId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyService.java
@@ -4,7 +4,9 @@ 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.dto.VolumeProductionZygCodeQuery; import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO; import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO; import org.springframework.web.bind.annotation.RequestBody; /** @@ -16,6 +18,6 @@ * @since 2024-06-25 */ public interface SlVolumeProductionZyService extends IService<SlVolumeProductionZy> { PageDTO<getVolumeProductionzyCodeVO> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyServiceImpl.java
@@ -4,12 +4,15 @@ 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.*; import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery; import com.ruoyi.management.domain.dto.VolumeProductionZygCodeQuery; import com.ruoyi.management.domain.vo.VolumeProductionCkglVO; import com.ruoyi.management.domain.vo.VolumeProductionzZyglVO; import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO; import com.ruoyi.management.domain.vo.getVolumeProductionzyCodeVO; import com.ruoyi.management.mapper.SlGoodsMaterialsMapper; import com.ruoyi.management.mapper.SlVolumeProductionRkMapper; import com.ruoyi.management.mapper.SlVolumeProductionZyMapper; import com.ruoyi.management.service.SlVolumeProductionZyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -34,4 +37,28 @@ @Service public class SlVolumeProductionZyServiceImpl extends ServiceImpl<SlVolumeProductionZyMapper, SlVolumeProductionZy> implements SlVolumeProductionZyService { @Resource private SlVolumeProductionRkMapper slVolumeProductionRkMapper; @Resource private SlGoodsMaterialsMapper slGoodsMaterialsMapper; @Override public PageDTO<getVolumeProductionzyCodeVO> getVolumeProductionzyCode(VolumeProductionZygCodeQuery volumeProductionZygCodeQuery) { Page<SlVolumeProductionZy> page = new Page<>(volumeProductionZygCodeQuery.getPageCurr(), volumeProductionZygCodeQuery.getPageSize()); LambdaQueryWrapper< SlVolumeProductionZy> wrapper1= Wrappers.lambdaQuery(); wrapper1.like(SlVolumeProductionZy::getZyglId,volumeProductionZygCodeQuery.getVolumeProductionzylId()); wrapper1.eq( SlVolumeProductionZy::getDelFlag,0); wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime); Page<SlVolumeProductionZy> page2 = this.page(page, wrapper1); PageDTO<getVolumeProductionzyCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionzyCodeVO.class); List<getVolumeProductionzyCodeVO> list2 = SlGoodsShelfDTO.getList(); for(getVolumeProductionzyCodeVO list:list2) { SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getScrkId()); SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId()); list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); list.setIsConsume(slGoodsMaterials.getIsConsume()); } return SlGoodsShelfDTO; } }