From 918ea1a18f18586d0c999dc93facd2cd8724ad1d Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 20 Dec 2022 14:24:40 +0800 Subject: [PATCH] =?UTF-8?q?DI=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 28 ++++++++++--------- .../basic/UdiRelevanceController.java | 4 --- .../service/basic/UdiRelevanceService.java | 1 + 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java index 5937624..e62da7b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiContrastController.java @@ -152,20 +152,22 @@ public class UdiContrastController { } List 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(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new 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(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new 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(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new 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(); - BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest); + UdiRelevanceRequest udiRelevanceRequest = new UdiRelevanceRequest(); + BeanUtils.copyProperties(udiRelevanceEntity, udiRelevanceRequest); udiRelevanceService.updateUdiRelevance(udiRelevanceRequest); insertUdiInfos(udiInfoEntities); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java index 4f46f5c..4b786b6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java +++ b/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("更新成功"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java index 79f9065..a63c0d0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java +++ b/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 id);