按钮和菜单的编辑接口优化

数据大屏优化
订单导入脚本重新添加

app/admin/common/User.php

@@ -196,5 +196,12 @@ class User
         return json_decode($rs, true);
     }
 
+    //方便调试
+    public function debug(string $key = '', array $param = [])
+    {
+        $rs = $this->post($this->host . $this->api[$key], $param);
+        echo $rs;exit;
+    }
+
 
 }

app/admin/controller/Action.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 use app\BaseController;
 use think\facade\Db;
+use think\facade\Validate;
 use think\Request;
 use think\App;
 
@@ -41,49 +42,68 @@ class Action extends BaseController
      */
     public function ActionSave()
     {
-        $post = $this->request->post();
-        $actionid = isset($post['id']) ? intval($post['id']) : "";
-        if ($actionid != "") {
-            $isf = Db::name("action_list")->where("id", "=", $actionid)->find();
-            if ($isf == false) {
-                return json_show(1005, "未找到数据");
-            }
-        }
-        $action = isset($post['action_name']) ? trim($post['action_name']) : "";
-        if ($action == "") {
-            return json_show(1003, '功能名称不能为空');
-        }
-        $desc = isset($post['action_desc']) ? trim($post['action_desc']) : "";
-        $status = isset($post['status']) ? intval($post['status']) : 0;
-        $data = [
-            "action_name" => $action,
-            "action_desc" => $desc,
-            "action_code" => "",
-        ];
 
-        $isTrue = Db::name("action_list")->where(["action_name" => $action])->find();
-        if ($isTrue) {
-            if ($isTrue['id'] != $actionid || $actionid == "") {
-                return json_show(1003, '功能名称不能重复');
-            }
-        }
+        $post = $this->request->only(['id', 'action_code'], 'post', 'trim');
 
-        try {
-            $message = "";
-            if ($actionid == "") {
-                $data['status'] = $status;
-                $data['is_show'] = 1;
-                $message = "新建成功";
-            } else {
-                $data['status'] = $status;
-                $data['id'] = $actionid;
-                $message = "更新成功";
-            }
-            Db::name("action_list")->save($data);
-            return json_show(0, $message);
-        } catch (\Exception $e) {
-            return json_show(1005, $e->getMessage());
-        }
+        $val = Validate::rule([
+            'id|ID' => 'require|number|gt:0',
+            'action_code' => 'require'
+        ]);
+
+        if ($val->check($post) == false) return error_show(1004, $val->getError());
+
+        $rs = Db::name("action")
+            ->where(['is_del' => 0, 'id' => $post['id']])
+            ->update([
+                'action_code' => $post['action_code'],
+                'updatetime' => date("Y-m-d H:i:s")
+            ]);
+
+        return $rs ? json_show(0, "修改成功") : json_show(0, "修改失败");
+
+//        $post = $this->request->post();
+//        $actionid = isset($post['id']) ? intval($post['id']) : "";
+//        if ($actionid != "") {
+//            $isf = Db::name("action_list")->where("id", "=", $actionid)->find();
+//            if ($isf == false) {
+//                return json_show(1005, "未找到数据");
+//            }
+//        }
+//        $action = isset($post['action_name']) ? trim($post['action_name']) : "";
+//        if ($action == "") {
+//            return json_show(1003, '功能名称不能为空');
+//        }
+//        $desc = isset($post['action_desc']) ? trim($post['action_desc']) : "";
+//        $status = isset($post['status']) ? intval($post['status']) : 0;
+//        $data = [
+//            "action_name" => $action,
+//            "action_desc" => $desc,
+//            "action_code" => "",
+//        ];
+//
+//        $isTrue = Db::name("action_list")->where(["action_name" => $action])->find();
+//        if ($isTrue) {
+//            if ($isTrue['id'] != $actionid || $actionid == "") {
+//                return json_show(1003, '功能名称不能重复');
+//            }
+//        }
+//
+//        try {
+//            $message = "";
+//            if ($actionid == "") {
+//                $data['status'] = $status;
+//                $data['is_show'] = 1;
+//                $message = "新建成功";
+//            } else {
+//                $data['status'] = $status;
+//                $data['id'] = $actionid;
+//                $message = "更新成功";
+//            }
+//            Db::name("action_list")->save($data);
+//            return json_show(0, $message);
+//        } catch (\Exception $e) {
+//            return json_show(1005, $e->getMessage());
+//        }
     }
 
     public function ActionStatus()

app/admin/controller/Data.php

@@ -298,7 +298,8 @@ class Data extends BaseController
         });
 
         //计算汇总完成率
-        $total_finish_rate = round((array_sum(array_column($sales_volume, 'sales_volume')) / array_sum(array_column($da, 'total_tips'))) * 100, 2);
+        $tmp_total_tips = array_sum(array_column($da, 'total_tips'));
+        $total_finish_rate = $tmp_total_tips ? round((array_sum(array_column($sales_volume, 'sales_volume')) / $tmp_total_tips) * 100, 2) : 0;
 
         return app_show(0, '请求成功', ['list' => $da, 'total_finish_rate' => $total_finish_rate]);
 

app/admin/controller/User.php

@@ -368,13 +368,13 @@ class User extends Base
     {
         $post = $this->request->only(["token" => "", "nickname" => "", "relaComNo" => "", "level" => "", "username" => "", "companyNo" => "", "status" => "", "page" => 1, "size" => 10], "post");
         if ($this->level == 2) {
-            $companyNo = $post['relaComNo'] ?? "";
+//            $companyNo = $post['relaComNo'] ?? "";
             $post['companyNo'] = $post['relaComNo'] ?? "";
         }
         $where = [["a.is_del", "=", 0]];
         unset($post['relaComNo']);
         if ($post['companyNo'] != "") {
-            $where[] = ["a.companyNo", "=", $companyNo];
+            $where[] = ["a.companyNo", "=", $post['companyNo']];
         }
         if ($post['status'] !== '') {
             $uid = Db::name("user_role")

app/command/ImportOrderFromCAnalysisData.php

@@ -0,0 +1,343 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use app\admin\model\OrderImportFromC as OIFCModel;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\Exception;
+use think\facade\Cache;
+use think\facade\Db;
+use think\facade\Validate;
+
+//C端订单导入-数据解析
+class ImportOrderFromCAnalysisData extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('analysisData')
+            ->setDescription('批量解析C端导入的订单数据');
+    }
+
+    //【脚本1】解析用户导入的数据
+    protected function execute(Input $input, Output $output)
+    {
+        //解析信息存到extend表,其中customer_code字段根据订单编号去customer_info查，其他根据商品编号查询
+
+        Db::startTrans();
+        try {
+
+            $rs = Db::name('order_import_from_c')
+                ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_validate])
+//                ->lock(true)
+                ->find();
+
+            if (empty($rs)) throw new Exception('无符合条件的记录');
+
+            //1.数据校验
+            $val = Validate::rule([
+                'platform_code|平台订单号' => 'require',
+                'platform_id|平台ID' => 'require|number',
+                'platform_time|平台下单时间' => 'require|date',
+                'sale_source|销售渠道' => 'require',
+                'plat_code|平台商品编号' => 'require',
+                'price|单价' => 'require|float',
+                'num|数量' => 'require|number|gt:0',
+                'before_discount_all_price|总金额' => 'require|float',
+                'mode|收费模式' => 'require',
+                'contactor|收货人' => 'require',
+                'mobile|联系电话' => 'require',
+                'addr|联系地址' => 'require',
+            ]);
+
+            $update_c_data = [
+                'updatetime' => date('Y-m-d H:i:s'),
+                'updateid' => 0,
+                'updater' => 'system',
+            ];
+            if (!$val->check($rs)) {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = '数据错误，' . $val->getError();
+            }
+
+            //平台订单号和平台商品编号的组合不能重复
+            $temp = Db::name('order_import_from_c')
+                ->where([
+                    'is_del' => OIFCModel::$is_del_normal,
+                    'platform_code' => $rs['platform_code'],
+                    'plat_code' => $rs['plat_code'],
+                ])->where('id', '<>', $rs['id'])->find();
+
+            if (!empty($temp)) {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',平台订单号和平台商品编号重复' : '平台订单号和平台商品编号重复';
+            }
+
+            $extend_insert_data = [
+                'order_import_from_c_id' => $rs['id'],
+                'createrid' => 0,
+                'creater' => 'system',
+                'discount_reason' => $rs['activity_name'],
+                'platform_code' => $rs['platform_code'],
+                'po_code' => $rs['po_code'],
+                'platform_time' => $rs['platform_time'],
+                'price' => $rs['price'],
+                'num' => $rs['num'],
+                'before_discount_all_price' => $rs['before_discount_all_price'],
+                'order_remark' => $rs['order_remark'],
+                'contactor' => $rs['contactor'],
+                'mobile' => $rs['mobile'],
+                'addr' => $rs['addr'],
+                'type' => 1,//1系统解析，2用户确认
+                'addtime' => date('Y-m-d H:i:s'),
+                'sale_source' => $rs['sale_source'],
+                'mode' => $rs['mode'],
+            ];
+
+            //组织extend的数据
+            $good_platform_info = Db::name('good_platform')
+                ->field('id,spuCode,platform_code,skuCode,plat_code')
+                ->where([
+                    'is_del' => 0,
+                    'plat_code' => $rs['plat_code'],
+                    'platform_code' => $rs['platform_id'],
+                    'exam_status' => 6//exam_status==6 已上线
+                ])->find();
+
+            //商品信息
+            if (!empty($good_platform_info)) {
+                $extend_insert_data['skuCode'] = $good_platform_info['skuCode'];
+                $extend_insert_data['platform_id'] = $good_platform_info['platform_code'];
+                $extend_insert_data['plat_code'] = $good_platform_info['plat_code'];
+
+                $good_info = Db::name('good')
+                    ->field('id,good_name,companyNo,supplierNo')
+                    ->where(['is_del' => 0])
+                    ->where('spuCode', $good_platform_info['spuCode'])
+                    ->find();
+                if (!empty($good_info)) {
+                    $extend_insert_data['companyNo'] = $good_info['companyNo'];
+                    $extend_insert_data['supplierNo'] = $good_info['supplierNo'];
+                    $extend_insert_data['good_name'] = $good_info['good_name'];
+                } else {
+                    $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                    $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',在上线商品表中查不到spuCode对应的商品信息' : '在上线商品表中查不到spuCode对应的商品信息';
+                }
+
+                //商品价格和总价
+                if ($rs['price'] > 0) {
+                    //活动
+                    if ($rs['activity_name']) {
+//                        $activity_info = Db::name('good_activity')
+//                            ->alias('ga')
+//                            ->field('ga.id,ga.activity_name,ga.activity_code,a.moq_num,a.activity_price')
+//                            ->where(['ga.activity_name' => $rs['activity_name'], 'ga.is_del' => 0])
+//                            ->leftJoin('activity_info a', 'a.activity_code=ga.activity_code AND a.is_del=0')
+//                            ->find();
+                        //同一个活动会有多个商品
+                        $activity_info = Db::name('activity_info')
+                            ->alias('ai')
+                            ->field('ai.id,ga.activity_name,ga.activity_code,ai.moq_num,ai.activity_price')
+                            ->where(['ai.skuCode' => $extend_insert_data['skuCode'], 'ga.activity_name' => $rs['activity_name'], 'ai.is_del' => 0])
+                            ->leftJoin('good_activity ga', 'ga.activity_code=ai.activity_code AND ga.is_del=0')
+                            ->find();
+                        if (empty($activity_info)) {
+                            $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                            $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',该活动不存在' : '该活动不存在';
+                            $extend_insert_data['activity_code'] = '';
+                            $extend_insert_data['activity_name'] = '';
+                            $extend_insert_data['price'] = 0;
+                            $extend_insert_data['before_discount_all_price'] = 0;
+                        } else {
+                            $extend_insert_data['activity_code'] = $activity_info['activity_code'];
+                            $extend_insert_data['activity_name'] = $activity_info['activity_name'];
+
+                            //是否满足活动的起订量和价格
+                            if ($rs['num'] < $activity_info['moq_num']) {
+                                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',不满足活动的最小起订量' . $activity_info['moq_num'] : '不满足活动的最小起订量' . $activity_info['moq_num'];
+                                $extend_insert_data['num'] = 0;
+                            }
+
+                            if ($rs['price'] < $activity_info['activity_price']) {
+                                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',不满足活动价' . $activity_info['activity_price'] : '不满足活动价' . $activity_info['activity_price'];
+                                $extend_insert_data['price'] = 0;
+                                $extend_insert_data['before_discount_all_price'] = 0;
+                            }
+
+                        }
+
+                    } else {
+
+
+                        $good_ladder = Db::name("good_ladder")
+                            ->field('id,sale_price')
+                            ->where(["skuCode" => $good_platform_info['skuCode'], "is_del" => 0, "status" => 1])
+                            ->where([["min_num", "<=", $rs['num']]])
+                            ->order("min_num desc")
+                            ->find();
+                        if (empty($good_ladder)) {
+                            $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                            $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',找不到商品售价' : '找不到商品售价';
+                        } else {
+
+                            if ($rs['price'] < $good_ladder['sale_price']) {
+                                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',售价低于系统标准价' . $good_ladder['sale_price'] : '售价低于系统标准价' . $good_ladder['sale_price'];
+                                $extend_insert_data['price'] = 0;//价格错误
+                                $extend_insert_data['before_discount_all_price'] = 0;//总价也错误
+                            }
+
+                        }
+                    }
+
+                    //判断总价是否计算正确
+                    if (bccomp((string)($rs['num'] * $rs['price']), (string)$rs['before_discount_all_price']) != 0) {
+                        $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                        $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',导入总价错误' : '导入总价错误';
+                        $extend_insert_data['before_discount_all_price'] = 0;
+                    }
+
+                } else {
+                    $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                    $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',售价不能为0' : '售价不能为0';
+                    $extend_insert_data['price'] = 0;
+                    $extend_insert_data['before_discount_all_price'] = 0;
+                }
+
+                //销售渠道
+                $sale_source_temp = Db::name('platform_source')
+                    ->field('id')
+                    ->where(['source' => $rs['sale_source'], 'is_del' => 0, 'platform_id' => $rs['platform_id']])
+                    ->find();
+                if (empty($sale_source_temp)) {
+                    $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                    $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',销售渠道不存在' : '销售渠道不存在';
+                    $extend_insert_data['sale_source'] = '';
+                }
+
+
+            } else {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',在商品平台表中查不到平台商品编号在对应平台ID的spuCode' : '在商品平台表中查不到平台商品编号在对应平台ID的spuCode';
+                $extend_insert_data['plat_code'] = '';
+                $extend_insert_data['sale_source'] = '';
+                $extend_insert_data['activity_code'] = '';
+                $extend_insert_data['activity_name'] = '';
+                $extend_insert_data['price'] = 0;
+                $extend_insert_data['before_discount_all_price'] = 0;
+                $extend_insert_data['platform_id'] = 0;
+            }
+
+            //收费模式
+            $mode_temp = in_array($rs['mode'], ['卡券支付', '现金支付', '混合支付']);
+            if ($mode_temp) $extend_insert_data['mode'] = $rs['mode'];
+            else {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',收费模式错误' : '收费模式错误';
+                $extend_insert_data['mode'] = '';
+            }
+
+            //企业客户
+            $co = Db::name('good_platform')
+                ->alias('gp')
+                ->leftJoin('platform p', 'p.id=gp.platform_code AND p.is_del=0')
+                ->leftJoin('customer_org1 co', 'co.name=p.platform_name AND co.is_del=0')
+                ->where('gp.plat_code', $rs['plat_code'])
+                ->where('gp.exam_status', 6)//exam_status==6已上线
+                ->field('co.id,co.name')
+                ->find();
+
+            if ($co) {
+                $customer_code = Db::name('customer_info')
+                    ->where(['itemid' => $co['id'], 'companyName' => $co['name'] . '客户', 'is_del' => 0])
+                    ->value('companyNo', '');
+
+                if ($customer_code) $extend_insert_data['customer_code'] = $customer_code;
+                else {
+                    $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                    $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',在企业客户管理组织中找不到对应的企业' : '在企业客户管理组织中找不到对应的企业';
+                }
+
+            } else {
+                $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+                $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',在企业客户管理组织中找不到平台名称对应的组织' : '在企业客户管理组织中找不到平台名称对应的组织';
+            }
+
+            //省市区
+            if ($rs['addr']) {
+                $p_c_a = get_address($rs['addr']);
+
+                $province = Db::name('province')
+                    ->field('province_code,name')
+                    ->where('name', $p_c_a['province'])
+                    ->findOrEmpty();
+
+                $city = Db::name('city')
+                    ->field('city_code,name')
+                    ->where(['name' => $p_c_a['city'], 'province_code' => $province['province_code'] ?? ''])
+                    ->findOrEmpty();
+                $area = Db::name('area')
+                    ->field('area_code,name')
+                    ->where(['name' => $p_c_a['district'], 'city_code' => $city['city_code'] ?? ''])
+                    ->findOrEmpty();
+
+                $extend_insert_data['addr_code'] = implode([$province['province_code'] ?? '', $city['city_code'] ?? '', $area['area_code'] ?? ''], ',');
+
+                //将地址中省市区部分替换掉
+                if (!empty($province) && $province['name'] !== '') {
+                    $extend_insert_data['addr'] = str_replace($province['name'], '', $extend_insert_data['addr']);
+                    if (!empty($city) && $city['name'] !== '') {
+                        $extend_insert_data['addr'] = str_replace($city['name'], '', $extend_insert_data['addr']);
+                        if (!empty($area) && $area['name'] != '') $extend_insert_data['addr'] = str_replace($area['name'], '', $extend_insert_data['addr']);
+
+                    }
+
+                }
+
+//                地址非必填，能解析就解析，解析不出来就不管了
+//                if (is_null($province) || is_null($city) || is_null($area)) {
+//                    $update_c_data['status'] = OIFCModel::$status_wait_confirm;
+//                    $update_c_data['remark'] = isset($update_c_data['remark']) ? $update_c_data['remark'] . ',地址解析失败' : '地址解析失败';
+//                } else  $extend_insert_data['addr_code'] = implode([$province, $city, $area], ',');
+            }
+
+            Db::name('order_import_from_c_extend')->insertGetId($extend_insert_data);
+
+            $is = false;
+            if (!isset($update_c_data['status'])) {
+                $is = true;
+                $update_c_data['status'] = OIFCModel::$status_wait_relation;
+            }
+
+            $res = Db::name('order_import_from_c')
+                ->where([
+                    'id' => $rs['id'],
+                    'is_del' => OIFCModel::$is_del_normal,
+                    'status' => OIFCModel::$status_wait_validate
+                ])->update($update_c_data);
+
+            Db::commit();
+
+            if ($is && $res) Cache::store("redis")->handler()->lPush('import_order_from_c_key', $rs['id']);//校验无误，入队列
+
+            // 指令输出
+            $output->writeln(date('Y-m-d H:i:s') . '|解析成功');
+
+        } catch (Exception $exception) {
+            Db::rollback();
+            // 指令输出
+            $output->writeln(date('Y-m-d H:i:s') . '|解析失败，' . $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
+        }
+
+
+    }
+
+
+}

app/command/ImportOrderFromCHandleData.php

@@ -0,0 +1,769 @@
+<?php
+declare (strict_types=1);
+
+namespace app\command;
+
+use app\admin\model\ActionLog;
+use app\admin\model\GoodLog;
+use app\admin\model\GoodStockInfo;use app\admin\model\OrderImportFromC as OIFCModel;
+use app\admin\model\ProcessOrder;
+use app\admin\model\Test1;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\Exception;
+use think\facade\Cache;
+use think\facade\Config;
+use think\facade\Db;
+
+//C端订单导入-处理
+class ImportOrderFromCHandleData extends Command
+{
+
+    private $cgd_data = [];//存储采购单的数据，目前是为了做供应商api推送而准备的
+
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('handleData')
+            ->setDescription('批量处理C端导入的订单数据');
+    }
+
+    //【脚本2】批量处理C端导入的订单数据
+    protected function execute(Input $input, Output $output)
+    {
+
+        $key = 'import_order_from_c_key';
+        $c_data_id = Cache::store('redis')->handler()->rpop($key);
+
+        if (!$c_data_id) $output->writeln('没有符合条件的记录');
+        else {
+            $order_import_from_c_db = new OIFCModel();
+
+            $c_data = $order_import_from_c_db
+                ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_wait_relation, 'id' => $c_data_id])
+//                ->lock(true)
+                ->field('id,createrid,creater')
+                ->find();
+
+            if (empty($c_data)) $output->writeln('未查询到该记录');
+            else {
+
+                Db::startTrans();
+                try {
+
+                    $standing_book_data = [];
+
+                    //先找用户确认信息
+                    $extend_data = Db::name('order_import_from_c_extend')
+                        ->where(['order_import_from_c_id' => $c_data['id'], 'is_del' => 0, 'type' => 2])
+                        ->find();
+                    if (empty($extend_data)) {
+                        $extend_data = Db::name('order_import_from_c_extend')
+                            ->where(['order_import_from_c_id' => $c_data['id'], 'is_del' => 0, 'type' => 1])
+                            ->find();
+                    }
+
+                    if (empty($extend_data)) throw new Exception('没有对应的解析数据');
+
+                    //复用sale::create()方法 -- start
+
+                    $orderCode = makeNo("QR");
+                    $customer_code = $extend_data['customer_code'];
+
+                    $customer = Db::name("customer_info")
+                        ->where(["companyNo" => $customer_code])
+                        ->find();
+
+                    if ($customer == false) throw new Exception('未找到客户数据');
+
+                    $supplierNo = $extend_data['companyNo'];
+                    $supplier = Db::name("business")
+                        ->where(["companyNo" => $supplierNo])
+                        ->find();
+                    if ($supplier == false) throw new Exception('未找到平台供应商数据');
+
+                    $goodtype = 1;//1正常商品
+
+                    $sendtype = 1;//直接发货
+                    $platform_id = $extend_data['platform_id'];
+
+                    $platform_order = $extend_data['platform_code'];
+                    $good_num = $extend_data['num'];
+                    $arrtime = $extend_data['platform_time'];
+                    $paytime = $extend_data['addtime'];
+                    $workNo = $extend_data['po_code'];
+                    $ct = Db::name('good_platform')
+                        ->alias('a')
+                        ->join('good b', 'b.spuCode=a.spuCode', 'left')
+                        ->where(['a.skuCode' => $extend_data['skuCode'], 'a.exam_status' => 6])//exam_status==6已上线
+                        ->field("b.*,a.skuCode,a.spuCode,a.platform_code,a.plat_code")
+                        ->find();
+                    if ($ct == false) throw new Exception('未找到商品数据');
+
+                    $goodinfo = $ct;
+                    $is_stock = $ct['is_stock'];
+                    $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;
+
+                    if ($goodinfo['is_stock'] == 1) {
+//                        $stock = Db::name("good_stock")
+//                            ->alias("a")
+//                            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
+//                            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, 'b.wsm_type' => 5, "b.companyNo" => $supplierNo])
+//                            ->field("a.id,a.usable_stock,a.wait_out_stock,a.wsm_code")
+//                            ->find();
+//
+//                        if ($stock == false || $stock['usable_stock'] < $good_num) throw new Exception('库存数量不足');
+//							$stock_num =Db::name("good_stock_info")->where(["stockid"=>$stock['id']])->sum('balance_num');
+//				            if($stock_num <  $good_num){
+//				              throw new Exception('bn库存数量不足');
+//				            }
+			            $stock_num = Db::name("good_stock")->alias("a")
+			            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
+			            ->leftJoin("good_stock_info c", "a.id=c.stockid and c.balance_num>0")
+			            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5, "b.companyNo" =>$supplierNo])
+			            ->sum('balance_num');
+			            if($stock_num < $good_num){
+			               throw new Exception('bn库存数量不足');
+			            }
+                        $origin_price = 0;
+
+                    } else {
+
+                        $origin = Db::name("good_nake")
+                            ->where([["spuCode", "=", $spuCode], ["min_num", "<=", $good_num], ["is_del", "=", 0]])
+                            ->order("min_num desc")
+                            ->find();
+                        if ($origin == false) throw new Exception('未找到相关成本价格');
+
+                        $origin_price = $origin['nake_total'];
+
+                    }
+
+                    $sale_price = $extend_data['price'];
+                    if ($goodtype == 1) {
+                        $good = Db::name("good_ladder")
+                            ->where(["skuCode" => $skuCode, "is_del" => 0, "status" => 1])
+                            ->where([["min_num", "<=", $good_num]])
+                            ->order("min_num desc")
+                            ->find();
+                        if ($good == false) throw new Exception('未找到相关阶梯价格');
+
+                        //$sale_price = $good['sale_price']; //不改动售价
+
+                        //理论上不会出现实时金价的订单
+                        if ($ct['is_gold_price'] == 1 && $is_stock != 1) {
+                            $gold = Db::name("gold_price1")
+                                ->field('id,price')
+                                ->where(["type" => $ct['noble_metal'], "is_del" => 0, "status" => 1])
+                                ->order("addtime desc")
+                                ->find();
+
+                            //$saleprice(最终售价) = （打样费/购买数量 + 开模费/购买数量 + 商品重量* 最新金价 + 工艺费* 商品重量+包装费+加标费+证书费+产品裸价+物流费）/(1-成本售价/100);
+                            $gold_sale_price = $ct['demo_fee'] / $good_num + $ct['open_fee'] / $good_num + $ct['noble_weight'] * $gold["price"] + $good['cost_fee'] * $ct['noble_weight'] + $origin['package_fee'] + $origin['mark_fee'] + $origin['cert_fee'] + $origin['nake_fee'] + $origin['delivery_fee'];
+                            if ($sale_price < $gold_sale_price) throw new Exception('价格不符合根据实时金价计算出的最终售价');
+
+                            $ct['cgd_gold_price'] = $gold['price'];
+
+//                $order_rate = Db::name("cat")->where(["id" => $ct['cat_id']])->value('order_rate');
+//                $budget = isset($order_rate) ? $order_rate / 100 : 0;
+
+                            // $saleprice = $total_fee / (1 - $budget);
+                        }
+
+                        if ($is_activity == 1) {
+                            $act = Db::name("activity_info")
+                                ->alias("a")
+                                ->leftJoin("good_activity b", "a.activity_code=b.activity_code")
+                                ->where(["a.skuCode" => $skuCode, "a.activity_code" => $extend_data['activity_code'], "a.is_del" => 0, "a.status" => 1, "b.status" => 6, "b.is_del" => 0])
+                                ->find();
+                            if ($act == false) throw new Exception('未找到相关活动价');
+                            if ($act['moq_num'] > $good_num) throw new Exception('商品不满足活动价起订量' . $act['moq_num']);
+                            if ($act['activity_stock'] < $good_num) throw new Exception('商品活动库存剩余' . $act['activity_stock']);
+                            //$sale_price = $act['activity_price'];//不能改动价格
+                        }
+                    }
+                     $supplier_temp_info = Db::name('supplier')
+                        ->field('id,person,personid')
+                        ->where('code', $ct['supplierNo'])
+                        ->findOrEmpty();
+                    $cgd = [
+                        "supplierNo" => $ct['supplierNo'],
+                        "companyNo" => $supplierNo,
+                        "orderCode" => $orderCode,
+                        "spuCode" => $ct['spuCode'],
+                        "skuCode" => $ct['skuCode'],
+                        "good_name" => $ct['good_name'],
+                        "sale_price" => $origin_price,
+                        "total_fee" => $origin_price * $good_num,
+                        "pakge_fee" => isset($origin['package_fee']) ? $origin['package_fee'] : 0,
+                        "cert_fee" => isset($origin['cert_fee']) ? $origin['cert_fee'] : 0,
+                        "open_fee" => $ct['open_fee'],
+                        "cost_fee" => isset($origin['cost_fee']) ? $origin['cost_fee'] : 0,
+                        "mark_fee" => isset($origin['mark_fee']) ? $origin['mark_fee'] : 0,
+                        "demo_fee" => $ct['demo_fee'],
+                        "nake_fee" => isset($origin['nake_fee']) ? $origin['nake_fee'] : 0,
+                        "delivery_fee" => isset($origin['delivery_fee']) ? $origin['delivery_fee'] : 0,
+                        "good_num" => $good_num,
+                        "good_type" => $goodtype,
+                        "order_type" => $order_type,
+                        "order_source" => $order_source,
+                        "createrid" =>$supplier_temp_info['personid'],
+                         "creater" =>$supplier_temp_info['person'],
+                        'send_way' => 2,
+                        'gold_price' => $ct['cgd_gold_price'],
+                        'good_createrid' => $goodinfo['createrid'],
+                        'good_creater' => $goodinfo['creater'],//商品创建人
+                        "weight"=>$ct['noble_weight']
+                    ];
+
+                    $send_num = $extend_data['num'];
+                    $remark = $extend_data['order_remark'];
+                    $rm = $c_data['createrid'];
+                    $ri = $c_data['creater'];
+
+
+                    $data = [
+                        "orderCode" => $orderCode,
+                        "good_code" => $spuCode,
+                        "skuCode" => $skuCode,
+                        "customer_code" => $customer_code,
+                        "good_name" => isset($goodinfo['good_name']) && $goodinfo['good_name'] !== '' ? $goodinfo['good_name'] : '',
+                        "good_num" => $good_num,
+                        "cat_id" => $goodinfo['cat_id'],
+                        "apply_id" => $rm,
+                        "apply_name" => $ri,
+                        "origin_price" => $origin_price,
+                        "sale_price" => $sale_price,
+                        "post_fee" => 0,
+                        "status" => 0,
+                        "send_num" => 0,
+                        "wsend_num" => $good_num,
+                        "send_status" => 1,
+                        "good_type" => $goodtype,
+                        "send_type" => $sendtype,
+                        "supplierNo" => $extend_data['companyNo'],
+                        "is_del" => 0,
+                        "zxNo" => "",
+                        "platform_order" => $platform_order,
+                        "platform_id" => $platform_id,
+                        "remark" => $remark,
+                        "is_stock" => $is_stock,
+                        "is_activity" => $is_activity === "" ? 0 : $is_activity,
+                        'activity_code' => $extend_data['activity_code'],
+                        "order_type" => $order_type,
+                        "order_source" => $order_source,
+//                "poNo"=>$poNo,
+                        'good_weight' => $ct['weight'],
+                        'gold_price' => $ct['cgd_gold_price'],
+                        'cost_price' => $ct['cost_fee'],
+                        'diff_weight' => 0,
+                        'diff_fee' => 0,
+                        "workNo" => $workNo,
+                        "addtime" => date("Y-m-d H:i:s"),
+                        "updatetime" => date("Y-m-d H:i:s"),
+                        'total_price' => round($sale_price * $good_num, 2),
+                        'cgderid' => $supplier_temp_info['personid'],
+                        'cgder' => $supplier_temp_info['person'],//采购员(供应商负责人)
+                        'good_createrid' => $goodinfo['createrid'],
+                        'good_creater' => $goodinfo['creater'],//商品创建人
+                    ];
+                    $paytime == "" ? "" : $data['paytime'] = $paytime;
+                    $datainfo = Db::name('sale')->insert($data, true);
+                    if ($datainfo > 0) {
+                        if ($is_activity == 1) {
+                            $actup = [
+                                "activity_stock" => $act['activity_stock'] - $good_num,
+                                "updatetime" => date("Y-m-d H:i:s")
+                            ];
+                            $actupp = Db::name("activity_info")
+                                ->where(["skuCode" => $skuCode, "activity_code" => $extend_data['activity_code'], "is_del" => 0, "status" => 1])
+                                ->save($actup);
+                            if ($actupp == false) throw new Exception('活动库存修改失败');
+
+                        }
+
+                        //补充台账数据
+                        $standing_book_data = array_merge($standing_book_data, [
+                            'orderCode' => $orderCode,
+                            'spuCode' => $data['good_code'],
+                            'skuCode' => $data['skuCode'],
+                            'order_type' => $data['order_type'],
+                            'order_source' => $data['order_source'],
+                            'supplierNo' => $extend_data['supplierNo'],
+                            'companyNo' => $extend_data['companyNo'],
+                            'customer_code' => $data['customer_code'],
+                        ]);
+                        if ($is_stock == 0) {
+
+                            //非库存品
+                            $bol = $this->createCgd($cgd, $rm, $ri, $standing_book_data);
+                            if ($bol == false) throw new Exception('订单创建失败');
+
+                        } else {
+                            //库存品
+//                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type, 'order_source' => $order_source,'good_createrid'=>$ct['createrid'],'good_creater'=>$ct['creater']], $standing_book_data);
+//                            if ($bol == false) throw new Exception('库存商品关联采购单失败');
+						 $stockid= Db::name("good_stock")->alias("a")
+			            ->leftJoin("warehouse_info b", "a.wsm_code=b.wsm_code")
+			            ->where(["spuCode" => $spuCode, "a.is_del" => 0, "a.status" => 1, "b.wsm_type" => 5, "b.companyNo" =>$supplierNo])
+			            ->column('a.id');
+	                        $stockinfo =GoodStockInfo::OrderBn($orderCode,$stockid,intval($good_num));
+	                        if($stockinfo==false){
+	                             throw new Exception('库存商品更新库存失败');
+	                        }
+
+//                            if (isset($stock)) {
+//                                $stck = [
+//                                    "usable_stock" => $stock['usable_stock'] - $good_num,
+//                                    "wait_out_stock" => $stock['wait_out_stock'] + $good_num,
+//                                    "updatetime" => date("Y-m-d H:i:s")
+//                                ];
+//                                $upad = Db::name("good_stock")
+//                                    ->where($stock)
+//                                    ->update($stck);
+//                                if ($upad == false) throw new Exception('库存商品更新库存失败');
+//								 $stockinfo =GoodStockInfo::OrderBn($orderCode,$stock['id'],$good_num);
+//		                        if($stockinfo==false){
+//		                                throw new Exception('bn库存商品更新库存失败');
+//		                        }
+//                                //商品变动日志表，good_log_code字段存储采购单号
+//                                $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 2, 'stock' => $good_num, "stock_name" => "usable_stock"];
+//                                $good_data[] = ['good_log_code' => $orderCode, "stock_id" => $datainfo, "type" => 1, 'stock' => $good_num, "stock_name" => "wait_out_stock"];
+//                                GoodLog::LogAdd(['id' => $rm, 'nickname' => $ri], $good_data, "XSQRD");
+//                            }
+
+                        }
+                        if ($sendtype == 1) {
+                            $temp = [
+                                'orderCode' => $orderCode,
+                                'contactor' => $extend_data['contactor'],
+                                'mobile' => $extend_data['mobile'],
+                                'addr' => $extend_data['addr'],
+                                'addr_code' => $extend_data['addr_code'],
+                                'customer_code' => $customer_code,
+                                'receipt_quantity' => $extend_data['num'],//收货数量,
+                                'post_fee' => 0,
+                                'is_del' => 0,
+                                'addtime' => date("Y-m-d H:i:s"),
+                                'updatetime' => date("Y-m-d H:i:s"),
+                                'arrive_time' => $arrtime,
+                            ];
+                            $vmp = Db::name('order_addr')->insert($temp, true);
+                            if ($vmp > 0) {
+                            	 $num = $extend_data['num'];
+                                $outCode = makeNo("DF");
+                            	if($is_stock!=1){
+	                                    $order = Db::name("order_num")
+	                                    ->where(["orderCode" => $orderCode, "status" => 1])
+	                                    ->where([["wsend_num", ">=", 0]])
+//	                                    ->lock(true)
+	                                    ->find();
+	                                if ($order == false) throw new Exception('未找到可以发货得采购单数据');
+	                                $order['wsend_num'] -= $num;
+	                                $order['send_num'] += $num;
+	                                $or = Db::name("order_num")->save($order);
+	                                if ($or == false) throw new Exception('发货地址更新失败');
+
+	                                $tep = [
+	                                    "cgdNo" => $order['cgdNo'],
+	                                    "outCode" => $outCode,
+	                                    "send_num" => $num,
+	                                    "status" => 1,
+	                                    "addtime" => date("Y-m-d H:i:s"),
+	                                    "updatetime" => date("Y-m-d H:i:s")
+	                                ];
+	                                $sen = Db::name("order_send")->save($tep);
+	                                if ($sen == false) throw new Exception('发货地址添加创建失败');
+
+	                                $cgdinfo = Db::name("purchease_order")->where(["cgdNo" => $order['cgdNo']])->find();
+	                                if ($cgdinfo == false) throw new Exception('未匹配到采购数据');
+
+                            	}
+
+                                $out = [
+                                    "orderCode" => $orderCode,
+                                    "outCode" => $outCode,
+                                    "apply_id" => $rm,
+                                    "apply_name" => $ri,
+                                    "addrid" => $vmp,
+                                    "post_name" => "",
+                                    "post_code" => "",
+                                    "post_fee" => 0,
+                                    "sendtime" => date("Y-m-d H:i:s"),
+                                    "send_num" => $num,
+                                    "check_num" => 0,
+                                    "error_num" => 0,
+                                    "wsm_code" =>$is_stock==1?'': $cgdinfo['wsm_code'],
+                                    "order_type" => $order_type,
+                                    "status" => $is_stock == 1 ? 1 : 0,
+                                    "addtime" => date("Y-m-d H:i:s"),
+                                    "updatetime" => date("Y-m-d H:i:s")
+                                ];
+                                $ou = Db::name("order_out")->insertGetId($out);
+                                if ($ou == false) throw new Exception('发货地址添加创建失败');
+                                else {
+                                	    //修改状态，添加待办
+                                	    if ($is_stock==1){
+                                	    	$roleid = Config('app.wsm_cgder_role');
+		                            $uids = Db::name('user_role')
+		                                ->where('is_del', 0)
+		                                ->whereIn('roleid', $roleid)
+		                                ->column('uid');
+		                            $handle_user_list=implode(',', $uids);
+                                	    }
+
+                                    //修改状态，添加待办
+                                    ActionLog::logAdd(['id' => $rm, 'nickname' => $ri], [
+                                        "order_code" => $outCode,//出库单号
+                                        "status" => 0,//这里的status是之前的值
+                                        "action_remark" => '',//备注
+                                        "action_type" => "create"//新建create，编辑edit，更改状态status
+                                    ], "CKD", 0, $out);
+
+                                    ProcessOrder::AddProcess(['id' => $rm, 'nickname' => $ri], [
+                                        "order_type" => 'CKD',
+                                        "order_code" => $outCode,//出库单号
+                                        "order_id" => $ou,
+                                        "order_status" => $is_stock == 1 ? 1 : 0,
+                                        "before_status" => 0,
+                                        'holder_id' =>  $rm,
+                                        'handle_user_list' =>$handle_user_list??""
+                                    ]);
+
+                                    $standing_book_data['outCode'] = $outCode;
+                                }
+                            } else throw new Exception('发货地址添加失败');
+                        }
+                    }
+
+                    //复用sale::create()方法 -- end
+
+                    //处理完成
+                    $order_import_from_c_db
+                        ->where('id', $c_data['id'])
+                        ->where('is_del', OIFCModel::$is_del_normal)
+                        ->save([
+                            'status' => $order_import_from_c_db::$status_success,
+                            'updatetime' => date('Y-m-d H:i:s'),
+                            'remark' => '',
+                            'updateid' => 0,
+                            'updater' => 'system',
+                            'orderCode' => $orderCode
+                        ]);
+
+                    //维护台账记录
+                    Db::name('standing_book')->insert(array_merge($standing_book_data, ['addtime' => date('Y-m-d H:i:s'), 'updatetime' => date('Y-m-d H:i:s'), 'standBookNo' => makeNo("IO")]));
+
+                    //将采购单数据塞入到队列中
+                    if ($this->cgd_data) {
+                        $push_data = json_encode([
+                            'supplierNo' => $this->cgd_data['supplierNo'],
+                            'type' => 1,//1销售订单(采销的采购单),2上线结果
+                            'data' => [
+                                'cgdNo' => $this->cgd_data['cgdNo'],
+                                'spuCode' => $this->cgd_data['spuCode'],
+                                'good_name' => $this->cgd_data['good_name'],
+                                'good_num' => $this->cgd_data['good_num'],
+                                'good_price' => $this->cgd_data['good_price'],
+                                'total_fee' => $this->cgd_data['total_fee'],
+                                'weight' => $this->cgd_data['weight'],
+                                'addtime' => $this->cgd_data['addtime'],
+                            ],
+                        ], JSON_UNESCAPED_UNICODE);
+//                        Cache::store("redis")->handler()->lPush(Config::get('app.abutment_queue'), $push_data);
+                    }
+
+                    Db::commit();
+
+                    $output->writeln(date('Y-m-d H:i:s') . '|处理成功');
+
+                } catch (\think\Exception $exception) {
+                    Db::rollback();
+                    $order_import_from_c_db
+                        ->where(['id' => $c_data['id'], 'status' => OIFCModel::$status_wait_relation])
+                        ->save([
+                            'status' => $order_import_from_c_db::$status_stock_not_enough,
+                            'updatetime' => date('Y-m-d H:i:s'),
+                            'remark' => $exception->getMessage(),
+                            'updateid' => 0,
+                            'updater' => 'system'
+                        ]);
+                    // 指令输出
+                    $output->writeln(date('Y-m-d H:i:s') . '|处理失败，' . $exception->getMessage() . '|' . $exception->getFile() . '|' . $exception->getLine());
+                }
+            }
+        }
+
+    }
+
+
+    //创建采购单
+    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;
+
+        $wsm = Db::name("warehouse_info")
+            ->where(["supplierNo" => $data["supplierNo"], "companyNo" => $data['companyNo'], "is_del" => 0])
+            ->find();
+        if ($wsm == false) {
+            $wsm_code = makeNo("WSM");
+            $inwsm = [
+                "wsm_code" => $wsm_code,
+                "name" => $supplier['name'],
+                "wsm_type" => 2,
+                "supplierNo" => $supplier['code'],
+                "addr" => "",
+                "addrs_code" => "",
+                "contactor" => 0,
+                "contactor_name" => 0,
+                "mobile" => "",
+                "position" => "",
+                "companyNo" => $data['companyNo'],
+                "status" => 1,
+                "is_del" => 0,
+                "addtime" => date("Y-m-d H:i:s"),
+                "updatetime" => date("Y-m-d H:i:s")
+            ];
+            $in = Db::name("warehouse_info")->insert($inwsm);
+            if ($in == false) return false;
+
+        } else {
+            $wsm_code = $wsm['wsm_code'];
+        }
+
+        //判断该供应商是否开通了供应商账号
+        $from_tag=checkHasAccountBySupplierNos([$data['supplierNo']]);
+
+        $cg = [
+            "cgdNo" => $cgdCode,
+            "bkcode" => "",
+            "wsm_code" => $wsm_code,
+            "cgder" => $data['creater'],
+            "cgder_id" => $data['createrid'],
+            "spuCode" => $data['spuCode'],
+            "skuCode" => $data['skuCode'],
+            "good_name" => $data['good_name'],
+            "good_num" => $data['good_num'],
+            "good_price" => $data['sale_price'],
+            "total_fee" => round($data['sale_price'] * $data['good_num'], 2),
+            "pakge_fee" => $data['pakge_fee'],
+            "cert_fee" => $data['cert_fee'],
+            "open_fee" => $data['open_fee'],
+            "teach_fee" => $data['cost_fee'],
+            "mark_fee" => $data['mark_fee'],
+            "demo_fee" => $data['demo_fee'],
+            "nake_fee" => $data['nake_fee'],
+            "delivery_fee" => $data['delivery_fee'],
+            "weight"=>$data['weight'],
+            "diff_weight" => "0",
+            "diff_fee" => "0",
+            "gold_price" => $data['gold_price'],
+            "supplierNo" => $data['supplierNo'],
+            "supplier_name" => $supplier['name'],
+            "companyNo" => $data['companyNo'],
+            "send_status" => 1,
+            "send_num" => 0,
+            "wsend_num" => $data['good_num'],
+            "remark" => "",
+            "status" => 0,//0初始化
+            "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"),
+            'good_createrid' => $data['good_createrid'],
+            'good_creater' => $data['good_createrid'],//商品创建人
+            'from_tag' => isset($from_tag[$data['supplierNo']]) ? 2 : 1,//来源标签：1采销(默认),2供应商端
+        ];
+        $up = Db::name("purchease_order")->insert($cg, true);
+        if ($up) {
+
+            //修改状态，添加待办
+            ActionLog::logAdd(['id' => $rm, 'nickname' => $ri], [
+                "order_code" => $cg['cgdNo'],//销售单code
+                "status" => 0,//这里的status是之前的值
+                "action_remark" => '',//备注
+                "action_type" => "create"//新建create，编辑edit，更改状态status
+            ], "CGD", $cg['status'], $cg);
+
+            //当采购单是节点0待与供应商确认，推给供应商负责人
+            ProcessOrder::AddProcess(['id' => $rm, 'nickname' => $ri], [
+                "order_type" => 'CGD',
+                "order_code" => $cg['cgdNo'],//销售单code
+                "order_id" => $up,
+                "order_status" => $cg['status'],
+                "before_status" => 0,
+                'holder_id' => $supplier['personid'],
+                'wait_id'=>$supplier['personid'],
+                'wait_name'=>$supplier['person'],
+            ]);
+
+            $standing_book_data['cgdNo'] = $cgdCode;
+
+            $rela = [
+                "orderCode" => $data['orderCode'],
+                "cgdNo" => $cgdCode,
+                "spuCode" => $data['spuCode'],
+                "good_num" => $data['good_num'],
+                "wsend_num" => $data['good_num'],
+                "send_num" => 0,
+                "wait_num" => 0,
+                "status" => 1,
+                "source" => 2
+            ];
+            $re = Db::name("order_num")->save($rela);
+            if ($re == false) return false;
+            else {
+                $stokc = Db::name("good_stock")
+                    ->where(['spuCode' => $data['spuCode'], "wsm_code" => $wsm_code, "is_del" => 0])
+                    ->find();
+                if ($stokc == false) {
+                    $stokc = [
+                        "spuCode" => $data['spuCode'],
+                        "wsm_code" => $wsm_code,
+                        "wait_in_stock" => $data['good_num'],
+                        "wait_out_stock" => 0,
+                        "usable_stock" => 0,
+                        "intra_stock" => 0,
+                        "total_stock" => 0,
+                        "status" => 1,
+                        "addtime" => date("Y-m-d H:i:s"),
+                        "updatetime" => date("Y-m-d H:i:s")
+                    ];
+                } else {
+                    $stokc['wait_in_stock'] += $data['good_num'];
+                    $stokc['updatetime'] = date("Y-m-d H:i:s");
+                }
+                $stoc = Db::name("good_stock")->save($stokc);
+                if ($stoc == false) {
+                    return false;
+                }
+                $good_data[] = ['good_log_code' => $cgdCode, "stock_id" => isset($stoc['id']) ? $stoc['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $data['good_num'], "stock_name" => "wait_in_stock"];
+                GoodLog::LogAdd(['id' => 0, 'nickname' => 'system'], $good_data, "CGD");
+
+                $this->cgd_data = $cg;
+
+                return true;
+            }
+        } else return false;
+
+    }
+
+
+    //创建.....
+    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;
+    }
+
+
+}