From c3bca4743c5b8ea15d45cf2ffa1787529f4995ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: Fri, 18 Nov 2022 10:11:23 +0800
Subject: [PATCH] 1.试剂表体积字段和相关接口返回 2.供应商订单修改试剂价格联动试剂原本价格一起变更
---
src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
index faa782d..fed7f24 100644
--- a/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
+++ b/src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java
@@ -558,7 +558,6 @@
// containerRight 对应 DB character_right
// createTimestamp 对应 DB create_time
- System.out.println("1111111111111111111111111");
// 注册接口没有之前的关系
//
// //清除之前的记录，然后关联现在的关系
@@ -1227,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);
@@ -1354,6 +1356,7 @@
throw new ApiException(ApiStatus.PARAM_ERR);
}
//判断是否重复
+ logger.info("测试");
if (sysAlarmDao.selectOne(containerCode, controllerCode, sysAlarm.getWarningId(), sysAlarm.getWarningTime()) > 0) {
continue;
}
@@ -1484,7 +1487,6 @@
Integer warningPoint = dataJson.getInteger("warningPoint");
SysUser user = sysUserDao.getSysUserByIdCard(idcard);
- System.out.println("====="+user);
if(user==null){
System.out.println(idcard.length());
if(idcard.length()==20){
@@ -1727,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");
@@ -1753,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