From da07a87738f5c06f6cccf5c8e76f7bec13d253e7 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 01 七月 2024 14:43:49 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java | 38 ++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java | 5
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java | 1
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java | 34 +++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java | 20 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 46 +++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 27 ++++
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java | 4
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgSlVolumeProductionCkVO.java | 41 ++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java | 26 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java | 6 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCk.java | 8 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java | 3
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java | 12 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java | 6 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 7 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsSlVolumeProductionRkQuery.java | 13 ++
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml | 11 +
20 files changed, 301 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
index 4e36808..f553ded 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
@@ -5,12 +5,10 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
-import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
-import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
-import com.ruoyi.management.domain.dto.SlGoodsShelfQuery;
+import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -61,4 +59,10 @@
return R.ok(slGoodsMaterialsService.getById(id));
}
+ @PostMapping("/getStoreManagementGoodSmaterialsOne")
+ @ApiOperation(value = "库存管理查看详情")
+ public R<PageDTO<StoreManagementGoodSmaterialsVO>> getStoreManagementGoodSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
+ return R.ok(slGoodsMaterialsService.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsQuery));
+ }
+
}
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 ad3ad45..b9636d0 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
@@ -1,10 +1,24 @@
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.SlVolumeProductionCk;
+import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
+import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+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 javax.annotation.Resource;
/**
* <p>
@@ -19,4 +33,16 @@
@Api(value = "发起出库接口", tags = "发起出库接口", description = "发起出库管理接口")
public class SlVolumeProductionCkController {
+ @Resource
+ private SlVolumeProductionCkService slVolumeProductionCkService;
+
+ @PostMapping("/getManagementimgSlVolumeProductionCkList")
+ @ApiOperation(value = "分页获取通过物资来获取当前批次出库的物资")
+ public R<PageDTO<ManagementimgSlVolumeProductionCkVO>> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
+ return R.ok(slVolumeProductionCkService.getManagementimgSlVolumeProductionCkList(slGoodsMaterialsSlVolumeProductionRkQuery));
+ }
+
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index c94c458..ee819dc 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -4,6 +4,7 @@
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.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
import com.ruoyi.management.service.SlVolumeProductionRkglService;
@@ -37,4 +38,10 @@
return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
}
+ @PostMapping("/getSlGoodsMaterialsSlVolumeProductionRkList")
+ @ApiOperation(value = "分页获取通过物资来获取当前批次入库的物资")
+ public R<PageDTO<ManagementimgVolumeProductionRkVO>> getSlGoodsMaterialsSlVolumeProductionRkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkDTO) {
+ return R.ok(slVolumeProductionRkService.getSlGoodsMaterialsSlVolumeProductionRkList(slGoodsMaterialsSlVolumeProductionRkDTO));
+ }
+
}
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 c8382f4..ac06efb 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
@@ -87,5 +87,13 @@
@TableField("type")
private String type;
+ @ApiModelProperty("出库时间")
+ @TableField("ck_time")
+ private Date ckTime;
+
+ @ApiModelProperty("归还时间")
+ @TableField("gh_time")
+ private Date ghTime;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
index 5110fa2..e6a7a6e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java
@@ -40,6 +40,12 @@
@TableField("rk_num")
private Integer rkNum;
+
+ @ApiModelProperty("入库编号")
+ @TableField("rk_number")
+ private String rkNumber;
+
+
@ApiModelProperty("入库型号")
@TableField("rk_model")
private String rkModel;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java
index 1b09fb2..de53627 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsDTO.java
@@ -10,7 +10,6 @@
@Data
@ApiModel("物资管理数据传输对象")
public class SlGoodsMaterialsDTO {
- @TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("物资名称")
private String goodsMaterialsName;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsSlVolumeProductionRkQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsSlVolumeProductionRkQuery.java
new file mode 100644
index 0000000..2da2b79
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlGoodsMaterialsSlVolumeProductionRkQuery.java
@@ -0,0 +1,13 @@
+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 SlGoodsMaterialsSlVolumeProductionRkQuery extends BasePage {
+ @ApiModelProperty("物资id")
+ private Long slGoodsMaterialsid;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java
new file mode 100644
index 0000000..b0f82ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java
@@ -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 StoreManagementGoodSmaterialsQuery extends BasePage {
+ @ApiModelProperty("物资名称")
+ private String goodsMaterialsName;
+
+ @ApiModelProperty("1 是非消耗，2是消耗 ")
+ private Integer isConsume;
+
+
+ @ApiModelProperty("仓库id")
+ private Long storeManagementId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgSlVolumeProductionCkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgSlVolumeProductionCkVO.java
new file mode 100644
index 0000000..11437ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgSlVolumeProductionCkVO.java
@@ -0,0 +1,41 @@
+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;
+
+import java.util.Date;
+
+@Data
+@ApiModel(value = "通过物资拿出库物资的数据对象", description = "通过物资拿出库物资的数据对象")
+public class ManagementimgSlVolumeProductionCkVO {
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @ApiModelProperty("物资id")
+ private Long materialsId;
+
+ @ApiModelProperty("入库")
+ private Long rkId;
+
+ @ApiModelProperty("入库编号")
+ private String rkNumber;
+
+ @ApiModelProperty("出库数量")
+ private Integer ckNum;
+
+ @ApiModelProperty("归还数量")
+ @TableField("guih_num")
+ private Integer guihNum;
+
+ @ApiModelProperty("出库时间")
+ @TableField("ck_time")
+ private Date ckTime;
+
+ @ApiModelProperty("归还时间")
+ @TableField("gh_time")
+ private Date ghTime;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
index 2be93c0..afc6215 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
@@ -27,15 +27,12 @@
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("供应商名称")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java
new file mode 100644
index 0000000..58108d9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java
@@ -0,0 +1,38 @@
+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;
+
+import java.util.Date;
+@Data
+@ApiModel(value = "仓库管理查看詳情", description = "仓库管理查看詳情")
+public class StoreManagementGoodSmaterialsVO {
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
+
+ @TableField("goods_materials_name")
+ private String goodsMaterialsName;
+
+ @ApiModelProperty("1 是非消耗，2是消耗 ")
+ private Integer isConsume;
+
+ @ApiModelProperty("库存总数")
+ private Integer repertorySum;
+
+ @ApiModelProperty("在库存的")
+ private Integer repertoryZhai;
+
+ @ApiModelProperty("出库存的")
+ private Integer repertoryChu;
+
+ @ApiModelProperty("遗失库存的")
+ private Integer repertoryYishi;
+
+ @ApiModelProperty("均价")
+ private Double averagePrice;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java
index 615e043..8dcc9ea 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlVolumeProductionRkMapper.java
@@ -17,4 +17,6 @@
Integer getManagementInventoryList(Long id);
+ Double getStoreManagementGoodSmaterialsOne(Long id);
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java
index 1e856b8..ea2770e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
+import com.ruoyi.management.domain.dto.StoreManagementGoodSmaterialsQuery;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
import org.springframework.web.bind.annotation.RequestBody;
/**
@@ -23,4 +25,6 @@
PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(@RequestBody SlGoodsMaterialsQuery slGoodsMaterialsQuery);
+ PageDTO<StoreManagementGoodSmaterialsVO> getStoreManagementGoodSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery);
+
}
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 5c575e6..fc1014e 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
@@ -1,7 +1,11 @@
package com.ruoyi.management.service;
+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.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -13,4 +17,6 @@
*/
public interface SlVolumeProductionCkService extends IService<SlVolumeProductionCk> {
+ PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(@RequestBody SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
index db426aa..3ac1354 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -4,6 +4,7 @@
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.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -16,6 +17,8 @@
* @since 2024-06-25
*/
public interface SlVolumeProductionRkService extends IService<SlVolumeProductionRk> {
- PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO);
+ PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO);
+
+ PageDTO<ManagementimgVolumeProductionRkVO> getSlGoodsMaterialsSlVolumeProductionRkList(SlGoodsMaterialsSlVolumeProductionRkQuery SlGoodsMaterialsSlVolumeProductionRkDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index eaa79d3..144b8b6 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
@@ -6,14 +6,24 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
+import com.ruoyi.management.domain.dto.StoreManagementGoodSmaterialsQuery;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
+import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
+import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.management.service.SlVolumeProductionRkService;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -25,6 +35,10 @@
*/
@Service
public class SlGoodsMaterialsServiceImpl extends ServiceImpl<SlGoodsMaterialsMapper, SlGoodsMaterials> implements SlGoodsMaterialsService {
+
+ @Resource
+ private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
+
@Override
public void addSlGoodsShelf(SlGoodsMaterialsDTO slGoodsMaterialsDTO) {
@@ -61,4 +75,36 @@
Page<SlGoodsMaterials> page1 = this.page(page, wrapper);
return PageDTO.of(page1,SlGoodsMaterialsVO.class);
}
+
+ @Override
+ public PageDTO<StoreManagementGoodSmaterialsVO> getStoreManagementGoodSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
+ LambdaQueryWrapper<SlVolumeProductionRk> wrappers= Wrappers.lambdaQuery();
+ wrappers.eq(SlVolumeProductionRk::getManagementId,storeManagementGoodSmaterialsQuery.getStoreManagementId());
+ List<SlVolumeProductionRk> slVolumeProductionRks = slVolumeProductionRkMapper.selectList(wrappers);
+ Set<Long> slVolumeProductionIdList = null;
+ slVolumeProductionIdList = slVolumeProductionRks.stream().map(SlVolumeProductionRk::getMaterialsId)
+ .collect(Collectors.toSet());
+
+ Page<SlGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
+ LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,storeManagementGoodSmaterialsQuery.getGoodsMaterialsName());
+ if (storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
+ wrapper.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
+ }
+ if (slVolumeProductionIdList.size()>0){
+ wrapper.in(SlGoodsMaterials::getId,slVolumeProductionIdList);
+ }
+ wrapper.eq( SlGoodsMaterials::getDelFlag,0);
+ wrapper.orderByDesc(SlGoodsMaterials::getCreateTime);
+ Page<SlGoodsMaterials> page1 = this.page(page, wrapper);
+ PageDTO<StoreManagementGoodSmaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, StoreManagementGoodSmaterialsVO.class);
+ List<StoreManagementGoodSmaterialsVO> list = storeManagementGoodSmaterialsVOPageDTO.getList();
+ for (StoreManagementGoodSmaterialsVO li:list){
+ Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getId());
+ li.setAveragePrice(storeManagementGoodSmaterialsOne);
+ }
+
+
+ return storeManagementGoodSmaterialsVOPageDTO;
+ }
}
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 31b3965..1f1801e 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
@@ -1,10 +1,22 @@
package com.ruoyi.management.service.impl;
-import com.ruoyi.management.domain.SlVolumeProductionCk;
+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.SlGoodsMaterialsSlVolumeProductionRkQuery;
+import com.ruoyi.management.domain.vo.ManagementimgSlVolumeProductionCkVO;
+import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.mapper.SlVolumeProductionCkMapper;
+import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.SlVolumeProductionCkService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.SysUser;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +29,24 @@
@Service
public class SlVolumeProductionCkServiceImpl extends ServiceImpl<SlVolumeProductionCkMapper, SlVolumeProductionCk> implements SlVolumeProductionCkService {
+ @Resource
+ private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
+
+ @Override
+ public PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
+ 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.orderByDesc(SlVolumeProductionCk::getCreateTime);
+ Page<SlVolumeProductionCk> page2 = this.page(page, wrapper1);
+ PageDTO<ManagementimgSlVolumeProductionCkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgSlVolumeProductionCkVO.class);
+ List<ManagementimgSlVolumeProductionCkVO> list2 = SlGoodsShelfDTO.getList();
+ for(ManagementimgSlVolumeProductionCkVO list:list2) {{
+ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId());
+ list.setRkNumber(slVolumeProductionRk.getRkNumber());
+ }
+ }
+ return SlGoodsShelfDTO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 1d3be5d..13a9db2 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -6,6 +6,7 @@
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.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.mapper.*;
@@ -67,4 +68,30 @@
}
return SlGoodsShelfDTO;
}
+
+ @Override
+ public PageDTO<ManagementimgVolumeProductionRkVO> getSlGoodsMaterialsSlVolumeProductionRkList(SlGoodsMaterialsSlVolumeProductionRkQuery SlGoodsMaterialsSlVolumeProductionRkDTO) {
+ Page<SlVolumeProductionRk> page = new Page<>(SlGoodsMaterialsSlVolumeProductionRkDTO.getPageCurr(), SlGoodsMaterialsSlVolumeProductionRkDTO.getPageSize());
+ LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(SlVolumeProductionRk::getMaterialsId,SlGoodsMaterialsSlVolumeProductionRkDTO.getSlGoodsMaterialsid());
+ wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ 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());
+
+ SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ list.setSupplierName(data.getNickName());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ }
+ }
+ return SlGoodsShelfDTO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
index 96e8c41..7ea9aa7 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
@@ -14,9 +14,7 @@
<result column="store_management_village" property="storeManagementVillage" />
<result column="director_id" property="directorId" />
<result column="competent_id" property="competentId" />
- <result column="administrator
-_id" property="administrator
-Id" />
+ <result column="administrator_id" property="administratorId" />
<result column="store_management_adder" property="storeManagementAdder" />
<result column="store_management_explain" property="storeManagementExplain" />
<result column="del_flag" property="delFlag" />
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
index 0c6fbdc..88dac5b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
@@ -32,4 +32,15 @@
</select>
+ <select id="getStoreManagementGoodSmaterialsOne" resultType="java.lang.Double">
+ SELECT ifnull(ROUND(AVG(sl.rk_pice),2), 0.0) FROM sl_volume_production_rk sl
+ WHERE
+ sl.materials_id = #{id}
+ AND sl.del_flag=0
+ GROUP BY sl.materials_id
+
+ </select>
+
+
+
</mapper>
--
Gitblit v1.7.1