药品选入bug

单据错误信息字段更改

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -281,11 +281,31 @@ public class UdiContrastService {
                 ybHcflDetailFilterRequest.setLimit(1);
                 ybHcflDetailFilterRequest.setPage(1);
                 ybHcflDetailFilterRequest.setGoodsCode(thrProductsEntity.getYbbm());
-                List<YbDrug> list = ybDrugService.getList(ybHcflDetailFilterRequest);
-
 
                 UdiProductEntity udiProductEntity = new UdiProductEntity();
                 BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
+                udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
+                udiProductEntity.setDiType(1);
+                udiProductEntity.setScbssfbhph("是");
+                udiProductEntity.setScbssfbhscrq("是");
+                udiProductEntity.setScbssfbhsxrq("是");
+                udiProductEntity.setScbssfbhxlh("否");
+                udiProductEntity.setProductsType(thrProductsEntity.getProductType());
+                udiProductEntity.setRequireScanCode(1);
+                udiProductEntity.setMajorStatus(1);
+                udiProductEntity.setPhysicType(3);
+                udiProductEntity.setCpmctymc(thrProductsEntity.getName());
+                udiProductEntity.setBzgg(thrProductsEntity.getSpec() + "/" + thrProductsEntity.getMeasname());
+                udiProductEntity.setMeasname(thrProductsEntity.getMeasname());
+                udiProductEntity.setNameCode(thrProductsEntity.getCode());
+
+                if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
+                    udiProductEntity.setPrice("0.00");
+                }
+                udiProductEntity.setUpdateTime(new Date());
+                udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
+
+                List<YbDrug> list = ybDrugService.getList(ybHcflDetailFilterRequest);
                 if (list != null && list.size() > 0) {
                     YbDrug ybDrug = list.get(0);
                     udiProductEntity.setId(IdUtil.getSnowflakeNextId());
@@ -310,21 +330,7 @@ public class UdiContrastService {
                     //商品条码 essentialDrugMarkName sptm
 //                    udiProductEntity.setSptm(ybDrug.getBusinessLicense());
                     udiProductEntity.setPrepnUnit(ybDrug.getRealityMedicinemodel());
-                    udiProductEntity.setUuid(udiRelevanceEntity.getUuid());
-                    udiProductEntity.setDiType(1);
-                    udiProductEntity.setScbssfbhph("是");
-                    udiProductEntity.setScbssfbhscrq("是");
-                    udiProductEntity.setScbssfbhsxrq("是");
-                    udiProductEntity.setScbssfbhxlh("否");
-                    udiProductEntity.setProductsType(thrProductsEntity.getProductType());
-                    udiProductEntity.setRequireScanCode(1);
-                    udiProductEntity.setMajorStatus(1);
-                    udiProductEntity.setPhysicType(3);
-                    if (StrUtil.isEmpty(udiProductEntity.getPrice())) {
-                        udiProductEntity.setPrice("0.00");
-                    }
-                    udiProductEntity.setUpdateTime(new Date());
-                    udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
+
                     List<ThirdAliDrug> thirdAliDrugList = thirdAliDrugService.findByByApproved(ybDrug.getApprovalCode());
                     if (CollUtil.isNotEmpty(thirdAliDrugList)) {
                         for (int i = 0; i < thirdAliDrugList.size(); i++) {
@@ -353,7 +359,10 @@ public class UdiContrastService {
                     } else {
                         udiProductService.insertUdiInfo(udiProductEntity);
                     }
+                } else {
+                    udiProductService.insertUdiInfo(udiProductEntity);
                 }
+
 //                setLevel(udiRelevanceEntity.getUuid());
                 UdiProductEntity byUuid = udiProductService.findByUuid(udiRelevanceEntity.getUuid());
                 udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, byUuid);

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -148,7 +148,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
         UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(relId);
         List<UdiProductEntity> udiInfoEntities = findByUuids(udiRelevanceEntity.getUuid());
         List<DiLevelResponse> diLevelResponses = new ArrayList<>();
-        if (CollUtil.isNotEmpty(udiInfoEntities)) {
+        if (CollUtil.isNotEmpty(udiInfoEntities) && StrUtil.isNotEmpty(udiInfoEntities.get(0).getPackLevel())) {
 
             Map<String, List<UdiProductEntity>> groupedByLevel = udiInfoEntities.stream()
                     .collect(Collectors.groupingBy(UdiProductEntity::getPackLevel));

src/main/resources/schemas/schema_v2.4.sql

@@ -4840,3 +4840,10 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'startUploadHour',
 CALL Pro_Temp_ColumnWork('auth_company', 'refEntId',
                          '   varchar(255) DEFAULT NULL COMMENT ''接口调用企业的唯一标识''',
                          1);
+
+ALTER TABLE io_collect_order_origin MODIFY errorMsg text;
+ALTER TABLE io_collect_order MODIFY errorMsg text;
+ALTER TABLE io_collect_order_backup MODIFY errorMsg text;
+
+
+