From 8e0341d23ffe87bd5a8a3ce5ebccca39eb0d39cf Mon Sep 17 00:00:00 2001
From: zccbbg <zccbbg@qq.com>
Date: Fri, 5 May 2023 22:46:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cyl/wms/service/ReceiptOrderService.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java b/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java
index cff9394..7d0a081 100644
--- a/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java
+++ b/wms/src/main/java/com/cyl/wms/service/ReceiptOrderService.java
@@ -158,8 +158,10 @@ public class ReceiptOrderService {
             receiptOrder.setCreateTime(LocalDateTime.now());
             res = receiptOrderMapper.insert(receiptOrder);
             saveDetails(receiptOrder.getId(), receiptOrder.getDetails());
-            //保存订单金额到供应商流水表
-            saveOrUpdatePayAmount(receiptOrder);
+            if(receiptOrder.getSupplierId()!=null && receiptOrder.getPayableAmount()!=null){
+                //保存订单金额到供应商流水表
+                saveOrUpdatePayAmount(receiptOrder);
+            }
             return res;
         }
         // 2. 编辑
@@ -215,8 +217,10 @@ public class ReceiptOrderService {
         receiptOrderDetailMapper.delete(qw);
         saveDetails(receiptOrder.getId(), receiptOrder.getDetails());
 
-        //保存订单金额到供应商流水表
-        saveOrUpdatePayAmount(receiptOrder);
+        if(receiptOrder.getSupplierId()!=null && receiptOrder.getPayableAmount() !=null){
+            //保存订单金额到供应商流水表
+            saveOrUpdatePayAmount(receiptOrder);
+        }
 
         // 2.2 更新入库单
         res = receiptOrderMapper.updateById(receiptOrder);
@@ -235,7 +239,6 @@ public class ReceiptOrderService {
         supplierTransaction.setSupplierId(String.valueOf(receiptOrder.getSupplierId()));
         supplierTransaction.setTransactionType(SupplierTransaction.RECEIPT);
         supplierTransaction.setTransactionAmount(receiptOrder.getPayableAmount());
-        supplierTransaction.setTransactionAmount(receiptOrder.getPayableAmount());
         supplierTransaction.setReceiptOrderId(receiptOrder.getId().intValue());
         supplierTransaction.setTransactionCode("TS-"+ DateUtils.randomId());
         supplierTransactionService.insert(supplierTransaction);