cqpCow 1 年之前
父節點
當前提交
eb81441c37

+ 4 - 0
app/Service/ConstructionService.php

@@ -225,6 +225,10 @@ class ConstructionService extends Service
      */
     public function constructionDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
+        $construction = Construction::where('del_time',0)->where('id',$data['id'])->first();
+        if(empty($construction)) return [false,'施工单不存在或已被删除'];
+        $construction = $construction->toArray();
+        if($construction['state'] > Construction::STATE_ZERO) return [false,'请确认施工单状态,操作失败'];
 
         $product_save = $this->getSaveDetail($data['id']);
         try {

+ 5 - 4
app/Service/PurchaseOrderService.php

@@ -147,6 +147,7 @@ class PurchaseOrderService extends Service
         if(empty($order)) return [false, '采购订单不存在或已被删除'];
         $order = $order->toArray();
         $order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
+        $order['order_type_title'] = PurchaseOrder::$order_type[$order['order_type']] ?? '';
         $order['state_title'] = PurchaseOrder::$name[$order['state']] ?? '';
         $sales = SalesOrder::where('id',$order['sales_order_id'])->value('order_number');
         $order['sales_order_number'] = $sales;
@@ -173,10 +174,10 @@ class PurchaseOrderService extends Service
      */
     public function del($data){
         if($this->isEmpty($data,'order_number')) return [false,'请选择数据!'];
-
-        $bool = PurchaseOrder::where('order_number',$data['order_number'])
-            ->where('state','>',PurchaseOrder::STATE_ZERO)->exists();
-        if($bool) return [false,'采购订单已审核,删除失败!'];
+        $order = PurchaseOrder::where('del_time',0)->where('order_number',$data['order_number'])->first();
+        if(empty($order)) return [false,'采购单不存在或已被删除'];
+        $order = $order->toArray();
+        if($order['state'] > PurchaseOrder::STATE_ZERO) return [false,'请确认采购订单状态,删除失败!'];
 
         try{
             DB::beginTransaction();

+ 4 - 4
app/Service/ReturnExchangeOrderService.php

@@ -246,10 +246,10 @@ class ReturnExchangeOrderService extends Service
 
     public function del($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
-
-        $bool = ReturnExchangeOrder::where('id',$data['id'])
-            ->where('state','>',ReturnExchangeOrder::State_zero)->exists();
-        if($bool) return [false,'退换货单已确认,删除失败!'];
+        $order = ReturnExchangeOrder::where('del_time',0)->where('id',$data['id'])->first();
+        if(empty($order)) return [false,'退换货单不存在或已被删除'];
+        $order = $order->toArray();
+        if($order['state'] > ReturnExchangeOrder::State_zero) return [false,'请确认退换货单状态,删除失败!'];
 
         $product_save_minus = $this->getSaveDetailMinus($data['id']);
         try{

+ 6 - 3
app/Service/SalesOrderService.php

@@ -285,13 +285,16 @@ class SalesOrderService extends Service
      */
     public function salesOrderDel($data){
         if($this->isEmpty($data,'id')) return [false,'请选择数据!'];
+        $sale_order = SalesOrder::where('id',$data['id'])->first();
+        if(empty($sale_order)) return [false,'合同不存在或已被删除'];
+        $sale_order = $sale_order->toArray();
+        if($sale_order['state'] > 0) return [false,'请确认合同状态,删除失败'];
 
         try {
             DB::beginTransaction();
 
-            SalesOrder::where('id',$data['id'])->update([
-                'del_time'=> time()
-            ]);
+            SalesOrder::where('del_time',0)
+                ->where('id',$data['id'])->update(['del_time'=> time()]);
             SalesOrderInfo::where('del_time',0)
                 ->where('sales_order_id',$data['id'])
                 ->update(['del_time' => time()]);