ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-audit") @Api(value = "审核记录接口", tags = "审核记录接口", description = "审核记录接口") public class SlAuditController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-audit-record") @Api(value = "审核管理接口", tags = "审核管理接口", description = "审核管理接口") public class SlAuditRecordController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-equipment") @Api(value = "设备管理接口", tags = "设备管理接口", description = "设备管理接口") public class SlEquipmentController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
@@ -12,6 +12,7 @@ import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.service.SlGoodsMaterialsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; @@ -28,6 +29,7 @@ */ @RestController @RequestMapping("/sl-goods-materials") @Api(value = "物资管理接口", tags = "物资管理接口", description = "物资管理接口") public class SlGoodsMaterialsController { @Resource private SlGoodsMaterialsService slGoodsMaterialsService; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -9,6 +9,7 @@ import com.ruoyi.management.domain.dto.*; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.service.SlGoodsShelfService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; @@ -26,6 +27,7 @@ */ @RestController @RequestMapping("/sl-goods-shelf") @Api(value = "货架接口", tags = "货架接口", description = "货架接口") public class SlGoodsShelfController { @Resource ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlManagementInventoryController.java
New file @@ -0,0 +1,31 @@ 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.SlStoreManagement; import com.ruoyi.management.domain.dto.StoreManagementQuery; import com.ruoyi.management.domain.vo.SlStoreManagementInventoryVO; import com.ruoyi.management.service.SlStoreManagementService; 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 org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @RestController @RequestMapping("/sl-management-inventory") @Api(value = "库存管理接口", tags = "库存管理接口", description = "库存管理接口") public class SlManagementInventoryController { @Resource private SlStoreManagementService slStoreManagementService; @PostMapping("/getManagementInventoryList") @ApiOperation(value = "分页获取库存管理") public R<PageDTO<SlStoreManagementInventoryVO>> getManagementInventoryList(@RequestBody StoreManagementQuery storeManagementQuery) { return R.ok(slStoreManagementService.getManagementInventoryList(storeManagementQuery)); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java
@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.management.domain.vo.RegionVo; import com.ruoyi.management.service.SlRegionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -24,6 +25,7 @@ */ @RestController @RequestMapping("/sl-region") @Api(value = "省市区4级联动接口", tags = "省市区4级联动接口", description = "省市区4级联动接口") public class SlRegionController { @Resource private SlRegionService regionService; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementController.java
@@ -8,6 +8,7 @@ import com.ruoyi.management.domain.dto.StoreManagementDTO; import com.ruoyi.management.domain.dto.StoreManagementQuery; import com.ruoyi.management.service.SlStoreManagementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; @@ -25,6 +26,7 @@ */ @RestController @RequestMapping("/sl-store-management") @Api(value = "仓库管理接口", tags = "仓库管理接口", description = "仓库管理接口") public class SlStoreManagementController { @Resource private SlStoreManagementService slStoreManagementService; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlStoreManagementImgController.java
@@ -7,6 +7,7 @@ import com.ruoyi.management.domain.dto.StoreManagementimgDTO; import com.ruoyi.management.domain.dto.StoreManagementimgQuery; import com.ruoyi.management.service.SlStoreManagementImgService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,7 @@ */ @RestController @RequestMapping("/sl-store-management-img") @Api(value = "仓库对应平面图接口", tags = "仓库对应平面图接口", description = "仓库对应平面图接口") public class SlStoreManagementImgController { @Resource ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-volume-production-ck") @Api(value = "发起出库接口", tags = "发起出库接口", description = "发起出库管理接口") public class SlVolumeProductionCkController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-volume-production-ckgl") @Api(value = "仓库出库管理接口", tags = "仓库出库管理接口", description = "仓库出库管理接口") public class SlVolumeProductionCkglController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -7,6 +7,7 @@ import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO; import com.ruoyi.management.service.SlVolumeProductionRkService; import com.ruoyi.management.service.SlVolumeProductionRkglService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -26,6 +27,7 @@ */ @RestController @RequestMapping("/sl-volume-production-rk") @Api(value = "发起入库接口", tags = "发起入库接口", description = "发起入库接口") public class SlVolumeProductionRkController { @Resource private SlVolumeProductionRkService slVolumeProductionRkService; ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -10,6 +10,7 @@ import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO; import com.ruoyi.management.service.SlVolumeProductionRkglService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; @@ -26,6 +27,7 @@ */ @RestController @RequestMapping("/sl-volume-production-rkgl") @Api(value = "入库管理接口", tags = "入库管理接口", description = "入库管理接口") public class SlVolumeProductionRkglController { @Resource ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-volume-production-zy") @Api(value = "发起转移接口", tags = "发起转移接口", description = "发起转移接口") public class SlVolumeProductionZyController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -1,6 +1,7 @@ package com.ruoyi.management.controller; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,6 +16,7 @@ */ @RestController @RequestMapping("/sl-volume-production-zygl") @Api(value = "转移管理接口", tags = "转移管理接口", description = "转移管理接口") public class SlVolumeProductionZyglController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
@@ -81,4 +81,9 @@ private Integer erwmNum; @ApiModelProperty("仓库ID") @TableField("management_id") private Long managementId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlStoreManagementInventoryVO.java
New file @@ -0,0 +1,62 @@ package com.ruoyi.management.domain.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "库存管理对象", description = "库存管理对象") public class SlStoreManagementInventoryVO { private Long id; @ApiModelProperty("仓库名称") private String storeManagementName; @ApiModelProperty("仓库编号") private String storeManagementNo; @ApiModelProperty("仓库层数 1代表一层,2代表两层,3代表三层") private Integer storeManagementNumber; @ApiModelProperty("仓库等级 0全部 1省级,2市州级,3市县级,5乡镇级,6 经营单位") private Integer storeManagementGrade; /** 所属省名称 */ @ApiModelProperty("所属省名称") private String provinceName; /** 所属省code */ @ApiModelProperty("所属省code") private String provinceCode; /** 城市名称 */ @ApiModelProperty("城市名称") private String cityName; /** 城市code */ @ApiModelProperty("城市code") private String cityCode; /** 所属区县名称 */ @ApiModelProperty("所属区县名称") private String countyName; /** 所属区县code */ @ApiModelProperty("所属区县code") private String countyCode; /** 所属街道名称 */ @ApiModelProperty("所属街道名称") private String townName; /** 所属街道code */ @ApiModelProperty("所属街道code") private String townCode; @ApiModelProperty("物资数") private Integer goodsMaterialsNum; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java
@@ -15,4 +15,6 @@ @Mapper public interface SlVolumeProductionRkMapper extends BaseMapper<SlVolumeProductionRk> { Integer getManagementInventoryList(Long id); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlStoreManagementService.java
@@ -6,6 +6,7 @@ import com.ruoyi.management.domain.dto.QStoreManagementQuery; import com.ruoyi.management.domain.dto.StoreManagementDTO; import com.ruoyi.management.domain.dto.StoreManagementQuery; import com.ruoyi.management.domain.vo.SlStoreManagementInventoryVO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; @@ -24,6 +25,8 @@ void addStoreManagement(StoreManagementDTO storeManagementDTO); List<SlStoreManagement> QueryStoreManagementList(@RequestBody QStoreManagementQuery StoreManagementQuery); List<SlStoreManagement> QueryStoreManagementList(QStoreManagementQuery StoreManagementQuery); PageDTO<SlStoreManagementInventoryVO> getManagementInventoryList(StoreManagementQuery storeManagementQuery); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -8,13 +8,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.management.domain.SlVolumeProductionRk; import com.ruoyi.management.domain.dto.QStoreManagementQuery; import com.ruoyi.management.domain.dto.StoreManagementDTO; import com.ruoyi.management.domain.dto.StoreManagementQuery; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.domain.vo.SlStoreManagementInventoryVO; import com.ruoyi.management.mapper.SlStoreManagementMapper; import com.ruoyi.management.mapper.SlVolumeProductionRkMapper; import com.ruoyi.management.mapper.SlVolumeProductionRkglMapper; import com.ruoyi.management.service.SlStoreManagementService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** @@ -27,6 +33,9 @@ */ @Service public class SlStoreManagementServiceImpl extends ServiceImpl<SlStoreManagementMapper, SlStoreManagement> implements SlStoreManagementService { @Resource private SlVolumeProductionRkMapper SlVolumeProductionRkMapper; @Override public PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery) { @@ -136,4 +145,28 @@ List<SlStoreManagement> page1 = this.list(wrapper); return page1; } @Override public PageDTO<SlStoreManagementInventoryVO> getManagementInventoryList(StoreManagementQuery storeManagementQuery) { Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize()); LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery(); wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName()); wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo()); if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade()); } wrapper.eq( SlStoreManagement::getDelFlag,0); wrapper.orderByDesc(SlStoreManagement::getCreateTime); Page<SlStoreManagement> page1 = this.page(page, wrapper); PageDTO<SlStoreManagementInventoryVO> InventoryVO = PageDTO.of(page1, SlStoreManagementInventoryVO.class); List<SlStoreManagementInventoryVO> list2 = InventoryVO.getList(); for(SlStoreManagementInventoryVO list:list2){ Integer managementInventoryList = SlVolumeProductionRkMapper.getManagementInventoryList(list.getId()); list.setGoodsMaterialsNum(managementInventoryList); } return InventoryVO; } } ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
@@ -23,4 +23,13 @@ <result column="state" property="state" /> </resultMap> <select id="getManagementInventoryList" resultType="java.lang.Integer"> SELECT ifnull(COUNT(*), 0) FROM sl_volume_production_rk sl WHERE sl.management_id = #{id} AND sl.del_flag=0 GROUP BY sl.materials_id </select> </mapper>