From 0ef39b8062c67eeab10d368d8942ea82a83bcb3e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 12 七月 2024 10:56:16 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 27 +++++---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java | 6 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java | 38 ++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java | 7 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/ManagementimgVolumeProductionCkQuery.java | 14 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionCkVO.java | 41 +++++++++++++
6 files changed, 121 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
index 9fb3d11..9f6313b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -4,21 +4,16 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
-import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
-import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
-import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
+import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.service.SlVolumeProductionCkService;
import com.ruoyi.management.service.impl.SlVolumeProductionCkServiceImpl;
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 io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -51,7 +46,17 @@
return R.ok();
}
+ @PostMapping("/getSlVolumeProductionCkList")
+ @ApiOperation(value = "分页获取通过出库管理ID当前出库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionCkVO>> getSlVolumeProductionCkList(@RequestBody ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery) {
+ return R.ok(slVolumeProductionCkService.getSlVolumeProductionCkList(managementimgVolumeProductionCkQuery));
+ }
-
-
+ @ApiOperation("删除出库批次")
+ @DeleteMapping("/{id}")
+ public R<?> delStoreManagement(
+ @ApiParam(name = "id", value = "出库批次id", required = true) @PathVariable("id") Integer id) {
+ slVolumeProductionCkService.removeById(id);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
index 5892346..6a376ea 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java
@@ -27,6 +27,11 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
+ @ApiModelProperty("出库管理id")
+ @TableField(" ckgl_id")
+ private Long ckglId;
+
+
@ApiModelProperty("物资id")
@TableField("materials_id")
private Long materialsId;
@@ -96,4 +101,6 @@
private Date ghTime;
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/ManagementimgVolumeProductionCkQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/ManagementimgVolumeProductionCkQuery.java
new file mode 100644
index 0000000..2d52bab
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/ManagementimgVolumeProductionCkQuery.java
@@ -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 ManagementimgVolumeProductionCkQuery extends BasePage {
+
+ @ApiModelProperty("入管理主表id")
+ private Long VolumeProductionCKglId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionCkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionCkVO.java
new file mode 100644
index 0000000..6195b44
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionCkVO.java
@@ -0,0 +1,41 @@
+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;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(value = "通过出库管理拿出库物资的数据对象", description = "通过出库管理拿出库物资的数据对象")
+public class ManagementimgVolumeProductionCkVO {
+
+ private Long id;
+
+ @ApiModelProperty("物资名称")
+ private String goodsMaterialsName;
+
+ @ApiModelProperty("货架名称")
+ private String goodsShelfName;
+
+ @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层")
+ private Integer storeManagementNumber;
+
+ @ApiModelProperty("在库存的")
+ private Long repertoryZhai;
+
+
+ @ApiModelProperty("出库数量")
+ private Integer ckNum;
+
+ @ApiModelProperty("入库批次")
+ private Long rkId;
+
+ @ApiModelProperty("入库编号")
+ private String rkNumber;
+
+ @ApiModelProperty("1 是非消耗，2是消耗 ")
+ private Integer isConsume;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
index 4468459..39610d9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
@@ -3,9 +3,11 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionCk;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionCkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -18,7 +20,9 @@
*/
public interface SlVolumeProductionCkService extends IService<SlVolumeProductionCk> {
- PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);
+ PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);
void addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO);
+
+ PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
index efac311..48040ab 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -5,10 +5,14 @@
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.ManagementimgVolumeProductionCkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlVolumeProductionCkDTO;
import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
+import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
+import com.ruoyi.management.mapper.SlGoodsShelfMapper;
import com.ruoyi.management.mapper.SlVolumeProductionCkMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.SlVolumeProductionCkService;
@@ -33,6 +37,12 @@
@Resource
private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
+ @Resource
+ private SlGoodsMaterialsMapper slGoodsMaterialsMapper;
+
+ @Resource
+ private SlGoodsShelfMapper slGoodsShelfMapper;
+
@Override
public PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
Page<SlVolumeProductionCk> page = new Page<>(slGoodsMaterialsSlVolumeProductionRkQuery.getPageCurr(), slGoodsMaterialsSlVolumeProductionRkQuery.getPageSize());
@@ -55,6 +65,7 @@
public void addSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
if (slVolumeProductionCkDTO.getId()==null){
SlVolumeProductionCk slVolumeProductionCk=new SlVolumeProductionCk();
+ slVolumeProductionCk.setCkglId(slVolumeProductionCkDTO.getId());
slVolumeProductionCk.setRkId(slVolumeProductionCkDTO.getRkId());
}else{
SlVolumeProductionCk byId = this.getById(slVolumeProductionCkDTO.getId());
@@ -62,4 +73,31 @@
this.updateById(byId);
}
}
+
+ @Override
+ public PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery) {
+ Page<SlVolumeProductionCk> page = new Page<>(managementimgVolumeProductionCkQuery.getPageCurr(), managementimgVolumeProductionCkQuery.getPageSize());
+ LambdaQueryWrapper< SlVolumeProductionCk> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionCk::getCkglId,managementimgVolumeProductionCkQuery.getVolumeProductionCKglId());
+ wrapper1.eq( SlVolumeProductionCk::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime);
+ Page<SlVolumeProductionCk> page2 = this.page(page, wrapper1);
+
+ PageDTO<ManagementimgVolumeProductionCkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionCkVO.class);
+ List<ManagementimgVolumeProductionCkVO> list2 = SlGoodsShelfDTO.getList();
+ for(ManagementimgVolumeProductionCkVO list:list2) {{
+
+ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId());
+ list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
+ list.setRkNumber(slVolumeProductionRk.getRkNumber());
+ list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ }
+ }
+ return SlGoodsShelfDTO;
+ }
}
--
Gitblit v1.7.1