Sfoglia il codice sorgente

平台订单导入处理库存的脚本优化,利用redis解决并发问题

wufeng 2 anni fa
parent
commit
e42fa4a184

+ 12 - 2
app/admin/controller/OrderImport.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 use app\admin\model\OrderImportFromC as OIFCModel;
 use think\Exception;
+use think\facade\Cache;
 use think\facade\Config;
 use think\facade\Db;
 use think\facade\Validate;
@@ -389,6 +390,8 @@ class OrderImport extends Base
             //从表数据
             Db::name('order_import_from_c_extend')->insert($extend_insert_data);
 
+            Cache::store("redis")->handler()->lPush('import_order_from_c_key', $param['id']);//校验无误,入队列
+
             Db::commit();
 
             return app_show(0, '修改成功');
@@ -454,13 +457,20 @@ class OrderImport extends Base
                 ->where(['is_del' => OIFCModel::$is_del_normal, 'status' => OIFCModel::$status_stock_not_enough])
                 ->update([
                     'status' => OIFCModel::$status_wait_relation,
+                    'remark' => '',
                     'updatetime' => date('Y-m-d H:i:s'),
                     'updateid' => isset($userinfo["data"]['id']) ? $userinfo["data"]['id'] : 0,
                     'updater' => isset($userinfo["data"]['nickname']) ? $userinfo["data"]['nickname'] : '',
                 ]);
 
-            if ($res) return app_show(0, '批量关联库存成功');
-            else return error_show(1005, '批量关联库存失败');
+            if ($res) {
+
+                foreach ($param['ids'] as $id) {
+                    Cache::store("redis")->handler()->lPush('import_order_from_c_key', $id);//校验无误,入队列
+                }
+
+                return app_show(0, '批量关联库存成功');
+            } else return error_show(1005, '批量关联库存失败');
         }
     }
 

+ 9 - 2
app/command/ImportOrderFromCAnalysisData.php

@@ -10,6 +10,7 @@ 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;
 
@@ -288,15 +289,21 @@ class ImportOrderFromCAnalysisData extends Command
 
             Db::name('order_import_from_c_extend')->insertGetId($extend_insert_data);
 
-            if (!isset($update_c_data['status'])) $update_c_data['status'] = OIFCModel::$status_wait_relation;
+            $is = false;
+            if (!isset($update_c_data['status'])) {
+                $is = true;
+                $update_c_data['status'] = OIFCModel::$status_wait_relation;
+            }
 
-            Db::name('order_import_from_c')
+            $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);
 
+            if ($is && $res) Cache::store("redis")->handler()->lPush('import_order_from_c_key', $rs['id']);//校验无误,入队列
+
             Db::commit();
 
             // 指令输出

+ 331 - 323
app/command/ImportOrderFromCHandleData.php

@@ -14,6 +14,7 @@ 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;
 
 //C端订单导入-处理
@@ -29,367 +30,374 @@ class ImportOrderFromCHandleData extends Command
     //【脚本2】批量处理C端导入的订单数据
     protected function execute(Input $input, Output $output)
     {
-        $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])
-            ->lock(true)
-            ->field('id,createrid,creater')
-            ->find();
+        $key = 'import_order_from_c_key';
+        $c_data_id = Cache::store('redis')->handler()->rpop($key);
 
-        if (empty($c_data)) $output->writeln('没有符合条件的记录');
+        if (!$c_data_id) $output->writeln('没有符合条件的记录');
         else {
+            $order_import_from_c_db = new OIFCModel();
 
-            Db::startTrans();
-            try {
+            $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();
 
-                //先找用户确认信息
-                $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)) {
+            if (empty($c_data)) $output->writeln('未查询到该记录');
+            else {
+
+                Db::startTrans();
+                try {
+
+                    //先找用户确认信息
                     $extend_data = Db::name('order_import_from_c_extend')
-                        ->where(['order_import_from_c_id' => $c_data['id'], 'is_del' => 0, 'type' => 1])
+                        ->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('没有对应的解析数据');
+                    if (empty($extend_data)) throw new Exception('没有对应的解析数据');
 
-                //复用sale::create()方法 -- start
+                    //复用sale::create()方法 -- start
 
-                $orderCode = makeNo("QR");
-                $customer_code = $extend_data['customer_code'];
+                    $orderCode = makeNo("QR");
+                    $customer_code = $extend_data['customer_code'];
 
-                $customer = Db::name("customer_info")
-                    ->where(["companyNo" => $customer_code])
-                    ->find();
+                    $customer = Db::name("customer_info")
+                        ->where(["companyNo" => $customer_code])
+                        ->find();
 
-                if ($customer == false) throw new Exception('未找到客户数据');
+                    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 ? 5 : 6;//1销售2咨询(1备库 2非库存 3咨询采反 4项目采反,5平台部订单销售库存品,6平台部订单销售非库存品)
-                $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")
+                    $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('未找到商品数据');
 
-                    if ($stock == false || $stock['usable_stock'] < $good_num) throw new Exception('库存数量不足');
+                    $goodinfo = $ct;
+                    $is_stock = $ct['is_stock'];
+                    $order_type = $is_stock == 1 ? 5 : 6;//1销售2咨询(1备库 2非库存 3咨询采反 4项目采反,5平台部订单销售库存品,6平台部订单销售非库存品)
+                    $spuCode = $ct['spuCode'];
+                    $skuCode = $ct['skuCode'];
+                    $is_activity = empty($extend_data['activity_name']) ? 0 : 1;
 
-                    $origin_price = 0;
+                    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")
+                            ->find();
 
-                } else {
+                        if ($stock == false || $stock['usable_stock'] < $good_num) throw new Exception('库存数量不足');
 
-                    $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 = 0;
 
-                    $origin_price = $origin['nake_total'];
+                    } 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('未找到相关成本价格');
 
-                $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")
+                        $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);
-                        $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'];
+                            //$saleprice(最终售价) = (打样费/购买数量 + 开模费/购买数量 + 商品重量* 最新金价 + 工艺费* 商品重量+包装费+加标费+证书费+产品裸价+物流费)/(1-成本售价/100);
+                            $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'];
 
-                        $ct['cgd_gold_price'] = $gold['price'];
+                            $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'];
-                    }
-                }
-                $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" => $ct['packing_fee'],
-                    "cert_fee" => $ct['cert_fee'],
-                    "open_fee" => $ct['open_fee'],
-                    "cost_fee" => $ct['cost_fee'],
-                    "mark_fee" => $ct['mark_fee'],
-                    "demo_fee" => $ct['demo_fee'],
-                    "good_num" => $good_num,
-                    "good_type" => $goodtype,
-                    "order_type" => $order_type,
-                    "createrid" => $ct['createrid'],
-                    "creater" => $ct['creater'],
-                    'send_way' => 2
-                ];
-
-                $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,
-                    "order_type" => $order_type,
-//                "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),
-                ];
-                $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('活动库存修改失败');
+                            // $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'];
+                        }
                     }
-                    if ($is_stock == 0) {
-
-                        //非库存品
-                        $bol = $this->createCgd($cgd, $rm, $ri);
-                        if ($bol == false) throw new Exception('订单创建失败');
+                    $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" => $ct['packing_fee'],
+                        "cert_fee" => $ct['cert_fee'],
+                        "open_fee" => $ct['open_fee'],
+                        "cost_fee" => $ct['cost_fee'],
+                        "mark_fee" => $ct['mark_fee'],
+                        "demo_fee" => $ct['demo_fee'],
+                        "good_num" => $good_num,
+                        "good_type" => $goodtype,
+                        "order_type" => $order_type,
+                        "createrid" => $ct['createrid'],
+                        "creater" => $ct['creater'],
+                        'send_way' => 2
+                    ];
 
-                    } else {
-                        //库存品
-                        $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type]);
-                        if ($bol == false) throw new Exception('库存商品关联采购单失败');
-
-                        if (isset($stock)) {
-                            $stck = [
-                                "usable_stock" => $stock['usable_stock'] - $good_num,
-                                "wait_out_stock" => $stock['wait_out_stock'] + $good_num,
+                    $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,
+                        "order_type" => $order_type,
+//                "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),
+                    ];
+                    $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")
                             ];
-                            $upad = Db::name("good_stock")
-                                ->where($stock)
-                                ->update($stck);
-                            if ($upad == false) throw new Exception('库存商品更新库存失败');
-
-                            //商品变动日志表,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");
+                            $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('活动库存修改失败');
+
                         }
+                        if ($is_stock == 0) {
+
+                            //非库存品
+                            $bol = $this->createCgd($cgd, $rm, $ri);
+                            if ($bol == false) throw new Exception('订单创建失败');
+
+                        } else {
+                            //库存品
+                            $bol = $this->RelaCgd(['orderCode' => $orderCode, "good_num" => $good_num, "spuCode" => $spuCode, "companyNo" => $supplierNo, 'order_type' => $order_type]);
+                            if ($bol == 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('库存商品更新库存失败');
+
+                                //商品变动日志表,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) {
-                            $order = Db::name("order_num")
-                                ->where(["orderCode" => $orderCode, "status" => 1])
-                                ->where([["wsend_num", ">=", 0]])
-                                ->lock(true)
-                                ->find();
-                            if ($order == false) throw new Exception('未找到可以发货得采购单数据');
-
-
-                            $num = $extend_data['num'];
-                            $outCode = makeNo("DF");
-                            $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" => $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")
+                        }
+                        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,
                             ];
-                            $ou = Db::name("order_out")->insert($out);
-                            if ($ou == false) throw new Exception('发货地址添加创建失败');
-                            else {
-                                //修改状态,添加待办
-                                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" => 0,
-                                    "order_status" => 0,
-                                    "before_status" => 0
-                                ]);
-                            }
-                        } else throw new Exception('发货地址添加失败');
+                            $vmp = Db::name('order_addr')->insert($temp, true);
+                            if ($vmp > 0) {
+                                $order = Db::name("order_num")
+                                    ->where(["orderCode" => $orderCode, "status" => 1])
+                                    ->where([["wsend_num", ">=", 0]])
+                                    ->lock(true)
+                                    ->find();
+                                if ($order == false) throw new Exception('未找到可以发货得采购单数据');
+
+
+                                $num = $extend_data['num'];
+                                $outCode = makeNo("DF");
+                                $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" => $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")->insert($out);
+                                if ($ou == false) throw new Exception('发货地址添加创建失败');
+                                else {
+                                    //修改状态,添加待办
+                                    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" => 0,
+                                        "order_status" => 0,
+                                        "before_status" => 0
+                                    ]);
+                                }
+                            } 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::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());
+                    //复用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::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());
+                }
             }
         }