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

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

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

@@ -47,8 +47,8 @@
/**
 * Created by cmower on 17/11/20.
 */
@Controller
@PropertySource(value = "WEB-INF/config.properties",encoding = "utf-8")
@Controller
@Scope("session")
public class WarehouseStockMngController extends BaseController {

@@ -166,6 +166,7 @@
   private String warehouseName;

   private Integer editFlag;
   private Integer isAllApply = 0;
   private StreamedContent file;
   @Value("${pdf.export.file.path}")
   private String pdfExportFilePath;
@@ -530,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){
@@ -562,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("至少选择一个");
@@ -623,7 +641,7 @@
         FacesUtils.info("至少选择一个");
         return;
      }

      this.userId = getUser().getId();
      this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW, Constants.PAGE_WAREHOUSE_STOCK_MNG);
   }
//
@@ -648,6 +666,8 @@
         }
      }
      checkTable = null;
      //
      this.userId = selectedTmpOrderList.get(0).getApplyUser();

      this.menuController.goToPage(Constants.PAGE_WAREHOUSE_REAGENT_USE_NEW_PERSON, Constants.PAGE_WAREHOUSE_STOCK_MNG);
   }
@@ -1148,7 +1168,7 @@
            this.opeWarehouseReserveService.reagentDStore3(opeList,userId);

            //扣库存
            opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
            opeWarehouseReserveService.btWarehouseReserveReduce(list2);
         }

         for(int i=0;i<list2.size();i++){
@@ -1251,6 +1271,20 @@
   /**
    * 点击打印  关联所有流向和领用单号e
    */


   public void associatedFlowReceiptNumber2() {
      try {
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
         //弹出打印窗口
         RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
      } catch (Exception e) {
         logger.info(e.getMessage());
      }

   }


   public void closeDialog() {
      try {
         opeUseFlowService.updateReceiptNumberByCode(selectedTmpOrderList, receiptNumber);
@@ -1261,11 +1295,10 @@

   }

   public void associatedFlowReceiptNumber2() {
   public void closeDialog2() {
      try {
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
         //弹出打印窗口
         RequestContext.getCurrentInstance().execute("document.getElementById('indirectPrint').click()");
         onCancelBtnClick();
      } catch (Exception e) {
         logger.info(e.getMessage());
      }
@@ -1525,6 +1558,7 @@
            //}
            this.opeWarehouseReserveService.claim(list, userId,projectNum);
         }

         if(list2.size()>0&&list2!=null){
            List<OpeApply> opeList=new ArrayList<>();
            //this.opeApplyService.getOpeApplyList(null,null,null,null,null)
@@ -1580,7 +1614,7 @@
                  opeUseFlow.setHouseId(list2.get(i).getWarehouseId());
                  opeUseFlow.setContainerId(warehouseReserveInfo.get(0).getContainerId());
                  opeUseFlow.setCreateTime(warehouseReserveInfo.get(0).getUpdateTime());
                  opeUseFlow.setUserId(userId);
                  opeUseFlow.setUserId(warehouseReserveInfo.get(0).getUserId());
                  opeUseFlow.setRemainder(list2.get(i).getReagent().getMainMetering()!=null?list2.get(i).getReagent().getMainMetering():new BigDecimal(0));
                  opeUseFlow.setStoreType(StoreType.DIRECTSTORE);

@@ -1620,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) {
@@ -1722,11 +1763,11 @@
               }

               try {
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id,reagentId, userName,productSn,applyCode,status);
                  int count = opeApplyService.getOpeApplyReserveTotalCountByNameFor(id, reagentId, userName, productSn, applyCode, status, isAllApply);
                  this.setRowCount(count);
                  if (count > 0) {
                     list = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, first,
                           pageSize,productSn,applyCode,status);
                     list = opeApplyService.getOpeApplyReserveListByNameFor(id, reagentId, userName, first,
                           pageSize, productSn, applyCode, status, isAllApply);
                  }
               } catch (Exception e) {
                  logger.error(e);
@@ -1831,7 +1872,7 @@
            realDataList=selectedListForPerson;
         }else {
            realDataList = opeApplyService.getOpeApplyReserveListByNameFor(id,reagentId, userName, null,
                  null,productSn,applyCode,status);
                  null,productSn,applyCode,status,isAllApply);
         }
         List<String> headerList = new ArrayList<>();
         headerList.add("申购编号");
@@ -2710,7 +2751,7 @@
            //   this.oriLaboratoryId = this.laboratory.get(0).getId();
            //}

            this.laboratoryId= laboratoryId==null?this.laboratory.get(0).getId():laboratoryId;
            this.laboratoryId = this.laboratory.get(0).getId();
            this.laboratoryContainers = this.sysLaboratoryContainerService.getSysLaboratoryContainerList(laboratoryId);
         }else {
            this.oriLaboratoryId = null;
@@ -3024,4 +3065,12 @@
   public void setWarehouseName(String warehouseName) {
      this.warehouseName = warehouseName;
   }

   public Integer getIsAllApply() {
      return isAllApply;
   }

   public void setIsAllApply(Integer isAllApply) {
      this.isAllApply = isAllApply;
   }
}