From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 15:48:28 +0800
Subject: [PATCH] 取消领用

---
 src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
index fbed957..a36d097 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java
@@ -1,8 +1,8 @@
 package com.nanometer.smartlab.service;
 
-import com.nanometer.smartlab.entity.OpeApply;
-import com.nanometer.smartlab.entity.OpeReagentStatus;
-import com.nanometer.smartlab.entity.SysUser;
+import com.nanometer.smartlab.entity.*;
+import com.nanometer.smartlab.entity.dto.PersonUseDetail;
+import com.nanometer.smartlab.exception.BusinessException;
 
 import java.util.Date;
 import java.util.LinkedHashMap;
@@ -68,6 +68,8 @@
 	boolean updateReagentStatus(OpeReagentStatus opeReagentStatus);
 	boolean updateReagentStatus2(OpeReagentStatus opeReagentStatus);
 
+	boolean updateReagentStatus3(OpeReagentStatus opeReagentStatus);
+
 	int getLogOpeReagentStatusTotalCount(String reagentLogId, Integer status, String userLogId, String loginId);
 
 	List<OpeReagentStatus> getLogOpeReagentStatusList(String reagentLogId, Integer status, String userLogId,
@@ -87,11 +89,22 @@
 
 	void updateTimeByCode(String code);
 
-	void batchUpdateStatusByCode(List<OpeReagentStatus> list) throws Exception;
+	void batchUpdateStatusByCode(List<PersonUseDetail> list) throws Exception;
 
 	public List<OpeReagentStatus> selectByReId(String id);
 	public void updateByReId(String newReId,String oldReId);
 
 
 	List<String> getReagentCodes(String reagentId);
+	//订单入库 新增试剂状态表 和流向
+    void orderInputWarehouseReagentStatusAndUseFlow(OpeApplyReserve opeApplyReserve, String userId, List<String> reagentCodeList , OpeOrder opeOrder);
+
+	List<String> checkReagentCode(String startReagentCode2, String endReagentCode2,Integer arrivalNum) throws BusinessException;
+
+	List<String> generateReagentCode(String startReagentCode2, String endReagentCode2);
+
+	void updateOpeReagentStatus(OpeReagentStatus opeReagentStatus);
+
+	int getReagentNumInWarehouse(String id, String articleNumber, String warehouseId);
+
 }

--
Gitblit v1.9.2