Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

 src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java

@@ -531,9 +531,22 @@
      selectedTmpOrderList = null;
   }

   public void hideOrderTmp() {
      //清空
      selectedTmpOrderList = null;
      //隐藏
      RequestContext.getCurrentInstance().execute("document.getElementById('showTabOrder').style.display='none'");
   }

   public void  clearInputStorageTmp(){
      selectedInputStorageTmpOrderList = null;
   }

   public void hideInputStorageTmp(){
        selectedInputStorageTmpOrderList = null;

        RequestContext.getCurrentInstance().execute("document.getElementById('putInStorage').style.display='none'");
    }

   public void cancel(){
      if (trulySelectedList == null || trulySelectedList.size()<=0){
@@ -563,6 +576,10 @@

   }

   public void hide(){
      selectedTmpList = null;
      RequestContext.getCurrentInstance().execute("document.getElementById('showTab').style.display='none'");
   }
   public void cancelOrderTmp(){
      if (trulySelectedOrderList == null || trulySelectedOrderList.size()<=0){
         FacesUtils.info("至少选择一个");
@@ -1637,6 +1654,13 @@
   */
   public void onSaveInputWarehouseClick(){
      try{
          //0.0输入校验
            for (OpeApplyReserve opeApplyReserve : opeApplyList) {
                if (StringUtils.isBlank(opeApplyReserve.getArticleNumber())) {
                    throw new BusinessException(ExceptionEnumCode.PARAM_EXIST, opeApplyReserve.getReagent().getName() + ":批号不能为空");
                }
            }

         //用来检验提交表单得试剂条码是否重复
         Map<String,Boolean> checkTable= new HashMap<>();
         if (opeApplyList != null && opeApplyList.size() > 0) {