Merge remote-tracking branch 'origin/master'
| | |
| | | LEFT JOIN `company` sd ON sd.ID = usr.COMPANY_ID AND sd.ISDELETED = 0 |
| | | LEFT JOIN `member` m ON usr.MEMBER_ID = m.id |
| | | <if test="dto.roleId != null"> |
| | | RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.ROLE_ID = #{dto.roleId} |
| | | RIGHT JOIN system_user_role sur on sur.USER_ID = usr.ID and sur.DELETED = 0 and sur.ROLE_ID = #{dto.roleId} |
| | | </if> |
| | | <where> |
| | | usr.DELETED = 0 |
| | |
| | | if(Objects.isNull(platformReason)|| !Constants.equalsInteger(platformReason.getIsdeleted(),Constants.ZERO)){ |
| | | throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"入园原因信息异常,请刷新重试"); |
| | | } |
| | | if(platformBooksApplyDTO.getTotalNum().compareTo(platformReason.getLimitNum())>Constants.ZERO){ |
| | | throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"任务量超出单日可作业量,请修改后重新输入!"); |
| | | } |
| | | PlatformGroup platformGroup= platformGroupMapper.selectById(platformReason.getGroupId()); |
| | | if(Objects.isNull(platformGroup)){ |
| | | throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"未查询到绑定月台组数据"); |
| | |
| | | entity.setJobId(job.getJobId()); |
| | | entity.setWmsJobId(job.getId()); |
| | | entity.setContractNum(param.getContractNum()); |
| | | entity.setRepertotyAddress(job.getRepertotyAddress()); |
| | | entity.setRepertotyAddress(param.getRepertotyAddress()); |
| | | entity.setWmsJobId(job.getId()); |
| | | entity.setStatus(Constants.ZERO); |
| | | entity.setIoQty(Constants.formatBigdecimal(d.getIoQty()).multiply(Constants.formatBigdecimal( d.getRate()))); |