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 74c3c890..bd9ac6d2 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -710,7 +710,7 @@ public class UdiRelevanceController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateById") - @Log(title = "单据管理", businessType = BusinessType.UPDATE) + @Log(title = "入院物资维护", businessType = BusinessType.UPDATE) public BaseResponse updateById(@RequestBody UdiProductEntity udiProductEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -720,6 +720,8 @@ public class UdiRelevanceController extends BaseController { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(udiProductEntity.getUid()); udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy())); + udiRelevanceEntity.setPurType(udiProductEntity.getPurType()); + udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType()); boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); if (udiProductEntity.getRelSupId() != null) { UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); 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 b854286a..ebea1168 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -227,6 +227,7 @@ public class ThrProductsAddDiController { udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType()); + udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType()); 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 e712685a..b7965637 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -1,5 +1,6 @@ package com.glxp.api.entity.basic; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; @@ -98,5 +99,6 @@ public class UdiProductEntity { private Boolean groupBuy; private Long uid; - + private Integer purType; + private Integer attributeType; } 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 259d0ff5..cbcf1692 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -101,6 +101,14 @@ public class UdiRelevanceEntity { */ @TableField(value = "purType") private Integer purType; + + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + @TableField(value = "attributeType") + private Integer attributeType; + + /** * 是否允许多次使用出库 */ 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 d3965551..ebfa2ed1 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -290,7 +290,11 @@ public class ThrProductsAddDiEntity { @ApiModelProperty(value = "采购类型") private Integer purType; - + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + @TableField(value = "attributeType") + private Integer attributeType; /** * 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 f92a4328..f4d22664 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -54,6 +55,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 0cf59f4b..b154ca3b 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java @@ -49,6 +49,10 @@ public class FilterUdiInfoRequest extends ListPageRequest { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 f0feefe0..95680ebf 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -50,6 +50,10 @@ public class FilterUdiRelRequest extends ListPageRequest { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 495ee706..d380cae3 100644 --- a/src/main/java/com/glxp/api/req/basic/SupplementRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SupplementRequest.java @@ -23,4 +23,8 @@ public class SupplementRequest { private String price; private Boolean groupBuy; private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; } 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 afa3637c..162c1616 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -35,6 +35,10 @@ public class UdiRelevanceRequest { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 b8c9c0a6..4de45b64 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -26,6 +26,10 @@ public class UdiRelevanceSaveRequest { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 3e4a8adf..2b338877 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java @@ -51,6 +51,10 @@ public class AddThrDiProductsRequest { private String deviceRecordKey; private Boolean groupBuy; private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; } 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 3906556a..81b289a4 100644 --- a/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java @@ -62,6 +62,10 @@ public class CompanyProductRelevanceResponse { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 153d1fdb..d4690b5e 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -26,6 +26,10 @@ public class UdiRelevanceResponse { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; private Boolean useMuti; private Integer useNum; private String supName; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java index 2179129c..ef8c1296 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java @@ -63,7 +63,10 @@ public class UdiRlSupResponse { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; - + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; private String scbssfbhph; private String scbssfbhxlh; private String scbssfbhscrq; 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 0e02a96a..feed0d65 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -64,6 +64,10 @@ public class UdiInfoResponse { * 采购类型 1:入账产品；2：预验收产品；3：寄售产品 */ private Integer purType; + /** + * 产品属性类型 0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费 + */ + private Integer attributeType; 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 8dbf2f15..f1475580 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 @@ -132,7 +132,7 @@ public class ThrProductsAddDiService extends ServiceImpl purType=#{purType}, + + attributeType=#{attributeType}, + + useMuti=#{useMuti}, @@ -1171,7 +1175,7 @@ into basic_udirel (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable, isLock, - lockStatus, isAdavence, purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, + lockStatus, isAdavence, purType, attributeType,useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser, updateUser, remark, useExpireTime, dispatch, groupBuy, needCert) @@ -1191,7 +1195,7 @@ #{item.isDisable}, #{item.isLock}, #{item.lockStatus}, - #{item.isAdavence}, #{item.purType}, + #{item.isAdavence}, #{item.purType},#{item.attributeType}, #{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 bc88ef04..c9dc021e 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.purType,basic_udirel.attributeType, 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 b84bb9ff..42211d5a 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) + qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType) 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.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType}) @@ -130,6 +130,9 @@ `purType`=#{purType}, + + `attributeType`=#{attributeType}, + WHERE id = #{id} diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 476878a7..87948621 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -674,8 +674,10 @@ 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('thr_products_add_di', 'purType', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('thr_products_add_di', 'attributeType', 'tinyint', 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);