库存领用补贴条码 补充重复条码判断

lyfO_o

2021-07-12 ae60dc2d56c553dd4b0ef0a5b0f2f3a676752dbb

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

@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.SysLaboratory;
import com.nanometer.smartlab.entity.dto.ApplyListDto;
import com.nanometer.smartlab.entity.dto.PersonUseDetail;
import com.nanometer.smartlab.entity.enumtype.ArrivalStatus;
import com.nanometer.smartlab.service.SysLaboratoryService;
import com.nanometer.smartlab.util.FacesUtils;
import com.nanometer.smartlab.util.Utils;
@@ -118,8 +119,28 @@
   public void reagentReturn(){

      try {
         List<OpeReagentStatus> list=this.selectedList;
         opeReagentStatusService.batchUpdateStatusByCode(list);
         if (selectOne == null) {
            FacesUtils.warn("请选择单号");
            return;
         }
         //判断单子下的试剂是否全部 为 领用待入库-1,不是就不能取消领用
         List<PersonUseDetail> applyList = opeUseFlowService.getApplyInfo(selectOne.getReceiptNumber());
         boolean flag = applyList.stream().allMatch(pu ->
                  opeReagentStatusService.getOpeReagentStatusByReagentCode(pu.getReagentCode() ).getStatus()== ArrivalStatus.NOREGISTER);
         if (!flag) {
            FacesUtils.warn("试剂当前状态不可以取消领用");
            return;
         }

         //没有批次号不可以取消领用
         boolean flag1 = applyList.stream().allMatch(pu -> pu.getArticleNumber() != null);
         if (!flag1) {
            FacesUtils.warn("没有批次号不可以取消领用");
            return;
         }

         //取消领用
         opeReagentStatusService.batchUpdateStatusByCode(applyList);
         FacesUtils.info("已取消试剂");
      }catch (Exception e){
         FacesUtils.info("请选择数据");
@@ -251,6 +272,7 @@
                     list = opeUseFlowService.getPersonalUseInfoList
                           (reagentCode,  getUserId(),startTime,endTime ,receiptNumber,department,project,applyPerson,reagentName,first,pageSize);
                  }
                  selectOne = null;
               } catch (Exception e) {
                  logger.error(e);
               }
@@ -259,17 +281,17 @@

            @Override
            public OpeUseFlow getRowData(String rowKey) {
               Iterator<OpeUseFlow> iterator = this.iterator();
               if (iterator != null) {
                  OpeUseFlow su = null;
                  while (iterator.hasNext()) {
                     su = iterator.next();
                     if (rowKey.equals(su.getReceiptNumber())) {
                        return su;
                     }
                  }
               }
               return null;
//               Iterator<OpeUseFlow> iterator = this.iterator();
//               if (iterator != null) {
//                  OpeUseFlow su = null;
//                  while (iterator.hasNext()) {
//                     su = iterator.next();
//                     if (rowKey.equals(su.getReceiptNumber())) {
//                        return su;
//                     }
//                  }
//               }
               return opeUseFlowService.selectByReceiptNumber(rowKey,getUserId());
            }
         };
      }
@@ -301,16 +323,27 @@
   }

   public Date getStartTime() {
      return startTime;
      if (null == startTime){
         Date now = new Date();
         Calendar cal = Calendar.getInstance();
         cal.setTime(now);
         cal.add(Calendar.DATE, -7);
         return cal.getTime();
      }else {
         return startTime;
      }
   }

   public void setStartTime(Date startTime) {
      this.startTime = startTime;
   }


   public Date getEndTime() {
      return endTime;
      if (null == endTime){
         return new Date();
      }else {
         return endTime;
      }
   }

   public void setEndTime(Date endTime) {