feat: 0531增加是否需要扫码字段

dev_ksck_axxyy
chenhc 1 year ago
parent 1b232af9b6
commit 8388ad0412

@ -249,6 +249,7 @@ public class UdiRelevanceController extends BaseController {
UdiRelevanceResponse udiRelevanceResponse = new UdiRelevanceResponse();
BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse);
BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse);
udiRelevanceResponse.setFlbm(udiProductEntity.getFlbm());
udiRelevanceResponses.add(udiRelevanceResponse);
}
}
@ -367,6 +368,8 @@ public class UdiRelevanceController extends BaseController {
udiProductEntity.setCatalogname2(udiRelevanceSaveRequest.getCatalogname2());
udiProductEntity.setCatalogname3(udiRelevanceSaveRequest.getCatalogname3());
udiProductEntity.setMatrial(udiRelevanceSaveRequest.getMatrial());
udiProductEntity.setRequireScanCode(udiRelevanceSaveRequest.getRequireScanCode());
udiProductEntity.setFlbm(udiRelevanceSaveRequest.getFlbm());
// udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
if (StrUtil.isNotEmpty(udiRelevanceSaveRequest.getOriginUuid())) {
udiProductEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);

@ -30,6 +30,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.CustomerInfoService;
import com.glxp.api.service.basic.*;
import com.glxp.api.service.system.ClassifyCodeService;
import com.glxp.api.service.system.CompanyService;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.SupplementVailUtil;
@ -80,6 +81,8 @@ public class UdiRlSupController extends BaseController {
private CustomerInfoService customerInfoService;
@Resource
private IBasicBussinessTypeService basicBussinessTypeService;
@Resource
private com.glxp.api.service.system.ClassifyCodeService classifyCodeService;
@AuthRuleAnnotation("")
@GetMapping("/sale/info/company/product/relevance/filter")
@ -270,6 +273,8 @@ public class UdiRlSupController extends BaseController {
udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
UdiProductEntity udiProductEntity = new UdiProductEntity();
BeanUtil.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiProductEntity);
//处理是否需要扫码字段
classifyCodeService.updateRequireScanCode(udiProductEntity);
udiProductEntity.setId(IdUtil.getSnowflakeNextId());
udiProductService.insertUdiInfo(udiProductEntity);
return ResultVOUtils.success("选入成功!");

@ -160,5 +160,7 @@ public class UdiProductEntity {
@ApiModelProperty(value = "三级分类名称(部位、功能、品种)")
private Integer catalogCode3;
private Integer requireScanCode;
}

@ -10,5 +10,6 @@ public class ClassifyCodeEntity {
private String name;
private String level;
private String qxlb;
private Integer requireScanCode;
}

@ -64,4 +64,8 @@ public class SupplementRequest {
private String matrial;
private String catalogcode;
private String flbm;
private String requireScanCode;
}

@ -144,4 +144,6 @@ public class UdiRelevanceSaveRequest {
private String matrial;
private String catalogcode;
private Integer requireScanCode;
}

@ -175,6 +175,8 @@ public class UdiRelevanceResponse {
@ApiModelProperty(value="耗材材质")
private String matrial;
private Integer requireScanCode;
public int getBhzxxsbzsl() {
if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {

@ -139,4 +139,6 @@ public class UdiRlSupResponse {
* 12.
*/
private Integer hcType;
private Integer requireScanCode;
}

@ -1,6 +1,7 @@
package com.glxp.api.service.system;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.system.ClassifyCodeEntity;
import com.glxp.api.req.system.FilterClassifyCodeRequest;
@ -12,4 +13,5 @@ public interface ClassifyCodeService {
ClassifyCodeEntity findByCode(String code);
void updateRequireScanCode(UdiProductEntity udiProductEntity);
}

@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.glxp.api.dao.system.ClassifyCodeDao;
import com.glxp.api.entity.basic.UdiProductEntity;
import com.glxp.api.entity.system.ClassifyCodeEntity;
import com.glxp.api.req.system.FilterClassifyCodeRequest;
import com.glxp.api.service.system.ClassifyCodeService;
@ -54,4 +55,18 @@ public class ClassifyCodeServiceImpl implements ClassifyCodeService {
}
return null;
}
@Override
public void updateRequireScanCode(UdiProductEntity udiProductEntity) {
udiProductEntity.setRequireScanCode(0);
String flbm = udiProductEntity.getFlbm();
if (StrUtil.isNotEmpty(flbm)){
FilterClassifyCodeRequest filterClassifyCodeRequest = new FilterClassifyCodeRequest();
filterClassifyCodeRequest.setCode(flbm);
List<ClassifyCodeEntity> classifyCodeEntities = classifyCodeDao.filteClassifyCode(filterClassifyCodeRequest);
if (classifyCodeEntities.size() > 0){
udiProductEntity.setRequireScanCode(classifyCodeEntities.get(0).getRequireScanCode());
}
}
}
}

@ -742,10 +742,12 @@
<if test="matrial != null">
matrial=#{matrial},
</if>
<if test="remark != null">
remark=#{remark},
</if>
<if test="requireScanCode != null">
requireScanCode=#{requireScanCode},
</if>
</trim>
where uuid = #{uuid}
</update>

@ -470,7 +470,9 @@
basic_products.catalogname1,
basic_products.catalogname2,
basic_products.catalogname3,
basic_products.matrial
basic_products.matrial,
basic_products.requireScanCode
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid

@ -113,6 +113,7 @@
basic_products.mjfs,
basic_products.categoryName,
basic_products.cphhhbh,
basic_products.requireScanCode,
basic_udirel.hcType,
basic_udirel.groupBuy,
basic_udirel.id as uid,

@ -6,23 +6,25 @@
<select id="filteClassifyCode" parameterType="com.glxp.api.req.system.FilterClassifyCodeRequest"
resultType="com.glxp.api.entity.system.ClassifyCodeEntity">
SELECT * FROM product_classify
SELECT product_classify.*, if(tmpc.materialCode is null,0,1) as requireScanCode
FROM product_classify
LEFT JOIN thr_medical_product_category tmpc ON tmpc.materialCode = product_classify.code
<where>
<if test="code != null and code != ''">
and code = #{code}
and product_classify.code = #{code}
</if>
<if test="name != null and name != ''">
and `name` = #{name}
and product_classify.`name` = #{name}
</if>
<if test="key != null and key != ''">
and
( `name` like concat('%',#{key},'%') or `code` like concat('%',#{key},'%'))
( product_classify.`name` like concat('%',#{key},'%') or product_classify.`code` like concat('%',#{key},'%'))
</if>
<if test="inFilterList!=null">
and `code` in
and product_classify.`code` in
<foreach collection="inFilterList" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
@ -30,4 +32,4 @@
</where>
</select>
</mapper>
</mapper>

@ -589,3 +589,20 @@ CREATE TABLE IF NOT EXISTS `device_upkeep_detail_item`
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci COMMENT = '设备保养项目'
ROW_FORMAT = Dynamic;
CREATE TABLE IF NOT EXISTS `thr_medical_product_category` (
`id` int NOT NULL AUTO_INCREMENT,
`materialId` int DEFAULT NULL COMMENT '物资分类编码',
`materialName` varchar(255) DEFAULT NULL COMMENT '物资分类的名称',
`firstLevelCategoryCode` int DEFAULT NULL COMMENT '一级分类的编码',
`firstLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '一级分类的名称',
`secondLevelCategoryCode` int DEFAULT NULL COMMENT '二级分类的编码',
`secondLevelCategoryName` varchar(255) DEFAULT NULL COMMENT '二级分类的名称',
`managementType` int DEFAULT NULL COMMENT '管理类别 ',
`materialCode` varchar(255) DEFAULT NULL COMMENT '标识',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=160 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='医疗产品分类标识';
CALL Pro_Temp_ColumnWork('basic_products', 'requireScanCode',
'bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否需要扫码 1是0否''',
1);

Loading…
Cancel
Save