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/SafeMaterialDetailService.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialDetailService.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialDetailService.java
index 1d7ce83..70e99d4 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialDetailService.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/SafeMaterialDetailService.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.equipment.service;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
@@ -13,27 +14,26 @@
public interface SafeMaterialDetailService {
ResultVO save(SafeMaterialDetailAddReq req);
- ResultVO singleDelivery(SafeMaterialDetailReq req);
+ void singleDelivery(ContextCacheUser currentUser,SafeMaterialDetailReq req);
- ResultVO singleReceipt(Long id);
+ void singleReceipt(Long id,ContextCacheUser currentUser);
ResultVO delete(Long id);
- ResultVO singleDdelivery0rReceipt(SafeMaterialDetailReq req);
ResultVO saveBatch(SafeMaterialDetailAddReq req);
ResultVO update(SafeMaterialDetailReq req);
- ResultVO receiptBatch(Long[] ids);
+ ResultVO receiptBatch(ParamForm paramForm);
- ResultVO deleteBatch(Long[] ids);
+ ResultVO deleteBatch(ContextCacheUser currentUser,ParamForm paramForm);
- ResultVO deliveryBatchByIds(MterialDeliveryReq req);
+ void deliveryBatchByIds(MterialDeliveryReq req,ContextCacheUser currentUser);
- ResultVO deliveryBatchRandom(MterialRandomDeliveryReq req);
+ void deliveryBatchBySmId(MterialRandomDeliveryReq req,ContextCacheUser currentUser);
- SearchResultVO<List<SafeMaterialDetailDto>> listByPage(PageQuery<SafeMatetrialDetailQuery> pageQuery);
+ SearchResultVO<List<SafeMaterialDetailDto>> listByPage(ContextCacheUser currentUser,PageQuery<SafeMatetrialDetailQuery> pageQuery);
ResultVO queryById(Long id);
List<SafeMaterialClassifyStockDto> getSmallClassifyStockByIds(List<Long> smallClassifyIds);
--
Gitblit v1.9.2