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 4fe3074f..ba2bc371 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -320,6 +320,7 @@ public class ThrProductsAddDiController { udiProductEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6()); udiProductEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7()); udiProductEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8()); + udiProductEntity.setProductsType(thrProductsAddDiResponse.getProductsType()); // udiProductEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy()); udiProductEntity.setCatalogname1(thrProductsAddDiResponse.getCatalogname1()); udiProductEntity.setCatalogname2(thrProductsAddDiResponse.getCatalogname2()); diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index a95d3973..44b7c241 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -136,7 +136,7 @@ public class ThrProductsController { if (null == thrProductsEntity) - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);; BeanUtil.copyProperties(thrProductsEntity, filterThrProductsRequest); List thrProductsEntities = thrProductsService.filterThrProducts1(filterThrProductsRequest); if (thrProductsEntities.size() == 0) { 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 2293b1b2..e36e6d8f 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java @@ -403,6 +403,12 @@ public class ThrProductsAddDiEntity { @ApiModelProperty(value = "来源类型 1新增;0选入") private Integer sourceType; + /** + * 产品类型 1:器械;2:药品 + */ + @TableField(value = "productsType") + private Integer productsType; + /** * 内部物资编码 */ diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index b567ea90..8298ff80 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -53,9 +53,8 @@ public class FilterThrProductsRequest extends ListPageRequest { private String internalMaterialCode; - /** - * 产品参数 - */ - private Integer productType = 1; + + private Integer productsType ; + private Integer productType ; } diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java index f3f7e374..c952be41 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsAddDiResponse.java @@ -61,4 +61,6 @@ public class ThrProductsAddDiResponse extends ThrProductsAddDiEntity { @TableField(value = "internalMaterialCode") @ApiModelProperty(value = "'内部物资编码'") private String internalMaterialCode; + + private Integer productsType; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 11b0b086..d18f9fa1 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -447,6 +447,7 @@ public class UdiProductServiceImpl implements UdiProductService { entity.setBhxjsl(request.getMyBhxjsl()); entity.setDiType(request.getDiType()); entity.setXjdw(request.getXjdw()); + entity.setUpdateTime(new Date()); } @Override @@ -568,6 +569,7 @@ public class UdiProductServiceImpl implements UdiProductService { } } udiProductEntity.setBhsycjsl(bhltsl); + udiProductEntity.setUpdateTime(new Date()); } } diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 70a1fec9..2c9f851d 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -185,8 +185,8 @@ FROM thr_products_add_di tdi left join basic_corp bc on tdi.customerId = bc.erpId - - AND tdi.productType = #{productType} + + AND tdi.productsType = #{productsType} AND tdi.status = #{checkStatus} diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 592474af..c1d85989 100644 --- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -83,6 +83,9 @@ AND thirdSysFk = #{thirdSysFk} + + AND productType = #{productType} + AND supName LIKE #{supName} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 8c44bf0e..0277ef23 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -1017,6 +1017,11 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'productType', 1); +CALL Pro_Temp_ColumnWork('thr_products_add_di', 'productsType', + ' tinyint NULL DEFAULT NULL COMMENT ''产品类型; 1:器械 2:药品''', + 1); + + CALL Pro_Temp_ColumnWork('io_code_temp', 'drugLink', ' tinyint NULL DEFAULT b''0''COMMENT ''药品关联关系是否存在 0不存在 1存在''', - 1); \ No newline at end of file + 1);