有赞、导入等维护采购单、销售单新增字段

app/admin/controller/Sale.php

@@ -3599,8 +3599,7 @@ class Sale extends Base
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo != "") {
-            $where[] = ['b.customer_code', "like", "%$companyNo%"];
-
+            $where[] = ['b.supplierNo', "like", "%$companyNo%"];
         }
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";

app/command/ImportOrderFromCHandleData.php

@@ -73,14 +73,16 @@ class ImportOrderFromCHandleData extends Command
                     $orderCode = makeNo("QR");
                     $customer_code = $extend_data['customer_code'];
 
-                    $customer = Db::name("customer_info")
+                    $customer = Db::connect('mysql_sys')
+                        ->name("customer_info")
                         ->where(["companyNo" => $customer_code])
                         ->find();
 
                     if ($customer == false) throw new Exception('未找到客户数据');
 
                     $supplierNo = $extend_data['companyNo'];
-                    $supplier = Db::name("business")
+                    $supplier = Db::connect('mysql_sys')
+                        ->name("business")
                         ->where(["companyNo" => $supplierNo])
                         ->find();
                     if ($supplier == false) throw new Exception('未找到平台供应商数据');
@@ -189,13 +191,16 @@ class ImportOrderFromCHandleData extends Command
                             //$sale_price = $act['activity_price'];//不能改动价格
                         }
                     }
-                     $supplier_temp_info = Db::name('supplier')
+                     $supplier_temp_info = Db::connect('mysql_sys')
+                         ->name('supplier')
                         ->field('id,person,personid')
                         ->where('code', $ct['supplierNo'])
                         ->findOrEmpty();
                     $cgd = [
                         "supplierNo" => $ct['supplierNo'],
+                        "supplier_name" =>$supplier_temp_info['name'] ,
                         "companyNo" => $supplierNo,
+                        "companyName" =>$supplier['company'] ,
                         "orderCode" => $orderCode,
                         "spuCode" => $ct['spuCode'],
                         "skuCode" => $ct['skuCode'],
@@ -215,7 +220,7 @@ class ImportOrderFromCHandleData extends Command
                         "order_type" => $order_type,
                         "order_source" => $order_source,
                         "createrid" =>$supplier_temp_info['personid'],
-                         "creater" =>$supplier_temp_info['person'],
+                        "creater" =>$supplier_temp_info['person'],
                         'send_way' => 2,
                         'gold_price' => $ct['cgd_gold_price'],
                         'good_createrid' => $goodinfo['createrid'],
@@ -508,8 +513,8 @@ class ImportOrderFromCHandleData extends Command
     private function createCgd($data = [], $rm = '0', $ri = '', array &$standing_book_data = [])
     {
         $cgdCode = makeNo("CG");
-        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
-        if ($supplier == false) return false;
+//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
+//        if ($supplier == false) return false;
 
         $wsm = Db::name("warehouse_info")
             ->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "is_del" => 0])
@@ -518,9 +523,9 @@ class ImportOrderFromCHandleData extends Command
             $wsm_code = makeNo("WSM");
             $inwsm = [
                 "wsm_code" => $wsm_code,
-                "name" => $supplier['name'],
+                "name" => $data['supplier_name'],
                 "wsm_type" => 2,
-                "supplierNo" => $supplier['code'],
+                "supplierNo" => $data['supplierNo'],
                 "addr" => "",
                 "addrs_code" => "",
                 "contactor" => 0,
@@ -568,8 +573,9 @@ class ImportOrderFromCHandleData extends Command
             "diff_fee" => "0",
             "gold_price" => $data['gold_price'],
             "supplierNo" => $data['supplierNo'],
-            "supplier_name" => $supplier['name'],
+            "supplier_name" => $data['supplier_name'],
             "companyNo" => $data['companyNo'],
+            "companyName" => $data['companyName'],
             "send_status" => 1,
             "send_num" => 0,
             "wsend_num" => $data['good_num'],
@@ -604,9 +610,9 @@ class ImportOrderFromCHandleData extends Command
                 "order_id" => $up,
                 "order_status" => $cg['status'],
                 "before_status" => 0,
-                'holder_id' => $supplier['personid'],
-                'wait_id'=>$supplier['personid'],
-                'wait_name'=>$supplier['person'],
+                'holder_id' => $data['createrid'],
+                'wait_id'=>$data['createrid'],
+                'wait_name'=>$data['creater'],
             ]);
 
             $standing_book_data['cgdNo'] = $cgdCode;
@@ -662,108 +668,109 @@ class ImportOrderFromCHandleData extends Command
 
 
     //创建.....
-    private function RelaCgd(array $outinfo = [], array &$standing_book_data = [])
-    {
-        //备库单
-        $cgd = Db::name("order_bk")
-            ->where([
-                ["spuCode", "=", $outinfo['spuCode']],
-                ["is_del", "=", 0],
-                ["balance_num", ">=", $outinfo['good_num']],
-                ['companyNo', "=", $outinfo['companyNo']]
-            ])
-//            ->lock(true)
-            ->find();
-
-        if ($cgd == false) return false;
-
-        $cgdinfo = Db::name("purchease_order")
-            ->where(['cgdNo' => $cgd['cgdNo'], "is_del" => 0])
-            ->find();
-        if ($cgdinfo == false) return false;
-
-        //判断该供应商是否开通了供应商账号
-        $from_tag=checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
-
-        $QrdCgd = [
-            "cgdNo" => makeNo("CG"),
-            "bkcode" => $cgdinfo['bkcode'],
-            'wsm_code' => $cgdinfo['wsm_code'],
-            "cgder_id" => $cgdinfo['cgder_id'],
-            "cgder" => $cgdinfo['cgder'],
-            "spuCode" => $cgdinfo['spuCode'],
-            "good_name" => $cgdinfo['good_name'],
-            "good_num" => $outinfo['good_num'],
-            "good_price" => $cgdinfo['good_price'],
-            "total_fee" => round($cgdinfo['good_price'] * $outinfo['good_num'], 2),
-            "pakge_fee" => $cgdinfo['pakge_fee'],
-            "cert_fee" => $cgdinfo['cert_fee'],
-            "open_fee" => $cgdinfo['open_fee'],
-            "delivery_fee" => $cgdinfo['delivery_fee'],
-            "mark_fee" => $cgdinfo['mark_fee'],
-            "teach_fee" => $cgdinfo['teach_fee'],
-            "nake_fee" => $cgdinfo['nake_fee'],
-            "demo_fee" => $cgdinfo['demo_fee'],
-            "weight" => $cgdinfo['weight'],
-            "diff_weight" => $cgdinfo['diff_weight'],
-            "diff_fee" => $cgdinfo['diff_fee'],
-            "gold_price" => $cgdinfo['gold_price'],
-            "supplierNo" => $cgdinfo['supplierNo'],
-            "supplier_name" => $cgdinfo['supplier_name'],
-            "companyNo" => $cgdinfo['companyNo'],
-            "send_status" => 3,
-            "send_num" => $outinfo['good_num'],
-            "wsend_num" => 0,
-            "remark" => $cgdinfo['remark'],
-            "status" => 3,//入库完成
-            "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"),
-            'good_createrid' => $outinfo['good_createrid'],
-            'good_creater' => $outinfo['good_creater'],//商品创建人
-            'from_tag' => isset($from_tag[$cgdinfo['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
-        ];
-        $insetrCgd = Db::name("purchease_order")->insert($QrdCgd);
-        if ($insetrCgd == false) return false;
-
-        $standing_book_data = array_merge($standing_book_data, [
-            'cgdNo' => $QrdCgd['cgdNo'],
-            'bk_code' => $QrdCgd['bkcode'],
-        ]);
-
-        $merge_num = Db::name("purchease_order")
-            ->where(["bkcode" => $cgdinfo['bkcode'], "order_type" => $outinfo['order_type'], "is_del" => 0])
-            ->where('order_source', '<>', 0)//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'];
-        $cgd['updatetime'] = date("Y-m-d H:i:s");
-        $up = Db::name("order_bk")->save($cgd);
-        if ($up == false) return false;
-
-        $data = [
-            "orderCode" => $outinfo['orderCode'],
-            "cgdNo" => $QrdCgd['cgdNo'],
-            "spuCode" => $outinfo['spuCode'],
-            "companyNo" => $outinfo['companyNo'],
-            "good_num" => $outinfo['good_num'],
-            "wsend_num" => $outinfo['good_num'],
-            "send_num" => 0,
-            "wait_num" => $outinfo['good_num'],
-            "status" => 1,
-            "source" => 1,
-        ];
-        $order = Db::name("order_num")->save($data);
-        if ($order == false) return false;
-
-        $this->cgd_data = $QrdCgd;
-        return true;
-    }
+//    private function RelaCgd(array $outinfo = [], array &$standing_book_data = [])
+//    {
+//        //备库单
+//        $cgd = Db::name("order_bk")
+//            ->where([
+//                ["spuCode", "=", $outinfo['spuCode']],
+//                ["is_del", "=", 0],
+//                ["balance_num", ">=", $outinfo['good_num']],
+//                ['companyNo', "=", $outinfo['companyNo']]
+//            ])
+////            ->lock(true)
+//            ->find();
+//
+//        if ($cgd == false) return false;
+//
+//        $cgdinfo = Db::name("purchease_order")
+//            ->where(['cgdNo' => $cgd['cgdNo'], "is_del" => 0])
+//            ->find();
+//        if ($cgdinfo == false) return false;
+//
+//        //判断该供应商是否开通了供应商账号
+//        $from_tag=checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
+//
+//        $QrdCgd = [
+//            "cgdNo" => makeNo("CG"),
+//            "bkcode" => $cgdinfo['bkcode'],
+//            'wsm_code' => $cgdinfo['wsm_code'],
+//            "cgder_id" => $cgdinfo['cgder_id'],
+//            "cgder" => $cgdinfo['cgder'],
+//            "spuCode" => $cgdinfo['spuCode'],
+//            "good_name" => $cgdinfo['good_name'],
+//            "good_num" => $outinfo['good_num'],
+//            "good_price" => $cgdinfo['good_price'],
+//            "total_fee" => round($cgdinfo['good_price'] * $outinfo['good_num'], 2),
+//            "pakge_fee" => $cgdinfo['pakge_fee'],
+//            "cert_fee" => $cgdinfo['cert_fee'],
+//            "open_fee" => $cgdinfo['open_fee'],
+//            "delivery_fee" => $cgdinfo['delivery_fee'],
+//            "mark_fee" => $cgdinfo['mark_fee'],
+//            "teach_fee" => $cgdinfo['teach_fee'],
+//            "nake_fee" => $cgdinfo['nake_fee'],
+//            "demo_fee" => $cgdinfo['demo_fee'],
+//            "weight" => $cgdinfo['weight'],
+//            "diff_weight" => $cgdinfo['diff_weight'],
+//            "diff_fee" => $cgdinfo['diff_fee'],
+//            "gold_price" => $cgdinfo['gold_price'],
+//            "supplierNo" => $cgdinfo['supplierNo'],
+//            "supplier_name" => $cgdinfo['supplier_name'],
+//            "companyNo" => $cgdinfo['companyNo'],
+//            "companyName" => ,
+//            "send_status" => 3,
+//            "send_num" => $outinfo['good_num'],
+//            "wsend_num" => 0,
+//            "remark" => $cgdinfo['remark'],
+//            "status" => 3,//入库完成
+//            "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"),
+//            'good_createrid' => $outinfo['good_createrid'],
+//            'good_creater' => $outinfo['good_creater'],//商品创建人
+//            'from_tag' => isset($from_tag[$cgdinfo['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
+//        ];
+//        $insetrCgd = Db::name("purchease_order")->insert($QrdCgd);
+//        if ($insetrCgd == false) return false;
+//
+//        $standing_book_data = array_merge($standing_book_data, [
+//            'cgdNo' => $QrdCgd['cgdNo'],
+//            'bk_code' => $QrdCgd['bkcode'],
+//        ]);
+//
+//        $merge_num = Db::name("purchease_order")
+//            ->where(["bkcode" => $cgdinfo['bkcode'], "order_type" => $outinfo['order_type'], "is_del" => 0])
+//            ->where('order_source', '<>', 0)//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'];
+//        $cgd['updatetime'] = date("Y-m-d H:i:s");
+//        $up = Db::name("order_bk")->save($cgd);
+//        if ($up == false) return false;
+//
+//        $data = [
+//            "orderCode" => $outinfo['orderCode'],
+//            "cgdNo" => $QrdCgd['cgdNo'],
+//            "spuCode" => $outinfo['spuCode'],
+//            "companyNo" => $outinfo['companyNo'],
+//            "good_num" => $outinfo['good_num'],
+//            "wsend_num" => $outinfo['good_num'],
+//            "send_num" => 0,
+//            "wait_num" => $outinfo['good_num'],
+//            "status" => 1,
+//            "source" => 1,
+//        ];
+//        $order = Db::name("order_num")->save($data);
+//        if ($order == false) return false;
+//
+//        $this->cgd_data = $QrdCgd;
+//        return true;
+//    }
 
 
 }

app/command/handleYzOrderData.php

@@ -277,11 +277,14 @@ class handleYzOrderData extends Command
                 $tmp = $userCommon->handle('sInfo',['code'=>$ct['supplierNo']]);
                 $supplier_temp_info = $tmp['data']??[];
 
+                $names = $userCommon->handle('getCodeAndName',['code'=>[$goodinfo['companyNo']]]);
+
                 $data = [
                     "orderCode" => $orderCode,
                     "good_code" => $spuCode,
                     "skuCode" => $skuCode,
                     "customer_code" => $customer_code,
+                    "customer_name" => $ct['name'] . '客户',
                     "good_name" => isset($goodinfo['good_name']) && $goodinfo['good_name'] !== '' ? $goodinfo['good_name'] : '',
                     "good_num" => $good_num,
                     "cat_id" => $goodinfo['cat_id'],
@@ -297,6 +300,9 @@ class handleYzOrderData extends Command
                     "good_type" => $goodtype,
                     "send_type" => $sendtype,
                     "supplierNo" => $goodinfo['companyNo'],
+                    "supplierName" => $names['data'][$goodinfo['companyNo']],
+                    'supNo'=>$goodinfo['supplierNo'],
+                    'supName'=>$supplier_temp_info['name'],
                     "is_del" => 0,
                     "zxNo" => "",
                     "platform_order" => $platform_order,
@@ -354,7 +360,9 @@ class handleYzOrderData extends Command
 
                         $cgd = [
                             "supplierNo" => $ct['supplierNo'],
+                            "supplier_name" => $supplier_temp_info['name'],
                             "companyNo" => $supplierNo,
+                            "companyName" => $names['data'][$supplierNo]??'',
                             "orderCode" => $orderCode,
                             "spuCode" => $spuCode,
                             "skuCode" => $skuCode,
@@ -374,7 +382,7 @@ class handleYzOrderData extends Command
                             "order_type" => $order_type,
                             "order_source" => $order_source,
                             "createrid" =>$supplier_temp_info['personid']??'',
-                             "creater" =>$supplier_temp_info['person']??'',
+                            "creater" =>$supplier_temp_info['person']??'',
                             'send_way' => 2,
                             'gold_price' => $ct['cgd_gold_price'],
                             'good_createrid' => $goodinfo['createrid'],
@@ -644,8 +652,8 @@ class handleYzOrderData extends Command
     private function createCgd($data = [], $rm = '0', $ri = '', array &$standing_book_data = [])
     {
         $cgdCode = makeNo("CG");
-        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
-        if ($supplier == false) return false;
+//        $supplier = Db::name("supplier")->where(["code" => $data['supplierNo'], "is_del" => 0])->find();
+//        if ($supplier == false) return false;
 
         $wsm = Db::name("warehouse_info")
             ->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "is_del" => 0])
@@ -654,9 +662,9 @@ class handleYzOrderData extends Command
             $wsm_code = makeNo("WSM");
             $inwsm = [
                 "wsm_code" => $wsm_code,
-                "name" => $supplier['name'],
+                "name" => $data['supplier_name'],
                 "wsm_type" => 2,
-                "supplierNo" => $supplier['code'],
+                "supplierNo" => $data['supplierNo'],
                 "addr" => "",
                 "addrs_code" => "",
                 "contactor" => 0,
@@ -704,8 +712,9 @@ class handleYzOrderData extends Command
             "diff_fee" => "0",
             "gold_price" => $data['gold_price'],
             "supplierNo" => $data['supplierNo'],
-            "supplier_name" => $supplier['name'],
+            "supplier_name" => $data['supplier_name'],
             "companyNo" => $data['companyNo'],
+            "companyName" => $data['companyName'],
             "send_status" => 1,
             "send_num" => 0,
             "wsend_num" => $data['good_num'],
@@ -740,9 +749,9 @@ class handleYzOrderData extends Command
                 "order_id" => $up,
                 "order_status" => $cg['status'],
                 "before_status" => 0,
-                'holder_id'=>$supplier['personid'],
-                'wait_id'=>$supplier['personid'],
-                'wait_name'=>$supplier['person'],
+                'holder_id'=>$data['createrid'],
+                'wait_id'=>$data['createrid'],
+                'wait_name'=>$data['creater'],
             ]);
 
             $standing_book_data['cgdNo'] = $cgdCode;
@@ -797,107 +806,107 @@ class handleYzOrderData extends Command
 
 
     //创建.....
-    private function RelaCgd(array $outinfo = [], array &$standing_book_data = [])
-    {
-        //备库单
-        $cgd = Db::name("order_bk")
-            ->where([
-                ["spuCode", "=", $outinfo['spuCode']],
-                ["is_del", "=", 0],
-                ["balance_num", ">=", $outinfo['good_num']],
-                ['companyNo', "=", $outinfo['companyNo']]
-            ])
-            ->lock(true)
-            ->find();
-
-        if ($cgd == false) return false;
-
-        $cgdinfo = Db::name("purchease_order")->where(['cgdNo' => $cgd['cgdNo'], "is_del" => 0])->find();
-        if ($cgdinfo == false) return false;
-
-        //判断该供应商是否开通了供应商账号
-        $from_tag=checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
-
-        $QrdCgd = [
-            "cgdNo" => makeNo("CG"),
-            "bkcode" => $cgdinfo['bkcode'],
-            'wsm_code' => $cgdinfo['wsm_code'],
-            "cgder_id" => $cgdinfo['cgder_id'],
-            "cgder" => $cgdinfo['cgder'],
-            "spuCode" => $cgdinfo['spuCode'],
-            "good_name" => $cgdinfo['good_name'],
-            "good_num" => $outinfo['good_num'],
-            "good_price" => $cgdinfo['good_price'],
-            "total_fee" => round($cgdinfo['good_price'] * $outinfo['good_num'], 2),
-            "pakge_fee" => $cgdinfo['pakge_fee'],
-            "cert_fee" => $cgdinfo['cert_fee'],
-            "open_fee" => $cgdinfo['open_fee'],
-            "delivery_fee" => $cgdinfo['delivery_fee'],
-            "mark_fee" => $cgdinfo['mark_fee'],
-            "teach_fee" => $cgdinfo['teach_fee'],
-            "nake_fee" => $cgdinfo['nake_fee'],
-            "demo_fee" => $cgdinfo['demo_fee'],
-            "weight" => $cgdinfo['weight'],
-            "diff_weight" => $cgdinfo['diff_weight'],
-            "diff_fee" => $cgdinfo['diff_fee'],
-            "gold_price" => $cgdinfo['gold_price'],
-            "supplierNo" => $cgdinfo['supplierNo'],
-            "supplier_name" => $cgdinfo['supplier_name'],
-            "companyNo" => $cgdinfo['companyNo'],
-            "send_status" => 3,
-            "send_num" => $outinfo['good_num'],
-            "wsend_num" => 0,
-            "remark" => $cgdinfo['remark'],
-            "status" => 3,//入库完成
-            "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"),
-            'good_createrid' => $outinfo['good_createrid'],
-            'good_creater' => $outinfo['good_creater'],//商品创建人
-            'from_tag' => isset($from_tag[$cgdinfo['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
-        ];
-        $insetrCgd = Db::name("purchease_order")->insert($QrdCgd);
-        if ($insetrCgd == false) return false;
-
-        $standing_book_data = array_merge($standing_book_data, [
-            'cgdNo' => $QrdCgd['cgdNo'],
-            'bk_code' => $QrdCgd['bkcode'],
-        ]);
-
-        $merge_num = Db::name("purchease_order")
-            ->where(["bkcode" => $cgdinfo['bkcode'], "order_type" => $outinfo['order_type'], "is_del" => 0])
-            ->where('order_source', '<>', 0)//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'];
-        $cgd['updatetime'] = date("Y-m-d H:i:s");
-        $up = Db::name("order_bk")->save($cgd);
-        if ($up == false) return false;
-
-        $data = [
-            "orderCode" => $outinfo['orderCode'],
-            "cgdNo" => $QrdCgd['cgdNo'],
-            "spuCode" => $outinfo['spuCode'],
-            "companyNo" => $outinfo['companyNo'],
-            "good_num" => $outinfo['good_num'],
-            "wsend_num" => $outinfo['good_num'],
-            "send_num" => 0,
-            "wait_num" => $outinfo['good_num'],
-            "status" => 1,
-            "source" => 1,
-        ];
-        $order = Db::name("order_num")->save($data);
-        if ($order == false) return false;
-
-        $this->cgd_data = $QrdCgd;
-
-        return true;
-    }
+//    private function RelaCgd(array $outinfo = [], array &$standing_book_data = [])
+//    {
+//        //备库单
+//        $cgd = Db::name("order_bk")
+//            ->where([
+//                ["spuCode", "=", $outinfo['spuCode']],
+//                ["is_del", "=", 0],
+//                ["balance_num", ">=", $outinfo['good_num']],
+//                ['companyNo', "=", $outinfo['companyNo']]
+//            ])
+//            ->lock(true)
+//            ->find();
+//
+//        if ($cgd == false) return false;
+//
+//        $cgdinfo = Db::name("purchease_order")->where(['cgdNo' => $cgd['cgdNo'], "is_del" => 0])->find();
+//        if ($cgdinfo == false) return false;
+//
+//        //判断该供应商是否开通了供应商账号
+//        $from_tag=checkHasAccountBySupplierNos([$cgdinfo['supplierNo']]);
+//
+//        $QrdCgd = [
+//            "cgdNo" => makeNo("CG"),
+//            "bkcode" => $cgdinfo['bkcode'],
+//            'wsm_code' => $cgdinfo['wsm_code'],
+//            "cgder_id" => $cgdinfo['cgder_id'],
+//            "cgder" => $cgdinfo['cgder'],
+//            "spuCode" => $cgdinfo['spuCode'],
+//            "good_name" => $cgdinfo['good_name'],
+//            "good_num" => $outinfo['good_num'],
+//            "good_price" => $cgdinfo['good_price'],
+//            "total_fee" => round($cgdinfo['good_price'] * $outinfo['good_num'], 2),
+//            "pakge_fee" => $cgdinfo['pakge_fee'],
+//            "cert_fee" => $cgdinfo['cert_fee'],
+//            "open_fee" => $cgdinfo['open_fee'],
+//            "delivery_fee" => $cgdinfo['delivery_fee'],
+//            "mark_fee" => $cgdinfo['mark_fee'],
+//            "teach_fee" => $cgdinfo['teach_fee'],
+//            "nake_fee" => $cgdinfo['nake_fee'],
+//            "demo_fee" => $cgdinfo['demo_fee'],
+//            "weight" => $cgdinfo['weight'],
+//            "diff_weight" => $cgdinfo['diff_weight'],
+//            "diff_fee" => $cgdinfo['diff_fee'],
+//            "gold_price" => $cgdinfo['gold_price'],
+//            "supplierNo" => $cgdinfo['supplierNo'],
+//            "supplier_name" => $cgdinfo['supplier_name'],
+//            "companyNo" => $cgdinfo['companyNo'],
+//            "send_status" => 3,
+//            "send_num" => $outinfo['good_num'],
+//            "wsend_num" => 0,
+//            "remark" => $cgdinfo['remark'],
+//            "status" => 3,//入库完成
+//            "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"),
+//            'good_createrid' => $outinfo['good_createrid'],
+//            'good_creater' => $outinfo['good_creater'],//商品创建人
+//            'from_tag' => isset($from_tag[$cgdinfo['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
+//        ];
+//        $insetrCgd = Db::name("purchease_order")->insert($QrdCgd);
+//        if ($insetrCgd == false) return false;
+//
+//        $standing_book_data = array_merge($standing_book_data, [
+//            'cgdNo' => $QrdCgd['cgdNo'],
+//            'bk_code' => $QrdCgd['bkcode'],
+//        ]);
+//
+//        $merge_num = Db::name("purchease_order")
+//            ->where(["bkcode" => $cgdinfo['bkcode'], "order_type" => $outinfo['order_type'], "is_del" => 0])
+//            ->where('order_source', '<>', 0)//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'];
+//        $cgd['updatetime'] = date("Y-m-d H:i:s");
+//        $up = Db::name("order_bk")->save($cgd);
+//        if ($up == false) return false;
+//
+//        $data = [
+//            "orderCode" => $outinfo['orderCode'],
+//            "cgdNo" => $QrdCgd['cgdNo'],
+//            "spuCode" => $outinfo['spuCode'],
+//            "companyNo" => $outinfo['companyNo'],
+//            "good_num" => $outinfo['good_num'],
+//            "wsend_num" => $outinfo['good_num'],
+//            "send_num" => 0,
+//            "wait_num" => $outinfo['good_num'],
+//            "status" => 1,
+//            "source" => 1,
+//        ];
+//        $order = Db::name("order_num")->save($data);
+//        if ($order == false) return false;
+//
+//        $this->cgd_data = $QrdCgd;
+//
+//        return true;
+//    }
 
 
     //与有赞项目回调