From 234d147afcb10b38990245e4bb02236743cc5590 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 14 Feb 2025 17:02:57 +0800 Subject: [PATCH] =?UTF-8?q?2/14=20=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRelevanceController.java | 6 ++++++ .../system/SysParamConfigController.java | 4 ++-- .../entity/system/ProductRemarkSetEntity.java | 16 ++++++++++++++++ .../api/req/basic/UdiRelevanceSaveRequest.java | 5 +++++ src/main/resources/application-dev.yml | 2 +- .../mybatis/mapper/basic/UdiProductDao.xml | 15 +++++++++++++++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 5 +++++ src/main/resources/schemas/schema_v2.4.sql | 12 ++++++++++++ 8 files changed, 62 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 1051ec487..694a6c1cb 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -8,6 +8,7 @@ import com.glxp.api.http.ErpBasicClient; import com.glxp.api.res.chs.YbHcflEntityResponse; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductService; +import com.glxp.api.util.IntUtil; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -380,6 +381,11 @@ public class UdiRelevanceController extends BaseController { udiProductEntity.setBasicPrductRemak6(udiRelevanceSaveRequest.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(udiRelevanceSaveRequest.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(udiRelevanceSaveRequest.getBasicPrductRemak8()); + udiProductEntity.setBasicPrductRemak9(udiRelevanceSaveRequest.getBasicPrductRemak9()); + udiProductEntity.setBasicPrductRemak10(udiRelevanceSaveRequest.getBasicPrductRemak10()); + udiProductEntity.setBasicPrductRemak11(udiRelevanceSaveRequest.getBasicPrductRemak11()); + udiProductEntity.setBasicPrductRemak12(udiRelevanceSaveRequest.getBasicPrductRemak12()); + udiProductEntity.setBasicPrductRemak13(udiRelevanceSaveRequest.getBasicPrductRemak13()); udiProductEntity.setCatalogname1(udiRelevanceSaveRequest.getCatalogname1()); udiProductEntity.setCatalogname2(udiRelevanceSaveRequest.getCatalogname2()); diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index eaec56832..cd3f01e89 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -188,11 +188,11 @@ public class SysParamConfigController { filterParamConfigRequest.setParamType(2); filterParamConfigRequest.setParamStatus(1); List systemParamConfigEntities = systemParamConfigService.queryPage(filterParamConfigRequest); - systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getParamKey)) + systemParamConfigEntities = systemParamConfigEntities.stream().sorted(Comparator.comparing(SystemParamConfigEntity::getId)) .collect(Collectors.toList()); ProductRemarkSetEntity productRemarkSetEntity = new ProductRemarkSetEntity(); - if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 8) { + if (CollUtil.isNotEmpty(systemParamConfigEntities) && systemParamConfigEntities.size() == 13) { for (int i = 0; i < systemParamConfigEntities.size(); i++) { SystemParamConfigEntity systemParamConfigEntity = systemParamConfigEntities.get(i); diff --git a/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java b/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java index 09d7bacb7..5e10ee492 100644 --- a/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java +++ b/src/main/java/com/glxp/api/entity/system/ProductRemarkSetEntity.java @@ -30,5 +30,21 @@ public class ProductRemarkSetEntity { private boolean remarkEnable6; private boolean remarkEnable7; private boolean remarkEnable8; + private String remarkKey9; + private String remarkKey10; + private String remarkKey11; + private String remarkKey12; + private String remarkKey13; + private String remarkTitle9; + private String remarkTitle10; + private String remarkTitle11; + private String remarkTitle12; + private String remarkTitle13; + + private boolean remarkEnable9; + private boolean remarkEnable10; + private boolean remarkEnable11; + private boolean remarkEnable12; + private boolean remarkEnable13; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 9f2e3aa3b..ff2a38fbc 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -98,6 +98,11 @@ public class UdiRelevanceSaveRequest { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String basicPrductRemak9; + private String basicPrductRemak10; + private String basicPrductRemak11; + private String basicPrductRemak12; + private String basicPrductRemak13; private String price; private Integer useExpireTime; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 087dbec16..abc2e6867 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.44:3306/lh_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index 566cdb83f..5e3165570 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -692,6 +692,21 @@ basicPrductRemak8=#{basicPrductRemak8}, + + basicPrductRemak9=#{basicPrductRemak9}, + + + basicPrductRemak10=#{basicPrductRemak10}, + + + basicPrductRemak11=#{basicPrductRemak11}, + + + basicPrductRemak12=#{basicPrductRemak12}, + + + basicPrductRemak13=#{basicPrductRemak13}, + updateTime=#{updateTime}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 01d0a417b..dad7868ed 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -550,6 +550,11 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, + basic_products.basicPrductRemak9, + basic_products.basicPrductRemak10, + basic_products.basicPrductRemak11, + basic_products.basicPrductRemak12, + basic_products.basicPrductRemak13, basic_products.sfwblztlcp, basic_products.cgzmraqxgxx, basic_products.sfbjwycxsy, diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index f2753ce76..5fa8abdf1 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4065,3 +4065,15 @@ CALL Pro_Temp_ColumnWork('basic_products', 'basicPrductRemak12', CALL Pro_Temp_ColumnWork('basic_products', 'basicPrductRemak13', 'varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注字段13''', 1); + +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20101, 0, '耗材字典备用字段9', 'basicPrductRemak9', '供货单位', 1, 2, NULL, '2025-01-15 11:36:12'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20102, 0, '耗材字典备用字段10', 'basicPrductRemak10', '零售价', 1, 2, NULL, '2025-01-15 10:44:12'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20103, 0, '耗材字典备用字段11', 'basicPrductRemak11', '病案名称', 1, 2, NULL, '2025-01-15 10:44:22'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20104, 0, '耗材字典备用字段12', 'basicPrductRemak12', '医保结算', 1, 2, NULL, '2025-01-15 10:44:31'); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (20105, 0, '耗材字典备用字段13', 'basicPrductRemak13', '是否医保范围', 1, 2, NULL, '2025-01-15 10:44:40'); + +INSERT ignore INTO `basic_product_set` (`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (84, '备注字段9', 'basicPrductRemak9', 1, 1, 1, 1, '备注字段9是否必填', 142, 1); +INSERT ignore INTO `basic_product_set` (`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (85, '备注字段10', 'basicPrductRemak10', 1, 1, 1, 1, '备注字段10是否必填', 143, 1); +INSERT ignore INTO `basic_product_set` (`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (86, '备注字段11', ' \r\nbasicPrductRemak11', 1, 1, 1, 1, '备注字段11是否必填', 144, 1); +INSERT ignore INTO `basic_product_set` (`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (87, '备注字段12', ' \r\nbasicPrductRemak12', 1, 1, 1, 1, '备注字段12是否必填', 145, 1); +INSERT ignore INTO `basic_product_set` (`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (88, '备注字段13', ' \r\nbasicPrductRemak13', 1, 1, 1, 1, '备注字段13是否必填', 146, 1);