1

app/Model/SalesOrderInfo.php

@@ -13,9 +13,11 @@ class SalesOrderInfo extends Model
     const type_one = 1; // 签订人
     const type_two = 2; // 负责人
     const type_three = 3; // 协同人
+    const type_four = 4; // 文件
     public static $type = [
         self::type_one,
         self::type_two,
         self::type_three,
+        self::type_four,
     ];
 }

app/Service/ConstructionService.php

@@ -102,6 +102,7 @@ class ConstructionService extends Service
                         'storehouse_id' => $data['storehouse_id'] ?? 0,
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 ConstructionProductInfo::insert($insert);
@@ -198,6 +199,7 @@ class ConstructionService extends Service
                         'storehouse_id' => $data['storehouse_id'] ?? 0,
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 ConstructionProductInfo::insert($insert);

app/Service/ProductInventoryService.php

@@ -388,6 +388,8 @@ class ProductInventoryService extends Service
         }
 
         if(isset($data['param_two'])){
+            $res = $this->checkNumber($data['param_two']);
+            if(! $res) return [false, '整单扣除率请输入不超过两位小数并且大于0的数值'];
             ProductInventorySet::where('id',$data['id'])
                 ->update(['param_two' => $data['param_two']]);
         }

app/Service/ReturnExchangeOrderService.php

@@ -47,6 +47,7 @@ class ReturnExchangeOrderService extends Service
                         'storehouse_id' => $data['storehouse_id'],
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 ReturnExchangeOrderProductInfo::insert($sub);
@@ -148,6 +149,7 @@ class ReturnExchangeOrderService extends Service
                         'storehouse_id' => $data['storehouse_id'],
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 ReturnExchangeOrderProductInfo::insert($sub);

app/Service/SalesOrderService.php

@@ -116,6 +116,19 @@ class SalesOrderService extends Service
                 SalesOrderInfo::insert($insert);
             }
 
+            if(! empty($data['file'])){
+                $insert = [];
+                foreach ($data['file'] as $value){
+                    $insert[] = [
+                        'sales_order_id' => $model->id,
+                        'file' => $value,
+                        'type' => SalesOrderInfo::type_four,
+                        'crt_time' => $time,
+                    ];
+                }
+                SalesOrderInfo::insert($insert);
+            }
+
             if(! empty($data['product'])){
                 $insert = [];
                 foreach ($data['product'] as $value){
@@ -129,6 +142,7 @@ class SalesOrderService extends Service
                         'crt_time' => $time,
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 SalesOrderProductInfo::insert($insert);
@@ -233,6 +247,19 @@ class SalesOrderService extends Service
                 SalesOrderInfo::insert($insert);
             }
 
+            if(! empty($data['file'])){
+                $insert = [];
+                foreach ($data['file'] as $value){
+                    $insert[] = [
+                        'sales_order_id' => $model->id,
+                        'file' => $value,
+                        'type' => SalesOrderInfo::type_four,
+                        'crt_time' => $time,
+                    ];
+                }
+                SalesOrderInfo::insert($insert);
+            }
+
             if(! empty($data['product'])){
                 $insert = [];
                 foreach ($data['product'] as $value){
@@ -246,6 +273,7 @@ class SalesOrderService extends Service
                         'crt_time' => $time,
                         'basic_type_id' => $value['basic_type_id'],
                         'price' => $value['price'],
+                        'final_amount' => $value['final_amount'] ?? 0,
                     ];
                 }
                 SalesOrderProductInfo::insert($insert);
@@ -315,7 +343,7 @@ class SalesOrderService extends Service
         $customer = Customer::where('id',$sales['customer_id'])->value('title');
         $sales['customer_title'] = $customer;
         $sales['sales_order_type_title'] = SalesOrder::$order_type[$sales['sales_order_type']] ?? '';
-        $sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = $sales['dispatch_depart_one'] = $sales['dispatch_employee'] = $sales['dispatch_depart_two'] = [];
+        $sales['file'] = $sales['employee_one'] = $sales['employee_two'] = $sales['employee_three'] = $sales['product'] = $sales['dispatch_depart_one'] = $sales['dispatch_employee'] = $sales['dispatch_depart_two'] = [];
         $array = [
             $sales['order_type'],
             $sales['deal_type'],
@@ -360,6 +388,11 @@ class SalesOrderService extends Service
                 $sales['employee_two'][] = $tmp;
             }elseif ($value['type'] == SalesOrderInfo::type_three){
                 $sales['employee_three'][] = $tmp;
+            }elseif ($value['type'] == SalesOrderInfo::type_four){
+                $sales['file'][] = [
+                    'url' => $value['file'],
+                    'name' => $value['name'],
+                ];
             }
         }
 
@@ -485,10 +518,6 @@ class SalesOrderService extends Service
             }
         }
 
-        if(! empty($data['rate'])){
-            $res = $this->checkNumber($data['rate']);
-            if(! $res) return [false, '整单扣除率请输入不超过两位小数并且大于0的数值'];
-        }
         if(! empty($data['contract_fee'])){
             $res = $this->checkNumber($data['contract_fee']);
             if(! $res) return [false, '合同金额请输入不超过两位小数并且大于0的数值'];