From 1a52289b4d1c7097a654610c132a91716655d3db Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 11 Jun 2021 17:34:34 +0800
Subject: [PATCH] 试剂安全库存

---
 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
index 08482d6..88d24c1 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java
@@ -15,6 +15,7 @@
 import com.nanometer.smartlab.util.MessageUtil;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
@@ -41,10 +42,13 @@
 
     @Resource(name = "opeApplyDao")
     OpeApplyDao opeApplyDao;
+    @Lazy
     @Resource
     OpeOrderService opeOrderService;
+    @Lazy
     @Resource
     OpeReagentStatusService opeReagentStatusService;
+    @Lazy
     @Resource
     OpeWarehouseReserveService opeWarehouseReserveService;
 
@@ -526,7 +530,7 @@
 	}
 
     @Override
-    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
+    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
@@ -534,7 +538,12 @@
             params.put("userId",id);
             params.put("productSn",productSn);
             params.put("applyCode",applyCode);
-            params.put("status",status);
+            if (isExpired) {
+                params.put("status",ApplyStatus.EXPIRED);
+            }else{
+                params.put("status", status);
+            }
+            params.put("isAllApply",isAllApply);
             return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
         } catch (DataAccessException e) {
             logger.error(e.getMessage(), e);
@@ -544,7 +553,7 @@
     }
     @Override
     public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
-                                                              Integer pageSize,String productSn,String applyCode,Integer status) {
+                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply,boolean isExpired) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentName);
@@ -554,7 +563,12 @@
             params.put("pageSize", pageSize);
             params.put("productSn",productSn);
             params.put("applyCode",applyCode);
-            params.put("status",status);
+            if (isExpired) {
+                params.put("status",ApplyStatus.EXPIRED);
+            }else{
+                params.put("status", status);
+            }
+            params.put("isAllApply",isAllApply);
             return this.opeApplyDao.getOpeApplyReserveListFor(params);
         } catch (DataAccessException e) {
             logger.error(e.getMessage(), e);
@@ -678,12 +692,12 @@
             if (codeList == null){
                 //无条码入库 不需要增加状态和流向
                 //1.1库存表增加
-                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
             }else{
                 //条码入库
                 assert codeList.size() > 0;
                 //1.1入库(库存表增加)
-                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo);
+                opeWarehouseReserveService.insertOpeWarehouseReserve2(opeApplyReserve, oo,consigneeId);
                 //1.2试剂状态表增加,流向增加
                 opeReagentStatusService.orderInputWarehouseReagentStatusAndUseFlow(opeApplyReserve,consigneeId,codeList,oo);
             }
@@ -693,12 +707,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);
@@ -707,5 +721,12 @@
 
         }
     }
+    /**
+    * 补贴条码更新订单的领用数量
+    */
+    @Override
+    public void btUpdateApplyAndOrder(List<OpeApply> opeList) {
+
+    }
 
 }

--
Gitblit v1.9.2