From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/baseService/SafeMaterialDetailInfoService.java |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 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 b32d6ce..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
@@ -2,11 +2,8 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialDetailBO;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialDetailInfo;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialDetailCountDO;
-import com.gkhy.safePlatform.equipment.entity.SafeMaterialDetailInfoDO;
-import com.gkhy.safePlatform.equipment.model.dto.req.SafeMatetrialDetailQuery;
+import com.gkhy.safePlatform.equipment.entity.*;
+import com.gkhy.safePlatform.equipment.model.dto.req.db.SafeMaterialDetailDBQuery;
 
 import java.util.List;
 
@@ -26,20 +23,43 @@
 
     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);
 
     int getCountBySmId(Long smId);
 
     void updateValidStatus(Long id);
+
+    List<Long> getRfidNotNullList(Integer count, Long smId);
+
+
+    List<Long> getRfidNullList(Integer count, Long smId);
+
+    List<Long> getIdListByRfid(Integer count, Long smId, String rfid);
+
+    List<SafeMaterialClassifyStockDO> getSmallClassifyStockByIds(List<Long> smallClassifyIds);
+
+    List<SafeMaterialDetailDO> getListBySmallClassifyIds(List<Long> smallClassifyIds,List<Long> depIds);
+
+    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