Merge branch 'version1.5' into wugg-dev

app/abutment/controller/Order.php

@@ -430,10 +430,10 @@ class Order extends HomeBaseController
                                 ['roleid', 'in', [31, 41]],
                                 ['status', '=', 1]
                             ])->column('uid');
-                        //if(!in_array($uid,$uids)) throw new Exception('库存品订单只能由库管人员操作');
+                        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)];
                     }elseif ($is_stock==0 || $info[$vlue]['order_type']==3) {
-                        //if($uid != $supplier_cgderid[$info[$vlue]['supplierNo']])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];

app/admin/controller/After.php

@@ -1934,6 +1934,8 @@ class After extends Base
                 "order_status" => $cg['status'],
                 "before_status"=> 0,
                 'holder_id' => $supplier['personid'],
+                'wait_id' => $supplier['personid'],
+                'wait_name' => $supplier['person'],
             ]);
 
             $standing_book_da = array_merge($standing_book_da, [

app/admin/controller/Purch.php

@@ -686,7 +686,7 @@ class Purch extends Base
                 $uname = $this->uname;
 
                 foreach ($cgdNo as $vlue) {
-                    if ($status == 2 || $status == 3) {
+                    if ($status == 1 || $status == 2) {
 //                    $orderinfo = Db::name('sale')
 //                    ->alias('a')
 //                    ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
@@ -707,11 +707,11 @@ class Purch extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            //if (!in_array($this->uid, $uids)) throw new Exception('库存品订单只能由库管人员操作');
+                            if (!in_array($this->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)];
                         } elseif ($is_stock == 0 || $info[$vlue]['order_type'] == 3) {
                             //非库存品和采返商品，推给供应商负责人
-                            //if ($this->uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            if ($this->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];
                         }

app/admin/controller/Purchin.php

@@ -447,11 +447,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                                 $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>implode(',', $uid)];
 
                             }elseif ($is_stock==0 || $cgdinfo['order_type']==3){
-                                //if($this->uid != $personid)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                if($this->uid != $personid)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                                 $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid,'handle_user_list'=>$personid];   //非库存品和采返商品，推给供应商负责人
                             }
                         }else $process = ["order_code" => $cgdNo, "order_id" => $cgdinfo['id'], "order_status" => $cgdinfo['status'], "order_type" => 'CGD', "before_status" => $order['status'], 'holder_id' => $personid];
@@ -682,11 +682,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
                             }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
                                 $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                                //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
                             }//非库存品和采返商品，推给供应商负责人
                         }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
@@ -736,11 +736,11 @@ class Purchin extends Base
                                         ['roleid', 'in', [31, 41]],
                                         ['status', '=', 1]
                                     ])->column('uid');
-                                //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                                if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
                             }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
                                 $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                                //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                                if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                                 $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
                             }//非库存品和采返商品，推给供应商负责人
                         }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
@@ -791,11 +791,11 @@ class Purchin extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
                         }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
                             $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
                         }//非库存品和采返商品，推给供应商负责人
                     }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
@@ -949,11 +949,11 @@ class Purchin extends Base
                                 ['roleid', 'in', [31, 41]],
                                 ['status', '=', 1]
                             ])->column('uid');
-                        //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                        if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
                     }elseif ($is_stock==0 || $cgdinfo==3) {
                         $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                        //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                        if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                         $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];
                     }//非库存品和采返商品，推给供应商负责人
                 }else $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];
@@ -1232,12 +1232,12 @@ class Purchin extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0),'handle_user_list'=>implode(',', $uid)];
 
                         }elseif ($is_stock==0 || $cgdinfo['order_type']==3) {
                             $holder_id = Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0);
-                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>$holder_id,'handle_user_list'=>$holder_id];//非库存品和采返商品，推给供应商负责人
                         }
                     }else $process=["order_code"=>$cgdinfo['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD',"before_status"=>$order['status'],'holder_id'=>Db::name('supplier')->where(['code' => $cgdinfo['supplierNo'], 'is_del' => 0])->value('personid', 0)];

app/admin/controller/Reorder.php

@@ -936,7 +936,7 @@ class Reorder extends Base
                                     ['roleid', 'in', [31, 41]],
                                     ['status', '=', 1]
                                 ])->column('uid');
-                            //if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
+                            if(!in_array($this->uid,$uid)) throw new Exception('库存品订单只能由库管人员操作');
                             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                                 "order_type" => 'CGD',
                                 "order_code" => $cgd['cgdNo'],
@@ -947,7 +947,7 @@ class Reorder extends Base
                                 'handle_user_list' => implode(',', $uid),
                             ]);
                         }elseif ($orderinfo['is_stock']==0 || $orderinfo['order_type']==3){
-                            //if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
+                            if($this->uid != $holder_id)throw new Exception('非库存品和采返商品只能由供应商负责人操作');
                             //非库存品和采返商品，推给供应商负责人
                             ProcessOrder::AddProcess(['id' => $this->uid, 'nickname' => $this->uname], [
                                 "order_type" => 'CGD',

app/admin/controller/Resign.php

@@ -713,7 +713,9 @@ class Resign extends Base
                     ];
                     $in= Db::name("purchease_order")->insert($data,true);
                     if($in>0){
-                        $order=["order_type"=>'CGD',"order_code"=>$data['cgdNo'],"order_id"=>$in, "order_status"=>$data['status'],"before_status"=>0];
+                        //当采购单是节点0待与供应商确认，推给供应商负责人
+                        if(!isset($supplier)) $supplier = Db::name("supplier")->where(["code"=>$purse['supplier']])->find();
+                        $order=["order_type"=>'CGD',"order_code"=>$data['cgdNo'],"order_id"=>$in, "order_status"=>$data['status'],"before_status"=>0,'wait_id'=>$supplier['personid'],'wait_name'=>$supplier['person']];
                         ProcessOrder::AddProcess($this->post['token'],$order);
                         $ste = ["order_code"=>$inw,"status"=>$data['status'],"action_remark"=>'',"action_type"=>"create"];
                         ActionLog::logAdd($this->post['token'],$ste,"CGD",$data['status'],$data);
@@ -941,7 +943,7 @@ class Resign extends Base
                         $order = ["order_code" =>  $cgdCode, "status" => 0, "action_remark" => '', "action_type" => "create"];
                         GoodLog::LogAdd($this->post['token'], $good_data, 'CGD');
                         ActionLog::logAdd($this->post['token'], $order, "CGD", 0, $good);
-                        $process = ["order_code" => $cgdCode, "order_id" => $up, "order_status" => $cg['status'], "order_type" => 'CGD',"before_status"=>0,'holder_id'=>Db::name('supplier')->where(['code' => $cg['supplierNo'], 'is_del' => 0])->value('personid', 0)];
+                        $process = ["order_code" => $cgdCode, "order_id" => $up, "order_status" => $cg['status'], "order_type" => 'CGD',"before_status"=>0,'holder_id'=>$supplier['personid'],'wait_id'=>$supplier['personid'],'wait_name'=>$supplier['person']];
                         ProcessOrder::AddProcess($this->post['token'], $process);
                         $info['wsm_code'] = $wsm_code;
                         $old_info_status = $info['status'];

app/admin/controller/Sale.php

@@ -405,16 +405,31 @@ class Sale extends Base
                                     "action_type" => "create"//新建create，编辑edit，更改状态status
                                 ], "CKD", $out['status'], $out);
 
-                                ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
-                                    "order_type" => 'CKD',
-                                    "order_code" => $outCode,//出库单号
-                                    "order_id" => $ou,
-                                    "order_status" => $out['status'],
-                                    "before_status" => $out['status'],
-                                    'holder_id'=>$out['apply_id'],
-                                ]);
-
-
+                                if($out['status']==1 && $data['is_stock']==0){
+                                    //非库存品的话，推给供应商负责人
+                                    $supp = Db::name('supplier')
+                                        ->field('person,personid')
+                                        ->where('code',$ct['supplierNo'])
+                                        ->findOrEmpty();
+                                    ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
+                                        "order_type" => 'CKD',
+                                        "order_code" => $outCode,//出库单号
+                                        "order_id" => $ou,
+                                        "order_status" => $out['status'],
+                                        "before_status" => $out['status'],
+                                        'wait_id'=>$supp['personid'],
+                                        'wait_name'=>$supp['person'],
+                                    ]);
+                                }else{
+                                    ProcessOrder::AddProcess(['id'=>$rm,'nickname'=>$ri], [
+                                        "order_type" => 'CKD',
+                                        "order_code" => $outCode,//出库单号
+                                        "order_id" => $ou,
+                                        "order_status" => $out['status'],
+                                        "before_status" => $out['status'],
+                                        'holder_id'=>$out['apply_id'],
+                                    ]);
+                                }
 //                                        $standing_book_da['outCode'] = $outCode;
                                 if (isset($standing_book_da['outCode'])) $standing_book_da['outCode'][] = $outCode;
                                 else $standing_book_da['outCode'] = [$outCode];
@@ -530,13 +545,16 @@ class Sale extends Base
                 "action_type" => "create"//新建create，编辑edit，更改状态status
             ], "CGD", $cg['status'], $cg);
 
+            //当节点是0待与供应商确认，推给供应商负责人
             ProcessOrder::AddProcess($this->post['token'], [
                 "order_type" => 'CGD',
                 "order_code" => $cg['cgdNo'],//销售单code
                 "order_id" => $up,
                 "order_status" => $cg['status'],
                 "before_status" => 0,
-                'holder_id' => $supplier['personid']
+                'holder_id' => $supplier['personid'],
+                'wait_id'=>$supplier['personid'],
+                'wait_name'=>$supplier['person'],
             ]);
 
             $standing_book_da = array_merge($standing_book_da, [

app/admin/controller/Salezx.php

@@ -371,12 +371,15 @@ class Salezx extends \app\BaseController
                             "action_type" => "create"//新建create，编辑edit，更改状态status
                         ], "CGD", $cg['status'], $cg);
 
+                        //当采购单是节点0待与供应商确认，推给供应商负责人
                         ProcessOrder::AddProcess($this->post['token'], [
                             "order_type" => 'CGD',
                             "order_code" => $cg['cgdNo'],//销售单code
                             "order_id" => $up,
                             "order_status" => $cg['status'],
-                            'holder_id'=>$supplier['personid']
+                            'holder_id'=>$supplier['personid'],
+                            'wait_id'=>$supplier['personid'],
+                            'wait_name'=>$supplier['person'],
                         ]);
 
                         $standing_bood_data['cgdNo']=$cgdCode;

app/command/ImportOrderFromCHandleData.php

@@ -584,13 +584,16 @@ class ImportOrderFromCHandleData extends Command
                 "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']
+                'holder_id' => $supplier['personid'],
+                'wait_id'=>$supplier['personid'],
+                'wait_name'=>$supplier['person'],
             ]);
 
             $standing_book_data['cgdNo'] = $cgdCode;

app/command/handleYzOrderData.php

@@ -656,13 +656,16 @@ class handleYzOrderData extends Command
                 "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']
+                'holder_id'=>$supplier['personid'],
+                'wait_id'=>$supplier['personid'],
+                'wait_name'=>$supplier['person'],
             ]);
 
             $standing_book_data['cgdNo'] = $cgdCode;