server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@ spring: profiles: active: pro active: dev application: name: visitsAdmin # 安全配置 server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java
@@ -19,7 +19,6 @@ private List<GeneralVO> stockList; @ApiModelProperty(value = "区域库存汇总集合") private List<GeneralVO> areaTotalList; @ApiModelProperty(value = "库存已利用") private BigDecimal num; @ApiModelProperty(value = "库存利用率") server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -488,10 +488,12 @@ //如果是访客登记，录入人员的在场数据记录 // retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType())); //来访时间 if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){ inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1); updateVistis.setStatus(Constants.VisitStatus.signin); updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime())); updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime())); } //更新最新来访时间 Member member = new Member(); member.setLastVisitDate(updateVistis.getInDate()); @@ -499,12 +501,14 @@ memberMapper.updateById(member); }else if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()) { //如果是访客签离事件 if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)){ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1); updateVistis.setStatus(Constants.VisitStatus.signout); updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime())); updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime())); updateVistis.setOutType(Constants.ZERO); updateVistis.setOutInfo("访客正常签离"); } }else{ //如果人员信息存在，切是访客通行，则删除之前的所有进场数据（无论此次推送是进厂还是出场推送事件） delRetentionLis.add(visits.getMemberId()); server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -941,12 +941,12 @@ BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//今天下发入库任务 data.setCurrentInNum(beforeInNum.add(currentInNum));//当前入库总任务成量 data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//当前出库总任务成量 data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,0,1));//今日完成量 data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,1,1));//今日完成量 data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//今日完成量 data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//今日完成量 //------------今日出入库效率---------------- BigDecimal outHours = getTotalDoneTimes(currentNum,0);// BigDecimal inHours = getTotalDoneTimes(currentNum,1);// BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);// BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);// if(outHours.compareTo(new BigDecimal(0))>0){ data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//当前入库总任务成量 }
