gdg
2021-01-29 3133c40cf7f5467db6c172b436f509c85e096eff
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -1148,7 +1148,7 @@
            this.opeWarehouseReserveService.reagentDStore3(opeList,userId);
            //扣库存
            opeWarehouseReserveService.btWarehouseReserveReduce(list2,userId);
            opeWarehouseReserveService.btWarehouseReserveReduce(list2);
         }
         for(int i=0;i<list2.size();i++){
@@ -1248,11 +1248,37 @@
   }
   /**
    * 点击打印  关联所有流向和领用单号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);
         onCancelBtnClick();
      } catch (Exception e) {
         logger.info(e.getMessage());
      }
   }
   public void closeDialog2() {
      try {
         opeUseFlowService.updateReceiptNumberByCode2(selectedTmpList, receiptNumber);
         onCancelBtnClick();
      } catch (Exception e) {
         logger.info(e.getMessage());
      }
@@ -1567,7 +1593,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);