李宇
2021-01-21 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java
@@ -89,13 +89,14 @@
   @Transactional(propagation = Propagation.REQUIRED)
   public List<OpeWarehouseReserve> getOpeWarehouseReserveListByName(String reagentId, String supplierId, Integer first,
         Integer pageSize) {
         Integer pageSize,String productSn) {
      try {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("reagentName", reagentId);
         params.put("supplierId", supplierId);
         params.put("first", first);
         params.put("pageSize", pageSize);
         params.put("productSn", productSn);
         return this.opeWarehouseReserveDao.getOpeWarehouseReserveList(params);
      } catch (DataAccessException e) {
         logger.error(e.getMessage(), e);
@@ -105,11 +106,12 @@
   }
   @Transactional(propagation = Propagation.REQUIRED)
   public int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId) {
   public int getOpeWarehouseReserveTotalCountByName(String reagentId, String supplierId,String productSn) {
      try {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("reagentName", reagentId);
         params.put("supplierId", supplierId);
         params.put("productSn", productSn);
         return this.opeWarehouseReserveDao.getOpeWarehouseReserveTotalCount(params);
      } catch (DataAccessException e) {
         logger.error(e.getMessage(), e);
@@ -326,7 +328,7 @@
         for (int i = 0; i < len; i++) {
            temp += "0";
         }
         for (BigInteger i = startReagentCode; i.compareTo(endReagentCode) < 1; i = i.add(BigInteger.ONE)) {
          for (BigInteger i = startReagentCode; i.compareTo(endReagentCode) < 1; i = i.add(BigInteger.ONE)) {
            reagentCode = temp + String.valueOf(i);
            if (this.opeReagentStatusService.isOpeReagentStatusExist(reagentCode)) {//条码存在
               //throw new BusinessException(ExceptionEnumCode.REAGENT_CODE_EXIST, "入库试剂:" + opeApply.getReagent().getName() + "的试剂条形码[" + reagentCode + "]已存在。");