From ad663df3b38b873d79fff48570dfb56b69697ac6 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:06:56 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementGoodSmaterialsQuery.java | 3 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 23 +++++++++++++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java | 3 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java | 6 ++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlGoodsMaterialsService.java | 2 ++
5 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
index daef247..3b6ab63 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
@@ -43,4 +43,7 @@
+
+
+
}
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 e26f500..b902be0 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
@@ -78,6 +78,12 @@
return R.ok(slGoodsMaterialsService.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsQuery));
}
+ @PostMapping("/getSmaterialsOne")
+ @ApiOperation(value = "感觉物资库存管理查看详情")
+ public R<StoreManagementGoodSmaterialsVO> getSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
+ return R.ok(slGoodsMaterialsService.getSmaterialsOne(storeManagementGoodSmaterialsQuery));
+ }
+
@GetMapping("/getGooManagementGoodSmaterials/{id}")
@ApiOperation(value = "库存管理查看物资詳情")
public R<StoreManagementGoodSmaterialsVO> getGooManagementGoodSmaterials(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Long id) {
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
index b0f82ca..d407674 100644
--- 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
@@ -14,6 +14,9 @@
@ApiModelProperty("1 是非消耗，2是消耗 ")
private Integer isConsume;
+ @ApiModelProperty("物资id")
+ private Long goodsMaterialsId;
+
@ApiModelProperty("仓库id")
private Long storeManagementId;
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 ea2770e..a0452f3 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
@@ -27,4 +27,6 @@
PageDTO<StoreManagementGoodSmaterialsVO> getStoreManagementGoodSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery);
+ StoreManagementGoodSmaterialsVO getSmaterialsOne(@RequestBody StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery);
+
}
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 32fd7ff..dd657cc 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
@@ -3,6 +3,7 @@
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.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsMaterials;
@@ -21,6 +22,7 @@
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlVolumeProductionRkService;
+import io.micrometer.core.instrument.binder.BaseUnits;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -145,4 +147,25 @@
return storeManagementGoodSmaterialsVOPageDTO;
}
+
+ @Override
+ public StoreManagementGoodSmaterialsVO getSmaterialsOne(StoreManagementGoodSmaterialsQuery storeManagementGoodSmaterialsQuery) {
+ LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+
+
+ wrapper.eq(ManagementGoodsMaterials::getGoodsMaterialsId,storeManagementGoodSmaterialsQuery.getGoodsMaterialsId());
+
+ wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
+ ManagementGoodsMaterials page1 = managementGoodsMaterialsService.getOne(wrapper);
+ StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO = BeanUtils.copyBean(page1, StoreManagementGoodSmaterialsVO.class);
+ Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
+ SlGoodsMaterials byId = this.getById(storeManagementGoodSmaterialsVO.getGoodsMaterialsId());
+ storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
+ storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());
+ storeManagementGoodSmaterialsVO.setAveragePrice(storeManagementGoodSmaterialsOne);
+ return storeManagementGoodSmaterialsVO;
+ }
+
+
}
--
Gitblit v1.7.1