From be9a844ebf9e46c030ae741192a8fcfb675b1a78 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 8 Mar 2024 15:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=80=97=E6=9D=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/UdiRelevanceController.java | 1 + .../thrsys/ThrProductsAddDiController.java | 1 + .../glxp/api/entity/basic/UdiProductEntity.java | 4 ++++ .../glxp/api/entity/basic/UdiRelevanceEntity.java | 6 ++++++ .../api/entity/thrsys/ThrProductsAddDiEntity.java | 8 ++++++++ .../req/basic/CompanyProductRelevanceRequest.java | 4 ++++ .../glxp/api/req/basic/FilterUdiInfoRequest.java | 4 ++++ .../glxp/api/req/basic/FilterUdiRelRequest.java | 4 ++++ .../com/glxp/api/req/basic/SupplementRequest.java | 4 ++++ .../glxp/api/req/basic/UdiRelevanceRequest.java | 4 ++++ .../api/req/basic/UdiRelevanceSaveRequest.java | 4 ++++ .../api/req/thrsys/AddThrDiProductsRequest.java | 4 ++++ .../basic/CompanyProductRelevanceResponse.java | 4 ++++ .../glxp/api/res/basic/UdiRelevanceResponse.java | 8 ++++++++ .../com/glxp/api/res/thrsys/UdiInfoResponse.java | 4 ++++ .../thrsys/impl/ThrProductsAddDiService.java | 3 ++- .../com/glxp/api/util/SupplementVailUtil.java | 13 +++++++++++++ .../mapper/basic/CompanyProductRelevanceDao.xml | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 15 +++++++++------ .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- .../mybatis/mapper/thrsys/ThrProductsAddDiDao.xml | 8 ++++++-- src/main/resources/schemas/schema_v2.3.sql | 12 +++++++++++- 22 files changed, 107 insertions(+), 12 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 561ec873..32ec631f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -722,6 +722,7 @@ public class UdiRelevanceController extends BaseController { udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy())); udiRelevanceEntity.setPurType(udiProductEntity.getPurType()); udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType()); + udiRelevanceEntity.setHcType(udiProductEntity.getHcType()); udiRelevanceEntity.setUpdateTime(new Date()); boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); if (udiProductEntity.getRelSupId() != null) { diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index ebea1168..5dc732ff 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -228,6 +228,7 @@ public class ThrProductsAddDiController { udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType()); udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType()); + udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType()); udiProductEntity.setNameCode(null); udiProductService.updateUdiInfoByUuid(udiProductEntity); UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index b7965637..e7490de5 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -101,4 +101,8 @@ public class UdiProductEntity { private Long uid; private Integer purType; private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 834b96bf..5191529d 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -108,6 +108,12 @@ public class UdiRelevanceEntity { @TableField(value = "attributeType") private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + @TableField(value = "hcType") + private Integer hcType; + /** * 是否允许多次使用出库 */ diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java index ebfa2ed1..8a9aeed7 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -295,6 +295,14 @@ public class ThrProductsAddDiEntity { */ @TableField(value = "attributeType") private Integer attributeType; + + + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + @TableField(value = "attributeType") + private Integer hcType; + /** * 1第三方2自增 */ diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index f4d22664..ddf5b760 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -59,6 +59,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java index b154ca3b..71c9edbc 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -53,6 +53,10 @@ public class FilterUdiInfoRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 95680ebf..3be41e78 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -54,6 +54,10 @@ public class FilterUdiRelRequest extends ListPageRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String corpId; private String billType; diff --git a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java index d380cae3..6241a2df 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -27,4 +27,8 @@ public class SupplementRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 162c1616..41260a43 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -39,6 +39,10 @@ public class UdiRelevanceRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String supName; private String originUuid; private String price; 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 4de45b64..3b106013 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -30,6 +30,10 @@ public class UdiRelevanceSaveRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java index 2b338877..421530da 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java @@ -55,6 +55,10 @@ public class AddThrDiProductsRequest { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; } diff --git a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java index 81b289a4..0146beff 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -66,6 +66,10 @@ public class CompanyProductRelevanceResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private String scbssfbhph; private String scbssfbhxlh; private String scbssfbhscrq; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index d4690b5e..d9323b18 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -30,6 +30,14 @@ public class UdiRelevanceResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + + + /** + * 耗材分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; + + private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index feed0d65..5981a78a 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -68,6 +68,10 @@ public class UdiInfoResponse { * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 */ private Integer attributeType; + /** + * 产品分类高值 ：1：高值耗材；2.普通耗材 + */ + private Integer hcType; private boolean isDisable; private boolean useMuti; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index f1475580..54e5d78d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -133,6 +133,7 @@ public class ThrProductsAddDiService extends ServiceImpl attributeType=#{attributeType}, + + hcType=#{hcType}, + useMuti=#{useMuti}, @@ -1175,7 +1178,7 @@ into basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, purType, attributeType,useMuti, useNum, supName, createTime, updateTime, modifyTime, + lockStatus, isAdavence, purType, attributeType,hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) @@ -1195,7 +1198,7 @@ #{item.isDisable}, #{item.isLock}, #{item.lockStatus}, - #{item.isAdavence}, #{item.purType},#{item.attributeType}, + #{item.isAdavence}, #{item.purType},#{item.attributeType},#{item.hcType}, #{item.useMuti}, #{item.useNum}, #{item.supName}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index c9dc021e..3912e75d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -46,7 +46,7 @@ basic_udirel.lockStatus, basic_udirel.mainId, basic_udirel.isAdavence, - basic_udirel.purType,basic_udirel.attributeType, + basic_udirel.purType,basic_udirel.attributeType,basic_udirel.hcType, basic_udirel.lowStockNum, basic_udirel.overStockNum, basic_udirel.recentDateTime, diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 42211d5a..98688a9a 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -16,7 +16,7 @@ qxlb, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, updateTime, supName, model, `standard`, - qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType) + qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType) values (#{item.uuid}, @@ -42,7 +42,7 @@ , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh} , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model} , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type}, - #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType}) + #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType}) @@ -133,6 +133,10 @@ `attributeType`=#{attributeType}, + + `hcType`=#{hcType}, + + WHERE id = #{id} diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index bdb88cea..592999c9 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -675,13 +675,23 @@ CALL Pro_Temp_ColumnWork('sys_menu_help', 'urlPath', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'attributeType', 'tinyint', 1); - +CALL Pro_Temp_ColumnWork('basic_udirel', 'hcType', 'tinyint NULL DEFAULT NULL COMMENT ''产品分类高值 ：1：高值耗材；2.普通耗材''', 1); CALL Pro_Temp_ColumnWork('thr_products_add_di', 'purType', 'tinyint', 1); CALL Pro_Temp_ColumnWork('thr_products_add_di', 'attributeType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_products_add_di', 'hcType', + 'tinyint NULL DEFAULT NULL COMMENT ''产品分类高值 ：1：高值耗材；2.普通耗材''', 1); INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, `sort`, `localEdit`) VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1); +INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, + `sort`, `localEdit`) +VALUES (44, '产品属性', 'attributeType', 1, 1, 1, 0, '产品属性是否必填字段', 65, 1); + +INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`, + `sort`, `localEdit`) +VALUES (45, '耗材分类', 'hcType', 1, 1, 1, 0, '耗材分类是否必填字段', 65, 1); + CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'splitOrder', 'tinyint', 1);