From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/nanometer/smartlab/api/ApiAction.java |  119 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index f87a8a5..6021835 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -316,7 +316,7 @@
         return retJSON.toJSONString();
     }
 
-    // 报送试剂最新信息接口
+    // 报送试剂最新信息接口 只更新试剂状态ope_regeant_status表  0, "领用" 1, "入库" 2, "存入" 3, "报废" -1, "领用待入库"
     @ResponseBody
     @RequestMapping(value = "/synchAllCabinet")
     public String synchAllCabinet(HttpServletRequest request) throws IOException {
@@ -366,7 +366,67 @@
         return retJSON.toJSONString();
     }
 
-    // 报警情况接口(warning)
+    // 出入库记录信息接口 更新试剂流向ope_use_flow表
+//    操作状态	2	领用
+//    操作状态	4	错误存放
+//    操作状态	1	错误入库
+//    操作状态	6	转移	智能柜试剂转移到另一个柜子
+//    操作状态	5	报废
+//    操作状态	3	存放
+//    操作状态	0	入库
+//    操作状态	11	仓库领用
+//    操作状态	10	仓库入库
+    @ResponseBody
+    @RequestMapping(value = "/cabinetData")
+    public String cabinetData(HttpServletRequest request) throws IOException {
+        BufferedReader br = request.getReader();
+        String str, data = "";
+        while((str = br.readLine()) != null){
+            data += str;
+        }
+        JSONObject retJSON = new JSONObject();
+        logger.info("cabinetData" + data);
+        String userId = request.getHeader("userId");
+
+        // Body参数
+        JSONObject bodyJSONObject = new JSONObject();
+        bodyJSONObject = JSONObject.parseObject(data);
+
+        // 主控条码
+        String controllerCode = bodyJSONObject.getString("controllerCode");
+
+        try {
+            // 数据
+            String dataStr = bodyJSONObject.getString("data");
+            JSONArray dataJSONArray = JSONArray.parseArray(dataStr);
+            logger.info("dataJSONArray: " + dataJSONArray);
+
+
+            if(	dataJSONArray.size() !=0 ){
+                interfaceService.cabinetData(dataJSONArray);
+            }
+
+            retJSON.put("code", ApiStatus.OK.getRetCode());
+            retJSON.put("message", ApiStatus.OK.getRetMsg());
+        } catch (ApiException e) {
+            retJSON.put("code", e.getApiStatus().getRetCode());
+            retJSON.put("message", e.getErrorMessage());
+        } catch (Exception e) {
+            retJSON.put("code", ApiStatus.SYS_ERR.getRetCode());
+            StackTraceElement[] stackTraceElements = e.getStackTrace();
+
+            StringBuilder sb = new StringBuilder();
+            sb.append(e.toString());
+            for (StackTraceElement stackTraceElement : stackTraceElements) {
+                sb.append("\n");
+                sb.append(stackTraceElement.toString());
+            }
+            retJSON.put("message", ApiStatus.SYS_ERR.getRetMsg() + "--" + sb.toString());
+        }
+        return retJSON.toJSONString();
+    }
+
+    // 报警情况接口(warning)  货柜预警接口
     @ResponseBody
     @RequestMapping(value = "/alarm")
     public String alarm(HttpServletRequest request) throws IOException {
@@ -437,56 +497,6 @@
         return retJSON.toJSONString();
     }
 
-    // 出入库记录信息接口
-    @ResponseBody
-    @RequestMapping(value = "/cabinetData")
-    public String cabinetData(HttpServletRequest request) throws IOException {
-    	BufferedReader br = request.getReader();
-        String str, data = "";
-        while((str = br.readLine()) != null){
-            data += str;
-        }
-        JSONObject retJSON = new JSONObject();
-        logger.info("cabinetData" + data);
-        String userId = request.getHeader("userId");
-
-        // Body参数
-        JSONObject bodyJSONObject = new JSONObject();
-        bodyJSONObject = JSONObject.parseObject(data);
-
-        // 主控条码
-        String controllerCode = bodyJSONObject.getString("controllerCode");
-
-        try {
-            // 数据
-            String dataStr = bodyJSONObject.getString("data");
-            JSONArray dataJSONArray = JSONArray.parseArray(dataStr);
-            logger.info("dataJSONArray: " + dataJSONArray);
-
-
-            if(	dataJSONArray.size() !=0 ){
-            	interfaceService.cabinetData(dataJSONArray);
-            }
-
-            retJSON.put("code", ApiStatus.OK.getRetCode());
-            retJSON.put("message", ApiStatus.OK.getRetMsg());
-        } catch (ApiException e) {
-            retJSON.put("code", e.getApiStatus().getRetCode());
-            retJSON.put("message", e.getErrorMessage());
-        } catch (Exception e) {
-            retJSON.put("code", ApiStatus.SYS_ERR.getRetCode());
-            StackTraceElement[] stackTraceElements = e.getStackTrace();
-
-            StringBuilder sb = new StringBuilder();
-            sb.append(e.toString());
-            for (StackTraceElement stackTraceElement : stackTraceElements) {
-                sb.append("\n");
-                sb.append(stackTraceElement.toString());
-            }
-            retJSON.put("message", ApiStatus.SYS_ERR.getRetMsg() + "--" + sb.toString());
-        }
-        return retJSON.toJSONString();
-    }
 
     //http://[URL]/smartlab/api/service/containerInfo
     @ResponseBody
@@ -608,7 +618,8 @@
             					(String[])wareContainerCodeList.toArray(new String[0])));
 
             }
-            if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()){
+            if(user.getSeeFlag().ordinal() == SeeFlag.MANAGE.ordinal()
+            || user.getSeeFlag().ordinal() == SeeFlag.LEADING.ordinal()){
                 map.put("containerCodeList", containerCodeList);
             }
         }
@@ -1416,6 +1427,7 @@
                     return  ResponseModel.getErrInstance(reagentCode+",该试剂在库存中不存在");
                 }
             }
+            String number = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
             for (String reagentCode : reagentReceiving.getReagentCode()) {
                 OpeReagentStatus opeReagentStatus = opeReagentStatusService
                         .getOpeReagentStatusByReagentCode(reagentCode);
@@ -1448,6 +1460,7 @@
                 opeUseFlow.setRemainder(opeUseFlowExist.getRemainder());
                 BaseMeta baseMeta = baseMetaService.getBaseMeta("operate_status",String.valueOf(OperateStatus.TRANSFER.getKey()),"转移");
                 opeUseFlow.setOperateState(baseMeta.getId());
+                opeUseFlow.setReceiptNumber(number);
                 opeUseFlowService.insertOpeUseFlow(opeUseFlow);
             }
             return ResponseModel.getOkInstence("转移成功");

--
Gitblit v1.9.2