Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/InterOrder.php

@@ -388,12 +388,12 @@ class InterOrder extends \app\admin\BaseController{
                                 'catInfo' => json_encode($cat,JSON_UNESCAPED_UNICODE),//分类详情,
                                 'fundCode' => $cat[2]['fund_code']??"",//核算编码,
                                 'tax' => $taxinfo,//税率,
-                                'goodNum' => $param['goodNum'],//销售数量,
-                                'goodPrice' => $param['goodPrice'],//产品单价,
-                                'totalPrice' =>round( $param['goodPrice']*$param['goodNum'],2),//货款总额,
-                                'sendNum' => $param['goodNum'],//已发货数量,
-                                'wpay_fee' => round( $param['goodPrice']*$param['goodNum'],2),
-                                'winv_fee' =>round( $param['goodPrice']*$param['goodNum'],2),
+//                                'goodNum' => $param['goodNum'],//销售数量,
+//                                'goodPrice' => $param['goodPrice'],//产品单价,
+//                                'totalPrice' =>round( $param['goodPrice']*$param['goodNum'],2),//货款总额,
+//                                'sendNum' => $param['goodNum'],//已发货数量,
+//                                'wpay_fee' => round( $param['goodPrice']*$param['goodNum'],2),
+//                                'winv_fee' =>round( $param['goodPrice']*$param['goodNum'],2),
                                 'area' =>$customer['companyName']??"",//公司,
                                 'customerAttr' => $customer['parent']??"",//客户属性,
                                 'branch' => $customer['branch']??"",//分公司,从客户表中查
@@ -414,17 +414,33 @@ class InterOrder extends \app\admin\BaseController{
                                 'catInfo' => json_encode($cat,JSON_UNESCAPED_UNICODE),//分类明细',
                                 'fundCode' => $cat[2]['fund_code']??"",//NOT NULL,
                                 'tax' => $taxinfo,//税点',
-                                'goodPrice' => round( $param['goodPrice']*(1-$param['cgd_tax']),2),//成本合计/单价',
-                                'goodNum' => $param['goodNum'],//下单数量',
-                                'totalPrice' => round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
+//                                'goodPrice' => round( $param['goodPrice']*(1-$param['cgd_tax']),2),//成本合计/单价',
+//                                'goodNum' => $param['goodNum'],//下单数量',
+//                                'totalPrice' => round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
                                 'supplierNo' => $param['supplierNo'],//供应商编号',
                                 'supplierName' => $supplierName,//供应商名称',
-                                'wpay_fee' =>round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
-                                'winv_fee' =>round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
-                                'sendNum' => $param['goodNum'],//已发货数量',
+//                                'wpay_fee' =>round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
+//                                'winv_fee' =>round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2),//采购总货款',
+//                                'sendNum' => $param['goodNum'],//已发货数量',
                                 'updatetime' => date("Y-m-d H:i:s"),
                             ];
 
+									if($qrd_order['status']==0 && $cgd_order['status']==0){
+										$qrd['goodNum'] = $param['goodNum'];//销售数量,
+										$qrd['goodPrice'] = $param['goodPrice'];//销售数量,
+										$qrd['totalPrice'] = $param['totalPrice'];//销售数量,
+										$qrd['sendNum'] = $param['goodNum'];//销售数量,
+										$qrd['wpay_fee'] = round( $param['goodPrice']*$param['goodNum'],2);//销售数量,
+										$qrd['winv_fee'] = round( $param['goodPrice']*$param['goodNum'],2);//销售数量,
+
+										$cgd['goodNum'] = $param['goodNum'];//销售数量,
+										$cgd['goodPrice'] =round( $param['goodPrice']*(1-$param['cgd_tax']),2);//销售数量,
+										$cgd['totalPrice'] = round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2);//销售数量,
+										$cgd['sendNum'] = $param['goodNum'];//销售数量,
+										$cgd['wpay_fee'] = round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2);//销售数量,
+										$cgd['winv_fee'] = round(  $param['goodNum']*$param['goodPrice']*(1-$param['cgd_tax']),2);//销售数量,
+									}
+
 			$good=[
 					"id"=>$goodinfo['id'],
 					"good_name"=>$param['goodName'],