修改试剂导入

李宇

2021-01-22 87a8b02f19d3000fc3e05f1a1fb60d9c627c703e

 src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java

@@ -8,6 +8,7 @@

import com.nanometer.smartlab.dao.OpeApplyDao;
import com.nanometer.smartlab.entity.*;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.exception.AlarmCode;
import com.nanometer.smartlab.exception.AlarmException;
import com.nanometer.smartlab.util.IDUtils;
@@ -88,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);
@@ -104,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);
@@ -325,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 + "]已存在。");
@@ -430,7 +433,29 @@
      this.opeWarehouseReserveDao.updateByReId(params);
   }

   @Transactional(propagation = Propagation.REQUIRED)
    @Override
   @Transactional
    public void insertOpeWarehouseReserve2(OpeApplyReserve opeApplyReserve, OpeOrder oo) {

      OpeWarehouseReserve ope = new OpeWarehouseReserve();
      //库存为到货数量
      ope.setReserve(opeApplyReserve.getArrivalNum());
      //仓库
      ope.setWarehouseId(opeApplyReserve.getHouseId());
      //试剂
      ope.setReagentId(opeApplyReserve.getReagent().getId());
      //订单编号
      ope.setOrderCode(oo.getOrderCode());
      // 申购编号
      ope.setApplyCode(opeApplyReserve.getApplyCode());
      //批号
      ope.setArticleNumber(opeApplyReserve.getArticleNumber());
      ope.setId(IDUtils.uuid());
      opeWarehouseReserveDao.insertOpeWarehouseReserve2(ope);

    }

    @Transactional(propagation = Propagation.REQUIRED)
   public void reagentDStore(List<OpeApply> reagentDStoreList, String loginUserId) {

      if (reagentDStoreList == null) {