From 52ff3ecd4a41668b08277ace6d0fa5fce8082f4c Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 6 Jun 2024 14:24:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=200606=E6=B3=A8=E9=87=8A=E6=8E=89?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=9C=80=E8=A6=81=E6=89=AB=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 12 ++++++-- .../inout/IoOrderDetailBizController.java | 30 ++++++++++++------- .../basic/BasicBussinessTypeEntity.java | 6 ++++ .../impl/IoOrderDetailBizServiceImpl.java | 14 +++++++-- src/main/resources/schemas/schema_v2.4.sql | 4 +++ 5 files changed, 52 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 1d8e06220..e69782ae6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -4,6 +4,7 @@ import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inv.InvProductDetailEntity; +import com.glxp.api.exception.JsonException; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.springframework.beans.BeanUtils; @@ -398,7 +399,15 @@ public class IoCodeTempController extends BaseController { } } - if (udiInfoEntity.getRequireScanCode() == 1){ +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiInfoEntity.getRequireScanCode() != 1){ +// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiInfoEntity.getRequireScanCode() != 0){ +// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiInfoEntity.getHcType()) != 1) { @@ -409,7 +418,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); } } - } String orderId = addOrderRequest.getBillNo(); 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 7cf18ec3f..08277c3c6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -219,16 +219,26 @@ public class IoOrderDetailBizController extends BaseController { } } - if (udiRelevanceResponse.getRequireScanCode() == 1) { - //是否校验耗材材质 1：高值耗材；2.普通耗材 - if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { - if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { - return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); - } - } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { - if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { - return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); - } +// if (bussinessTypeEntity.getCheckVailDate() != 4) { +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiRelevanceResponse.getRequireScanCode() != 1){ +// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiRelevanceResponse.getRequireScanCode() != 0){ +// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } +// } + + //是否校验耗材材质 1：高值耗材；2.普通耗材 + if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { + if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { + return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！"); + } + } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) { + if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) { + return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！"); } } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 9523657f0..70d70b0c0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -505,4 +505,10 @@ public class BasicBussinessTypeEntity { @TableField(value = "devInType") private Integer devInType; + /** + * 是否需要扫码 ：0：不需要；1.需要 + */ + @TableField(value = "requireScanCode") + private Integer requireScanCode; + } 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 f37f4e867..91ca2958e 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 @@ -290,7 +290,18 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } } - if (udiRelevanceResponse.getRequireScanCode() == 1){ +// if (bussinessTypeEntity.getCheckVailDate() != 4) { +// if (bussinessTypeEntity.getRequireScanCode() == 1) { +// if (udiRelevanceResponse.getRequireScanCode() != 1){ +// throw new JsonException("单据只允许录入需要扫码耗材" + ",请检查后重试！"); +// } +// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ +// if (udiRelevanceResponse.getRequireScanCode() != 0){ +// throw new JsonException("单据只允许录入不需要扫码耗材" + ",请检查后重试！"); +// } +// } +// } + //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) { if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) { @@ -301,7 +312,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { throw new JsonException("单据只允许录入普通耗材\" + \",请检查后重试！"); } } - } if (udiRelevanceResponse.getPurType() == 2) { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 02b81f79d..0c7cde721 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -3691,3 +3691,7 @@ CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode', 1); INSERT IGNORE INTO `sys_custom_config_detail` (`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (41779, 94, '2', 1, 'confirmDateRange', '发票确认时间', 'datePickera', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'requireScanCode', + 'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是；0否''', + 1);