|
|
@ -87,41 +87,43 @@ public class ForThirdSysApiController {
|
|
|
|
if (checkUdi == null) {
|
|
|
|
if (checkUdi == null) {
|
|
|
|
return ResultVOUtils.error(500, "收费项目未对照!");
|
|
|
|
return ResultVOUtils.error(500, "收费项目未对照!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
boolean checkSuccess = true;
|
|
|
|
// boolean checkSuccess = true;
|
|
|
|
String lostMsg = "";
|
|
|
|
// String lostMsg = "";
|
|
|
|
//校验条码完整性
|
|
|
|
// //校验条码完整性
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
// if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
checkSuccess = false;
|
|
|
|
// checkSuccess = false;
|
|
|
|
lostMsg = lostMsg + ",批次号";
|
|
|
|
// lostMsg = lostMsg + ",批次号";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
|
|
|
|
// if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) {
|
|
|
|
checkSuccess = false;
|
|
|
|
// checkSuccess = false;
|
|
|
|
lostMsg = lostMsg + ",生产日期";
|
|
|
|
// lostMsg = lostMsg + ",生产日期";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
|
|
|
|
// if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) {
|
|
|
|
checkSuccess = false;
|
|
|
|
// checkSuccess = false;
|
|
|
|
lostMsg = lostMsg + ",失效日期";
|
|
|
|
// lostMsg = lostMsg + ",失效日期";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
if ("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo())) {
|
|
|
|
// if ("是".equals(checkUdi.getScbssfbhxlh()) && StrUtil.isEmpty(udiEntity.getSerialNo())) {
|
|
|
|
checkSuccess = false;
|
|
|
|
// checkSuccess = false;
|
|
|
|
lostMsg = lostMsg + ",序列号";
|
|
|
|
// lostMsg = lostMsg + ",序列号";
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
|
|
|
|
// if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
|
|
|
|
return ResultVOUtils.error(504, "序列号超出20位!");
|
|
|
|
// return ResultVOUtils.error(504, "序列号超出20位!");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
|
|
|
|
// if (StrUtil.isNotEmpty(udiEntity.getBatchNo()) && udiEntity.getBatchNo().length() > 20) {
|
|
|
|
return ResultVOUtils.error(504, "批次号超出20位!");
|
|
|
|
// return ResultVOUtils.error(504, "批次号超出20位!");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
// if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
|
|
|
|
checkSuccess = false;
|
|
|
|
// checkSuccess = false;
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
if (!checkSuccess) {
|
|
|
|
// if (!checkSuccess) {
|
|
|
|
return ResultVOUtils.error("UDI码格式错误:缺少" + lostMsg);
|
|
|
|
// return ResultVOUtils.error("UDI码格式错误:缺少" + lostMsg);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
IoCodeEntity codeEntity = codeService.getOne(new QueryWrapper<IoCodeEntity>().likeLeft("code", filterInvProductRequest.getUdiCode()).last("limit 1"));
|
|
|
|
IoCodeEntity codeEntity = codeService.getOne(new QueryWrapper<IoCodeEntity>().likeLeft("code", filterInvProductRequest.getUdiCode()).last("limit 1"));
|
|
|
|
if (codeEntity == null) {
|
|
|
|
if (codeEntity == null) {
|
|
|
|
|
|
|
|
codeEntity = codeService.getOne(new QueryWrapper<IoCodeEntity>().likeLeft("errUdiCode", filterInvProductRequest.getUdiCode()).last("limit 1"));
|
|
|
|
|
|
|
|
if (codeEntity == null)
|
|
|
|
return ResultVOUtils.error("库存未找到该UDI码,请检查该UDI是否存在错误!");
|
|
|
|
return ResultVOUtils.error("库存未找到该UDI码,请检查该UDI是否存在错误!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//1.获取预验收库存
|
|
|
|
//1.获取预验收库存
|
|
|
|