From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index b056160..90690cd 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -526,12 +526,15 @@
 	}
 
     @Override
-    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName) {
+    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
             params.put("personName", personName);
             params.put("userId",id);
+            params.put("productSn",productSn);
+            params.put("applyCode",applyCode);
+            params.put("status",status);
             return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
         } catch (DataAccessException e) {
             logger.error(e.getMessage(), e);
@@ -541,7 +544,7 @@
     }
     @Override
     public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
-                                                              Integer pageSize) {
+                                                              Integer pageSize,String productSn,String applyCode,Integer status) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
@@ -549,6 +552,9 @@
             params.put("userId",id);
             params.put("first", first);
             params.put("pageSize", pageSize);
+            params.put("productSn",productSn);
+            params.put("applyCode",applyCode);
+            params.put("status",status);
             return this.opeApplyDao.getOpeApplyReserveListFor(params);
         } catch (DataAccessException e) {
             logger.error(e.getMessage(), e);
@@ -687,12 +693,12 @@
             //2.2更改订单状态
             List<OpeApply> oas = opeOrderService.getOpeApplyListByOrder(oo.getId());
             assert oas.size() > 0;
-            //子订单是否全部入库,是则父单为完成,否则未完成
+            //子订单是否全部入库,是则父单为已入库,否则未完成
             boolean flag = oas.stream().allMatch(oa -> oa.getStatus() == ApplyStatus.STORAGE);
             oo.setConsigneeUserId(consigneeId);
             oo.setArrivalTime(arrivalTime);
             if (flag){
-                oo.setStatus(ApplyStatus.FINISHED);
+                oo.setStatus(ApplyStatus.STORAGE);
                 opeOrderService.updateOpeOrderStatus(oo);
             }else{
                 oo.setStatus(ApplyStatus.UNCOMPLETED);

--
Gitblit v1.9.2