Merge remote-tracking branch 'origin/busUser' into busUser

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java

@@ -152,20 +152,22 @@ public class UdiContrastController {
         }
         List<UdiInfoEntity> udiInfoEntities = udiDlHttpClient.getUdiByUuid(combineRequest.getKeys().get(0));
 
-        udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
+//        udiInfoService.deleteByUuid(udiRelevanceEntity.getUuid());
         for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
             udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
             udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
-
+            UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-
+            UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust();
+            BeanUtils.copyProperties(udiInfoEntity, udiInfoReqeust);
+            udiInfoService.updateUdiInfo(udiInfoReqeust);
         }
         udiInfoService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
-//        udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
+        udiRelevanceEntity.setUuid(udiInfoEntities.get(0).getUuid());
         String time = DateUtil.formatDateTime(new Date());
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
-        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
         udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         return ResultVOUtils.success("切换成功！");
     }
@@ -192,8 +194,8 @@ public class UdiContrastController {
             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
         } else {
             try {
-                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
-                BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
                 udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
             } catch (Exception e) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
@@ -246,8 +248,8 @@ public class UdiContrastController {
             udiRelevanceEntity.setPrice("");
             udiRelevanceEntity.setManufactory("");
             udiRelevanceEntity.setMeasname("");
-            UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+            UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
-            BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+            BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
             udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         } catch (Exception e) {
             e.printStackTrace();
@@ -362,7 +364,7 @@ public class UdiContrastController {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+        UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust();
         BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
         udiInfoService.insertUdiInfo(udiInfoRequest);
     }
@@ -374,8 +376,8 @@ public class UdiContrastController {
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest();
-        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest);
         udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         insertUdiInfos(udiInfoEntities);
     }

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -301,9 +301,6 @@ public class UdiRelevanceController {
                 companyProductRelevanceService.updateCompanyProductRelevance(companyProductRelevanceEntity);
             }
         }
-
-
-
         UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
         udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
         udiInfoEntity.setNameCode(udiRelevanceResponse.getNameCode());
@@ -327,7 +324,6 @@ public class UdiRelevanceController {
         if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
             udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
         }
-
         udiInfoEntity.setUuid(udiRelevanceResponse.getUuid());
         udiInfoService.updateUdiInfo(udiInfoEntity);
         return ResultVOUtils.success("更新成功");

api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java

@@ -57,6 +57,7 @@ public interface UdiRelevanceService {
 
     boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
 
+
     boolean deleteById(String id);
 
     boolean deleteByIds(List<String> id);