优化order_type,新增order_source

app/admin/controller/After.php

@@ -249,7 +249,7 @@ class After extends Base
         $info['order_type'] = $orderinfo['order_type'];
         $info['sale_price'] = $orderinfo['sale_price'];
         $info['total_price'] = sprintf("%1\$.2f", $orderinfo['sale_price'] * $info['error_num']);
-        if ($orderinfo['order_type'] == 3 || $orderinfo['order_type'] == 4) {
+        if ($orderinfo['order_type'] == 3) {
             $goon = Db::name("good_zixun")->where(["spuCode" => $orderinfo['good_code'], "is_del" => 0])->find();
         } else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')

app/admin/controller/Orderback.php

@@ -124,7 +124,7 @@ class Orderback extends Base
       $info['companyNo']=$orderinfo['supplierNo'];
       $info['company'] = Db::name('business')->where(['companyNo' => $orderinfo['supplierNo'], 'is_del' => 0])->value('company','');
       $info['addr_cn']=GetAddr($info['addr_code']);
-      if($orderinfo['order_type']==3|| $orderinfo['order_type']==4){
+      if($orderinfo['order_type']==3){
           $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
           $is_stock=0;
       }else {
@@ -540,8 +540,7 @@ class Orderback extends Base
                             Db::rollback();
                             return error_show(1005,'备库单未完全入库');
                         }
-                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$bk['bkcode'],"order_type"=>5,"is_del"=>0])
-                            ->field("sum(send_num)-sum(th_num) as num")->find();
+                        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$bk['bkcode'],"order_type"=>1,"is_del"=>0])->field("sum(send_num)-sum(th_num) as num")->find();
 
                         $orderbk['balance_num']=$orderbk['total_num']-$merge_num['num'];
                         $orderbk['merge_num']=$merge_num['num'];

app/admin/controller/Project.php

@@ -1012,6 +1012,7 @@ class Project extends Base
             "good_name" => $backinfo['good_name'],
             "good_num" => $backinfo['num'],
             "order_type" =>3,
+            "order_source" =>3,//3项目
             "item_code"=>isset($plat['platform_code'])? $plat['platform_code']:"",
             "good_type"=>1,
             "apply_id" => $rm,
@@ -1074,6 +1075,7 @@ class Project extends Base
                         'customer_code' => $prject['khNo'],
                         'spuCode' => $backinfo['spuCode'],
                         'order_type' => $data['order_type'],
+                        'order_source' => $data['order_source'],
                         'supplierNo' => $prject['companyNo'],
                         'updatetime' => date("Y-m-d H:i:s")
                     ]);

app/admin/controller/Purch.php

@@ -147,7 +147,7 @@ class Purch extends Base
                 $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
                 $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             }
-            if($value['order_type']==3|| $value['order_type']==4){
+            if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
                 $value["speclist"]=isset($goon['specinfo'])&&$goon['specinfo']!=""? json_decode($goon['specinfo'],true):"";
             }else {
@@ -201,7 +201,7 @@ class Purch extends Base
         $im = Db::name('purchease_back')->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->select();
         $var=[];
         foreach ($im as $value){
-            if($data['order_type']==3|| $data['order_type']==4){
+            if($data['order_type']==3){
                 $goo = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             }else {
                 $goo =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();
@@ -215,7 +215,7 @@ class Purch extends Base
         }
         //采购工差单
         $dom = Db::name("purchease_diff")->where(['cgdNo'=>$data['cgdNo'],'is_del'=>0])->find();
-        if($data['order_type']==3|| $data['order_type']==4){
+        if($data['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$data['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$data['spuCode']])->find();
@@ -655,7 +655,7 @@ class Purch extends Base
         if($cg==""){
             return error_show(1002,"未找到采购单数据");
         }
-        if($cg['order_type']==3|| $cg['order_type']==4){
+        if($cg['order_type']==3){
             $gd = Db::name("good_zixun")->where(["spuCode"=>$cg['spuCode']])->find();
         }else {
             $gd =Db::name('good_basic')->where(['spuCode'=>$cg['spuCode']])->find();
@@ -832,7 +832,7 @@ class Purch extends Base
         }
         $dn = Db::name('purchease_order')->where(['cgdNo'=>$idinf['cgdNo'],'is_del'=>0])->find();
 
-        if($dn['order_type']==3|| $dn['order_type']==4){
+        if($dn['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dn['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dn['spuCode']])->find();
@@ -1008,7 +1008,7 @@ class Purch extends Base
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
+            if ($value['order_type'] == 3) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit,tax')

app/admin/controller/Purchback.php

@@ -209,7 +209,7 @@ public function backfe(){
             return error_show(1002,"未找到数据");
         }
         $dom = Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],'is_del'=>0])->find();
-        if($dom['order_type']==3|| $dom['order_type']==4){
+        if($dom['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dom['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dom['spuCode']])->find();

app/admin/controller/Purchin.php

@@ -111,7 +111,7 @@ class Purchin extends Base
         foreach ($list as $value){
 
             //获取规格、品牌信息
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
+            if ($value['order_type'] == 3) {
                 $temp = Db::name('good_zixun')
                     ->alias('gz')
                     ->field('gz.specinfo,b.brand_name')
@@ -431,7 +431,7 @@ class Purchin extends Base
             return error_show(1004,"未找到数据");
         }
         $dom = Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],'is_del'=>0])->find();
-        if($dom['order_type']==3|| $dom['order_type']==4){
+        if($dom['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$dom['spuCode'],"is_del"=>0])->find();
         }else {
             $goon =Db::name('good_basic')->where(['spuCode'=>$dom['spuCode']])->find();
@@ -1109,7 +1109,7 @@ class Purchin extends Base
             ->select();
         $data=[];
         foreach ($list as $value){
-            if($value['order_type']==3|| $value['order_type']==4){
+            if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             }else {
                 $goon =Db::name('good_basic')->where(['spuCode'=>$value['spuCode']])->find();

app/admin/controller/Reorder.php

@@ -34,7 +34,7 @@ class Reorder extends Base
         if($retrun>0){
             return error_show(1005,"存在未完成退货订单数据");
         }
-        if($order['order_type']==3|| $order['order_type']==4){
+        if($order['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$order['good_code'],"is_del"=>0])->find();
         }else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -269,8 +269,7 @@ class Reorder extends Base
                             Db::rollback();
                             return error_show(1005, '备库单未完全入库');
                         }
-                        $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 5, "is_del" => 0])
-                            ->field("sum(send_num)-sum(th_num) as num")->find();
+                        $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 1, "is_del" => 0])->field("sum(send_num)-sum(th_num) as num")->find();
 
                         $orderbk['balance_num'] = $orderbk['total_num'] - $merge_num['num'];
                         $orderbk['merge_num'] = $merge_num['num'];
@@ -430,7 +429,7 @@ class Reorder extends Base
            return error_show(1004,"未找到退货数据");
        }
        $orderinfo = Db::name("sale")->where(["orderCode"=>$info["orderCode"]])->find();
-        if($orderinfo['order_type']==3|| $orderinfo['order_type']==4){
+        if($orderinfo['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$orderinfo['good_code'],"is_del"=>0])->find();
 
         }else {
@@ -780,7 +779,7 @@ class Reorder extends Base
                                 Db::rollback();
                                 return error_show(1005, '备库单未完全入库');
                             }
-                            $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 5, "is_del" => 0])
+                            $merge_num = Db::name("purchease_order")->where(["bkcode" => $bk['bkcode'], "order_type" => 1, "is_del" => 0])
                                 ->field("sum(send_num)-sum(th_num) as num")->find();
 
                             $orderbk['balance_num'] = $orderbk['total_num'] - $merge_num['num'];
@@ -1072,8 +1071,7 @@ class Reorder extends Base
                     ]);
 
                 if ($order['send_type'] == 1) {
-                    $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"
-                    =>2])->select();
+                    $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"=>2])->select();
                        // ->save(["status" => 0, "updatetime" => date("Y-m-d H:i:s")]);
                     if(!empty($wsend)){
                         foreach ($wsend as $value){

app/admin/controller/Resign.php

@@ -771,6 +771,7 @@ class Resign extends Base
         }
     }
 
+    //备库单生成采购单
     public function createCgd(){
         $bk_code=isset($this->post['bk_code'])&&$this->post['bk_code']!=="" ? trim($this->post['bk_code']):"";
         if($bk_code===""){
@@ -850,7 +851,8 @@ class Resign extends Base
             "status"=>0,//0表示初始化
             "lasttime"=>$info['lasttime'],
             "is_del"=>0,
-            "order_type"=>1,
+            "order_type" => 1,//1备库
+            "order_source" => 0,//0备库下单
             "good_type"=>1,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
@@ -913,6 +915,7 @@ class Resign extends Base
                             Db::name('standing_book')->where('bk_code', $bk_code)->update([
                                 'spuCode' => $cg['spuCode'],
                                 'order_type' => $cg['order_type'],
+                                'order_source' => $cg['order_source'],
                                 'supplierNo' => $cg['supplierNo'],
                                 'companyNo' => $cg['companyNo'],
                                 'cgdNo' => $cg['cgdNo'],

app/admin/controller/Sale.php

@@ -43,8 +43,7 @@ class Sale extends Base
             return error_show(1004,"未找到平台供应商数据");
         }
         $goodtype =isset($this->post['goodtype']) && $this->post['goodtype'] !=="" ?intval($this->post['goodtype']):"1";
-        $order_type =isset($this->post['order_type']) && $this->post['order_type'] !=="" ?intval($this->post['order_type'])
-            :"1";
+        $order_type =isset($this->post['order_type']) && $this->post['order_type'] !=="" ?intval($this->post['order_type']) :"1";
         $sendtype =isset($this->post['sendtype']) && $this->post['sendtype'] !=="" ?intval($this->post['sendtype']):"";
         if($sendtype===''){
             return error_show(1004,"参数sendtype不能为空");
@@ -174,6 +173,7 @@ class Sale extends Base
             "weight"=>$ct['noble_weight'],
             "gold_price"=>isset($ct['cgd_gold_price'])?$ct['cgd_gold_price']:0,
             "order_type"=>$is_stock==1?1:2,
+            "order_source"=>1,//1直接下单
             "createrid"=>$ct['createrid'],
             "creater"=>$ct['creater'],
             'send_way'=>2
@@ -229,6 +229,7 @@ class Sale extends Base
                 "is_stock"=>$is_stock,
                 "is_activity"=>$is_activity===""?0:$is_activity,
                 "order_type"=>$is_stock==1?1:2,
+                "order_source"=>1,//1直接下单
 //                "poNo"=>$poNo,
                 'good_weight'=>$ct['noble_weight'],
                 'gold_price'=>isset($ct['cgd_gold_price'])?$ct['cgd_gold_price']:0,
@@ -287,7 +288,9 @@ class Sale extends Base
                         "good_num"=>$good_num,
                         "spuCode"=>$spuCode,
                         "companyNo"=>$supplierNo,
-                        "cost_fee"=>isset($good['cost_fee'])?$good['cost_fee']:0
+                        "cost_fee"=>isset($good['cost_fee'])?$good['cost_fee']:0,
+                        'order_type' => $data['order_type'],
+                        'order_source' => $data['order_source'],
                     ],$standing_book_da);
                     if($bol==false){
                         Db::rollback();
@@ -515,6 +518,7 @@ class Sale extends Base
             "lasttime"=>date("Y-m-d H:i:s"),
             "is_del"=>0,
             "order_type"=>$data['order_type'],
+            "order_source"=>$data['order_source'],
             "good_type"=>$data['good_type'],
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
@@ -542,6 +546,7 @@ class Sale extends Base
                 'spuCode' => $data['spuCode'],
                 'skuCode' => $data['skuCode'],
                 'order_type' => $data['order_type'],
+                'order_source' => $data['order_source'],
                 'supplierNo' => $data['supplierNo'],
                 "companyNo" => $data['companyNo'],
             ]);
@@ -862,6 +867,7 @@ class Sale extends Base
             "gold_price"=>$zxinfo['gold_price'],
             "is_diff"=>$zxinfo['is_diff'],
             "order_type"=>3,
+            "order_source"=>2,//咨询
             'send_way'=>$zxinfo['send_way']
         ];
         $token=isset($this->post['token'])&&$this->post['token']!=""? trim($this->post['token']):"";
@@ -935,6 +941,7 @@ class Sale extends Base
                 "is_activity"=>0,
                 "proof_id"=>0,
                 "order_type"=>3,
+                "order_source"=>2,//2咨询
                 'good_weight'=>$zxinfo['good_weight'],
                 'gold_price'=>$zxinfo['gold_price'],
                 'cost_price'=>$zxinfo['sale_cost_fee'],
@@ -948,7 +955,11 @@ class Sale extends Base
             $datainfo = Db::name('sale')->insert($data, true);
             if($datainfo>0){
 
-                $standing_book_data = ['sale_id' => $datainfo, 'infoNo' => $zxinfo['infoNo'], 'updatetime' => date('Y-m-d H:i:s')];
+                $standing_book_data = [
+                    'sale_id' => $datainfo,
+                    'infoNo' => $zxinfo['infoNo'],
+                    'updatetime' => date('Y-m-d H:i:s')
+                ];
 
                 //修改状态，添加待办
                 ActionLog::logAdd($this->post['token'], [
@@ -1373,7 +1384,8 @@ class Sale extends Base
             "weight"=>$goodinfo['good_weight'],
             "gold_price"=>$goodinfo['gold_price'],
             "good_type"=>1,
-            "order_type"=>4,
+            "order_type"=>3,//3咨询商品
+            "order_source"=>3,//项目
             "send_way"=>$goodinfo['send_way'],
 
         ];
@@ -1405,7 +1417,8 @@ class Sale extends Base
             "is_stock"=>0,
             "is_activity"=>0,
             "proof_id"=>0,
-            "order_type"=>4,
+            "order_type"=>3,//咨询商品
+            "order_source"=>3,//项目
             'good_weight'=>$goodinfo['good_weight'],
             'gold_price'=>$goodinfo['gold_price'],
             'cost_price'=>$goodinfo['sale_cost_fee'],
@@ -1544,7 +1557,7 @@ class Sale extends Base
                             "check_num" => 0,
                             "error_num" => 0,
                             "wsm_code" => "",
-                            "order_type" => 4,
+                            "order_type" => 3,//3咨询商品
                             "status" => 0,
                             "addtime" => date("Y-m-d H:i:s"),
                             "updatetime" => date("Y-m-d H:i:s")
@@ -1672,7 +1685,8 @@ class Sale extends Base
             "is_stock"=>$good['is_stock'],
             "is_activity"=>0,
             "proof_id"=>0,
-            "order_type"=>$good['is_stock']==1?1:2,
+            "order_type"=>$good['is_stock']==1?1:2,//1备库,2非库存品
+            'order_source' => 3,//3项目
             'good_weight'=>$good['noble_weight'],
             'gold_price'=>isset($good['cgd_gold_price'])? $good['cgd_gold_price']:0,
             'cost_price'=>$goodlass['cost_fee'],
@@ -1724,6 +1738,7 @@ class Sale extends Base
                 "createrid"=>$good['createrid'],
                 "creater"=>$good['creater'],
                 "order_type"=>$good['is_stock']==1?1:2,
+                'order_source' => 3,//3项目
                 'send_way'=>2
             ];
             if($good['is_stock']==0) {
@@ -1739,7 +1754,7 @@ class Sale extends Base
                         return 1; //库存不足
                     }
 
-                $bol =$this->RelaCgd(['orderCode'=>$orderCode,"good_num"=>$data['good_num'],"spuCode"=>$good['spuCode'],"companyNo"=>$data['companyNo'],"cost_fee"=>$goodlass['cost_fee']],$standing_book_data);
+                $bol =$this->RelaCgd(['orderCode'=>$orderCode,"good_num"=>$data['good_num'],"spuCode"=>$good['spuCode'],"companyNo"=>$data['companyNo'],"cost_fee"=>$goodlass['cost_fee'],'order_type'=>$cgd['order_type'],'order_source'=>$cgd['order_source']],$standing_book_data);
                 if($bol==false){
                     return 3;//关联采购失败
                 }
@@ -1943,7 +1958,7 @@ class Sale extends Base
             ->cursor();
         $data = [];
         foreach ($list as $value) {
-            if($value['order_type']==3|| $value['order_type']==4){
+            if($value['order_type']==3){
                 $var = Db::name("good_zixun")->where(["spuCode"=>$value['good_code'],"is_del"=>0])->find();
                 $value["speclist"]=isset($var['specinfo'])&&$var['specinfo']!=""? json_decode($var['specinfo'],true):"";
             }else {
@@ -2154,7 +2169,7 @@ class Sale extends Base
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if($einfo['order_type']==3|| $einfo['order_type']==4){
+        if($einfo['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$einfo['good_code'],"is_del"=>0])->find();
         }else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -2426,6 +2441,7 @@ class Sale extends Base
                         "is_del" => 0,
                         "status" => $dio['send_type'] == 1 ? 3 : 0,
                         "order_type" => 2,
+                        "order_source" => 3,//3项目，废弃接口？？？
                         "addtime" => date("Y-m-d H:i:s"),
                         "updatetime" => date("Y-m-d H:i:s")
                     ];
@@ -2878,7 +2894,7 @@ class Sale extends Base
 
         $data = [];
         foreach ($list as $value) {
-            if($value['order_type']==3|| $value['order_type']==4){
+            if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['good_code'],"is_del"=>0])->find();
             }else {
                 $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -3080,7 +3096,7 @@ class Sale extends Base
         if ($einfo==false) {
             return error_show(1002, "未找到销售订单数据");
         }
-        if($einfo['order_type']==3|| $einfo['order_type']==4){
+        if($einfo['order_type']==3){
             $goon = Db::name("good_zixun")->where(["spuCode"=>$einfo['good_code'],"is_del"=>0])->find();
         }else {
             $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -3190,7 +3206,7 @@ class Sale extends Base
             $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")
                 ->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
             $addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
-            if($value['order_type']==3|| $value['order_type']==4){
+            if($value['order_type']==3){
                 $goon = Db::name("good_zixun")->where(["spuCode"=>$value['good_code'],"is_del"=>0])->find();
             }else {
                 $goon = Db::name('good_platform')->alias('a')->join('good b', 'b.spuCode=a.spuCode', 'left')
@@ -3221,7 +3237,7 @@ class Sale extends Base
             return error_show(1002, "未找到出库数据");
         }
         $item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
-        if($item['order_type']==3|| $item['order_type']==4){
+        if($item['order_type']==3){
             $goodinfo = Db::name("good_zixun")->where(["spuCode"=>$item['good_code'],"is_del"=>0])->find();
             if($goodinfo==false){
                 return error_show(1004,"未找到商品数据");
@@ -3437,6 +3453,7 @@ class Sale extends Base
                             ->where('orderCode', $orderCode)
                             ->update([
                                 'order_type' => $der['order_type'],
+                                'order_source' => $der['order_source'],
                                 'cgdNo' => $order['cgdNo'],
                                 'outCode' => $outCode,
                                 'customer_code' => $der['customer_code'],
@@ -3625,7 +3642,8 @@ class Sale extends Base
                 "status"=>3,
                 "lasttime"=>$cgdinfo['lasttime'],
                 "is_del"=>0,
-                "order_type"=>5,
+                "order_type"=>$outinfo['order_type'],
+                "order_source"=>$outinfo['order_source'],
                 "good_type"=>$cgdinfo['good_type'],
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
@@ -3641,6 +3659,7 @@ class Sale extends Base
                     'cgdNo' => $QrdCgd['cgdNo'],
                     'spuCode' => $outinfo['spuCode'],
                     'order_type' => $QrdCgd['order_type'],
+                    'order_source' => $QrdCgd['order_source'],
                     'supplierNo' => $cgdinfo['supplierNo'],
                     "companyNo" => $cgdinfo['companyNo'],
 //                    'addtime' => date('Y-m-d H:i:s'),
@@ -3668,7 +3687,7 @@ class Sale extends Base
                     return false;
                 }
             }
-        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgdinfo['bkcode'],"order_type"=>5,"is_del"=>0])
+        $merge_num = Db::name("purchease_order")->where(["bkcode"=>$cgdinfo['bkcode'],"order_type"=>1,"is_del"=>0])
             ->field("sum(send_num)-sum(th_num) as num")->find();
         $cgd['balance_num']=$cgd['total_num']-$merge_num['num'];
         $cgd['merge_num']=$merge_num['num'];
@@ -3957,7 +3976,7 @@ class Sale extends Base
 
         foreach ($list as &$value) {
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
+            if ($value['order_type'] == 3) {
                 $temp = Db::name("good_zixun")
                     ->where(["spuCode" => $value['产品编号'], "is_del" => 0])
                     ->field('id,specinfo,good_unit')

app/admin/controller/SaleReport.php

@@ -309,7 +309,7 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else  $value['unit'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             $value['is_stock'] = isset($this->all_stock[$value['is_stock']]) ? $this->all_stock[$value['is_stock']] : '';
@@ -417,7 +417,7 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) {
+            if ($value['order_type'] == 3) {
                 $value['unit'] = Db::name("good_zixun")
                     ->alias('gz')
                     ->leftJoin('unit u', 'u.id=gz.good_unit')
@@ -467,7 +467,7 @@ class SaleReport extends Base
                 $value['二级企业'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['单位'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             $value['创建人所属部门'] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
@@ -523,7 +523,7 @@ class SaleReport extends Base
                 $value['second_customer_org'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3) $value['unit'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['unit'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             $value['creater_company'] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
@@ -603,7 +603,7 @@ class SaleReport extends Base
                 $value['二级企业'] = isset($customer_org1[2]) ? $customer_org1[2] : '';
             }
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
+            if ($value['order_type'] == 3) $value['单位'] = Db::name("good_zixun")->alias('gz')->leftJoin('unit u', 'u.id=gz.good_unit')->where(["gz.spuCode" => $value['good_code'], "gz.is_del" => 0])->value('u.unit');
             else $value['单位'] = Db::name('good_basic')->alias('gb')->leftJoin('unit u', 'u.id=gb.good_unit')->where(["gb.spuCode" => $value['good_code'], "gb.is_del" => 0])->value('u.unit');
 
             $value['创建人所属部门'] = get_company_name_by_uid($value['apply_id']);//获取创建人的所属部门
@@ -967,7 +967,7 @@ class SaleReport extends Base
 
         foreach ($data as $value) {
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
+            if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
             else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode']])->value('noble_metal');
 
 
@@ -1008,7 +1008,7 @@ class SaleReport extends Base
 
         foreach ($data as $value) {
 
-            if ($value['order_type'] == 3 || $value['order_type'] == 4) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
+            if ($value['order_type'] == 3) $noble_metal = Db::name("good_zixun")->where(["spuCode" => $value['spuCode'], "is_del" => 0])->value('noble_metal');
             else $noble_metal = Db::name('good_basic')->where(['spuCode' => $value['spuCode']])->value('noble_metal');
 
             $value['部门'] = get_company_name_by_uid($value['apply_id']);

app/admin/controller/Salezx.php

@@ -120,7 +120,8 @@ class Salezx extends \app\BaseController
                 "platform_order"=>$platform_order,
                 "platform_id"=>$platform_id,
                 "remark"=>$remark,
-                "order_type"=>2,
+                "order_type"=>2,//非库存品
+                "order_source"=>2,//咨询
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'total_price'=>round($goodinfo['sale_price']*$good_num,2),
@@ -134,6 +135,9 @@ class Salezx extends \app\BaseController
                     "sale_id"=>$datainfo,
                     "customer_code"=>$customer_code,
                     "supplierNo"=>$supplierNo,
+                    "order_type"=>$data['order_type'],
+                    "order_source"=>$data['order_source'],
+                    "spuCode"=>$good_code,
                     'updatetime'=>date("Y-m-d H:i:s"),
                 ];
 
@@ -311,7 +315,8 @@ class Salezx extends \app\BaseController
                     "status"=>0,
                     "lasttime"=>date("Y-m-d H:i:s"),
                     "is_del"=>0,
-                    "order_type"=>2,
+                    "order_type"=>$data['order_type'],
+                    "order_source"=>$data['order_source'],
                     "good_type"=>$good['good_type'],
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s")
@@ -541,8 +546,7 @@ class Salezx extends \app\BaseController
             if($datainfo) {
                 $st = ["order_code"=>$der['outCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
                 ActionLog::logAdd($this->post['token'],$st,"CKD",1,$der);
-                $ord=["order_type"=>"CKD","order_code"=>$der['outCode'],"order_id"=>$der['id'],
-                    "order_status"=>$der['status']];
+                $ord=["order_type"=>"CKD","order_code"=>$der['outCode'],"order_id"=>$der['id'], "order_status"=>$der['status']];
                 ProcessOrder::AddProcess($this->post['token'],$ord);
 //                    $send =Db::name("order_out")->where(["wsm_code"=>$der['wsm_code'],'orderCode'=>$der['orderCode']])->sum("send_num");
 //                    $order['send_num']+= $der['send_num'];

app/command/ImportOrderFromCHandleData.php

@@ -101,7 +101,8 @@ class ImportOrderFromCHandleData extends Command
 
                     $goodinfo = $ct;
                     $is_stock = $ct['is_stock'];
-                    $order_type = $is_stock == 1 ? 5 : 6;//1销售2咨询(1备库 2非库存 3咨询采反 4项目采反,5平台部订单销售库存品,6平台部订单销售非库存品)
+                    $order_type = $is_stock == 1 ? 1 : 2;//1备库(库存品)2非库存品
+                    $order_source = 4;//4平台
                     $spuCode = $ct['spuCode'];
                     $skuCode = $ct['skuCode'];
                     $is_activity = empty($extend_data['activity_name']) ? 0 : 1;
@@ -193,6 +194,7 @@ class ImportOrderFromCHandleData extends Command
                         "good_num" => $good_num,
                         "good_type" => $goodtype,
                         "order_type" => $order_type,
+                        "order_source" => $order_source,
                         "createrid" => $ct['createrid'],
                         "creater" => $ct['creater'],
                         'send_way' => 2,
@@ -231,6 +233,7 @@ class ImportOrderFromCHandleData extends Command
                         "is_stock" => $is_stock,
                         "is_activity" => $is_activity === "" ? 0 : $is_activity,
                         "order_type" => $order_type,
+                        "order_source" => $order_source,
 //                "poNo"=>$poNo,
                         'good_weight' => $ct['weight'],
                         'gold_price' => $ct['cgd_gold_price'],
@@ -260,11 +263,10 @@ class ImportOrderFromCHandleData extends Command
                         //补充台账数据
                         $standing_book_data = array_merge($standing_book_data, [
                             'orderCode' => $orderCode,
-//                            'outCode'=>,
-//                            'cgdNo'=>,
                             'spuCode' => $data['good_code'],
                             'skuCode' => $data['skuCode'],
                             'order_type' => $data['order_type'],
+                            'order_source' => $data['order_source'],
                             'supplierNo' => $data['supplierNo'],
                             'companyNo' => $extend_data['companyNo'],
                             'customer_code' => $data['customer_code'],
@@ -277,7 +279,7 @@ class ImportOrderFromCHandleData extends Command
 
                         } else {
                             //库存品
-                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type], $standing_book_data);
+                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type, 'order_source' => $order_source], $standing_book_data);
                             if ($bol == false) throw new Exception('库存商品关联采购单失败');
 
                             if (isset($stock)) {
@@ -502,6 +504,7 @@ class ImportOrderFromCHandleData extends Command
             "lasttime" => date("Y-m-d H:i:s"),
             "is_del" => 0,
             "order_type" => $data['order_type'],
+            "order_source" => $data['order_source'],
             "good_type" => $data['good_type'],
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s")
@@ -630,6 +633,7 @@ class ImportOrderFromCHandleData extends Command
             "lasttime" => $cgdinfo['lasttime'],
             "is_del" => 0,
             "order_type" => $outinfo['order_type'],
+            "order_source" => $outinfo['order_source'],
             "good_type" => $cgdinfo['good_type'],
             "addtime" => date("Y-m-d H:i:s"),
             "updatetime" => date("Y-m-d H:i:s")