From 3a879c604e3c3bfba1d5a67bdd179b3aa251ef86 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 4 Jul 2024 14:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=A0=A1=E9=AA=8C=E8=80=97?= =?UTF-8?q?=E6=9D=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeTempController.java | 4 ++-- .../inout/IoOrderDetailBizController.java | 16 ++++++++-------- .../inout/impl/IoOrderDetailBizServiceImpl.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 1aba960d7..873a41289 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -409,12 +409,12 @@ public class IoCodeTempController extends BaseController { // } if (bussinessTypeEntity != null && udiInfoEntity != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 - if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + if (IntUtil.value(bussinessTypeEntity.getVailHcType() )== 1) { } if (IntUtil.value(udiInfoEntity.getHcType()) != 1) { return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); } - } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { + } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) { if (IntUtil.value(udiInfoEntity.getHcType()) != 2) { return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 369f54697..09fc396a7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -186,10 +186,10 @@ public class IoOrderDetailBizController extends BaseController { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); //是否校验产品采购类型 ：1：校验；2.无需校验 - if(IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1){ + if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) { Integer purType = IntUtil.value(udiRelevanceResponse.getPurType()); //1：普通入账产品；2.预验收产品。3：寄售产品 int actionType = IntUtil.value(bussinessTypeEntity.getActionType()); //1：带票（正常）；2.预验收。3：寄售 - if (purType != actionType){ + if (purType != actionType) { //包装友好提示 String msg = ""; switch (actionType) { @@ -215,7 +215,7 @@ public class IoOrderDetailBizController extends BaseController { msg2 = "寄售产品"; break; } - return ResultVOUtils.error(500, "单据只允许录入" + msg +",当前录入产品为"+msg2+",请检查后重试！"); + return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！"); } } @@ -231,24 +231,24 @@ public class IoOrderDetailBizController extends BaseController { // } // } - if (bussinessTypeEntity != null && udiRelevanceResponse != null){ + if (bussinessTypeEntity != null && udiRelevanceResponse != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 - if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); } - } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { + } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); } } //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 - if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){ + if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 1) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) { return ResultVOUtils.error(500, "单据只允许录入需要扫码产品" + ",请检查后重试！"); } - }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) { + } else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) { return ResultVOUtils.error(500, "单据只允许录入不需要扫码产品" + ",请检查后重试！"); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index a29c6afeb..7a241cfee 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -304,22 +304,22 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { if (bussinessTypeEntity != null && udiRelevanceResponse != null){ //是否校验耗材材质 1：高值耗材；2.普通耗材 - if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { throw new JsonException("单据只允许录入高值耗材" + ",请检查后重试！"); } - } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { + } else if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 2) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { throw new JsonException("单据只允许录入普通耗材" + ",请检查后重试！"); } } //是否开启校验扫码 ：0:不校验；1:只允许录入扫码产品；2:只允许录入不扫码产品 - if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 1)){ + if (IntUtil.value(bussinessTypeEntity.getCodeCheck() )== 1){ if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 1) { throw new JsonException("单据只允许录入需要扫码产品" + ",请检查后重试！"); } - }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck() == 2)) { + }else if (IntUtil.value(bussinessTypeEntity.getCodeCheck()) == 2) { if (IntUtil.value(udiRelevanceResponse.getRequireScanCode()) != 0) { throw new JsonException("单据只允许录入不需要扫码产品" + ",请检查后重试！"); }