From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Mon, 25 Mar 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialInfoService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialInfoService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialInfoService.java
index c12986a..237a9a8 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialInfoService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialInfoService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.gkhy.safePlatform.equipment.entity.SafeMaterialBO;
import com.gkhy.safePlatform.equipment.entity.SafeMaterialDO;
import com.gkhy.safePlatform.equipment.entity.SafeMaterialInfo;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialQuery;
@@ -11,9 +12,9 @@
public interface SafeMaterialInfoService extends IService<SafeMaterialInfo> {
int getTotalCount();
- SafeMaterialInfo queryById(Long id);
+ SafeMaterialDO queryById(Long id);
- int getCountByClassify(Long classifyId);
+
int deleteBatch(List<Long> ids);
@@ -22,4 +23,13 @@
List<SafeMaterialDO> listByPage(Page<SafeMaterialDO> page, SafeMaterialQuery query);
+ int getCountBySmallClassifyId(Long smallClassifyId);
+
+ boolean checkMaterial(Long smallClassifyId, Long depId, Long id);
+
+ void updateCountById(SafeMaterialBO safeMaterialBO);
+
+ List<SafeMaterialInfo> listByDepId(Long depId);
+
+ void updateStockCount(List<SafeMaterialBO> safeMaterialBOList);
}
--
Gitblit v1.9.2