From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 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/SafeMaterialDetailInfoService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialDetailInfoService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialDetailInfoService.java
index 9981f0e..50d2eae 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialDetailInfoService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialDetailInfoService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.gkhy.safePlatform.equipment.entity.*;
-import com.gkhy.safePlatform.equipment.model.dto.req.SafeMatetrialDetailQuery;
+import com.gkhy.safePlatform.equipment.model.dto.req.db.SafeMaterialDetailDBQuery;
import java.util.List;
@@ -23,16 +23,15 @@
List<SafeMaterialDetailCountDO> getStatisticsValidStock(List<Long> smIds);
- void deleteBatch(Long[] ids);
+ void deleteBatch(List<Long> ids);
- void updateDeliveryStatusByIds(SafeMaterialDetailBO detailBO);
-
- void deliveryBatchRandom(SafeMaterialDetailBO detailBO);
+ void updateDeliveryStatusByIds(SafeMaterialBatchDeliveryBO detailBO);
+
Integer getValidStockCount(Long smId);
- List<SafeMaterialDetailInfoDO> listByPage(Page<SafeMaterialDetailInfo> page, SafeMatetrialDetailQuery query);
+ List<SafeMaterialDetailInfoDO> listByPage(Page<SafeMaterialDetailInfo> page, SafeMaterialDetailDBQuery query);
int getCountBySmIds(List<Long> smIds);
@@ -53,4 +52,14 @@
List<SafeMaterialDetailInfoDO> getListByRfids(List<String> rfid);
+ List<SafeMaterialDetailInfo> getUnValidList();
+
+ void updateValidStatusByIds(List<Long> ids);
+
+
+ List<SafeMaterialDetailInfo> getListBySmIdAndRfid(SafeMaterialDetailDBQuery query);
+
+ List<SafeMaterialDetailInfo> getListBySmId(SafeMaterialDetailDBQuery query);
+
+ void updateBatch(List<SafeMaterialDetailInfo> safeMaterialDetailInfoList);
}
--
Gitblit v1.9.2