From 5eaa5ee48d6b55246ec47c1c75ba00f8ddc0fb8f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 02 二月 2021 17:17:30 +0800
Subject: [PATCH] 修改危废状态

---
 src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java |   44 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
index 2a931b7..40352f7 100644
--- a/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java
@@ -56,8 +56,6 @@
     @Resource
     private OpeReagentStatusService opeReagentStatusService;
     @Resource
-    private OpeUseFlowService opeUseFlowService;
-    @Resource
     private SysReagentService sysReagentService;
     @Resource
     private BaseMetaDao baseMetaDao;
@@ -136,7 +134,7 @@
     }
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode, Integer status, String userId,
+    public List<OpeUseFlow> getOpeUseFlowListByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,
                                                     Date startDate,Date endDate,Integer first, Integer pageSize) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
@@ -176,6 +174,7 @@
 
             params.put("status", status);
             params.put("houseName", houseName);
+            params.put("containerCode", containerCode);
             addParamByUserId(userId, params);
 
             params.put("first", first);
@@ -189,7 +188,7 @@
     }
 
     @Transactional(propagation = Propagation.REQUIRED)
-    public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode, Integer status, String userId,Date startDate,Date endDate) {
+    public int getOpeUseFlowTotalCountByName(String houseName,String reagentId, String reagentCode,String containerCode, Integer status, String userId,Date startDate,Date endDate) {
         try {
             Map<String, Object> params = new HashMap<String, Object>();
             params.put("reagentName", reagentId);
@@ -227,6 +226,7 @@
             }
 
             params.put("houseName", houseName);
+            params.put("containerCode", containerCode);
             addParamByUserId(userId, params);
 
             params.put("status", status);
@@ -390,11 +390,11 @@
                 for (String statusId : codeTmp) {
                     String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
                     //此时状态为领用待入库
-                    opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+                    this.updateReceiptNumber(code, receiptNumber);
                 }
             }else{
                 for (String code : codeTmp) {
-                    opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+                    this.updateReceiptNumber(code, receiptNumber);
                 }
             }
 
@@ -444,11 +444,11 @@
                 for (String statusId : codeTmp) {
                     String code = opeReagentStatusService.getOpeReagentStatus(statusId).getReagentCode();
                     //此时状态为领用待入库
-                    opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+                    this.updateReceiptNumber(code, receiptNumber);
                 }
             }else{
                 for (String code : codeTmp) {
-                    opeUseFlowService.updateReceiptNumber(code, receiptNumber);
+                    this.updateReceiptNumber(code, receiptNumber);
                 }
             }
 
@@ -457,7 +457,8 @@
     }
 
     @Override
-    public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project) {
+    public int getPersonalUseInfoCount(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber,
+                                       String department, String project,String applyPerson,String reagentName) {
         Map<String,Object> params = new HashMap<>();
         params.put("userId", userId);
         params.put("startTime", startTime);
@@ -466,6 +467,12 @@
         params.put("department", department);
         params.put("project", project);
         params.put("reagentCode", reagentCode);
+        params.put("applyPerson", applyPerson);
+        if (StringUtils.isNotBlank(reagentName)) {
+            //根据试剂名获取单号
+
+        }
+        params.put("reagentName", reagentName);
         //操作状态位仓库领取
         Map<String, String> metaMap2 = new HashMap<>();
         metaMap2.put("groupId", "operate_status");
@@ -478,7 +485,8 @@
     }
 
     @Override
-    public List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber, String department, String project, int first, int pageSize) {
+    public List<OpeUseFlow> getPersonalUseInfoList(String reagentCode,String userId, Date startTime, Date endTime, String receiptNumber,
+                                                   String department, String project,String applyPerson,String reagentName, int first, int pageSize) {
         Map<String, Object> params = new HashMap<>();
         params.put("userId", userId);
         params.put("startTime", startTime);
@@ -487,6 +495,8 @@
         params.put("department", department);
         params.put("project", project);
         params.put("reagentCode", reagentCode);
+        params.put("applyPerson", applyPerson);
+        params.put("reagentName", reagentName);
         //操作状态位仓库领取
         Map<String, String> metaMap2 = new HashMap<>();
         metaMap2.put("groupId", "operate_status");
@@ -515,4 +525,18 @@
     }
 
 
+    @Override
+    public int getApplyInfoSize(String receiptNumber) {
+        Map<String,Object> params = new HashMap<>();
+        Map<String, String> metaMap2 = new HashMap<>();
+        metaMap2.put("groupId", "operate_status");
+        metaMap2.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
+        List<BaseMeta> baseMetas = baseMetaDao.getBaseMetaList(metaMap2);
+        params.put("operatestate", baseMetas.get(0).getId());
+        params.put("receiptNumber", receiptNumber);
+
+        return  opeUseFlowDao.getApplyInfoSize(params);
+
+    }
+
 }

--
Gitblit v1.9.2