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/service/InterfaceServiceImpl.java | 6 ++++++
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 6 ++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index 7a1b1eb..d7d1c54 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -2111,6 +2111,12 @@
}
}
+
+ public void onExportOutAndIn(){
+
+
+ }
+
public HSSFWorkbook exportExcelNew(List<String> headerList, List<OpeWarehouseReserve> dataList) {
HSSFWorkbook hssfWorkbook = new HSSFWorkbook();
Integer total = null;
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index 30112ab..fed7f24 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -1226,6 +1226,9 @@
SysUser user = sysUserDao.getSysUserByIdCard(idcard);
LinkedHashMap params = new LinkedHashMap();
+ if (user == null) {
+ throw new ApiException(ApiStatus.PARAM_ERR,"无相关人员卡号");
+ }
params.put("userId", user.getId());
params.put("realstatus", realstatus);
params.put("reagentCode", reagentCode);
@@ -1353,6 +1356,7 @@
throw new ApiException(ApiStatus.PARAM_ERR);
}
//判断是否重复
+ logger.info("测试");
if (sysAlarmDao.selectOne(containerCode, controllerCode, sysAlarm.getWarningId(), sysAlarm.getWarningTime()) > 0) {
continue;
}
@@ -1725,6 +1729,7 @@
String updateTime = dataJson.getString("updateTime");
BigDecimal remainder = dataJson.getBigDecimal("remainder");
String operateState = dataJson.getString("operateState");
+ BigDecimal volume = dataJson.getBigDecimal("volume");
Map<String, String> metaMap = new HashMap<>();
metaMap.put("groupId", "operate_status");
@@ -1751,6 +1756,7 @@
opeUseFlow.setRemainder(remainder);
opeUseFlow.setOperateState(baseMetaList.get(0).getId());
opeUseFlow.setCreateTime(new java.sql.Timestamp(createtime.getTime()));
+ opeUseFlow.setVolume(volume);
// <!--0：个人领用 1：在仓库sys_warehouse_container
// 2：在实验室sys_laboratory_container 3：报废-->
--
Gitblit v1.9.2