Browse Source

活动包更新

chenqp 8 months ago
parent
commit
ed73a8630b
2 changed files with 11 additions and 3 deletions
  1. 7 3
      app/Service/CheckService.php
  2. 4 0
      app/Service/InvoiceOrderService.php

+ 7 - 3
app/Service/CheckService.php

@@ -639,6 +639,7 @@ class CheckService extends Service
                     'storehouse_id' => $value['storehouse_id'],
                     'depart_id' => $order['depart_id'],
                     'top_depart_id' => $order['top_depart_id'],
+                    'price' => $value['price'],
                 ];
             }
         }
@@ -702,6 +703,7 @@ class CheckService extends Service
                     'storehouse_id' => $value['storehouse_id'],
                     'depart_id' => $order['depart_id'],
                     'top_depart_id' => $order['top_depart_id'],
+                    'price' => $value['price'],
                 ];
             }
         }
@@ -755,6 +757,7 @@ class CheckService extends Service
                     'storehouse_id' => $value['storehouse_id'],
                     'depart_id' => $order['depart_id'],
                     'top_depart_id' => $order['top_depart_id'],
+                    'price' => $value['price'],
                 ];
             }
         }
@@ -862,6 +865,7 @@ class CheckService extends Service
                         'storehouse_id' => $value['storehouse_id'],
                         'depart_id' => $order['depart_id'],
                         'top_depart_id' => $order['top_depart_id'],
+                        'price' => $value['return_exchange_price'],
                     ];
                 }
             }
@@ -1086,7 +1090,7 @@ class CheckService extends Service
             ->where('crt_time',$crt_time)
             ->where('order_number',$data['order_number'])
             ->where('number','<',0)
-            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type')
+            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type','price')
             ->get()->toArray();
         if(empty($result)) return [false,'施工出库流水数据未找到'];
 
@@ -1119,7 +1123,7 @@ class CheckService extends Service
             ->where('crt_time',$crt_time)
             ->where('order_number',$data['order_number'])
             ->where('number','>',0)
-            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type')
+            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type','price')
             ->get()->toArray();
         if(empty($result)) return [false,'采购入库流水数据未找到'];
 
@@ -1152,7 +1156,7 @@ class CheckService extends Service
         $result = InOutRecord::where('del_time',0)
             ->where('crt_time',$crt_time)
             ->where('order_number',$data['order_number'])
-            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type')
+            ->select('product_id','storehouse_id','number','depart_id','order_number','top_depart_id','order_type','price')
             ->get()->toArray();
         if(empty($result)) return [false,'退换货流水数据未找到'];
 

+ 4 - 0
app/Service/InvoiceOrderService.php

@@ -55,6 +55,8 @@ class InvoiceOrderService extends Service
                         'storehouse_id' => $data['storehouse_id'] ?? 0,
                         'product_id' => $value['product_id'],
                         'number' => $value['number'],
+                        'price' => $value['price'] ?? 0,
+                        'final_amount' => $value['final_amount'] ?? 0,
                         'mark' => $value['mark'] ?? '',
                     ];
                 }
@@ -111,6 +113,8 @@ class InvoiceOrderService extends Service
                         'storehouse_id' => $data['storehouse_id'] ?? 0,
                         'product_id' => $value['product_id'],
                         'number' => $value['number'],
+                        'price' => $value['price'] ?? 0,
+                        'final_amount' => $value['final_amount'] ?? 0,
                         'mark' => $value['mark'] ?? '',
                     ];
                 }