feat: 0701-是否需要扫码前判断单据是否为空

dev_kcyj
chenhc 1 year ago
parent a4aad12e71
commit e33e19ec99

@ -407,9 +407,10 @@ public class IoCodeTempController extends BaseController {
// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试!"); // return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试!");
// } // }
// } // }
//是否校验耗材材质 1高值耗材2.普通耗材 if (bussinessTypeEntity != null) {
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { //是否校验耗材材质 1高值耗材2.普通耗材
} if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
}
if (IntUtil.value(udiInfoEntity.getHcType()) != 1) { if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试!"); return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试!");
} }
@ -418,6 +419,8 @@ public class IoCodeTempController extends BaseController {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试!"); return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试!");
} }
} }
}
String orderId = addOrderRequest.getBillNo(); String orderId = addOrderRequest.getBillNo();

@ -231,17 +231,20 @@ public class IoOrderDetailBizController extends BaseController {
// } // }
// } // }
//是否校验耗材材质 1高值耗材2.普通耗材 if (bussinessTypeEntity != null){
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { //是否校验耗材材质 1高值耗材2.普通耗材
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试!"); if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
} return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试!");
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { }
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试!"); if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试!");
}
} }
} }
// todo 查询产品是否已经通过认证 // todo 查询产品是否已经通过认证
// BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); // BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
// if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { // if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {

@ -302,6 +302,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
// } // }
// } // }
if (bussinessTypeEntity != null){
//是否校验耗材材质 1高值耗材2.普通耗材 //是否校验耗材材质 1高值耗材2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
@ -312,6 +313,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试!"); throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试!");
} }
} }
}
if (udiRelevanceResponse.getPurType() == 2) { if (udiRelevanceResponse.getPurType() == 2) {

Loading…
Cancel
Save