Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/abutment/controller/Order.php

@@ -408,7 +408,7 @@ class Order extends HomeBaseController
                     ->column('personid', 'code');
 
                 foreach ($cgdNo as $vlue) {
-                    if ($status == 1 || $status == 2) {
+//                    if ($status == 1 || $status == 2) {
 //                    $orderinfo = Db::name('sale')
 //                        ->alias('a')
 //                        ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
@@ -418,32 +418,32 @@ class Order extends HomeBaseController
 //                            'b.cgdNo'=>$vlue,
 //                        ])->findOrEmpty();
 
-                        $is_stock = Db::name('good_basic')
-                            ->where(['is_del' => 0, 'spuCode' => $info[$vlue]['spuCode']])
-                            ->value('is_stock');
-
-                        if ($is_stock == 1) {
-                            //库存品，推给31库管人员、41库管-张凯旋
-                            $uids = Db::name('user_role')
-                                ->where([
-                                    ['is_del', '=', 0],
-                                    ['roleid', 'in', [31, 41]],
-                                    ['status', '=', 1]
-                                ])->column('uid');
-                            if (!in_array($uid, $uids)) throw new Exception('库存品订单只能由库管人员操作');
+//                        $is_stock = Db::name('good_basic')
+//                            ->where(['is_del' => 0, 'spuCode' => $info[$vlue]['spuCode']])
+//                            ->value('is_stock');
+
+//                        if ($is_stock == 1) {
+                    //库存品，推给31库管人员、41库管-张凯旋
+//                            $uids = Db::name('user_role')
+//                                ->where([
+//                                    ['is_del', '=', 0],
+//                                    ['roleid', 'in', [31, 41]],
+//                                    ['status', '=', 1]
+//                                ])->column('uid');
+//                            if (!in_array($uid, $uids)) throw new Exception('库存品订单只能由库管人员操作');
 //                        $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>implode(',', $uids)];
-                        } else {
-                            //非库存品和采返商品，推给供应商负责人(还得是没开通账号的供应商)
-                            $res = SupplierRelationUserModel::field('id')
-                                ->where(['is_del' => SupplierUserModel::$is_del_normal, 'supplierNo' => $info[$vlue]['supplierNo'], 'status' => SupplierUserModel::$status_normal])
-                                ->findOrEmpty()
-                                ->isEmpty();
-                            if (!$res) throw new Exception('供应商已开通账号，只能由供应商端操作');
-
-                            if ($uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+//                        } else {
+                    //非库存品和采返商品，推给供应商负责人(还得是没开通账号的供应商)
+//                            $res = SupplierRelationUserModel::field('id')
+//                                ->where(['is_del' => SupplierUserModel::$is_del_normal, 'supplierNo' => $info[$vlue]['supplierNo'], 'status' => SupplierUserModel::$status_normal])
+//                                ->findOrEmpty()
+//                                ->isEmpty();
+//                            if (!$res) throw new Exception('供应商已开通账号，只能由供应商端操作');
+
+//                            if ($uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
 //                        $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0,'handle_user_list'=>isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
-                        }
-                    }//else $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
+//                        }
+//                    }//else $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0,'holder_id'=> isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
 
                     $process = ["order_code" => $vlue, "order_id" => isset($info[$vlue]['id']) ? $info[$vlue]['id'] : 0, "order_status" => $status, "order_type" => 'CGD', "before_status" => isset($info[$vlue]['status']) ? $info[$vlue]['status'] : 0, 'holder_id' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0, 'handle_user_list' => isset($supplier_cgderid[$info[$vlue]['supplierNo']]) ? $supplier_cgderid[$info[$vlue]['supplierNo']] : 0];
                     ProcessOrder::AddProcess(['id' => $uid, 'nickname' => $uname], $process);