From 4c1fb7d7c1ebf73b728577766e245ed7975c63ba Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Tue, 24 Sep 2019 22:07:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A7=94=E5=A4=96=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=20=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95=20=20?=
 =?UTF-8?q?=E5=8F=91=E8=B4=A7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customerOrder/service/impl/CustomerOrderServiceImpl.java  | 3 +++
 .../modules/wms/invoice/service/impl/InvoiceServiceImpl.java  | 4 ++++
 .../service/impl/OutSourceProcessSheetServiceImpl.java        | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java
index 859097e8..17d342fd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/customerOrder/service/impl/CustomerOrderServiceImpl.java
@@ -238,6 +238,9 @@ public class CustomerOrderServiceImpl implements CustomerOrderService {
             BeanUtils.copyProperties(customerOrderProductDTO, customerOrderProduct);
             customerOrderProduct.setCustomerOrderId(customerOrder.getId());
             customerOrderProduct.setStatus(true);
+            if(!(!CollectionUtils.isEmpty(deleteTargetList) && deleteTargetList.contains(customerOrderProductDTO.getId()))){
+                customerOrderProductList.add(customerOrderProduct);
+            }
         }
         customerOrderProductRepository.saveAll(customerOrderProductList);
 
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java
index 44d47ef0..f67aaba9 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/invoice/service/impl/InvoiceServiceImpl.java
@@ -259,6 +259,10 @@ public class InvoiceServiceImpl implements InvoiceService {
             BeanUtils.copyProperties(invoiceProductDTO, invoiceProduct);
             invoiceProduct.setInvoiceId(invoice.getId());
             invoiceProduct.setStatus(true);
+
+            if(!(!CollectionUtils.isEmpty(deleteTargetList) && deleteTargetList.contains(invoiceProductDTO.getId()))){
+                invoiceProductList.add(invoiceProduct);
+            }
         }
         invoiceProductRepository.saveAll(invoiceProductList);
 
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java
index dadda0a5..41719b8d 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/outSourceProductSheet/service/impl/OutSourceProcessSheetServiceImpl.java
@@ -218,6 +218,10 @@ public class OutSourceProcessSheetServiceImpl implements OutSourceProcessSheetSe
             BeanUtils.copyProperties(outSourceProcessSheetProductDTO, outSourceProcessSheetProduct);
             outSourceProcessSheetProduct.setOutSourceProcessSheetId(outSourceProcessSheet.getId());
             outSourceProcessSheetProduct.setStatus(true);
+
+            if(!(!CollectionUtils.isEmpty(deleteTargetList) && deleteTargetList.contains(outSourceProcessSheetProductDTO.getId()))){
+                outSourceProcessSheetProductList.add(outSourceProcessSheetProduct);
+            }
         }
         outSourceProcessSheetProductRepository.saveAll(outSourceProcessSheetProductList);