cqpCow 1 år sedan
förälder
incheckning
904300e5ab
2 ändrade filer med 5 tillägg och 2 borttagningar
  1. 3 1
      app/Service/PurchaseOrderService.php
  2. 2 1
      app/Service/SalesOrderService.php

+ 3 - 1
app/Service/PurchaseOrderService.php

@@ -7,6 +7,7 @@ use App\Model\BookingList;
 use App\Model\Depart;
 use App\Model\Employee;
 use App\Model\PaymentReceipt;
+use App\Model\PaymentReceiptInfo;
 use App\Model\PurchaseOrder;
 use App\Model\PurchaseOrderFile;
 use App\Model\PurchaseOrderInfo;
@@ -298,7 +299,8 @@ class PurchaseOrderService extends Service
         $order = $order->toArray();
         if($order['state'] > PurchaseOrder::STATE_ZERO) return [false,'请确认采购订单状态,删除失败!'];
 
-        $bool = PaymentReceipt::where('del_time',0)
+        $bool = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
             ->where('data_order_no', $order['order_number'])
             ->exist();
         if($bool) return [false, '采购已存在收付款单记录,请先删除收付款单据!'];

+ 2 - 1
app/Service/SalesOrderService.php

@@ -478,7 +478,8 @@ class SalesOrderService extends Service
         $sale_order = $sale_order->toArray();
         if($sale_order['state'] > 0) return [false,'请确认合同状态,删除失败'];
 
-        $bool = PaymentReceipt::where('del_time',0)
+        $bool = PaymentReceiptInfo::where('del_time',0)
+            ->where('type',PaymentReceiptInfo::type_three)
             ->where('data_order_no', $sale_order['order_number'])
             ->exist();
         if($bool) return [false, '合同已存在收付款单记录,请先删除收付款单据!'];