Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/After.php

@@ -112,6 +112,10 @@ class After extends \app\BaseController
         if($status!==""){
             $where[]=['a.status',"=", $status];
         }
+        $order_type = isset($this->post['order_type']) && $this->post['order_type']!=="" ? intval($this->post['order_type']):"";
+        if($order_type!==""){
+            $where[]=['a.order_type',"=", $order_type];
+        }
         $orderCode = isset($this->post['orderCode']) && $this->post['orderCode']!="" ? trim($this->post['orderCode'])
             :"";
         if($orderCode!=""){

app/admin/controller/Consult.php

@@ -66,8 +66,7 @@ class Consult extends BaseController
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
       $list = Db::name('consult')->where($where)->page($page,$size)
-          ->field('id,zxNo,salesman,khNo,zxtime,zxtype,color,cpname,model,material,num,unit,total_fee,desc,
-          sale_price,sale_fee,khname,scheme_name,status,sequenceNo,cat_id')->select();
+          ->select();
      $data=[];
       foreach ($list as $value){
           $value['can']= isset($value['cat_id']) && $value['cat_id'] !=0 ? made($value['cat_id']):[];

app/admin/controller/Resign.php

@@ -159,7 +159,7 @@ class Resign extends BaseController
         ];
         $in = Db::name("purchease")->insert($info);
         if($in){
-            $order=["order_type"=>'BKD',"order_code"=>$bk_code,"order_status"=>0];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_status"=>0];
             ProcessOrder::AddProcess($token,$order);
           return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
@@ -197,7 +197,7 @@ class Resign extends BaseController
         unset($info['id']);
         $in = Db::name("purchease")->insert($info);
         if($in){
-            $order=["order_type"=>'BKD',"order_code"=>$bk_code,"order_status"=>0];
+            $order=["order_type"=>'BHD',"order_code"=>$bk_code,"order_status"=>0];
             ProcessOrder::AddProcess($this->post['token']  ,$order);
             return app_show(0,"新建成功",['bk_code'=>$bk_code]);
         }else{
@@ -318,7 +318,7 @@ class Resign extends BaseController
         ];
         $in = Db::name("purchease")->where($info)->save($up);
         if($in){
-            $order=["order_type"=>'BKD',"order_code"=>$info['bk_code'],"order_status"=>$info['status']];
+            $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_status"=>$info['status']];
             ProcessOrder::AddProcess($this->post['token'],$order);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
@@ -358,7 +358,7 @@ class Resign extends BaseController
         $info['updatetime']=date("Y-m-d H:i:s");
         $up = Db::name("purchease")->update($info);
         if($up){
-            $order=["order_type"=>'BKD',"order_code"=>$info['bk_code'],"order_status"=>$status];
+            $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_status"=>$status];
             ProcessOrder::AddProcess($this->post['token'],$order);
             return app_show(0,"更新成功",['bk_code'=>$info['bk_code']]);
         }else{
@@ -418,6 +418,7 @@ class Resign extends BaseController
        $mark_fee = isset($this->post['mark_fee'])&&$this->post['mark_fee']!=="" ? $this->post['mark_fee']:0;
        $teach_fee = isset($this->post['teach_fee'])&&$this->post['teach_fee']!=="" ? $this->post['teach_fee']:0;
        $nake_fee = isset($this->post['nake_fee'])&&$this->post['nake_fee']!=="" ? $this->post['nake_fee']:0;
+       $demo_fee = isset($this->post['demo_fee'])&&$this->post['demo_fee']!=="" ? $this->post['demo_fee']:0;
        $weight = isset($this->post['weight'])&&$this->post['weight']!=="" ? $this->post['weight']:0;
        $diff_weight =isset($this->post['diff_weight'])&&$this->post['diff_weight']!=="" ? $this->post['diff_weight']:0;
        $diff_price =isset($this->post['diff_price'])&&$this->post['diff_price']!=="" ? $this->post['diff_price']:0;
@@ -440,6 +441,7 @@ class Resign extends BaseController
             'mark_fee'=>$mark_fee,
             'teach_fee'=>$teach_fee,
             'nake_fee'=>$nake_fee,
+            'demo_fee'=>$demo_fee,
             'delivery_fee'=>$delivery_fee,
             'weight'=>$weight,
             'remark'=>$remark,
@@ -458,7 +460,7 @@ class Resign extends BaseController
                 $info['addtime']=date("Y-m-d H:i:s");
                 $ood=Db::name('purchease')->save($info);
                 if($ood){
-                    $order=["order_type"=>'BKD',"order_code"=>$info['bk_code'],"order_status"=>$info['status']];
+                    $order=["order_type"=>'BHD',"order_code"=>$info['bk_code'],"order_status"=>$info['status']];
                     ProcessOrder::AddProcess($this->post['token'],$order);
                     Db::commit();
                     return app_show(0,"新建成功");
@@ -541,7 +543,7 @@ class Resign extends BaseController
             $feed['updatetime']=date("Y-m-d H:i:s");
             $up = Db::name("purchease")->update($feed);
             if($up){
-                $order=["order_type"=>'BKD',"order_code"=>$feed['bk_code'],"order_status"=>$feed['status']];
+                $order=["order_type"=>'BHD',"order_code"=>$feed['bk_code'],"order_status"=>$feed['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 if($status==3){
                   //  $ware = Db::name("warehouse_addr")->where(["wsm_code"=>$feed['warehouse'],"is_del"=>0])->find();
@@ -577,6 +579,7 @@ class Resign extends BaseController
                         'mark_fee'=>$purse['mark_fee'],
                         'teach_fee'=>$purse['teach_fee'],
                         'nake_fee'=>$purse['nake_fee'],
+                        'demo_fee'=>$purse['demo_fee'],
                         'delivery_fee'=>$purse['delivery_fee'],
                         'weight'=>$purse['weight'],
                         'diff_weight'=>$purse['diff_weight'],

app/admin/controller/Sale.php

@@ -244,7 +244,7 @@ class Sale extends BaseController
     if($good_code==""){
         return error_show(1002,"商品code不能为空");
     }
-    $customer_code=isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? intval($this->post['customer_code']):"";
+    $customer_code=isset($this->post['customer_code']) && $this->post['customer_code'] !=="" ? trim($this->post['customer_code']):"";
     if($customer_code==""){
         return error_show(1002,"客户code不能为空");
     }
@@ -263,11 +263,11 @@ class Sale extends BaseController
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
 
     $vr= isset($this->post['order_addr']) && $this->post['order_addr'] !=="" ?  $this->post['order_addr']:"";
-    if($vr==""){
+    if($vr=="" &&$etid['order_type']==1 ){
         return error_show(1002,"参数order_addr不能为空");
     }
     $vi= isset($this->post['good_stock']) && $this->post['good_stock'] !=="" ?  $this->post['good_stock']:"";
-    if($vi==""){
+    if($vi=="" &&$etid['send_type']==1){
         return error_show(1002,"参数good_stock不能为空");
     }
     Db::startTrans();
@@ -289,42 +289,44 @@ class Sale extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $datninfo = Db::name('sale')->where(['id'=>$id,'is_del'=>0])->save($datn);
-        //$vat=[];
         if($datninfo>0){
-            foreach ($vi as $ion){
-                $iten=[];
-                isset($ion['id'])&&$ion['id']!=="" ? $iten['id'] = $ion['id']:'';
-                $iten['orderCode']=$etid['orderCode'];
-                $iten['wsm_code']=$ion['wsm_code'];
-                $iten['stock_id']=$ion['stock_id'];
-                $iten['num']=$ion['num'];
-                $iten['status']=$ion['status'];
-                $iten['sale_price']=$ion['sale_price'];
-                isset($ion['id'])&&$ion['id']!=="" ? '' : $iten['addtime'] =date("Y-m-d H:i:s");
-                $iten['updatetime'] =date("Y-m-d H:i:s");
-                //$inn[]=$iten;
-                $vp= Db::name('sale_info')->save($iten);
+            if($etid['order_type']==1) {
+                foreach ($vi as $ion) {
+                    $iten = [];
+                    isset($ion['id']) && $ion['id'] !== "" ? $iten['id'] = $ion['id'] : '';
+                    $iten['orderCode'] = $etid['orderCode'];
+                    $iten['wsm_code'] = $ion['wsm_code'];
+                    $iten['stock_id'] = $ion['stock_id'];
+                    $iten['num'] = $ion['num'];
+                    $iten['status'] = $ion['status'];
+                    $iten['sale_price'] = $ion['sale_price'];
+                    isset($ion['id']) && $ion['id'] !== "" ? '' : $iten['addtime'] = date("Y-m-d H:i:s");
+                    $iten['updatetime'] = date("Y-m-d H:i:s");
+                    //$inn[]=$iten;
+                    $vp = Db::name('sale_info')->save($iten);
+                }
             }
-
-            foreach ($vr as $value){
-                $temp=[];
-                isset($value['id'])&&$value['id']!=="" ? $temp['id'] = $value['id']:'';
-                $temp['orderCode']=$etid['orderCode'];
-                $temp['contactor']=$value['contactor'];
-                $temp['mobile'] = $value['mobile'];
-                $temp['addr'] = $value['addr'];
-                $temp['addr_code'] =$value['addr_code'];
-                $temp['customer_code'] =$customer_code;
-                $temp['receipt_quantity']=$value['receipt_quantity'];
-                $temp['post_fee'] =0;
-                $temp['is_del'] =$value['is_del'];
-                isset($value['id'])&&$value['id']!=="" ? '' : $temp['addtime'] =date("Y-m-d H:i:s");
-                $temp['updatetime'] =date("Y-m-d H:i:s");
-                $temp['arrive_time']=date("Y-m-d H:i:s");
-                $dat = Db::name('order_addr')->save($temp);
-                if($dat==false){
-                    Db::rollback();
-                    return error_show(1002,"更新失败");
+            if($etid['send_type']==1){
+                foreach ($vr as $value) {
+                    $temp = [];
+                    isset($value['id']) && $value['id'] !== "" ? $temp['id'] = $value['id'] : '';
+                    $temp['orderCode'] = $etid['orderCode'];
+                    $temp['contactor'] = $value['contactor'];
+                    $temp['mobile'] = $value['mobile'];
+                    $temp['addr'] = $value['addr'];
+                    $temp['addr_code'] = $value['addr_code'];
+                    $temp['customer_code'] = $customer_code;
+                    $temp['receipt_quantity'] = $value['receipt_quantity'];
+                    $temp['post_fee'] = 0;
+                    $temp['is_del'] = $value['is_del'];
+                    isset($value['id']) && $value['id'] !== "" ? '' : $temp['addtime'] = date("Y-m-d H:i:s");
+                    $temp['updatetime'] = date("Y-m-d H:i:s");
+                    $temp['arrive_time'] = date("Y-m-d H:i:s");
+                    $dat = Db::name('order_addr')->save($temp);
+                    if ($dat == false) {
+                        Db::rollback();
+                        return error_show(1002, "更新失败");
+                    }
                 }
             }
             Db::commit();
@@ -365,62 +367,68 @@ class Sale extends BaseController
     $fo = Db::name('order_addr')->where(['orderCode'=>$einfo['orderCode'],'is_del'=>0])->select();
     $bum = Db::name('order_out')->where(['orderCode'=>$einfo['orderCode']])->select();
     $ins=[];
-    foreach ($bum as $stn){
-        $so = Db::name('order_addr')->where(['id'=>$stn['addrid']])->find();
-        $addr = GetAddr($so['addr_code']);
-        $stn['addr_info']=$addr;
-        $stn['add_code']=json_decode($so['addr_code'],true);
-        $stn['addr']=$so['addr'];
-        $stn['contact']=$so['contactor'];
-        $stn['mobile']=$so['mobile'];
-        $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
-            ->where(["a.wsm_code" => $stn['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
-        $stn['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-        $stn['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-        $stn['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
-        $ins[]=$stn;
+    if(!empty($bum)){
+        foreach ($bum as $stn){
+            $so = Db::name('order_addr')->where(['id'=>$stn['addrid']])->find();
+            $addr = GetAddr($so['addr_code']);
+            $stn['addr_info']=$addr;
+            $stn['add_code']=json_decode($so['addr_code'],true);
+            $stn['addr']=$so['addr'];
+            $stn['contact']=$so['contactor'];
+            $stn['mobile']=$so['mobile'];
+            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
+                ->where(["a.wsm_code" => $stn['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
+            $stn['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
+            $stn['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
+            $stn['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
+            $ins[]=$stn;
+        }
     }
-
     $addrs=[];
-    foreach ($fo as $value){
-        $value['addr_info']="";
-        $value['send_num']=0;
-        if($value['addr_code']!=""){
-            $addr=GetAddr($value['addr_code']);
-            $value['addr_info'] = $addr;
-            $value['addr_code'] = json_decode($value['addr_code'],true);
+    if(!empty($fo)){
+        foreach ($fo as $value){
+            $value['addr_info']="";
+            $value['send_num']=0;
+            if($value['addr_code']!=""){
+                $addr=GetAddr($value['addr_code']);
+                $value['addr_info'] = $addr;
+                $value['addr_code'] = json_decode($value['addr_code'],true);
 
-            $send = Db::name("order_out")->where(['addrid'=>$value['id'],'orderCode' => $einfo['orderCode']])->sum("send_num");
+                $send = Db::name("order_out")->where(['addrid'=>$value['id'],'orderCode' => $einfo['orderCode']])->sum("send_num");
 
-            $value['send_num'] = $send ?? 0;
+                $value['send_num'] = $send ?? 0;
+            }
+            $value['wsend_num']=$value['receipt_quantity']-$value['send_num'];
+            $addrs[]=$value;
         }
-        $value['wsend_num']=$value['receipt_quantity']-$value['send_num'];
-        $addrs[]=$value;
     }
 
+
     //->field('num,sale_price,wsm_code,stock_id')
     $st = Db::name('sale_info')->where(['orderCode'=>$einfo['orderCode']])->select();
     $data=[];
-    foreach ($st as $value){
-        $value['wsm_name']="";
-        $value['wsm_supplier']="";
-        $value['wsm_supplierNo']="";
-        $value['usable_stock']=0;
-        $value['send_num']=0;
-        if($value['wsm_code']!="") {
-            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
-                ->where(["a.wsm_code" => $value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
-            $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
-            $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
-            $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
-            $dn = Db::name('good_stock')->where(['wsm_code' => $value['wsm_code'], 'good_type_code' => $einfo['good_code']])->find();
-            $value['usable_stock'] = isset($dn['usable_stock']) ? $dn['usable_stock'] : "0";
-            $send = Db::name("order_out")->where(["wsm_code" => $value['wsm_code'], 'orderCode' => $einfo['orderCode']])->sum("send_num");
-            $value['send_num'] = $send ?? 0;
-        }
-        $value['wsend_num']=$value['num']-$value['send_num'];
-        $data[]=$value;
-    }
+        if(!empty($fo)) {
+            foreach ($st as $value) {
+                $value['wsm_name'] = "";
+                $value['wsm_supplier'] = "";
+                $value['wsm_supplierNo'] = "";
+                $value['usable_stock'] = 0;
+                $value['send_num'] = 0;
+                if ($value['wsm_code'] != "") {
+                    $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b", "a.supplierNo=b.code")
+                        ->where(["a.wsm_code" => $value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
+                    $value['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
+                    $value['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
+                    $value['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
+                    $dn = Db::name('good_stock')->where(['wsm_code' => $value['wsm_code'], 'good_type_code' => $einfo['good_code']])->find();
+                    $value['usable_stock'] = isset($dn['usable_stock']) ? $dn['usable_stock'] : "0";
+                    $send = Db::name("order_out")->where(["wsm_code" => $value['wsm_code'], 'orderCode' => $einfo['orderCode']])->sum("send_num");
+                    $value['send_num'] = $send ?? 0;
+                }
+                $value['wsend_num'] = $value['num'] - $value['send_num'];
+                $data[] = $value;
+            }
+        }
     $einfo['info']=$data;
     $einfo['companyName']=isset($in['companyName']) ? $in['companyName']:"";
     $einfo['addrs']=$addrs;
@@ -461,6 +469,27 @@ class Sale extends BaseController
     if(empty($dio)){
         return error_show(1002,"销售单信息未找到");
     }
+        if($status==1 && $dio['order_type']==2) {
+            $zxinfo = Db::name("consult")->where(["zxNo" => $dio['zxNo'], "is_del" => 0])->find();
+            if ($zxinfo == false) {
+                return error_show(1004, "未找到咨询单数据");
+            }
+            if ($zxinfo['zx_type'] == 2) {
+                if ($zxinfo['metals'] == "") {
+                    return error_show(1004, "未找到咨询单贵金属类型数据");
+                }
+                $metals = $zxinfo['metals'] == '18K' ? 1 : ($zxinfo['metals'] == '24K' ? 2 : 3);
+                $gold = Db::name("gold_price")->where(["type" => $metals])->order("addtime desc")->find();
+                if (empty($gold)) {
+                    return error_show(1004, "未找到咨询单贵金属类型数据");
+                }
+            }
+            $wsm = Db::name("warehouse_info")->where(["supplierNo" => $zxinfo['gysNo'], "wsm_type" => 2])->find();
+            if (empty($wsm)) {
+                return error_show(1002, "供应商仓库未找到");
+            }
+            $dio['gold_price']=$gold['gold_price'];
+        }
     Db::startTrans();
     try {
         $dio['status']=$status;
@@ -492,6 +521,49 @@ class Sale extends BaseController
                     }
                 }
             }
+            if($status==1 && $dio['order_type']==2){
+                $cgd =makeNo("CG");
+                $clll=[
+                    "cgdNo"=>$cgd,
+                    "bkcode"=>$dio['orderCode'],
+                    "wsm_code"=>$wsm['wsm_code'],
+                    "cgder_id"=>"0",
+                    "cgder"=>$zxinfo['saler'],
+                    "good_code"=>"GD-".$zxinfo['cpNo'],
+                    "good_name"=>$zxinfo['cpName'],
+                    "good_type_code"=>$zxinfo['cpNo'],
+                    "good_num"=>$dio['good_num'],
+                    "good_price"=>$zxinfo['total_fee'],
+                    "total_fee"=>round($zxinfo['total_fee']*$dio['good_num'],2),
+                    "pakge_fee"=>$zxinfo['package_fee'],
+                    "cert_fee"=>$zxinfo['cert_fee'],
+                    "open_fee"=>$zxinfo['open_fee'],
+                    "delivery_fee"=>$zxinfo['delivery_fee'],
+                    "mark_fee"=>$zxinfo['mark_fee'],
+                    "teach_fee"=>$zxinfo['cost_fee'],
+                    "demo_fee"=>$zxinfo['demo_fee'],
+                    "nake_fee"=>$zxinfo['bare_fee'],
+                    "weight"=>isset($zxinfo['weight'])?$zxinfo['weight']:0,
+                    "supplierNo"=>$zxinfo['gysNo'],
+                    "supplier_name"=>$zxinfo['gysname'],
+                    "gold_price"=>$gold['gold_price'],
+                    "send_num"=>0,
+                    "wsend_num"=>$dio['good_num'],
+                    "remark"=>'',
+                    "lasttime"=>date("Y-m-d H:i:s"),
+                    "is_del"=>0,
+                    "status"=>$dio['send_type']==1?1:0,
+                    "order_type"=>2,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+                $cgin = Db::name("purchease_order")->insert($clll);
+                //  var_dump(Db::name("purchease_order")->getLastSql(),$clll);
+                if($cgin==false){
+                    Db::rollback();
+                    return error_show(1002,"咨询采购单创建商品失败");
+                }
+            }
         }
         Db::commit();
         return error_show(0,"订单状态更新成功");

app/admin/controller/Salezx.php

@@ -40,6 +40,10 @@ class Salezx extends \app\BaseController
         if($supplier==false){
             return error_show(1004,"未找到平台供应商数据");
         }
+        $wsm=Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gsyNo'],"wsm_type"=>2])->find();
+        if(empty($wsm)){
+            return error_show(1004,"未找到供应商仓库数据");
+        }
         $sendtype =isset($this->post['sendtype']) && $this->post['sendtype'] !=="" ?trim($this->post['sendtype']):"";
         if($sendtype==''){
             return error_show(1004,"参数sendtype不能为空");
@@ -87,64 +91,34 @@ class Salezx extends \app\BaseController
                 "send_type"=>$sendtype,
                 "supplierNo"=>$supplierNo,
                 "is_del"=>0,
+                "zxNo"=>$zxNo,
                 "remark"=>$remark,
                 "order_type"=>2,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
-                'total_price'=>round($zxinfo['sale_fee']*$good_num,2),
+                'total_price'=>round($zxinfo['last_price']*$good_num,2),
             ];
             $datainfo = Db::name('sale')->insert($data,true);
             $vat=[];
             if($datainfo>0){
                 $addgood=$this->addGood($zxinfo);
-
                 if($addgood==false){
                     Db::rollback();
                     return error_show(1002,"咨询订单创建商品失败");
                 }
-                $wsm = Db::name("warehouse_info")->where(["supplierNo"=>$zxinfo['gysNo'],"wsm_type"=>2])->find();
-                if(empty($wsm)){
-                    Db::rollback();
-                    return error_show(1002,"供应商仓库未找到");
-                }
-                $cgd =makeNo("CG");
-                $clll=[
-                    "cgdNo"=>$cgd,
-                    "bkcode"=>$orderCode,
+                $saleinfo=[
+                    "orderCode"=>$orderCode,
                     "wsm_code"=>$wsm['wsm_code'],
-                    "cgder_id"=>"0",
-                    "cgder"=>$zxinfo['saler'],
-                    "good_code"=>"GD-".$zxinfo['cpNo'],
-                    "good_name"=>$zxinfo['cpName'],
-                    "good_type_code"=>$zxinfo['cpNo'],
-                    "good_num"=>$good_num,
-                    "good_price"=>$zxinfo['total_fee'],
-                    "total_fee"=>round($zxinfo['total_fee']*$good_num,2),
-                    "pakge_fee"=>$zxinfo['package_fee'],
-                    "cert_fee"=>$zxinfo['cert_fee'],
-                    "open_fee"=>$zxinfo['open_fee'],
-                    "delivery_fee"=>$zxinfo['delivery_fee'],
-                    "mark_fee"=>$zxinfo['mark_fee'],
-                    "teach_fee"=>$zxinfo['cost_fee'],
-                    "nake_fee"=>$zxinfo['bare_fee'],
-                    "weight"=>isset($zxinfo['weight'])?$zxinfo['weight']:0,
-                    "supplierNo"=>$zxinfo['gysNo'],
-                    "supplier_name"=>$zxinfo['gysname'],
-                    "send_num"=>0,
-                    "wsend_num"=>$good_num,
-                    "remark"=>$remark,
-                    "lasttime"=>date("Y-m-d H:i:s"),
-                    "is_del"=>0,
-                    "status"=>$sendtype==1?1:0,
-                    "order_type"=>2,
+                    "num"=>$good_num,
+                    "sale_price"=>$zxinfo['last_price'],
+                    "total_price"=>round($zxinfo['last_price']*$good_num,2),
                     "addtime"=>date("Y-m-d H:i:s"),
-                    "updatetime"=>date("Y-m-d H:i:s")
+                    "updatetime"=>date("Y-m-d H:i:s"),
                 ];
-                $cgin = Db::name("purchease_order")->insert($clll);
-              //  var_dump(Db::name("purchease_order")->getLastSql(),$clll);
-                if($cgin==false){
+                $info = Db::name("sale_info")->insert($saleinfo);
+                if($info==false){
                     Db::rollback();
-                    return error_show(1002,"咨询采购单创建商品失败");
+                    return error_show(1002,"咨询订单创建失败");
                 }
                 if($sendtype!=2){
                     foreach ($addrlist as $value){
@@ -206,7 +180,7 @@ class Salezx extends \app\BaseController
             "good_name"=>$data["cpName"],
             "good_desc"=>$data["desc"],
             "brand"=>$data["brank"],
-            "original_price"=>$data["sale_price"],
+            "original_price"=>$data["sale_fee"],
             "cg_saler"=>$data["saler"],
             "good_type"=>$data["zxtype"],
             "unit"=>$data["unit"],