|
@@ -184,7 +184,8 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
|
|
|
if (StringUtils.isNotEmpty(inspectionStatus) && inspectionStatus.equals("40")) {
|
|
|
//return "该报验单已取消";
|
|
|
|
|
|
- sb.append("单据号:"+inspectioncode+"已取消</br>");
|
|
|
+ sb.append("单据号:"+inspectioncode+"已取消<br>");
|
|
|
+ continue;
|
|
|
}
|
|
|
/* 取消 */
|
|
|
if ("10".equals(operType)) {
|
|
@@ -211,7 +212,8 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
|
|
|
} else if (Arrays.asList("30", "40").contains(operType)) {
|
|
|
if ("30".equals(operType) && hasDispatch) {
|
|
|
//return "该报验单已派单";
|
|
|
- sb.append("单据号:"+inspectioncode+"已派单</br>");
|
|
|
+ sb.append("单据号:"+inspectioncode+"已派单<br>");
|
|
|
+ continue;
|
|
|
}
|
|
|
//SysUserDo toUser = userService.getById(vo.get(i).getToUser());
|
|
|
SupervisionVo supervisionVo = vo.get(i).getSupervisionVo();
|
|
@@ -226,17 +228,20 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
|
|
|
/* 接收/有条件接收 */
|
|
|
//不是本人的数据无法接收 Inspectionstatus=40代表取消
|
|
|
if(!dispatchDo.getSupervisionuserid().equals(user.getId())){
|
|
|
- sb.append("单据号:"+inspectioncode+"已被改派,不能接收,请刷新数据查看</br>");
|
|
|
+ sb.append("单据号:"+inspectioncode+"已被改派,不能接收,请刷新数据查看<br>");
|
|
|
+ continue;
|
|
|
}
|
|
|
if("40".equals(inspectionItpDo.getInspectionstatus())){
|
|
|
- sb.append("单据号:"+inspectioncode+"已被取消,请刷新数据查看</br>");
|
|
|
+ sb.append("单据号:"+inspectioncode+"已被取消,请刷新数据查看<br>");
|
|
|
+ continue;
|
|
|
}
|
|
|
if (Integer.valueOf(inspectionItpDo.getInspectionstatus()) == 20) {
|
|
|
dispatchDo.setInspectionconclusion(operType.equals("50") ? "10" : "30");
|
|
|
dispatchDo.setRefusereason(vo.get(i).getReason());
|
|
|
inspectionItpDo.setInspectionstatus("30");
|
|
|
}else{
|
|
|
- sb.append("单据号:"+inspectioncode+"已被接收,请刷新数据查看</br>");
|
|
|
+ sb.append("单据号:"+inspectioncode+"已被接收,请刷新数据查看<br>");
|
|
|
+ continue;
|
|
|
}
|
|
|
}
|
|
|
/* 检验员拒收和接收时会传回检验开始/结束时间和文件 */
|