From 1c375d6dcd0c41bc3c206585a2712ec066bf5992 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 18 十一月 2022 10:09:13 +0800
Subject: [PATCH] 卡号 bug
---
src/main/java/com/nanometer/smartlab/api/ApiAction.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 7789cf4..d3a9991 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -101,6 +101,9 @@
@Lazy
@Resource
private OpeUseFlowService opeUseFlowService;
+ @Lazy
+ @Resource
+ private SysWarehouseStatusService sysWarehouseStatusService;
@Value("${institute.url}")
String instituteUrl;
@@ -426,7 +429,7 @@
return retJSON.toJSONString();
}
- // 报警情况接口（warning）
+ // 报警情况接口（warning） 货柜预警接口
@ResponseBody
@RequestMapping(value = "/alarm")
public String alarm(HttpServletRequest request) throws IOException {
@@ -618,7 +621,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);
}
}
@@ -1426,6 +1430,7 @@
return ResponseModel.getErrInstance(reagentCode+",该试剂在库存中不存在");
}
}
+ String number = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
for (String reagentCode : reagentReceiving.getReagentCode()) {
OpeReagentStatus opeReagentStatus = opeReagentStatusService
.getOpeReagentStatusByReagentCode(reagentCode);
@@ -1458,6 +1463,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("转移成功");
@@ -1793,4 +1799,36 @@
}
return retJSON.toJSONString();
}
+
+
+
+
+ @ResponseBody
+ @RequestMapping("/getAllWarehouse")
+ public Object getAllWarehouse() {
+ try {
+ List<Map> res = sysWarehouseService.getAllWarehouse();
+ return ResponseModel.getOkInstence(res);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+
+ }
+
+ @ResponseBody
+ @RequestMapping(value = "addWarehouseStatus",method = RequestMethod.POST)
+ public Object addWarehouseStatus(@RequestBody SysWarehouseStatus one){
+ try {
+ one.setCreateTime(new Date());
+ sysWarehouseStatusService.addOne(one);
+ return ResponseModel.getOkInstence("新增成功");
+ } catch (BusinessException e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance(e.getMessage());
+ } catch (Exception e) {
+ e.printStackTrace();
+ return ResponseModel.getErrInstance("系统内部错误");
+ }
+ }
}
--
Gitblit v1.9.2