feat：Sap接口修改

abi-cloud-qr-platform-api/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>abi-cloud-qr-platform-api</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.3-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/api/BaseSapImportApi.java

@@ -31,6 +31,15 @@ public interface BaseSapImportApi {
     @PostMapping("batchImportOrganization")
     BaseResponse batchImportOrganization(@RequestBody BatchImportOrganizationReq batchImportOrganizationReq);
 
+    /**
+     * 批量修改组织架构数据
+     *
+     * @param batchImportOrganizationReq 批量修改组织架构数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateOrganization")
+    BaseResponse batchUpdateOrganization(@RequestBody BatchImportOrganizationReq batchImportOrganizationReq);
+
     /**
      * 批量导入SKU数据
      *
@@ -40,6 +49,15 @@ public interface BaseSapImportApi {
     @PostMapping("batchImportSku")
     BaseResponse batchImportSku(@RequestBody BatchImportSkuReq batchImportSkuReq);
 
+    /**
+     * 批量修改SKU数据
+     *
+     * @param batchImportSkuReq 批量修改SKU数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateSku")
+    BaseResponse batchUpdateSku(@RequestBody BatchImportSkuReq batchImportSkuReq);
+
     /**
      * 批量导入品牌数据
      *
@@ -49,6 +67,15 @@ public interface BaseSapImportApi {
     @PostMapping("batchImportBrand")
     BaseResponse batchImportBrand(@RequestBody BatchImportBrandReq batchImportBrandReq);
 
+    /**
+     * 批量修改品牌数据
+     *
+     * @param batchImportBrandReq 批量修改品牌数据入参
+     * @return
+     */
+    @PostMapping("batchUpdateBrand")
+    BaseResponse batchUpdateBrand(@RequestBody BatchImportBrandReq batchImportBrandReq);
+
     /**
      * 批量导入Sap物料数据
      *

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportBrandReq.java

@@ -30,9 +30,6 @@ public class BatchImportBrandReq implements Serializable {
     @ApiModel(value = "BatchImportBrandReq_SapBrandBean")
     public static class SapBrandBean implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "品牌code")
         private String brandCode;
 

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportOrganizationReq.java

@@ -30,9 +30,6 @@ public class BatchImportOrganizationReq implements Serializable {
     @ApiModel(value = "BatchImportOrganizationReq_SapOrganization")
     public static class SapOrganization implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "组织架构代码")
         private String customerCode;
 

abi-cloud-qr-platform-api/src/main/java/com/abi/platform/dto/req/BatchImportSkuReq.java

@@ -30,9 +30,6 @@ public class BatchImportSkuReq implements Serializable {
     @ApiModel(value = "BatchImportSkuReq_SapSkuBean")
     public static class SapSkuBean implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "商品编号（即页面上手输的skuid）")
         private String skuCode;
 

abi-cloud-qr-platform-server/pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.abi.qr.platform</groupId>
             <artifactId>abi-cloud-qr-platform-api</artifactId>
-            <version>1.0.2-SNAPSHOT</version>
+            <version>1.0.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.abi.qr.platform</groupId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/console/BaseSapImportController.java

@@ -73,6 +73,16 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量修改组织架构数据")
+    @PostMapping("batchUpdateOrganization")
+    @PassToken
+    public BaseResponse batchUpdateOrganization(@RequestBody BatchImportOrganizationReq batchImportOrganizationReq) {
+
+        baseSapOrganizationService.batchUpdateOrganization(batchImportOrganizationReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
 
     @ApiOperation("批量导入SKU数据")
     @PostMapping("batchImportSku")
@@ -84,6 +94,16 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量修改SKU数据")
+    @PostMapping("batchUpdateSku")
+    @PassToken
+    public BaseResponse batchUpdateSku(@RequestBody BatchImportSkuReq batchImportSkuReq) {
+
+        baseSapSkuService.batchUpdateSku(batchImportSkuReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
     @ApiOperation("批量导入品牌数据")
     @PostMapping("batchImportBrand")
     @PassToken
@@ -94,6 +114,16 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量修改品牌数据")
+    @PostMapping("batchUpdateBrand")
+    @PassToken
+    public BaseResponse batchUpdateBrand(@RequestBody BatchImportBrandReq batchImportBrandReq) {
+
+        baseSapBrandService.batchUpdateBrand(batchImportBrandReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
     @ApiOperation("批量导入Sap物料数据")
     @PostMapping("batchImportMaterial")
     @PassToken

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportBrandReq.java

@@ -30,9 +30,6 @@ public class BatchImportBrandReq implements Serializable {
     @ApiModel(value = "BatchImportBrandReq_SapBrandBean")
     public static class SapBrandBean implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "品牌code")
         private String brandCode;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportOrganizationReq.java

@@ -30,9 +30,6 @@ public class BatchImportOrganizationReq implements Serializable {
     @ApiModel(value = "BatchImportOrganizationReq_SapOrganization")
     public static class SapOrganization implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "组织架构代码")
         private String customerCode;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/BatchImportSkuReq.java

@@ -30,9 +30,6 @@ public class BatchImportSkuReq implements Serializable {
     @ApiModel(value = "BatchImportSkuReq_SapSkuBean")
     public static class SapSkuBean implements Serializable {
 
-        @ApiModelProperty(value = "id")
-        private Long id;
-
         @ApiModelProperty(value = "商品编号（即页面上手输的skuid）")
         private String skuCode;
 

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

@@ -15,4 +15,11 @@ public interface BaseSapBrandService {
      * @param batchImportBrandReq
      */
     void batchImportBrand(BatchImportBrandReq batchImportBrandReq);
+
+    /**
+     * 批量修改品牌数据
+     *
+     * @param batchImportBrandReq
+     */
+    void batchUpdateBrand(BatchImportBrandReq batchImportBrandReq);
 }

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

@@ -15,4 +15,11 @@ public interface BaseSapOrganizationService {
      * @param batchImportOrganizationReq
      */
     void batchImportOrganization(BatchImportOrganizationReq batchImportOrganizationReq);
+
+    /**
+     * 批量修改Sap组织架构数据
+     *
+     * @param batchImportOrganizationReq
+     */
+    void batchUpdateOrganization(BatchImportOrganizationReq batchImportOrganizationReq);
 }

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

@@ -15,4 +15,11 @@ public interface BaseSapSkuService {
      * @param batchImportSkuReq
      */
     void batchImportSku(BatchImportSkuReq batchImportSkuReq);
+
+    /**
+     * 批量修改SKU数据
+     *
+     * @param batchImportSkuReq
+     */
+    void batchUpdateSku(BatchImportSkuReq batchImportSkuReq);
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -38,14 +37,12 @@ public class BaseSapBrandServiceImpl implements BaseSapBrandService {
             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);
             } catch (Exception e) {
                 log.error("导入Sap品牌数据失败", e);
@@ -53,32 +50,65 @@ public class BaseSapBrandServiceImpl implements BaseSapBrandService {
         }
     }
 
-    public void saveBaseSapBrand(BaseSapBrand bsb) {
+    @Override
+    public void batchUpdateBrand(BatchImportBrandReq req) {
 
-        //校验入参 code不能重复
-        QueryWrapper<BaseSapBrand> qw = new QueryWrapper<>();
-        qw.eq("brand_code", bsb.getBrandCode());
-        if (bsb.getId() != null) {
-            qw.ne("id", bsb.getId());
-        }
-        List<BaseSapBrand> sapBrandList = baseSapBrandMapper.selectList(qw);
-        if (CollectionUtil.isNotEmpty(sapBrandList)) {
-            log.info("品牌code:{}已存在", bsb.getBrandCode());
-        }
+        List<BatchImportBrandReq.SapBrandBean> brandBeanList = req.getSapBrandBeanList();
+
+        for (BatchImportBrandReq.SapBrandBean brand : brandBeanList) {
 
-        if (bsb.getId() != null) {
-            BaseSapBrand baseSapBrand = baseSapBrandMapper.selectById(bsb.getId());
-            if (ObjectUtil.isNull(baseSapBrand)) {
-                log.info("sap品牌code:{}不存在", baseSapBrand.getBrandCode());
+            try {
+                //申明对象
+                BaseSapBrand sapBrand = new BaseSapBrand();
+                sapBrand.setBrandCode(brand.getBrandCode());
+                sapBrand.setBrandLevel(brand.getBrandLevel());
+                sapBrand.setBrandName(brand.getBrandName());
+                sapBrand.setParentBrandCode(brand.getParentBrandCode());
+                sapBrand.setParentBrandName(brand.getParentBrandName());
+
+                updateBaseSapBrand(sapBrand);
+            } catch (Exception e) {
+                log.error("修改Sap品牌数据失败", e);
             }
         }
 
-        //新增or修改
-        if (bsb.getId() != null) {
-            baseSapBrandMapper.updateById(bsb);
-        } else {
-            baseSapBrandMapper.insert(bsb);
+    }
+
+    private void updateBaseSapBrand(BaseSapBrand bsb) {
+
+        BaseSapBrand sapBrand = getBaseSapBrand(bsb.getBrandCode());
+
+        if (ObjectUtil.isNull(bsb)) {
+            log.info("品牌code:{}不存在", bsb.getBrandCode());
+        }
+
+        bsb.setId(sapBrand.getId());
+        baseSapBrandMapper.updateById(bsb);
+    }
+
+    public void saveBaseSapBrand(BaseSapBrand bsb) {
+
+        BaseSapBrand sapBrand = getBaseSapBrand(bsb.getBrandCode());
+
+        if (ObjectUtil.isNotNull(sapBrand)) {
+            log.info("品牌code:{}已存在", bsb.getBrandCode());
+            return;
         }
 
+        baseSapBrandMapper.insert(bsb);
+
+    }
+
+    private BaseSapBrand getBaseSapBrand(String brandCode) {
+
+        QueryWrapper<BaseSapBrand> qw = new QueryWrapper<>();
+        qw.eq("brand_code", brandCode);
+        qw.eq("is_delete", 0);
+
+        //根据品牌code查询Sap品牌信息
+        BaseSapBrand baseSapBrand = baseSapBrandMapper.selectOne(qw);
+
+        return baseSapBrand;
+
     }
 }

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.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -40,7 +39,6 @@ public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationServic
                 organization.setOrganizationLevel(sap.getOrganizationLevel());
                 organization.setParentCode(sap.getParentCode());
                 organization.setProvince(sap.getProvince());
-                organization.setId(sap.getId());
 
                 saveBaseSapOrganization(organization);
             } catch (Exception e) {
@@ -50,32 +48,66 @@ public class BaseSapOrganizationServiceImpl implements BaseSapOrganizationServic
 
     }
 
-    public void saveBaseSapOrganization(BaseSapOrganization bso) {
+    @Override
+    public void batchUpdateOrganization(BatchImportOrganizationReq req) {
+        List<BatchImportOrganizationReq.SapOrganization> organizationList = req.getOrganizationList();
 
-        //校验入参 code不能重复
-        QueryWrapper<BaseSapOrganization> qw = new QueryWrapper<>();
-        qw.eq("customer_code", bso.getCustomerCode());
-        if (bso.getId() != null) {
-            qw.ne("id", bso.getId());
-        }
-        List<BaseSapOrganization> organizationList = baseSapOrganizationMapper.selectList(qw);
-        if (CollectionUtil.isNotEmpty(organizationList)) {
-            log.info("组织架构代码:{}已存在", bso.getCustomerCode());
-        }
+        for (BatchImportOrganizationReq.SapOrganization sap : organizationList) {
+
+            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());
 
-        if (bso.getId() != null) {
-            BaseSapOrganization baseSapOrganization = baseSapOrganizationMapper.selectById(bso.getId());
-            if (ObjectUtil.isNull(baseSapOrganization)) {
-                log.info("组织架构代码:{}不存在", bso.getCustomerCode());
+                updateBeaseSapOrganization(organization);
+            } catch (Exception e) {
+                log.error("修改组织架构数据失败", e);
             }
+
         }
 
-        //新增or修改
-        if (bso.getId() != null) {
-            baseSapOrganizationMapper.updateById(bso);
-        } else {
-            baseSapOrganizationMapper.insert(bso);
+    }
+
+    private void updateBeaseSapOrganization(BaseSapOrganization bso) {
+
+        BaseSapOrganization sapOrganization = getBaseSapOrganization(bso.getCustomerCode());
+
+        if (ObjectUtil.isNull(sapOrganization)) {
+            log.info("组织架构代码:{}不存在", bso.getCustomerCode());
+        }
+
+        bso.setId(sapOrganization.getId());
+        bso.setUpdateTime(LocalDateTime.now());
+        baseSapOrganizationMapper.updateById(bso);
+    }
+
+    public void saveBaseSapOrganization(BaseSapOrganization bso) {
+
+        BaseSapOrganization sapOrganization = getBaseSapOrganization(bso.getCustomerCode());
+
+        if (ObjectUtil.isNotNull(sapOrganization)) {
+            log.info("组织架构代码:{}已存在", bso.getCustomerCode());
+            return;
         }
 
+        baseSapOrganizationMapper.insert(bso);
+
+    }
+
+
+    private BaseSapOrganization getBaseSapOrganization(String customerCode) {
+
+        QueryWrapper<BaseSapOrganization> qw = new QueryWrapper<>();
+        qw.eq("customer_code", customerCode);
+        qw.eq("is_delete", 0);
+
+        //根据组织架构代码查询组织架构信息
+        BaseSapOrganization baseSapOrganization = baseSapOrganizationMapper.selectOne(qw);
+
+        return baseSapOrganization;
+
     }
 }

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

@@ -1,6 +1,5 @@
 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;
@@ -35,7 +34,6 @@ public class BaseSapSkuServiceImpl implements BaseSapSkuService {
             try {
                 //申明对象
                 BaseSapSku sapSku = new BaseSapSku();
-                sapSku.setId(sku.getId());
                 sapSku.setBrandCode(sku.getBrandCode());
                 sapSku.setSubBrandCode(sku.getSubBrandCode());
                 sapSku.setSkuCode(sku.getSkuCode());
@@ -49,33 +47,62 @@ public class BaseSapSkuServiceImpl implements BaseSapSkuService {
         }
     }
 
-    public void saveBaseSapSku(BaseSapSku bss) {
+    @Override
+    public void batchUpdateSku(BatchImportSkuReq req) {
 
-        //校验入参 code不能重复
-        QueryWrapper<BaseSapSku> qw = new QueryWrapper<>();
-        qw.eq("sku_code", bss.getSkuCode());
-        if (bss.getId() != null) {
-            qw.ne("id", bss.getId());
-        }
-        List<BaseSapSku> sapSkuList = baseSapSkuMapper.selectList(qw);
-        if (CollectionUtil.isNotEmpty(sapSkuList)) {
-            log.info("SKU ID:{}已存在", bss.getSkuCode());
-        }
+        List<BatchImportSkuReq.SapSkuBean> sapSkuBeanList = req.getSapSkuBeanList();
+
+        for (BatchImportSkuReq.SapSkuBean sku : sapSkuBeanList) {
+
+            try {
+                //申明对象
+                BaseSapSku sapSku = new BaseSapSku();
+                sapSku.setBrandCode(sku.getBrandCode());
+                sapSku.setSubBrandCode(sku.getSubBrandCode());
+                sapSku.setSkuCode(sku.getSkuCode());
+                sapSku.setSkuName(sku.getSkuName());
+                sapSku.setSkuType(sku.getSkuType());
 
-        if (bss.getId() != null) {
-            BaseSapSku baseSapSku = baseSapSkuMapper.selectById(bss.getId());
-            if (ObjectUtil.isNull(baseSapSku)) {
-                log.info("SKU不存在:{}不存在", bss.getSkuCode());
+                updateBaseSapSku(sapSku);
+            } catch (Exception e) {
+                log.error("修改SKU数据失败", e);
             }
         }
 
-        //新增or修改
-        if (bss.getId() != null) {
-            baseSapSkuMapper.updateById(bss);
-        } else {
-            baseSapSkuMapper.insert(bss);
+    }
+
+    private void updateBaseSapSku(BaseSapSku bss) {
+
+        BaseSapSku sapSku = getBaseSapSku(bss.getSkuCode());
+        if (ObjectUtil.isNull(sapSku)) {
+            log.info("SKU ID:{}不存在", bss.getSkuCode());
         }
 
+        bss.setId(sapSku.getId());
+        baseSapSkuMapper.updateById(bss);
+    }
+
+    public void saveBaseSapSku(BaseSapSku bss) {
+
+        BaseSapSku sapSku = getBaseSapSku(bss.getSkuCode());
+        if (ObjectUtil.isNotNull(sapSku)) {
+            log.info("SKU ID:{}已存在", bss.getSkuCode());
+            return;
+        }
+
+        baseSapSkuMapper.insert(bss);
+
+    }
+
+    private BaseSapSku getBaseSapSku(String skuCode) {
+        QueryWrapper<BaseSapSku> qw = new QueryWrapper<>();
+        qw.eq("sku_code", skuCode);
+        qw.eq("is_delete", 0);
+
+        //根据SKU code 查询SKU信息
+        BaseSapSku baseSapSku = baseSapSkuMapper.selectOne(qw);
+
+        return baseSapSku;
     }
 
 }