ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -1,20 +1,38 @@ 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.ManagementimgVolumeProductionRkQuery; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; import com.ruoyi.management.service.SlVolumeProductionRkService; import com.ruoyi.management.service.SlVolumeProductionRkglService; 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 org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> * 发起入库管理 前端控制器 * </p> * * @author hjl * @author * @since 2024-06-25 */ @RestController @RequestMapping("/sl-volume-production-rk") public class SlVolumeProductionRkController { @Resource private SlVolumeProductionRkService slVolumeProductionRkService; @PostMapping("/getManagementimgVolumeProductionList") @ApiOperation(value = "分页获取通过入库管理来获取当前批次入库的物资") public R<PageDTO<ManagementimgVolumeProductionRkVO>> getManagementimgVolumeProductionList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) { return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO)); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java
@@ -24,12 +24,12 @@ @ApiModel(value = "SlAudit对象", description = "审核记录") public class SlAudit { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("入库批次id") @TableField("rk_id") private Integer rkId; private Long rkId; @ApiModelProperty("删除标志（0代表存在 2代表删除）") @TableField("del_flag") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java
@@ -24,16 +24,16 @@ @ApiModel(value = "SlAuditRecord对象", description = "审核管理") public class SlAuditRecord { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("审核记录的") @TableField("audit_id") private Integer auditId; private Long auditId; @ApiModelProperty("审核人id") @TableField("shenh_id") private Integer shenhId; private Long shenhId; @ApiModelProperty("1 是管理员审核，2 主管审核，3 是主任审核") @TableField("type") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlEquipment.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,7 +24,7 @@ @ApiModel(value = "SlEquipment对象", description = "设备管理") public class SlEquipment { @TableId("id") @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("设备名称") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java
@@ -24,10 +24,11 @@ @ApiModel(value = "SlGoodsMaterials对象", description = "物资管理") public class SlGoodsMaterials { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @TableField("goods_materials_name") @ApiModelProperty("物资名称 ") private String goodsMaterialsName; @ApiModelProperty("1 是非消耗，2是消耗 ") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsShelf.java
@@ -24,8 +24,8 @@ @ApiModel(value = "SlGoodsShelf对象", description = "货架表") public class SlGoodsShelf { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("货架名称") @TableField("goods_shelf_name") @@ -33,7 +33,7 @@ @ApiModelProperty("仓库id") @TableField("store_management_id") private Integer storeManagementId; private Long storeManagementId; @ApiModelProperty("是否放 1否，2 是") @TableField("is_store_management") @@ -41,7 +41,7 @@ @ApiModelProperty("图片id") @TableField("img_id") private Integer imgId; private Long imgId; @ApiModelProperty("仓库在图片坐标X轴") @TableField("zb_x") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlRegion.java
@@ -24,8 +24,8 @@ public class SlRegion { @ApiModelProperty("主键ID") @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("城市名称") @TableField("name") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,8 +24,8 @@ @ApiModel(value = "SlStoreManagement对象", description = "仓库管理") public class SlStoreManagement { @TableId("id") private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("仓库名称") @TableField("store_management_name") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagementImg.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,8 +24,8 @@ @ApiModel(value = "SlStoreManagementImg对象", description = "仓库对应平面图") public class SlStoreManagementImg { @TableId("id") private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("图片路径") @TableField("img_url") @@ -36,7 +37,7 @@ @ApiModelProperty("仓库id") @TableField("store_management_id") private Integer storeManagementId; private Long storeManagementId; @ApiModelProperty("删除标志（0代表存在 2代表删除）") @TableField("del_flag") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,16 +24,16 @@ @ApiModel(value = "SlVolumeProductionCk对象", description = "发起出库") public class SlVolumeProductionCk { @TableId("id") private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("物资id") @TableField("materials_id") private Integer materialsId; private Long materialsId; @ApiModelProperty("入库数量") @TableField("rk_id") private Integer rkId; private Long rkId; @ApiModelProperty("出库数量") @TableField("ck_num") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
@@ -24,7 +24,7 @@ @ApiModel(value = "SlVolumeProductionCkgl对象", description = "仓库管理") public class SlVolumeProductionCkgl { @TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("发起人ID") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
@@ -25,12 +25,16 @@ @ApiModel(value = "SlVolumeProductionRk对象", description = "发起入库管理") public class SlVolumeProductionRk { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("入管理主表id") @TableField("volume_production_rkgl_id") private Long VolumeProductionRkglId; @ApiModelProperty("物资id") @TableField("materials_id") private Integer materialsId; private Long materialsId; @ApiModelProperty("入库数量") @TableField("rk_num") @@ -50,7 +54,7 @@ @ApiModelProperty("货架id") @TableField("shelf_id") private Integer shelfId; private Long shelfId; @ApiModelProperty("删除标志（0代表存在 2代表删除）") @TableField("del_flag") @@ -72,5 +76,9 @@ @TableField("update_time") private Date updateTime; @ApiModelProperty("二维码数量") @TableField("erwm_num") private Integer erwmNum; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
@@ -24,7 +24,7 @@ @ApiModel(value = "SlVolumeProductionRkgl对象", description = "入库管理") public class SlVolumeProductionRkgl { @TableId(value = "id", type = IdType.AUTO) @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("发起人ID") @@ -73,7 +73,7 @@ @ApiModelProperty("供应商id") @TableField("supplier_id") private Integer supplierId; private Long supplierId; @ApiModelProperty("附件") @TableField("attachment") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZy.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -23,12 +24,12 @@ @ApiModel(value = "SlVolumeProductionZy对象", description = "发起转移") public class SlVolumeProductionZy { @TableId("id") @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("物资id") @TableField("materials_id") private Integer materialsId; private Long materialsId; @ApiModelProperty("入库数量") @TableField("rk_id") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
@@ -24,8 +24,8 @@ @ApiModel(value = "SlVolumeProductionZygl对象", description = "转移管理") public class SlVolumeProductionZygl { @TableId(value = "id", type = IdType.AUTO) private Integer id; @TableId(value = "id", type = IdType.ASSIGN_ID) private Long id; @ApiModelProperty("发起人ID") @TableField("sys_id") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
@@ -8,10 +8,10 @@ @Data @ApiModel("货物管理放置数据传输对象") public class GoodsShelfDTO { private Integer id; private Long id; @ApiModelProperty("图片id") private Integer imgId; private Long imgId; @ApiModelProperty("仓库在图片坐标X轴") private String zbX; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfQuery.java
@@ -10,7 +10,7 @@ public class GoodsShelfQuery { @ApiModelProperty("仓库id") @TableField("store_management_id") private Integer storeManagementId; private Long storeManagementId; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") @TableField("store_management_number") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/ManagementimgVolumeProductionRkQuery.java
New file @@ -0,0 +1,14 @@ 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 ManagementimgVolumeProductionRkQuery extends BasePage { @ApiModelProperty("入管理主表id") private Long VolumeProductionRkglId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java
@@ -11,7 +11,7 @@ @ApiModel("物资管理数据传输对象") public class SlGoodsMaterialsDTO { @TableId(value = "id", type = IdType.AUTO) private Integer id; private Long id; @ApiModelProperty("物资名称") private String goodsMaterialsName;
@@ -11,13 +11,13 @@ @ApiModel("货物管理数据传输对象") public class SlGoodsShelfDTO { private Integer id; private Long id; @ApiModelProperty("货架名称") private String goodsShelfName; @ApiModelProperty("仓库id") private Integer storeManagementId; private Long storeManagementId; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") private Integer storeManagementNumber; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementDTO.java
@@ -9,8 +9,7 @@ @Data @ApiModel("仓库管理数据传输对象") public class StoreManagementDTO { @TableId("id") private Integer id; private Long id; @ApiModelProperty("仓库名称") private String storeManagementName; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgDTO.java
@@ -9,8 +9,7 @@ @Data @ApiModel("仓库对应平面图数据传输对象") public class StoreManagementimgDTO { @TableId("id") private Integer id; private Long id; @ApiModelProperty("图片路径") private String imgUrl; @@ -19,5 +18,5 @@ private Integer storeManagementNumber; @ApiModelProperty("仓库id") private Integer storeManagementId; private Long storeManagementId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementimgQuery.java
@@ -12,5 +12,5 @@ private Integer storeManagementNumber; @ApiModelProperty("仓库id") private Integer storeManagementId; private Long storeManagementId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SupplierVolumeProductionRkglQuery.java
@@ -10,5 +10,5 @@ @ApiModel("供应商关联入库数据查询传输对象") public class SupplierVolumeProductionRkglQuery extends BasePage { @ApiModelProperty("供应商id") private Integer supplierId; private Long supplierId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
New file @@ -0,0 +1,53 @@ 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; import lombok.Data; import java.math.BigDecimal; @Data @ApiModel(value = "通过入库管理拿入库物资的数据对象", description = "通过入库管理拿入库物资的数据对象") public class ManagementimgVolumeProductionRkVO { private Long id; @ApiModelProperty("物资名称") private String goodsMaterialsName; @ApiModelProperty("1 是非消耗，2是消耗 ") private Integer isConsume; @ApiModelProperty("货架名称") private String goodsShelfName; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") private Integer storeManagementNumber; @ApiModelProperty("入库数量") @TableField("rk_num") private Integer rkNum; @ApiModelProperty("入库型号") @TableField("rk_model") private String rkModel; @ApiModelProperty("入库价格") @TableField("rk_pice") private BigDecimal rkPice; @ApiModelProperty("供应商名称") private String supplierName; @ApiModelProperty("入管理主表id") private Long VolumeProductionRkglId; @ApiModelProperty("物资id") private Long materialsId; @ApiModelProperty("货架id") private Long shelfId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/RegionVo.java
@@ -1,32 +1,42 @@ 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; import lombok.Data; import java.util.List; @Data @ApiModel(value = "地址视图对象", description = "地址图对象") public class RegionVo { @ApiModelProperty(value = "区域代码") @JsonInclude(JsonInclude.Include.ALWAYS) private String value; @ApiModelProperty(value = "区域名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String label; @ApiModelProperty(value = "子级列表") @JsonInclude(JsonInclude.Include.ALWAYS) private List<RegionVo> children; @ApiModelProperty(value = "id") @JsonInclude(JsonInclude.Include.ALWAYS) private Long id; @ApiModelProperty(value = "父级id") @JsonInclude(JsonInclude.Include.ALWAYS) private Long parentId; @ApiModelProperty(value = "层级") @JsonInclude(JsonInclude.Include.ALWAYS) private Integer level; @ApiModelProperty("code") @JsonInclude(JsonInclude.Include.ALWAYS) private String code; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsMaterialsVO.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,14 +10,16 @@ @Data @ApiModel(value = "物资视图对象", description = "物视图对象") public class SlGoodsMaterialsVO { @TableId(value = "id", type = IdType.AUTO) private Integer id; private Long id; @ApiModelProperty("物资名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String goodsMaterialsName; @ApiModelProperty("1 是非消耗，2是消耗 ") @JsonInclude(JsonInclude.Include.ALWAYS) private Integer isConsume; @ApiModelProperty("预警库存") @JsonInclude(JsonInclude.Include.ALWAYS) private Integer repertory; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlGoodsShelfVO.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,13 +15,14 @@ private Integer id; @ApiModelProperty("仓库id") @JsonInclude(JsonInclude.Include.ALWAYS) private Integer storeManagementId; @ApiModelProperty("仓库名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String storeManagementName; @ApiModelProperty("货架名称") @TableField("goods_shelf_name") private String goodsShelfName; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,25 +10,28 @@ @Data public class SupplierVolumeProductionRkglVO { @ApiModelProperty("用户名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String nickName; @ApiModelProperty(name = "手机号码") @JsonInclude(JsonInclude.Include.ALWAYS) private String phonenumber; @TableId("id") private Integer id; @ApiModelProperty("仓库名称") @JsonInclude(JsonInclude.Include.ALWAYS) private String storeManagementName; @ApiModelProperty("发起时间") @JsonInclude(JsonInclude.Include.ALWAYS) private Date startiTime; @ApiModelProperty("供应商id") private Integer supplierId; @JsonInclude(JsonInclude.Include.ALWAYS) private Long supplierId; @ApiModelProperty("仓库ID") @TableField("management_id") private Long managementId;
@@ -10,7 +10,6 @@ @Data public class VolumeProductionRkgInfoVO { @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty("发起人名称") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -1,7 +1,11 @@ package com.ruoyi.management.service; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlVolumeProductionRk; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; import org.springframework.web.bind.annotation.RequestBody; /** * <p> @@ -12,5 +16,6 @@ * @since 2024-06-25 */ public interface SlVolumeProductionRkService extends IService<SlVolumeProductionRk> { PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -45,7 +45,7 @@ } wrapper.eq(SlStoreManagement::getDelFlag,0); List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper); Set<Integer> slStoreManagementIdList = null; Set<Long> slStoreManagementIdList = null; slStoreManagementIdList = page1.stream().map(SlStoreManagement::getId) .collect(Collectors.toSet());
@@ -1,10 +1,26 @@ package com.ruoyi.management.service.impl; import com.ruoyi.management.domain.SlVolumeProductionRk; import com.ruoyi.management.mapper.SlVolumeProductionRkMapper; 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.*; import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery; import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.mapper.*; import com.ruoyi.management.service.SlStoreManagementService; import com.ruoyi.management.service.SlVolumeProductionRkService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.management.service.SlVolumeProductionRkglService; import com.ruoyi.system.api.domain.SysUser; 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> @@ -16,5 +32,39 @@ */ @Service public class SlVolumeProductionRkServiceImpl extends ServiceImpl<SlVolumeProductionRkMapper, SlVolumeProductionRk> implements SlVolumeProductionRkService { @Resource private SlGoodsMaterialsMapper slGoodsMaterialsMapper; @Resource private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper; @Resource private SlGoodsShelfMapper slGoodsShelfMapper; @Resource private SysUserClient sysUserClient; @Override public PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) { Page<SlVolumeProductionRk> page = new Page<>(managementimgVolumeProductionRkDTO.getPageCurr(), managementimgVolumeProductionRkDTO.getPageSize()); LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery(); wrapper1.like(SlVolumeProductionRk::getVolumeProductionRkglId,managementimgVolumeProductionRkDTO.getVolumeProductionRkglId()); wrapper1.eq( SlVolumeProductionRk::getDelFlag,0); wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime); Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1); SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(managementimgVolumeProductionRkDTO.getVolumeProductionRkglId()); SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData(); PageDTO<ManagementimgVolumeProductionRkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionRkVO.class); List<ManagementimgVolumeProductionRkVO> list2 = SlGoodsShelfDTO.getList(); for(ManagementimgVolumeProductionRkVO list:list2) {{ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId()); list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName()); list.setIsConsume(slGoodsMaterials.getIsConsume()); list.setSupplierName(data.getNickName()); SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId()); list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName()); } } return SlGoodsShelfDTO; } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -53,7 +53,7 @@ PageDTO<SupplierVolumeProductionRkglVO> SlGoodsShelfDTO = PageDTO.of(page2, SupplierVolumeProductionRkglVO.class); List<SupplierVolumeProductionRkglVO> list2 = SlGoodsShelfDTO.getList(); for(SupplierVolumeProductionRkglVO list:list2){ SysUser data = sysUserClient.getSysUser(Long.valueOf(list.getSupplierId())).getData(); SysUser data = sysUserClient.getSysUser(list.getSupplierId()).getData(); list.setNickName(data.getNickName()); list.setPhonenumber(data.getPhonenumber()); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
