卡号 bug

lyfO_o

2022-11-18 1c375d6dcd0c41bc3c206585a2712ec066bf5992

卡号 bug

 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;

 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：报废-->