修改课题管理bug

kongzy

2023-11-28 59d9ea33f503e363f2e2941c7c00cc9dd9d9d1c7

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

@@ -1135,6 +1135,7 @@
         checkReserve(list2);
         //1.2判断提交的条码是否重复(只有补贴条码需要判断)
         checkReagentCode(list2);
         String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
         //库中领取
         if(list.size()>0&&list!=null){
            //扣库存 对象中的reagentCode存的是id
@@ -1152,7 +1153,7 @@
               }
            }

            this.opeWarehouseReserveService.claimForPerson(list, userId,projectNum,laboratoryId,laboratoryContainerId);
            this.opeWarehouseReserveService.claimForPerson(list, userId,projectNum,laboratoryId,laboratoryContainerId,receiptNum);
         }

         //补贴条码
@@ -1233,7 +1234,7 @@
         printTable.put("applyPerson", applyPersonInfo.getName());
         printTable.put("department", applyPersonInfo.getDepartment());
         printTable.put("date", Utils.now("yyyy-MM-dd"));
         String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());

         printTable.put("receiptNumber", receiptNum);
         if (StringUtils.isNotBlank(applyPersonInfo.getPhone())){
            printTable.put("phone", applyPersonInfo.getPhone());
@@ -1493,6 +1494,8 @@
      }

   }


   public  void  onSaveBtnClick() {
      try {
         if (this.selectedTmpList == null || this.selectedTmpList.size() == 0) {
@@ -1524,7 +1527,7 @@
         if (StringUtils.isNotBlank(applyPersonInfo.getProject())){
            printTable.put("project", applyPersonInfo.getProject());
         }
         SysLaboratory lab = sysLaboratoryService.getSysLaboratory(laboratoryId);
         SysLaboratory lab = sysLaboratoryService.getSysLaboratorySimpleInfo(laboratoryId);
         String receiptNum = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
         printTable.put("receiptNumber", receiptNum);
         printTable.put("lab", lab.getName());
@@ -1615,7 +1618,7 @@
            //FacesUtils.warn("未选择一个条形码。");
            //return;
            //}
            this.opeWarehouseReserveService.claim(list, userId,projectNum);
            this.opeWarehouseReserveService.claim(list, userId,projectNum,receiptNumber);
         }

         if(list2.size()>0&&list2!=null){