关联关系修改，处方下载修改

src/main/java/com/glxp/api/controller/collect/RelCodeBatchController.java

@@ -82,7 +82,7 @@ public class RelCodeBatchController extends BaseController {
     @GetMapping("/udiwms/relCode/batch/filter")
     public BaseResponse list(RelCodeBatchRequest relCodeBatchRequest, BindingResult bindingResult) {
         String customerId = getCustomerId();
-        relCodeBatchRequest.setErpId(customerId);
+//        relCodeBatchRequest.setErpId(customerId);
         List<RelCodeBatchResponse> relCodeBatchResponses = relCodeBatchService.filterList(relCodeBatchRequest);
         PageInfo<RelCodeBatchResponse> pageInfo = new PageInfo<>(relCodeBatchResponses);
         PageSimpleResponse<RelCodeBatchResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -1682,26 +1682,26 @@ public class IoCodeTempController extends BaseController {
                 // 判断货位里面是否有相同产品
                 if (orderEntity != null && StrUtil.isNotEmpty(orderEntity.getWorkPlaceQueueCode())) {
                     SysWorkplaceQueue workplaceQueue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>()
-                            .eq(SysWorkplaceQueue::getCode,orderEntity.getWorkPlaceQueueCode()));
+                            .eq(SysWorkplaceQueue::getCode, orderEntity.getWorkPlaceQueueCode()));
                     if (workplaceQueue != null) {
                         //判断槽位产品是否一样
-                        if (StrUtil.isNotBlank(workplaceQueue.getRelId())){
+                        if (StrUtil.isNotBlank(workplaceQueue.getRelId())) {
                             if (!udiRelevanceResponse.getId().equals(Long.parseLong(workplaceQueue.getRelId()))) {
 //                                orderService.deleteByBillNo(orderId);
                                 UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByRelId(workplaceQueue.getRelId());
-                                return ResultVOUtils.error(507, "上货产品不符！" + "当前取货槽已被"+ udiRelevanceResponse1.getCpmctymc() + "使用" );
+                                return ResultVOUtils.error(507, "上货产品不符！" + "当前取货槽已被" + udiRelevanceResponse1.getCpmctymc() + "使用");
                             }
                         } else {
                             //判断产品是否已经绑定其他槽位
                             SysWorkplaceQueue workplaceQueue1 = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getRelId, udiRelevanceResponse.getId()));
-                            if (workplaceQueue1 != null ) {
+                            if (workplaceQueue1 != null) {
                                 if (!orderEntity.getWorkPlaceQueueCode().equals(workplaceQueue1.getCode())) {
 //                                orderService.deleteByBillNo(orderId);
                                     return ResultVOUtils.error(507, "当前产品已绑定在" + workplaceQueue1.getCode() + "取货槽");
                                 }
                             }
                         }
-                    }else {
+                    } else {
                         return ResultVOUtils.error(500, "取货槽位不存在!");
                     }
                     if (orderEntity != null && CollUtil.isNotEmpty(codeEnttitys)) {
@@ -1715,10 +1715,10 @@ public class IoCodeTempController extends BaseController {
 //                            orderService.deleteByBillNo(orderId);
                             return ResultVOUtils.error(507, "上货产品不符！");
                     }
-                   //校验完成 获取当前槽位 绑定产品
+                    //校验完成 获取当前槽位 绑定产品
                     SysWorkplaceQueue sysWorkplaceQueue = sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>()
                             .eq(SysWorkplaceQueue::getCode, orderEntity.getWorkPlaceQueueCode()));
-                    if (sysWorkplaceQueue.getRelId() == null){
+                    if (sysWorkplaceQueue.getRelId() == null) {
                         sysWorkplaceQueue.setRelId(udiRelevanceResponse.getId() + "");
                         sysWorkplaceQueueService.updateById(sysWorkplaceQueue);
                     }
@@ -1996,11 +1996,11 @@ public class IoCodeTempController extends BaseController {
 
         List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectDrugsByNameCode(codeEnttity, unitFk);
         if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 1 && codeEnttity.getRelId() == null) {//同一个DI绑定多个产品西信息
-//            codeEnttity.setRelId(null);
+            String code = ";";
-//            codeEnttity.setStatus(ConstantStatus.ORDER_DETAIL_DI_MUTI);
+            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceEntities) {
-//            codeTempService.insert(codeEnttity);
+                code = code + udiRelevanceResponse.getMainId() + ";";
-//            codeEnttity = codeTempService.findByUnique(codeEnttity.getOrderId(), codeEnttity.getCode());
+            }
-            BaseResponse baseResponse = ResultVOUtils.error(502, "DI绑定多个产品ID,请指定对应产品");
+            BaseResponse baseResponse = ResultVOUtils.error(502, "层级编码绑定多个第三方产品ID" + code.substring(1) + ",请检查后重试");
             baseResponse.setData(codeEnttity);
             return baseResponse;
         } else if (udiRelevanceEntities == null || udiRelevanceEntities.size() == 0) {//未找到产品信息，一般不会出现

src/main/java/com/glxp/api/service/collect/down/YPCF002Download.java

@@ -36,6 +36,7 @@ public class YPCF002Download implements IDownload {
         getSickPrescribeRequest.setStartTime(collectOrderRequest.getStartTime());
         getSickPrescribeRequest.setEndTime(collectOrderRequest.getEndTime());
         getSickPrescribeRequest.setKey(collectOrderRequest.getKeyWords());
+        getSickPrescribeRequest.setBusType(collectOrderRequest.getBusType());
         while (true) {
             getSickPrescribeRequest.setPage(page);
             BaseResponse<PageSimpleResponse<IoCollectOrder>> baseResponse = erpBasicClient.getPrescribeV2(getSickPrescribeRequest);
@@ -44,7 +45,7 @@ public class YPCF002Download implements IDownload {
 
             if (baseResponse.getCode() == 20000) {
                 List<IoCollectOrder> list = baseResponse.getData().getList();
-                if (list == null){
+                if (list == null) {
                     return ResultVOUtils.error(500, "未查到此业务单据");
                 }
                 thrOrderDownload.importThrOrder(list, collectOrderRequest);

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -2220,7 +2220,11 @@ public class HeartService {
             for (RelCodeBatch entity : spsSyncDrugDataTaskResponse.getRelCodeBatches()) {
                 entity.setUpdateTime(null);
             }
-            boolean b = relCodeBatchMapper.insertBatch(spsSyncDrugDataTaskResponse.getRelCodeBatches());
+            try {
+                boolean b = relCodeBatchMapper.insertBatch(spsSyncDrugDataTaskResponse.getRelCodeBatches());
+            } catch (Exception e) {
+            }
+
         }
         if (CollectionUtil.isNotEmpty(spsSyncDrugDataTaskResponse.getRelCodeDetails())) {
             boolean b = relCodeDetailMapper.replaceBatchs(spsSyncDrugDataTaskResponse.getRelCodeDetails());

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -115,7 +115,6 @@
                basic_products.majorType,
                basic_products.physicType,
                basic_products.medicareType,
-               basic_products.medicareType,
                basic_products.price as productPrice,
                basic_products.indate,
                basic_products.storageCondition,
@@ -298,6 +297,7 @@
                 or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%'))
             </if>
         </where>
+        GROUP BY basic_udirel.id
         ORDER BY company_product_relevance.updateTime DESC
     </select>