UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单据校验耗材问题

Browse Source
dev_kcyj
anthonywj 1 year ago
parent 027c1cf7e5
commit 3a879c604e
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -409,12 +409,12 @@ public class IoCodeTempController extends BaseController {
// } // }
if (bussinessTypeEntity != null && udiInfoEntity != null) { if (bussinessTypeEntity != null && udiInfoEntity != null) {
//是否校验耗材材质 1：高值耗材；2.普通耗材 //是否校验耗材材质 1：高值耗材；2.普通耗材
if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { 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, "单据只允许录入高值耗材" + ",请检查后重试！");
} }
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) {
if (IntUtil.value(udiInfoEntity.getHcType()) != 2) { if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
} }

8
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -233,22 +233,22 @@ public class IoOrderDetailBizController extends BaseController {
if (bussinessTypeEntity != null && udiRelevanceResponse != null) { if (bussinessTypeEntity != null && udiRelevanceResponse != 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) {
return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
} }
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
} }
} }
//是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){ if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) {
if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) {
return ResultVOUtils.error(500, "单据只允许录入需要扫码产品" + ",请检查后重试！"); return ResultVOUtils.error(500, "单据只允许录入需要扫码产品" + ",请检查后重试！");
} }
}else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) { } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) {
if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) {
return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！"); return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！");
} }

8
src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java
Unescape Escape View File

@ -304,22 +304,22 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
if (bussinessTypeEntity != null && udiRelevanceResponse != null){ if (bussinessTypeEntity != null && udiRelevanceResponse != 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) {
throw new JsonException("单据只允许录入高值耗材" + ",请检查后重试！"); throw new JsonException("单据只允许录入高值耗材" + ",请检查后重试！");
} }
} else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) {
if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
throw new JsonException("单据只允许录入普通耗材" + ",请检查后重试！"); throw new JsonException("单据只允许录入普通耗材" + ",请检查后重试！");
} }
} }
//是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品
if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){ if (IntUtil.value(bussinessTypeEntity.getCodeCheck() )== 1){
if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) {
throw new JsonException("单据只允许录入需要扫码产品" + ",请检查后重试！"); throw new JsonException("单据只允许录入需要扫码产品" + ",请检查后重试！");
} }
}else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) { }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) {
if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) {
throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试！"); throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试！");
} }

Write Preview
Loading…
Cancel
Save