feat：sap接口修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapBeerFactoryServiceImpl.java

@@ -2,13 +2,11 @@ package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.BaseSapBeerFactory;
-import com.abi.qms.platform.dao.entity.BaseSapCoverFactory;
 import com.abi.qms.platform.dao.mapper.BaseSapBeerFactoryMapper;
 import com.abi.qms.platform.dto.req.BatchImportSapBeerFactoryReq;
 import com.abi.qms.platform.service.BaseSapBeerFactoryService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +19,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapBeerFactoryServiceImpl implements BaseSapBeerFactoryService {
 
     @Autowired
@@ -32,11 +31,15 @@ public class BaseSapBeerFactoryServiceImpl implements BaseSapBeerFactoryService
         List<BatchImportSapBeerFactoryReq.BatchImportBeerFactory> beerFactoryList = req.getBatchImportBeerFactoryList();
         for (BatchImportSapBeerFactoryReq.BatchImportBeerFactory beerFactory : beerFactoryList) {
 
-            BaseSapBeerFactory baseSapBeerFactory = new BaseSapBeerFactory();
-            baseSapBeerFactory.setSapBeerFactoryId(beerFactory.getSapBeerFactoryId());
-            baseSapBeerFactory.setSapBeerFactoryName(beerFactory.getSapBeerFactoryName());
+            try {
+                BaseSapBeerFactory baseSapBeerFactory = new BaseSapBeerFactory();
+                baseSapBeerFactory.setSapBeerFactoryId(beerFactory.getSapBeerFactoryId());
+                baseSapBeerFactory.setSapBeerFactoryName(beerFactory.getSapBeerFactoryName());
 
-            saveBaseSapBeerFactory(baseSapBeerFactory);
+                saveBaseSapBeerFactory(baseSapBeerFactory);
+            } catch (Exception e) {
+                log.error("导入Sap啤酒厂数据失败", e);
+            }
         }
 
     }
@@ -48,11 +51,15 @@ public class BaseSapBeerFactoryServiceImpl implements BaseSapBeerFactoryService
         List<BatchImportSapBeerFactoryReq.BatchImportBeerFactory> beerFactoryList = req.getBatchImportBeerFactoryList();
         for (BatchImportSapBeerFactoryReq.BatchImportBeerFactory beerFactory : beerFactoryList) {
 
-            BaseSapBeerFactory baseSapBeerFactory = new BaseSapBeerFactory();
-            baseSapBeerFactory.setSapBeerFactoryId(beerFactory.getSapBeerFactoryId());
-            baseSapBeerFactory.setSapBeerFactoryName(beerFactory.getSapBeerFactoryName());
+            try {
+                BaseSapBeerFactory baseSapBeerFactory = new BaseSapBeerFactory();
+                baseSapBeerFactory.setSapBeerFactoryId(beerFactory.getSapBeerFactoryId());
+                baseSapBeerFactory.setSapBeerFactoryName(beerFactory.getSapBeerFactoryName());
 
-            updateBaseSapBeerFactory(baseSapBeerFactory);
+                updateBaseSapBeerFactory(baseSapBeerFactory);
+            } catch (Exception e) {
+                log.error("修改Sap啤酒厂数据失败", e);
+            }
         }
 
     }
@@ -63,7 +70,7 @@ public class BaseSapBeerFactoryServiceImpl implements BaseSapBeerFactoryService
         BaseSapBeerFactory baseSapBeerFactory = getBaseSapCoverFactoryInfo(sapBeerFactory.getSapBeerFactoryId());
 
         if (ObjectUtil.isNull(baseSapBeerFactory)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap啤酒厂ID不存在");
+            log.info("Sap啤酒厂ID:{}不存在", sapBeerFactory.getSapBeerFactoryId());
         }
 
         sapBeerFactory.setId(baseSapBeerFactory.getId());
@@ -76,7 +83,7 @@ public class BaseSapBeerFactoryServiceImpl implements BaseSapBeerFactoryService
         BaseSapBeerFactory baseSapBeerFactory = getBaseSapCoverFactoryInfo(sapBeerFactory.getSapBeerFactoryId());
 
         if (ObjectUtil.isNotNull(baseSapBeerFactory)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap啤酒厂ID已存在");
+            log.info("Sap啤酒厂ID:{}已存在", sapBeerFactory.getSapBeerFactoryId());
         }
 
         baseSapBeerFactoryMapper.insert(sapBeerFactory);

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapBrandServiceImpl.java

@@ -1,14 +1,13 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.BaseSapBrand;
 import com.abi.qms.platform.dao.mapper.BaseSapBrandMapper;
 import com.abi.qms.platform.dto.req.BatchImportBrandReq;
-import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.service.BaseSapBrandService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,6 +20,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapBrandServiceImpl implements BaseSapBrandService {
 
     @Autowired
@@ -35,17 +35,21 @@ public class BaseSapBrandServiceImpl implements BaseSapBrandService {
 
         for (BatchImportBrandReq.SapBrandBean brand : brandBeanList) {
 
-            //申明对象
-            BaseSapBrand sapBrand = new BaseSapBrand();
-            sapBrand.setId(brand.getId());
-            sapBrand.setBrandCode(brand.getBrandCode());
-            sapBrand.setBrandLevel(brand.getBrandLevel());
-            sapBrand.setBrandName(brand.getBrandName());
-            sapBrand.setParentBrandCode(brand.getParentBrandCode());
-            sapBrand.setParentBrandName(brand.getParentBrandName());
+            try {
+                //申明对象
+                BaseSapBrand sapBrand = new BaseSapBrand();
+                sapBrand.setId(brand.getId());
+                sapBrand.setBrandCode(brand.getBrandCode());
+                sapBrand.setBrandLevel(brand.getBrandLevel());
+                sapBrand.setBrandName(brand.getBrandName());
+                sapBrand.setParentBrandCode(brand.getParentBrandCode());
+                sapBrand.setParentBrandName(brand.getParentBrandName());
 
 
-            saveBaseSapBrand(sapBrand);
+                saveBaseSapBrand(sapBrand);
+            } catch (Exception e) {
+                log.error("导入Sap品牌数据失败", e);
+            }
         }
     }
 
@@ -59,12 +63,14 @@ public class BaseSapBrandServiceImpl implements BaseSapBrandService {
         }
         List<BaseSapBrand> sapBrandList = baseSapBrandMapper.selectList(qw);
         if (CollectionUtil.isNotEmpty(sapBrandList)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "品牌 ID已存在");
+            log.info("品牌code:{}已存在", bsb.getBrandCode());
         }
 
         if (bsb.getId() != null) {
             BaseSapBrand baseSapBrand = baseSapBrandMapper.selectById(bsb.getId());
-            AssertUtil.isNull(baseSapBrand, "sap品牌不存在");
+            if (ObjectUtil.isNull(baseSapBrand)) {
+                log.info("sap品牌code:{}不存在", baseSapBrand.getBrandCode());
+            }
         }
 
         //新增or修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapCoverFactoryServiceImpl.java

@@ -5,12 +5,10 @@ import com.abi.qms.platform.dao.entity.BaseSapCoverFactory;
 import com.abi.qms.platform.dao.mapper.BaseSapCoverFactoryMapper;
 import com.abi.qms.platform.dto.req.BatchImportCoverFactoryReq;
 import com.abi.qms.platform.service.BaseSapCoverFactoryService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -21,45 +19,52 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryService {
 
     @Autowired
     private BaseSapCoverFactoryMapper baseSapCoverFactoryMapper;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchImportCoverFactory(BatchImportCoverFactoryReq req) {
 
         List<BatchImportCoverFactoryReq.BatchImportCoverFactory> sapCoverFactoryList = req.getBatchImportCoverFactoryList();
 
         for (BatchImportCoverFactoryReq.BatchImportCoverFactory coverFactory : sapCoverFactoryList) {
 
-            BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
-            baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
-            baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
-            baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
-            baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
-
-            saveBaseSapCoverFactory(baseSapCoverFactory);
+            try {
+                BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
+                baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
+                baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
+                baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
+                baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
+
+                saveBaseSapCoverFactory(baseSapCoverFactory);
+            } catch (Exception e) {
+                log.error("导入Sap供应商数据失败", e);
+            }
         }
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchUpdateCoverFactory(BatchImportCoverFactoryReq req) {
 
         List<BatchImportCoverFactoryReq.BatchImportCoverFactory> sapCoverFactoryList = req.getBatchImportCoverFactoryList();
 
         for (BatchImportCoverFactoryReq.BatchImportCoverFactory coverFactory : sapCoverFactoryList) {
 
-            BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
-            baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
-            baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
-            baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
-            baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
-
-            updateBaseSapCoverFactory(baseSapCoverFactory);
+            try {
+                BaseSapCoverFactory baseSapCoverFactory = new BaseSapCoverFactory();
+                baseSapCoverFactory.setSapCoverFactoryId(coverFactory.getSapCoverFactoryId());
+                baseSapCoverFactory.setSapCoverFactoryName(coverFactory.getSapCoverFactoryName());
+                baseSapCoverFactory.setKeymanName(coverFactory.getKeymanName());
+                baseSapCoverFactory.setKeymanMobile(coverFactory.getKeymanMobile());
+
+                updateBaseSapCoverFactory(baseSapCoverFactory);
+            } catch (Exception e) {
+                log.error("修改Sap供应商数据失败", e);
+            }
         }
 
     }
@@ -75,7 +80,7 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
         BaseSapCoverFactory baseSapCoverFactory = getBaseSapCoverFactoryInfo(sapCoverFactory.getSapCoverFactoryId());
 
         if (ObjectUtil.isNull(baseSapCoverFactory)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap供应商ID不存在");
+            log.info("Sap供应商ID:{}不存在", baseSapCoverFactory.getSapCoverFactoryId());
         }
 
         sapCoverFactory.setId(baseSapCoverFactory.getId());
@@ -96,7 +101,7 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
         BaseSapCoverFactory baseSapCoverFactory = getBaseSapCoverFactoryInfo(sapCoverFactory.getSapCoverFactoryId());
 
         if (ObjectUtil.isNotNull(baseSapCoverFactory)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap供应商ID已存在");
+            log.info("Sap供应商ID:{}已存在", baseSapCoverFactory.getSapCoverFactoryId());
         }
 
         baseSapCoverFactoryMapper.insert(sapCoverFactory);

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapMaterialServiceImpl.java

@@ -5,12 +5,10 @@ import com.abi.qms.platform.dao.entity.BaseSapMaterial;
 import com.abi.qms.platform.dao.mapper.BaseSapMaterialMapper;
 import com.abi.qms.platform.dto.req.BatchImportMaterialReq;
 import com.abi.qms.platform.service.BaseSapMaterialService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -21,39 +19,46 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
 
     @Autowired
     private BaseSapMaterialMapper baseSapMaterialMapper;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchImportMaterial(BatchImportMaterialReq req) {
         List<BatchImportMaterialReq.BatchImportMaterial> sapMaterialList = req.getBatchImportMaterialList();
 
         for (BatchImportMaterialReq.BatchImportMaterial material : sapMaterialList) {
 
-            BaseSapMaterial baseSapMaterial = new BaseSapMaterial();
-            baseSapMaterial.setSapMaterialId(material.getSapMaterialId());
-            baseSapMaterial.setSapMaterialName(material.getSapMaterialName());
+            try {
+                BaseSapMaterial baseSapMaterial = new BaseSapMaterial();
+                baseSapMaterial.setSapMaterialId(material.getSapMaterialId());
+                baseSapMaterial.setSapMaterialName(material.getSapMaterialName());
 
-            saveBaseSapMaterial(baseSapMaterial);
+                saveBaseSapMaterial(baseSapMaterial);
+            } catch (Exception e) {
+                log.error("导入Sap物料数据失败", e);
+            }
         }
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchUpdateMaterial(BatchImportMaterialReq req) {
         List<BatchImportMaterialReq.BatchImportMaterial> sapMaterialList = req.getBatchImportMaterialList();
 
         for (BatchImportMaterialReq.BatchImportMaterial material : sapMaterialList) {
 
-            BaseSapMaterial baseSapMaterial = new BaseSapMaterial();
-            baseSapMaterial.setSapMaterialId(material.getSapMaterialId());
-            baseSapMaterial.setSapMaterialName(material.getSapMaterialName());
+            try {
+                BaseSapMaterial baseSapMaterial = new BaseSapMaterial();
+                baseSapMaterial.setSapMaterialId(material.getSapMaterialId());
+                baseSapMaterial.setSapMaterialName(material.getSapMaterialName());
 
-            updateBaseSapMaterial(baseSapMaterial);
+                updateBaseSapMaterial(baseSapMaterial);
+            } catch (Exception e) {
+                log.error("修改Sap物料数据失败", e);
+            }
         }
 
     }
@@ -69,7 +74,7 @@ public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
         BaseSapMaterial baseSapMaterial = getBaseSapMaterialInfo(sapMaterial.getSapMaterialId());
 
         if (ObjectUtil.isNull(baseSapMaterial)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料ID不存在");
+            log.info("Sap物料ID:{}不存在", baseSapMaterial.getSapMaterialId());
         }
 
         sapMaterial.setId(baseSapMaterial.getId());
@@ -90,7 +95,7 @@ public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
         BaseSapMaterial baseSapMaterial = getBaseSapMaterialInfo(sapMaterial.getSapMaterialId());
 
         if (ObjectUtil.isNotNull(baseSapMaterial)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料ID已存在");
+            log.info("Sap物料ID:{}已存在", baseSapMaterial.getSapMaterialId());
         }
 
         baseSapMaterialMapper.insert(sapMaterial);

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapOrganizationServiceImpl.java

@@ -1,17 +1,16 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.BaseSapOrganization;
 import com.abi.qms.platform.dao.mapper.BaseSapOrganizationMapper;
 import com.abi.qms.platform.dto.req.BatchImportOrganizationReq;
 import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.service.BaseSapOrganizationService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,6 +20,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationService {
 
     @Autowired
@@ -28,21 +28,24 @@ public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationServic
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchImportOrganization(BatchImportOrganizationReq req) {
         List<BatchImportOrganizationReq.SapOrganization> organizationList = req.getOrganizationList();
 
         for (BatchImportOrganizationReq.SapOrganization sap : organizationList) {
 
-            BaseSapOrganization organization = new BaseSapOrganization();
-            organization.setCustomerCode(sap.getCustomerCode());
-            organization.setCustomerName(sap.getCustomerName());
-            organization.setOrganizationLevel(sap.getOrganizationLevel());
-            organization.setParentCode(sap.getParentCode());
-            organization.setProvince(sap.getProvince());
-            organization.setId(sap.getId());
+            try {
+                BaseSapOrganization organization = new BaseSapOrganization();
+                organization.setCustomerCode(sap.getCustomerCode());
+                organization.setCustomerName(sap.getCustomerName());
+                organization.setOrganizationLevel(sap.getOrganizationLevel());
+                organization.setParentCode(sap.getParentCode());
+                organization.setProvince(sap.getProvince());
+                organization.setId(sap.getId());
 
-            saveBaseSapOrganization(organization);
+                saveBaseSapOrganization(organization);
+            } catch (Exception e) {
+                log.error("导入组织架构数据失败", e);
+            }
         }
 
     }
@@ -57,12 +60,14 @@ public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationServic
         }
         List<BaseSapOrganization> organizationList = baseSapOrganizationMapper.selectList(qw);
         if (CollectionUtil.isNotEmpty(organizationList)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "组织架构ID已存在");
+            log.info("组织架构代码:{}已存在", bso.getCustomerCode());
         }
 
         if (bso.getId() != null) {
             BaseSapOrganization baseSapOrganization = baseSapOrganizationMapper.selectById(bso.getId());
-            AssertUtil.isNull(baseSapOrganization, "组织架构不存在");
+            if (ObjectUtil.isNull(baseSapOrganization)) {
+                log.info("组织架构代码:{}不存在", bso.getCustomerCode());
+            }
         }
 
         //新增or修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/BaseSapSkuServiceImpl.java

@@ -1,17 +1,15 @@
 package com.abi.qms.platform.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.BaseSapSku;
 import com.abi.qms.platform.dao.mapper.BaseSapSkuMapper;
 import com.abi.qms.platform.dto.req.BatchImportSkuReq;
-import com.abi.qms.platform.infrastructure.util.AssertUtil;
 import com.abi.qms.platform.service.BaseSapSkuService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,6 +19,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class BaseSapSkuServiceImpl implements BaseSapSkuService {
 
     @Autowired
@@ -28,22 +27,25 @@ public class BaseSapSkuServiceImpl implements BaseSapSkuService {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void batchImportSku(BatchImportSkuReq req) {
         List<BatchImportSkuReq.SapSkuBean> sapSkuBeanList = req.getSapSkuBeanList();
 
         for (BatchImportSkuReq.SapSkuBean sku : sapSkuBeanList) {
 
-            //申明对象
-            BaseSapSku sapSku = new BaseSapSku();
-            sapSku.setId(sku.getId());
-            sapSku.setBrandCode(sku.getBrandCode());
-            sapSku.setSubBrandCode(sku.getSubBrandCode());
-            sapSku.setSkuCode(sku.getSkuCode());
-            sapSku.setSkuName(sku.getSkuName());
-            sapSku.setSkuType(sku.getSkuType());
+            try {
+                //申明对象
+                BaseSapSku sapSku = new BaseSapSku();
+                sapSku.setId(sku.getId());
+                sapSku.setBrandCode(sku.getBrandCode());
+                sapSku.setSubBrandCode(sku.getSubBrandCode());
+                sapSku.setSkuCode(sku.getSkuCode());
+                sapSku.setSkuName(sku.getSkuName());
+                sapSku.setSkuType(sku.getSkuType());
 
-            saveBaseSapSku(sapSku);
+                saveBaseSapSku(sapSku);
+            } catch (Exception e) {
+                log.error("导入SKU数据失败", e);
+            }
         }
     }
 
@@ -57,12 +59,14 @@ public class BaseSapSkuServiceImpl implements BaseSapSkuService {
         }
         List<BaseSapSku> sapSkuList = baseSapSkuMapper.selectList(qw);
         if (CollectionUtil.isNotEmpty(sapSkuList)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "SKU ID已存在");
+            log.info("SKU ID:{}已存在", bss.getSkuCode());
         }
 
         if (bss.getId() != null) {
             BaseSapSku baseSapSku = baseSapSkuMapper.selectById(bss.getId());
-            AssertUtil.isNull(baseSapSku, "组织架构不存在");
+            if (ObjectUtil.isNull(baseSapSku)) {
+                log.info("SKU不存在:{}不存在", bss.getSkuCode());
+            }
         }
 
         //新增or修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageSapOrderItemServiceImpl.java

@@ -8,6 +8,7 @@ import com.abi.qms.platform.service.QrPackageSapOrderItemService;
 import com.abi.task.common.api.exception.BusinessException;
 import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +21,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemService {
 
     @Autowired
@@ -31,15 +33,20 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
         List<BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem> sapOrderItemList = req.getBatchImportSapOrderItemList();
         for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item : sapOrderItemList) {
 
-            QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
-            sapOrderItem.setSapOrderNo(item.getSapOrderNo());
-            sapOrderItem.setSapMaterialId(item.getSapMaterialId());
-            sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
-            sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
-            sapOrderItem.setSapMaterialName(item.getSapMaterialName());
-            sapOrderItem.setPurchaseCount(item.getPurchaseCount());
+            try {
+                QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
+                sapOrderItem.setSapOrderNo(item.getSapOrderNo());
+                sapOrderItem.setSapMaterialId(item.getSapMaterialId());
+                sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
+                sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
+                sapOrderItem.setSapMaterialName(item.getSapMaterialName());
+                sapOrderItem.setPurchaseCount(item.getPurchaseCount());
 
-            saveQrPackageSapOrderItem(sapOrderItem);
+                saveQrPackageSapOrderItem(sapOrderItem);
+            } catch (Exception e) {
+
+                log.error("导入sap订单明细数据失败",e);
+            }
         }
 
     }
@@ -50,15 +57,20 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
         List<BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem> sapOrderItemList = req.getBatchImportSapOrderItemList();
         for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item : sapOrderItemList) {
 
-            QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
-            sapOrderItem.setSapOrderNo(item.getSapOrderNo());
-            sapOrderItem.setSapMaterialId(item.getSapMaterialId());
-            sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
-            sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
-            sapOrderItem.setSapMaterialName(item.getSapMaterialName());
-            sapOrderItem.setPurchaseCount(item.getPurchaseCount());
+            try {
+                QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
+                sapOrderItem.setSapOrderNo(item.getSapOrderNo());
+                sapOrderItem.setSapMaterialId(item.getSapMaterialId());
+                sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
+                sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
+                sapOrderItem.setSapMaterialName(item.getSapMaterialName());
+                sapOrderItem.setPurchaseCount(item.getPurchaseCount());
+
+                updateQrPackageSapOrderItem(sapOrderItem);
+            } catch (Exception e) {
 
-            updateQrPackageSapOrderItem(sapOrderItem);
+                log.error("修改Sap订单明细数据失败",e);
+            }
         }
 
     }
@@ -66,10 +78,10 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
     private void updateQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
 
         //根据sap订单号查询物料订单明细信息
-        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo());
+        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
 
         if (ObjectUtil.isNull(qrPackageSapOrderItem)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料订单明细订单号不存在");
+            log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",qrPackageSapOrderItem.getSapOrderNo(),qrPackageSapOrderItem.getSapMaterialId());
         }
 
         sapOrderItem.setId(qrPackageSapOrderItem.getId());
@@ -80,19 +92,20 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
     private void saveQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
 
         //根据sap订单号查询物料订单明细信息
-        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo());
+        QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
 
         if (ObjectUtil.isNotNull(qrPackageSapOrderItem)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap物料订单明细订单号已存在");
+            log.info("Sap物料订单明细订单号:{}sap物料id:{}已存在",qrPackageSapOrderItem.getSapOrderNo(),qrPackageSapOrderItem.getSapMaterialId());
         }
 
         qrPackageSapOrderItemMapper.insert(sapOrderItem);
     }
 
-    private QrPackageSapOrderItem getQrPackageSapOrderItemInfo(String sapOrderNo) {
+    private QrPackageSapOrderItem getQrPackageSapOrderItemInfo(String sapOrderNo,String sapMaterialId) {
 
         QueryWrapper<QrPackageSapOrderItem> qw = new QueryWrapper<>();
         qw.eq("sap_order_no", sapOrderNo);
+        qw.eq("sap_material_id", sapMaterialId);
         qw.eq("is_delete", 0);
 
         //根据sap订单号查询物料订单明细信息

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageSapOrderServiceImpl.java

@@ -5,9 +5,8 @@ import com.abi.qms.platform.dao.entity.QrPackageSapOrder;
 import com.abi.qms.platform.dao.mapper.QrPackageSapOrderMapper;
 import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderReq;
 import com.abi.qms.platform.service.QrPackageSapOrderService;
-import com.abi.task.common.api.exception.BusinessException;
-import com.abi.task.common.api.exception.ErrorCodeEnum;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +19,7 @@ import java.util.List;
  * @description:
  */
 @Service
+@Slf4j
 public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
 
     @Autowired
@@ -30,11 +30,15 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
 
         List<BatchImportPackageSapOrderReq.BatchImportSapOrder> sapOrderList = req.getBatchImportSapOrderList();
         for (BatchImportPackageSapOrderReq.BatchImportSapOrder order : sapOrderList) {
-            QrPackageSapOrder sapOrder = new QrPackageSapOrder();
-            sapOrder.setSapOrderCommitTime(order.getSapOrderCommitTime());
-            sapOrder.setSapOrderNo(order.getSapOrderNo());
-
-            saveQrPackageSapOrder(sapOrder);
+            try {
+                QrPackageSapOrder sapOrder = new QrPackageSapOrder();
+                sapOrder.setSapOrderCommitTime(order.getSapOrderCommitTime());
+                sapOrder.setSapOrderNo(order.getSapOrderNo());
+
+                saveQrPackageSapOrder(sapOrder);
+            } catch (Exception e) {
+                log.error("导入Sap订单失败", e);
+            }
         }
 
     }
@@ -44,11 +48,15 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
 
         List<BatchImportPackageSapOrderReq.BatchImportSapOrder> sapOrderList = req.getBatchImportSapOrderList();
         for (BatchImportPackageSapOrderReq.BatchImportSapOrder order : sapOrderList) {
-            QrPackageSapOrder sapOrder = new QrPackageSapOrder();
-            sapOrder.setSapOrderCommitTime(order.getSapOrderCommitTime());
-            sapOrder.setSapOrderNo(order.getSapOrderNo());
-
-            updateQrPackageSapOrder(sapOrder);
+            try {
+                QrPackageSapOrder sapOrder = new QrPackageSapOrder();
+                sapOrder.setSapOrderCommitTime(order.getSapOrderCommitTime());
+                sapOrder.setSapOrderNo(order.getSapOrderNo());
+
+                updateQrPackageSapOrder(sapOrder);
+            } catch (Exception e) {
+                log.error("修改Sap订单失败", e);
+            }
         }
 
     }
@@ -59,7 +67,7 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
         QrPackageSapOrder qrPackageSapOrder = getQrPackageSapOrderInfo(sapOrder.getSapOrderNo());
 
         if (ObjectUtil.isNull(qrPackageSapOrder)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap订单号不存在");
+            log.info("Sap订单号:{}不存在", qrPackageSapOrder.getSapOrderNo());
         }
 
         sapOrder.setId(qrPackageSapOrder.getId());
@@ -73,7 +81,7 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
         QrPackageSapOrder qrPackageSapOrder = getQrPackageSapOrderInfo(sapOrder.getSapOrderNo());
 
         if (ObjectUtil.isNotNull(qrPackageSapOrder)) {
-            throw new BusinessException(ErrorCodeEnum.ERROR_PARAM.getCode(), "Sap订单号已存在");
+            log.info("Sap订单号:{}已存在", qrPackageSapOrder.getSapOrderNo());
         }
 
         qrPackageSapOrderMapper.insert(sapOrder);