feat：添加sap订单明细删除接口

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

@@ -1,6 +1,7 @@
 package com.abi.qms.platform.controller.console;
 
 import com.abi.qms.platform.annotation.PassToken;
+import com.abi.qms.platform.dto.req.BatchDeletePackageSapOrderReq;
 import com.abi.qms.platform.dto.req.BatchImportBrandReq;
 import com.abi.qms.platform.dto.req.BatchImportCoverFactoryReq;
 import com.abi.qms.platform.dto.req.BatchImportMaterialReq;
@@ -204,6 +205,16 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量删除Sap码包订单数据")
+    @PostMapping("batchDeletePackageSapOrder")
+    @PassToken
+    public BaseResponse batchDeletePackageSapOrder(@RequestBody BatchDeletePackageSapOrderReq batchDeletePackageSapOrderReq) {
+
+        qrPackageSapOrderService.batchDeletePackageSapOrder(batchDeletePackageSapOrderReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
     @ApiOperation("批量导入Sap物料订单明细数据")
     @PostMapping("batchImportPackageSapOrderItem")
     @PassToken
@@ -224,5 +235,15 @@ public class BaseSapImportController {
         return BaseResponse.create();
     }
 
+    @ApiOperation("批量删除SAP物料订单明细数据")
+    @PostMapping("batchDeletePackageSapOrderItem")
+    @PassToken
+    public BaseResponse batchDeletePackageSapOrderItem(@RequestBody BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq) {
+
+        qrPackageSapOrderItemService.batchDeletePackageSapOrderItem(batchImportPackageSapOrderItemReq);
+        //包装出参
+        return BaseResponse.create();
+    }
+
 
 }

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

@@ -0,0 +1,21 @@
+package com.abi.qms.platform.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: fangxinjian
+ * @date: 2021/07/01 17:31
+ * @description: 批量删除sap订单数据入参
+ */
+@Data
+@ApiModel
+public class BatchDeletePackageSapOrderReq implements Serializable {
+
+    @ApiModelProperty("sap订单号list")
+    private List<String> sapOrderNoList;
+}

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

@@ -22,4 +22,11 @@ public interface QrPackageSapOrderItemService {
      * @param batchImportPackageSapOrderItemReq
      */
     void batchUpdatePackageSapOrderItem(BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
+
+    /**
+     * 批量删除SAP物料订单明细数据
+     *
+     * @param batchImportPackageSapOrderItemReq
+     */
+    void batchDeletePackageSapOrderItem(BatchImportPackageSapOrderItemReq batchImportPackageSapOrderItemReq);
 }

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

@@ -1,5 +1,6 @@
 package com.abi.qms.platform.service;
 
+import com.abi.qms.platform.dto.req.BatchDeletePackageSapOrderReq;
 import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderReq;
 
 /**
@@ -22,4 +23,11 @@ public interface QrPackageSapOrderService {
      * @param batchImportPackageSapOrderReq
      */
     void batchUpdatePackageSapOrder(BatchImportPackageSapOrderReq batchImportPackageSapOrderReq);
+
+    /**
+     * 批量删除sap码包订单数据
+     *
+     * @param batchDeletePackageSapOrderReq
+     */
+    void batchDeletePackageSapOrder(BatchDeletePackageSapOrderReq batchDeletePackageSapOrderReq);
 }

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

@@ -80,7 +80,7 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
         BaseSapCoverFactory baseSapCoverFactory = getBaseSapCoverFactoryInfo(sapCoverFactory.getSapCoverFactoryId());
 
         if (ObjectUtil.isNull(baseSapCoverFactory)) {
-            log.info("Sap供应商ID:{}不存在", baseSapCoverFactory.getSapCoverFactoryId());
+            log.info("Sap供应商ID:{}不存在", sapCoverFactory.getSapCoverFactoryId());
             return;
         }
 
@@ -102,7 +102,7 @@ public class BaseSapCoverFactoryServiceImpl implements BaseSapCoverFactoryServic
         BaseSapCoverFactory baseSapCoverFactory = getBaseSapCoverFactoryInfo(sapCoverFactory.getSapCoverFactoryId());
 
         if (ObjectUtil.isNotNull(baseSapCoverFactory)) {
-            log.info("Sap供应商ID:{}已存在", baseSapCoverFactory.getSapCoverFactoryId());
+            log.info("Sap供应商ID:{}已存在", sapCoverFactory.getSapCoverFactoryId());
             return;
         }
 

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

@@ -74,7 +74,7 @@ public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
         BaseSapMaterial baseSapMaterial = getBaseSapMaterialInfo(sapMaterial.getSapMaterialId());
 
         if (ObjectUtil.isNull(baseSapMaterial)) {
-            log.info("Sap物料ID:{}不存在", baseSapMaterial.getSapMaterialId());
+            log.info("Sap物料ID:{}不存在", sapMaterial.getSapMaterialId());
             return;
         }
 
@@ -96,7 +96,7 @@ public class BaseSapMaterialServiceImpl implements BaseSapMaterialService {
         BaseSapMaterial baseSapMaterial = getBaseSapMaterialInfo(sapMaterial.getSapMaterialId());
 
         if (ObjectUtil.isNotNull(baseSapMaterial)) {
-            log.info("Sap物料ID:{}已存在", baseSapMaterial.getSapMaterialId());
+            log.info("Sap物料ID:{}已存在", sapMaterial.getSapMaterialId());
             return;
         }
 

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

@@ -75,13 +75,27 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
 
     }
 
+    @Override
+    public void batchDeletePackageSapOrderItem(BatchImportPackageSapOrderItemReq req) {
+        List<BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem> sapOrderItemList = req.getBatchImportSapOrderItemList();
+        for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem sapOrderItem : sapOrderItemList) {
+            QrPackageSapOrderItem sapOrderItemInfo = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(), sapOrderItem.getSapMaterialId());
+            if (ObjectUtil.isNull(sapOrderItemInfo)) {
+                log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
+                return;
+            }
+            qrPackageSapOrderItemMapper.deleteById(sapOrderItemInfo.getId());
+        }
+
+    }
+
     private void updateQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
 
         //根据sap订单号查询物料订单明细信息
         QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
 
         if (ObjectUtil.isNull(qrPackageSapOrderItem)) {
-            log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",qrPackageSapOrderItem.getSapOrderNo(),qrPackageSapOrderItem.getSapMaterialId());
+            log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
             return;
         }
 
@@ -90,14 +104,22 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
         qrPackageSapOrderItemMapper.updateById(sapOrderItem);
     }
 
-    private void saveQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
+    private void  saveQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
+
+        //采购数量
+        long newPurchaseCount = sapOrderItem.getPurchaseCount() == null ? 0 : sapOrderItem.getPurchaseCount();
 
         //根据sap订单号查询物料订单明细信息
         QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
+        long oldPurchaseCount = qrPackageSapOrderItem.getPurchaseCount() == null ? 0 : qrPackageSapOrderItem.getPurchaseCount();
 
         if (ObjectUtil.isNotNull(qrPackageSapOrderItem)) {
-            log.info("Sap物料订单明细订单号:{}sap物料id:{}已存在",qrPackageSapOrderItem.getSapOrderNo(),qrPackageSapOrderItem.getSapMaterialId());
-            return;
+            log.info("Sap物料订单明细订单号:{}sap物料id:{}已存在",sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
+
+            //根据订单号和物料ID查询明细信息 如果存在就累加采购数量
+            qrPackageSapOrderItem.setPurchaseCount(oldPurchaseCount + newPurchaseCount);
+            qrPackageSapOrderItemMapper.updateById(qrPackageSapOrderItem);
+
         }
 
         qrPackageSapOrderItemMapper.insert(sapOrderItem);

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

@@ -3,6 +3,7 @@ package com.abi.qms.platform.service.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.abi.qms.platform.dao.entity.QrPackageSapOrder;
 import com.abi.qms.platform.dao.mapper.QrPackageSapOrderMapper;
+import com.abi.qms.platform.dto.req.BatchDeletePackageSapOrderReq;
 import com.abi.qms.platform.dto.req.BatchImportPackageSapOrderReq;
 import com.abi.qms.platform.service.QrPackageSapOrderService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author: fangxinjian
@@ -61,13 +63,28 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
 
     }
 
+    @Override
+    public void batchDeletePackageSapOrder(BatchDeletePackageSapOrderReq req) {
+
+        List<String> sapOrderNoList = req.getSapOrderNoList();
+        for (String sapOrderNo : sapOrderNoList) {
+            QrPackageSapOrder qrPackageSapOrderInfo = getQrPackageSapOrderInfo(sapOrderNo);
+            if (ObjectUtil.isNull(qrPackageSapOrderInfo)) {
+                log.info("Sap订单号:{}不存在",sapOrderNo);
+                return;
+            }
+            qrPackageSapOrderMapper.deleteById(qrPackageSapOrderInfo.getId());
+        }
+
+    }
+
     private void updateQrPackageSapOrder(QrPackageSapOrder sapOrder) {
 
         //根据sap订单号查询订单信息
         QrPackageSapOrder qrPackageSapOrder = getQrPackageSapOrderInfo(sapOrder.getSapOrderNo());
 
         if (ObjectUtil.isNull(qrPackageSapOrder)) {
-            log.info("Sap订单号:{}不存在", qrPackageSapOrder.getSapOrderNo());
+            log.info("Sap订单号:{}不存在", sapOrder.getSapOrderNo());
             return;
         }
 
@@ -82,7 +99,7 @@ public class QrPackageSapOrderServiceImpl implements QrPackageSapOrderService {
         QrPackageSapOrder qrPackageSapOrder = getQrPackageSapOrderInfo(sapOrder.getSapOrderNo());
 
         if (ObjectUtil.isNotNull(qrPackageSapOrder)) {
-            log.info("Sap订单号:{}已存在", qrPackageSapOrder.getSapOrderNo());
+            log.info("Sap订单号:{}已存在", sapOrder.getSapOrderNo());
             return;
         }