From 90b5b2363d5f40b90443f8d9539c568d26f06da1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 20 Dec 2022 21:52:18 +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=EF=BC=8C=E9=A6=96?= =?UTF-8?q?=E8=90=A5=E8=B5=84=E8=B4=A8=E7=9B=B8=E5=85=B3bug=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadController.java | 3 + .../basic/SpsSyncDownloadService.java | 34 ++++--- .../basic/SpsSyncExportStatusController.java | 1 + .../basic/SpsSyncUploadController.java | 88 ++++++++++++++----- .../basic/UdiContrastController.java | 34 ++++--- .../sale/admin/dao/purchase/SupCertDao.java | 2 + .../admin/dao/purchase/SupCertSetDao.java | 3 + .../sale/admin/req/basic/UdiInfoReqeust.java | 86 ------------------ .../req/purchase/FilterCertSetsRequest.java | 1 + .../admin/res/basic/SpsSyncDataResponse.java | 6 +- .../admin/res/basic/SupCertSetResponse.java | 27 ++++++ .../service/purchase/SupCertService.java | 6 ++ .../service/purchase/SupCertSetService.java | 2 + .../purchase/impl/SupCertServiceImpl.java | 34 +++++++ .../purchase/impl/SupCertSetServiceImpl.java | 5 ++ .../thread/BasicBackUpdateProductService.java | 1 + .../main/resources/application-dev.properties | 2 +- .../mybatis/mapper/purchase/SupCertDao.xml | 18 ++++ .../mybatis/mapper/purchase/SupCertSetDao.xml | 12 ++- .../mybatis/mapper/purchase/SupCompanyDao.xml | 2 +- .../mapper/purchase/SupManufacturerDao.xml | 2 +- .../mybatis/mapper/purchase/SupProductDao.xml | 2 +- 22 files changed, 224 insertions(+), 147 deletions(-) delete mode 100644 api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/basic/SupCertSetResponse.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java index d4b2519..a6fdff8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadController.java @@ -93,6 +93,9 @@ public class SpsSyncDownloadController { if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertEntities())) logs = logs + "其他资质证书：" + baseResponse.getData().getSupCertEntities().size() + "条\n"; + if (CollUtil.isNotEmpty(baseResponse.getData().getSupCertSetEntities())) + logs = logs + "证书设置：" + baseResponse.getData().getSupCertSetEntities().size() + "条\n"; + basicExportStatusEntity.setRemark(logs); basicExportService.updateExportStatus(basicExportStatusEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index dacec98..6dbe33b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -14,10 +14,7 @@ import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity; -import com.glxp.sale.admin.entity.purchase.SupCertEntity; -import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; -import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.entity.purchase.*; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.entity.thrsys.*; import com.glxp.sale.admin.req.auth.AuthAdminQueryRequest; @@ -27,15 +24,14 @@ import com.glxp.sale.admin.req.info.FilterCompanyProductRelevanceRequest; import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inventory.FilterInvUserRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; import com.glxp.sale.admin.req.purchase.FilterPoductRequest; import com.glxp.sale.admin.req.purchase.FilterSupCompanyRequest; import com.glxp.sale.admin.req.purchase.FilterSupManufacturerRequest; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.*; -import com.glxp.sale.admin.res.basic.SpSyncUdiResponse; -import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; -import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; -import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.sale.admin.res.basic.*; +import com.glxp.sale.admin.res.inout.WarehouseResponse; import com.glxp.sale.admin.res.param.SyncDataSetResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.DeptService; @@ -46,10 +42,7 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SyncDataSetService; -import com.glxp.sale.admin.service.purchase.SupCertService; -import com.glxp.sale.admin.service.purchase.SupCompanyService; -import com.glxp.sale.admin.service.purchase.SupManufacturerService; -import com.glxp.sale.admin.service.purchase.SupProductService; +import com.glxp.sale.admin.service.purchase.*; import com.glxp.sale.admin.service.receipt.ProductInfoService; import com.glxp.sale.admin.service.thrsys.*; import com.glxp.sale.admin.util.BeanUtils; @@ -118,6 +111,8 @@ public class SpsSyncDownloadService { @Resource SupProductService supProductService; @Resource + SupCertSetService supCertSetService; + @Resource SupCertService supCertService; @Resource private BasicExportTimeService basicExportTimeService; @@ -348,6 +343,20 @@ public class SpsSyncDownloadService { } syncDataResponse.setSupCertEntities(supCertEntityList); + //企业证书设置 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, filterCertSetsRequest); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + if (CollUtil.isNotEmpty(supCertSetEntities)) { + List temps = supCertSetService.filterCertSets(new FilterCertSetsRequest()); + List supCertSetResponses = temps.stream().map(item -> + { + SupCertSetResponse supCertSetResponse = new SupCertSetResponse(); + BeanUtils.copyProperties(item, supCertSetResponse); + return supCertSetResponse; + }).collect(Collectors.toList()); + syncDataResponse.setSupCertSetEntities(supCertSetResponses); + } return ResultVOUtils.success(syncDataResponse); } @@ -616,6 +625,7 @@ public class SpsSyncDownloadService { || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities()) ) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA); basicExportTimeService.updateExportStatus(basicExportStatusTimeEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java index 6571198..9aefbe7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncExportStatusController.java @@ -197,6 +197,7 @@ public class SpsSyncExportStatusController { || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities()) ) { BasicExportStatusTimeEntity basicExportStatusTimeEntity = basicExportTimeService.findByType(ConstantStatus.SYNC_BASIC_DATA); if (basicExportStatusTimeEntity != null) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 25b6e41..3767fbf 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -21,11 +21,14 @@ import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; +import com.glxp.sale.admin.entity.purchase.*; import com.glxp.sale.admin.entity.thrsys.*; import com.glxp.sale.admin.req.basic.UdiInfoRequest; +import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; import com.glxp.sale.admin.res.basic.SpsSyncBusResponse; import com.glxp.sale.admin.res.basic.SpsSyncDataResponse; import com.glxp.sale.admin.res.basic.SpsSyncOrderResponse; +import com.glxp.sale.admin.res.basic.SupCertSetResponse; import com.glxp.sale.admin.service.basic.BasicDownloadService; import com.glxp.sale.admin.service.basic.BussinessChangeTypeService; import com.glxp.sale.admin.service.basic.EntrustReceService; @@ -34,6 +37,7 @@ import com.glxp.sale.admin.service.inventory.InvBusUserService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; +import com.glxp.sale.admin.service.purchase.*; import com.glxp.sale.admin.service.thrsys.ThrSubInvWarehouseService; import com.glxp.sale.admin.thread.BasicBackUpdateProductService; import com.glxp.sale.admin.util.BeanUtils; @@ -84,6 +88,17 @@ public class SpsSyncUploadController { @Resource InvBusUserService invBusUserService; + @Resource + SupCompanyService supCompanyService; + @Resource + SupManufacturerService supManufacturerService; + @Resource + SupProductService supProductService; + @Resource + SupCertService supCertService; + @Resource + SupCertSetService supCertSetService; + @PostMapping("sps/sync/basic/upload") public BaseResponse findProductInfo(@RequestBody SpsSyncDataResponse syncDataResponse) { @@ -215,8 +230,8 @@ public class SpsSyncUploadController { List udiInfoEntities = syncDataResponse.getUdiInfoEntities(); UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class); for (UdiInfoEntity udiInfoEntity : udiInfoEntities) { - UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); - BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); + BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); mapper.insertUdiInfo(udiInfoRequest); } batchSession.commit(); @@ -276,22 +291,6 @@ public class SpsSyncUploadController { e.printStackTrace(); } } -// -// //仓库用户表 -// if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseUserEntities())) { -// for (WarehouseUserEntity warehouseUserEntity : syncDataResponse.getWarehouseUserEntities()) { -// warehouseUserDao.insertOrUpdate(warehouseUserEntity); -// } -// remark.append("仓库用户：").append(syncDataResponse.getWarehouseUserEntities().size()).append("条\n"); -// } -// -// //仓库单据类型表 -// if (CollUtil.isNotEmpty(syncDataResponse.getWarehouseBussinessTypeEntities())) { -// for (WarehouseBussinessTypeEntity warehouseUserEntity : syncDataResponse.getWarehouseBussinessTypeEntities()) { -// warehouseBussinessTypeDao.insertOrUpdate(warehouseUserEntity); -// } -// remark.append("仓库单据：").append(syncDataResponse.getWarehouseBussinessTypeEntities().size()).append("条\n"); -// } //第三方产品信息导入 @@ -371,9 +370,58 @@ public class SpsSyncUploadController { } } -// batchSession.clearCache(); - batchSession.close(); + //配送企业首营资质 + if (CollUtil.isNotEmpty(syncDataResponse.getSupCompanyEntities())) { + for (SupCompanyEntity supCompanyEntity : syncDataResponse.getSupCompanyEntities()) { + supCertService.deleteByCustomerId(supCompanyEntity.getCustomerId()); + supCompanyEntity.setUpdateTime(null); + supCompanyService.insertCompany(supCompanyEntity); + } + remark.append("配送企业证书：").append(syncDataResponse.getSupCompanyEntities().size()).append("条\n"); + } + //生产企业首营资质 + if (CollUtil.isNotEmpty(syncDataResponse.getSupManufacturerEntities())) { + for (SupManufacturerEntity supManufacturerEntity : syncDataResponse.getSupManufacturerEntities()) { + supCertService.delManufacturerId(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + supManufacturerEntity.setUpdateTime(null); + supManufacturerService.insertCompany(supManufacturerEntity); + } + remark.append("生产企业证书：").append(syncDataResponse.getSupManufacturerEntities().size()).append("条\n"); + } + + + //配送企业首营资质 + if (CollUtil.isNotEmpty(syncDataResponse.getSupProductEntities())) { + for (SupProductEntity supProductEntity : syncDataResponse.getSupProductEntities()) { + supCertService.delProductId(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + supProductEntity.setUpdateTime(null); + supProductService.insertRegistration(supProductEntity); + } + remark.append("产品资质证书：").append(syncDataResponse.getSupProductEntities().size()).append("条\n"); + } + + //所有证书提交 + if (CollUtil.isNotEmpty(syncDataResponse.getSupCertEntities())) { + for (SupCertEntity supCertEntity : syncDataResponse.getSupCertEntities()) { + supCertService.insertCompanyCert(supCertEntity); + } + remark.append("相关证书总数：").append(syncDataResponse.getSupCertEntities().size()).append("条\n"); + } + + + //资质证书设置 + if (CollUtil.isNotEmpty(syncDataResponse.getSupCertSetEntities())) { + List backs = supCertSetService.filterCertSets(new FilterCertSetsRequest()); + supCertSetService.deleteAll(); + for (SupCertSetResponse supCertSetResponse : syncDataResponse.getSupCertSetEntities()) { + SupCertSetEntity supCertSetEntity = new SupCertSetEntity(); + BeanUtils.copyProperties(supCertSetResponse, supCertSetEntity); + supCertSetService.insertCertSet(supCertSetEntity); + } + remark.append("证书设置：").append(syncDataResponse.getSupCertSetEntities().size()).append("条\n"); + } + batchSession.close(); basicDownloadStatusEntity.setStatus(1); basicDownloadStatusEntity.setUpdateTime(new Date()); basicDownloadStatusEntity.setEndTime(new Date()); 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 0f4895d..6807e56 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 @@ -12,10 +12,7 @@ import com.glxp.sale.admin.entity.info.CompanyEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; -import com.glxp.sale.admin.req.basic.CombineRequest; -import com.glxp.sale.admin.req.basic.RemoveRelRequest; -import com.glxp.sale.admin.req.basic.UdiInfoRequest; -import com.glxp.sale.admin.req.basic.UdiRelevanceRequest; +import com.glxp.sale.admin.req.basic.*; import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.PageSimpleResponse; @@ -152,25 +149,26 @@ 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); + UdiInfoRequest udiInfoReqeust = new UdiInfoRequest(); + 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("切换成功！"); } - //更换关联ERP产品 @AuthRuleAnnotation("") @PostMapping("/udi/udirel/modifyRel") @@ -192,8 +190,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 +244,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 +360,7 @@ public class UdiContrastController { udiInfoEntity.setScbssfbhsxrq("是"); udiInfoEntity.setScbssfbhxlh("否"); udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity); - UdiInfoRequest udiInfoRequest=new UdiInfoRequest(); + UdiInfoRequest udiInfoRequest = new UdiInfoRequest(); BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest); udiInfoService.insertUdiInfo(udiInfoRequest); } @@ -374,8 +372,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/dao/purchase/SupCertDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java index 4704cb9..5391d75 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertDao.java @@ -32,4 +32,6 @@ public interface SupCertDao { @Param("oldManufacturerIdFk") String oldManufacturerIdFk, @Param("newManufacturerIdFk") String newManufacturerIdFk, @Param("oldProductIdFk") String oldProductIdFk, @Param("newProductIdFk") String newProductIdFk); + + boolean deleteCert(FilterSupCertRequest filterSupCertRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java index c7e35c6..87eee82 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupCertSetDao.java @@ -8,6 +8,7 @@ import java.util.List; @Mapper public interface SupCertSetDao { + List filterCertSets(FilterCertSetsRequest filterCertSetsRequest); boolean insertCertSet(SupCertSetEntity supCertSetEntity); @@ -16,4 +17,6 @@ public interface SupCertSetDao { boolean updateCertSet(SupCertSetEntity supCertSetEntity); boolean deleteById(String id); + + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java deleted file mode 100644 index ff0a17e..0000000 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/UdiInfoReqeust.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.glxp.sale.admin.req.basic; - - -import lombok.Data; - -@Data -public class UdiInfoReqeust { - - private Integer id; - private String nameCode; - private String packRatio; - private String packLevel; - private Integer bhxjsl; - private Integer bhzxxsbzsl; - private Integer zxxsbzbhsydysl; - private String bhxjcpbm; - private String sjcpbm; // - private String bzcj; - private String addType; - private String deviceRecordKey; - private String cpmctymc; - private String cplb; - private String flbm; - private String ggxh; - private String qxlb; - private String tyshxydm; - private String ylqxzcrbarmc; - private String zczbhhzbapzbh; - private String ylqxzcrbarywmc; - private String sydycpbs; - private String uuid; - private Integer versionNumber; - private Integer diType; - private String thirdId; - private String thirdName; - private String ybbm; - private String sptm; - private String manufactory; - private String measname; - private Integer productType; - private String scbssfbhph; - private String scbssfbhxlh; - private String scbssfbhscrq; - private String scbssfbhsxrq; - private String cpms; - private String spmc; - private String originUuid; - - //本地生成信息 - private String batchNo; - private String produceDate; - private String expireDate; - private String serialNo; - private String udi; - private String code; - private Integer count; - private String warehouseCode; - private String udplatCode; - private String relId;//关联ID主键 - private Integer status; - private String supId; - - private Boolean isCheck; - private Boolean allowNoBatch; - private Boolean allowNoExpire; - private Boolean allowNoProduct; - - private String price; - private String cplx; - private String hchzsb; - - //产品代理商 - private String cpdls; - - - private String basicPrductRemak1; - private String basicPrductRemak2; - private String basicPrductRemak3; - private String basicPrductRemak4; - private String basicPrductRemak5; - private String basicPrductRemak6; - private String basicPrductRemak7; - private String basicPrductRemak8; - - -} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java index 86f8058..ff3940b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/FilterCertSetsRequest.java @@ -9,5 +9,6 @@ public class FilterCertSetsRequest extends ListPageRequest { private String name; private Integer type; private Integer need; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 6454d86..823d5d8 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -12,10 +12,7 @@ import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; import com.glxp.sale.admin.entity.inventory.InvBusUserEntity; import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; -import com.glxp.sale.admin.entity.purchase.SupCertEntity; -import com.glxp.sale.admin.entity.purchase.SupCompanyEntity; -import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; -import com.glxp.sale.admin.entity.purchase.SupProductEntity; +import com.glxp.sale.admin.entity.purchase.*; import com.glxp.sale.admin.entity.thrsys.*; import lombok.Data; @@ -62,6 +59,7 @@ public class SpsSyncDataResponse { List supManufacturerEntities; List supProductEntities; List supCertEntities; + List supCertSetEntities; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SupCertSetResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SupCertSetResponse.java new file mode 100644 index 0000000..2d2136f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SupCertSetResponse.java @@ -0,0 +1,27 @@ +package com.glxp.sale.admin.res.basic; + +import cn.hutool.core.util.StrUtil; +import lombok.Data; + +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +@Data +public class SupCertSetResponse { + + private Integer id; + private String name; + private boolean need; + private Integer foreign; + private String cplx; + private String hchzsb; + private String flbm; + private Integer imports; + private String remark; + private Date updateTime; + private Integer type; + + private boolean isPass; + +} diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java index 4bd7631..f48cd69 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertService.java @@ -31,4 +31,10 @@ public interface SupCertService { boolean insertCompanyCert(SupCertEntity supCertEntity); boolean deleteById(String id); + + boolean deleteByCustomerId(String customerId); + + boolean delManufacturerId(String customerId, String manufacturerId); + + boolean delProductId(String customerId, String manufacturerId, String productId); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java index f6392c9..67da275 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupCertSetService.java @@ -16,4 +16,6 @@ public interface SupCertSetService { boolean deleteById(String id); + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java index 99a85d2..9c2e50b 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertServiceImpl.java @@ -116,4 +116,38 @@ public class SupCertServiceImpl implements SupCertService { public boolean deleteById(String id) { return supCertDao.deleteById(id); } + + @Override + public boolean deleteByCustomerId(String customerId) { + + if (StrUtil.isNotEmpty(customerId)) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + return supCertDao.deleteCert(filterSupCertRequest); + } + return false; + } + + @Override + public boolean delManufacturerId(String customerId, String manufacturerId) { + if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId)) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + return supCertDao.deleteCert(filterSupCertRequest); + } + return false; + } + + @Override + public boolean delProductId(String customerId, String manufacturerId, String productId) { + if (StrUtil.isNotEmpty(customerId) && StrUtil.isNotEmpty(manufacturerId) && StrUtil.isNotEmpty(productId)) { + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(customerId); + filterSupCertRequest.setManufacturerIdFk(manufacturerId); + filterSupCertRequest.setProductIdFk(productId); + return supCertDao.deleteCert(filterSupCertRequest); + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java index c47e395..8c5469d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupCertSetServiceImpl.java @@ -45,4 +45,9 @@ public class SupCertSetServiceImpl implements SupCertSetService { public boolean deleteById(String id) { return supCertSetDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return supCertSetDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 7cffa04..ccdcbb6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -331,6 +331,7 @@ public class BasicBackUpdateProductService { || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCompanyEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupManufacturerEntities()) || CollUtil.isNotEmpty(spsSyncDataResponse.getSupProductEntities()) + || CollUtil.isNotEmpty(spsSyncDataResponse.getSupCertSetEntities()) ) { BasicExportStatusEntity basicExportStatusEntity = new BasicExportStatusEntity(); basicExportStatusEntity.setId(CustomUtil.getId()); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index f24124d..431376d 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,7 +1,7 @@ # \u751F\u4EA7\u73AF\u5883 server.port=9906 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_wmd?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/spms_ph?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root spring.datasource.password=123456 spring.datasource.hikari.connection-timeout=60000 diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index 8e44f35..36251d6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -132,4 +132,22 @@ WHERE id = #{id} + + + + DELETE + FROM sup_cert + + + and customerId = #{customerId} + + + and manufacturerIdFk = #{manufacturerIdFk} + + + and productIdFk = #{productIdFk} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 0cc54f8..261bdb6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -16,6 +16,9 @@ and `need` = #{need} + + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]> + ORDER BY id DESC @@ -47,7 +50,7 @@ - INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports,`type`) + INSERT INTO sup_cert_set(`name`, `need`, `foreign`, remark, cplx, updateTime, hchzsb, flbm, imports, `type`) values (#{name}, #{need}, #{foreign}, @@ -56,8 +59,11 @@ #{updateTime}, #{hchzsb}, #{flbm}, - #{imports},#{type}) + #{imports}, #{type}) - + + DELETE + FROM sup_cert_set + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index b647829..672ab4f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -153,7 +153,7 @@ - INSERT INTO company(companyName, bussinessStatus, creditNum, classes, area, + replace INTO company(companyName, bussinessStatus, creditNum, classes, area, detailAddr, appId, appSecret, contacts, mobile, tel, email, customerId, areaCode, auditStatus, unitIdFk, createTime, createBy, updateTime, auditTime, auditComment, editStatus) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index 4a09bce..5e47412 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -102,7 +102,7 @@ - INSERT INTO sup_manufacturer(companyName, creditCode, companyType, + replace INTO sup_manufacturer(companyName, creditCode, companyType, placeArea, placeAreaCode, placeAddress, legalPersonName, legalPersonPapersType, legalPersonPapersCode, productionArea, productionAreaCode, productionAddress, diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml index 02d8458..1ec5871 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupProductDao.xml @@ -171,7 +171,7 @@ - INSERT INTO sup_product(enterpriseId, recordCode, recordProductName, + replace INTO sup_product(enterpriseId, recordCode, recordProductName, productManageType, recordPeopleName, recordPeopleArea, recordPeopleAreaCode, recordPeopleAddress, productType, productDirectoryCode, agentName, agentArea,