用友修改

app/Service/U8ServerService.php

@@ -120,7 +120,7 @@ class U8ServerService extends Service
     }
 
     //采购订单保存
-    public function U8PO_PomainSave($data){
+    public function U8PO_PomainSave($data,$cmaker = ""){
         if(! is_array($data)) $data = [$data];
         $id = $data;
 
@@ -195,8 +195,8 @@ class U8ServerService extends Service
             $post['data'] = [
                 "cpoid"=>"",
                 "dpodate"=>date("Y-m-d",$value['crt_time']),
-                "cmemo"=>"T9采购单:" . $value['order_number'],
-                "cmaker"=>"admin",
+                "cmemo"=>$value['mark'], //"T9采购单:" . $value['order_number']
+                "cmaker"=>$cmaker ?? 'admin',
                 "cmaketime"=>$time,
                 "IsExamine"=>false,
                 "cptname"=>$value['cptname']??"",//采购类型
@@ -251,7 +251,7 @@ class U8ServerService extends Service
     }
 
     //销售订单（合同）保存
-    public function U8SaleOrderSave($data){
+    public function U8SaleOrderSave($data,$cmaker = ""){
         if(! is_array($data)) $data = [$data];
         $id = $data;
 
@@ -339,7 +339,7 @@ class U8ServerService extends Service
             $post['data'] = [
                 "csocode"=>'',
                 "ddate"=> $time,
-                "cmaker"=>"admin",
+                "cmaker"=>$cmaker ?? 'admin',
                 "dcreatesystime"=>$time1,
                 "cstcode"=>"",
                 "cbustype" => $value['cbustype'], //业务类型
@@ -351,7 +351,7 @@ class U8ServerService extends Service
                 "cpersoncode"=>"", //业务员编码 暂时不要
                 "jobnumber"=>$value['jobnumber'],//业务员工号
                 "itaxrate"=>"0",
-                "cmemo"=>"T9销售订单:". $value['order_number'],
+                "cmemo"=>$value['mark'],//"T9销售订单:". $value['order_number']
                 "cdefine1"=>"",
                 "cdefine2"=>"",
                 "cdefine3"=>"",
@@ -533,6 +533,12 @@ class U8ServerService extends Service
             $main_tmp = $main_map[$value['sales_order_id']] ?? [];
             $position = $code_map[$main_tmp['install_position']] ?? "";
 
+            if($main_tmp['model_type'] == SalesOrder::Model_type_four){
+                //线上订单
+                $cdefine28 = $main_tmp['plat_order'] ?? "";
+            }else{
+                $cdefine28 = $main_tmp['order_number'] ?? "";
+            }
 //            "itaxrate"=>$son['itaxrate'], //税率
 //            "iunitprice"=>$son['iunitprice'],//原币单价
 //            "itaxunitprice"=>$son['itaxunitprice'], // 原币含税单价
@@ -543,21 +549,21 @@ class U8ServerService extends Service
             if($value['rate'] > 0){
                 $value['itaxrate'] = $value['rate'];
                 $rate = round($value['rate'] / 100,2);
-                $value['iunitprice'] = round($value['price'] / (1 + $rate),2);
-                $value['itaxunitprice'] = $value['price'];
-                $value['isum'] = round($value['price'] * $value['number'],2);
+                $value['iunitprice'] = round($value['final_amount'] / (1 + $rate),2);
+                $value['itaxunitprice'] = $value['final_amount'];
+                $value['isum'] = round($value['final_amount'] * $value['number'],2);
                 $value['imoney'] = round($value['iunitprice'] * $value['number'],2);
                 $value['itax'] = round($value['isum'] - $value['imoney'],2);
             }else{
                 $value['itaxrate'] = 0;
-                $value['iunitprice'] = $value['price'];
-                $value['itaxunitprice'] = $value['price'];
-                $value['isum'] = $value['price'] * $value['number'];
+                $value['iunitprice'] = $value['final_amount'];
+                $value['itaxunitprice'] = $value['final_amount'];
+                $value['isum'] = $value['final_amount'] * $value['number'];
                 $value['imoney'] = $value['isum'];
                 $value['itax'] = 0;
             }
             $value['cdefine25'] = $code_map[$main_tmp['plat_type']] ?? ""; //平台类型
-            $value['cdefine28'] = $main_tmp['plat_order'] ?? ""; //平台单号
+            $value['cdefine28'] = $cdefine28; //平台单号
 //            $top_depart_id = $see[$value['sales_order_id']] ?? 0;
             $value['cdefine29'] = $position ?? "";//安装地点
             $value['cdefine32'] = "";//直播销售 暂时没有