Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Purch.php

@@ -611,19 +611,9 @@ class Purch extends Base
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
         if($upd){
-//            ActionLog::logAdd($this->post['token'],$order,'cgd',$data['status'],$this->post);
-
             //修改状态，添加待办
             ActionLog::logAdd($this->post['token'], $order, "CGD", $data['status'], $this->post);
 
-//            ProcessOrder::AddProcess($this->post['token'], [
-//                "order_type" => 'CGD',
-//                "order_code" => $cgdNo,//销售单code
-//                "order_id" => $data['id'],
-//                "order_status" => $data['status'],"before_status"=>1
-//            ]);
-
-
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,'更新失败');
@@ -681,10 +671,6 @@ class Purch extends Base
             }
 
             //供应商信息
-//            $supplier_rs = Db::name('supplier')
-//                ->field('id,name supplierName,code supplierNo,person,personid')
-//                ->where(['is_del' => 0, 'code' => $param['supplierNo']])
-//                ->find();
 			$userCommon= \app\admin\common\User::getIns();
             $supplier_temp =$userCommon->handle("sInfo",["code"=>$param['supplierNo']]);
 
@@ -738,17 +724,8 @@ class Purch extends Base
                     'creater_id' => $creater_id,
                     'creater' => $creater,
                 ]);
-
             //记录日志
             ActionLog::logAdd(['id' => $creater_id, 'nickname' => $creater], $rs, "CGD", $rs['status'], $param);
-
-//            ProcessOrder::AddProcess($this->post['token'], [
-//                "order_type" => 'CGD',
-//                "order_code" => $param['cgdNo'],//销售单code
-//                "order_id" => $rs['id'],
-//                "order_status" => $rs['status']
-//            ]);
-
             //维护台账
             Db::name('standing_book')
                 ->where('cgdNo', $param['cgdNo'])
@@ -790,15 +767,7 @@ class Purch extends Base
                 if (!empty($data)) throw new Exception($data['cgdNo'] . "采购单发货中无法取消");
 
             }
-//        if($data['send_status']>1 && $status==0){
-//            return error_show(1004,"采购单发货中无法取消");
-//        }
-//        $order = ["order_code"=>$cgdNo,"status"=> $data['status'] ,"action_remark"=>$remark,"action_type"=>"status"];
-//        $data['status'] = $status;
-//        $data['remark'] = $remark;
-//        $data['updatetime'] =date("Y-m-d H:i:s");
-
-            //原始数据
+          //原始数据
             $info = Db::name("purchease_order")
                 ->whereIn('cgdNo', $cgdNo)
                 ->column('id,cgdNo,status,supplierNo,spuCode,order_type', 'cgdNo');
@@ -815,16 +784,7 @@ class Purch extends Base
                 //获取供应商的负责人
                 $userCommon = \app\admin\common\User::getIns();
                 $supplier = $userCommon->handle('sGetList',['more_code'=>array_column($info, 'supplierNo')]);
-
                 $supplier_cgderid = array_column($supplier['data']['list'],'personid','code');
-//                $supplier_cgderid = Db::name('supplier')
-//                    ->where('is_del', 0)
-//                    ->whereIn('code', array_column($info, 'supplierNo'))
-//                    ->column('personid', 'code');
-//            ->leftJoin('supplier sip', 'sip.code=po.supplierNo')
-//                ->field('po.*,on.orderCode,u.itemid,sip.personid as supplier_cgderid,sip.person as supplier_cgder')
-
-//            $user=GetUserInfo($this->post['token']);
                 $uid = $this->uid;
                 $uname = $this->uname;
 
@@ -839,48 +799,17 @@ class Purch extends Base
 			        if($status == 1){
                         //如果开通了供应商账号，则只允许level3账号操作，level2账号不允许操作
                         if (isset($all_has_supplier_account[$info[$vlue]['supplierNo']]) && $this->level == 2) throw new Exception('已开通供应商账号，当前账号不能操作');
-//                        if($this->level == 2 && $uid != $supplier_cgderid[$info[$vlue]['supplierNo']]) throw new Exception('只能由供应商负责人来操作');//与供应商确认的这个操作，只能由供应商负责人来操作
-                    }
+					  }
 
                     if ($status == 1 || $status == 2) {
-//                    $orderinfo = Db::name('sale')
-//                    ->alias('a')
-//                    ->field('a.id,a.orderCode,a.is_stock,a.order_type,a.cgderid')
-//                    ->leftJoin('order_num b','b.orderCode=a.orderCode')
-//                    ->where([
-//                        'a.is_del'=>0,
-//                        '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($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('非库存品和采返商品只能由供应商负责人操作');
-
-                            $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];
-//                        }
+                    	$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];
 
                     ProcessOrder::AddProcess(['id' => $uid, 'nickname' => $uname], $process);
                     $order = ["order_code" => $vlue, "status" => '', "action_remark" => $remark, "action_type" => "status"];
                     ActionLog::logAdd(['id' => $uid, 'nickname' => $uname], $order, 'CGD', $status, $this->post);
                 }
-//                return app_show(0, "更新成功");
             } else throw new Exception('更新失败');
-//                return error_show(1004, '更新失败');
-
             Db::commit();
             return app_show(0, "更新成功");
         } catch (Exception $exception) {
@@ -892,7 +821,6 @@ class Purch extends Base
     //创建采购工差单
     public function diffcreat(){
         $token = isset($this->post['token']) && $this->post['token'] !=="" ?trim($this->post['token']):"";
-        //$cgdNo=makeNo("CG");
         $cgdNo = $this->post['cgdNo'] && $this->post['cgdNo'] !=="" ? trim($this->post['cgdNo']) :"";
         if($cgdNo==""){
             return error_show(1002,"参数good_code不能为空");

app/admin/controller/Sale.php

@@ -5167,6 +5167,7 @@ class Sale extends Base
 
             $date = date('Y-m-d H:i:s');
 			$th=[];
+			$cgdId=[];
             foreach ($list as $sale) {
 
                 if ($sale['sale_status'] == 3) throw new \think\Exception($sale['orderCode'] . '已取消，无法重复操作');
@@ -5257,8 +5258,8 @@ class Sale extends Base
                         "before_status" => $sale['cgd_status'],
                         'holder_id' => $sale['cgder_id'],
                     ]);
+                    $cgdId[]=$sale['cgd_id'];
                 }
-
             }
            $orderup= Db::name('sale')
                 ->where(['is_del' => 0, 'id' => array_column($list, 'sale_id')])
@@ -5275,17 +5276,20 @@ class Sale extends Base
            
            $thin= Db::name("th_data")->insertAll($th);
            if($thin==false) throw new \Exception('订单取消失败');
-            $cgdup=Db::name('purchease_order')
-                ->where(['is_del' => 0, 'id' => array_column($list, 'cgd_id')])
+           if(!empty($cgdId)){
+           	$cgdup=Db::name('purchease_order')
+                ->where(['is_del' => 0, 'id' => $cgdId])
                 ->update([
                 	'status' => 4,
-                    'th_num' => Db::raw("wsend_num"),
-                	'th_fee' =>Db::raw("total_fee"),
+                    'th_num' => Db::raw('wsend_num'),
+                	'th_fee' =>Db::raw('total_fee'),
                 	'wsend_num' =>0,
-                	'send_num' =>Db::raw("wsend_num"),
+                	'send_num' =>Db::raw('wsend_num'),
                 	'send_status' =>3,
                     'updatetime' => $date]);
 			 if($cgdup==false) throw new \Exception('采购单取消失败');
+           }
+            
             $out_list = Db::name('order_out')
                 ->where(['is_del' => 0, 'orderCode' => $orderCode])
                 ->select()

app/admin/controller/SaleReport.php

@@ -2684,7 +2684,7 @@ class SaleReport extends Base
 	        'start_day' => date('Y-m-01'),
 	        'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0],['a.status',"<>",4]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
@@ -2821,7 +2821,7 @@ class SaleReport extends Base
         $param = $this->request->only(['token', 'supplierNo' => '', 'companyNo' => '', 'supplier_name' => '','status' => '',
 	        'person_id' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0]];
+        $where = [['a.is_del', '=', 0],['a.status','<>',4]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];

app/admin/controller/SaleReportByRelaComNo.php

@@ -2820,7 +2820,7 @@ class SaleReportByRelaComNo extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo]];
+        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo],['a.status','<>',4]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
@@ -2909,7 +2909,7 @@ class SaleReportByRelaComNo extends Base
     {
         $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
-        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo]];
+        $where = [['a.is_del', '=', 0], ['a.companyNo', '=', $this->relaComNo],['a.status','<>',4]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];