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

app/admin/controller/DataChange.php

@@ -9,10 +9,10 @@ use think\facade\Db;
 class DataChange extends Base
 {
 	protected $model;
-  public function __construct(App $app) {
-  	parent::__construct($app);
-  	$this->model=new \app\admin\model\DataChange();
-  }
+	  public function __construct(App $app) {
+	    parent::__construct($app);
+	    $this->model=new \app\admin\model\DataChange();
+	  }
 	  /**
 	* @return \think\response\Json|void
 	* @throws \think\db\exception\DataNotFoundException
@@ -37,12 +37,11 @@ class DataChange extends Base
   	}
   	if($param['type']==2){
   		$orderinfo = Db::name('sale')->where(['orderCode'=>$param['code']])->find();
-  		  $fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$param['code'],'is_cgd_check'=>0]);
-				if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
-					return json_show(1005, $fininfo['message']??'结算校验失败');
-				}
+  		$fininfo =GetFin('admin/orderischeck',['token'=>$this->post['token'],'orderCode'=>$param['code'],'is_cgd_check'=>0]);
+		if(!isset($fininfo['code'])||$fininfo['code']!=0 ){
+			return json_show(1005, $fininfo['message']??'结算校验失败');
+		}
   	}
-  	
   	if($param['type']==3){
   		$orderinfo = Db::name('good_zixun')->where(['spuCode'=>$param['code']])->find();
   	}

app/admin/controller/Keepbrand.php

@@ -89,15 +89,10 @@ class Keepbrand extends Base
         if(!$info) {
             return error_show(1002, "未找到对应数据");
         }
-        $data = Db::name("brand")->alias('a')
-            ->join("brand_book b","b.brand_id=a.id")
-            ->field("b.*,a.brand_name")
-            ->where(["a.id"=>$info['brand_id']])->find();
-        if($data){
-            return app_show(0,"获取成功",$data);
-        }else{
-            return app_show(1002,"获取失败",$data);
-        }
+		$info['brand_name'] = Db::name("brand")->where(["id"=>$info['brand_id']])->value("brand_name",'');
+        
+        return app_show(0,"获取成功",$info);
+        
     }
     public function status(){
         $id = isset($this->post['id']) && $this->post['id'] !==""? intval($this->post['id']):"";

app/admin/controller/Manager.php

@@ -0,0 +1,94 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\controller;
+
+use app\admin\model\ManagerChange;
+use think\App;
+use think\facade\Db;
+use think\facade\Validate;
+
+class Manager extends Base
+{
+	protected $model=null;
+   public function __construct(App $app) {
+   	parent::__construct($app);
+   	$this->model=new ManagerChange();
+   }
+   
+   public function create(){
+   	$param = $this->request->only(["orderCode"=>[],"manager"=>"","managerid"=>"","companyNo"=>"","remark"=>""],"post","trim");
+   	$valid=Validate::rule([
+   		"orderCode|订单集合"=>"require|array",
+   		"manager|项目经理"=>"require|max:255",
+   		"managerid|项目经理"=>"require|number|gt:0",
+   		"companyNo|业务公司"=>"require"
+   		]);
+   	if($valid->check($param)==false) return error_show(1004,$valid->getError());
+   	$orderinfo= Db::name("sale")->whereIn("orderCode",$param['orderCode'])->where("supplierNo",$param['companyNo'])
+   	->column("orderCode");
+   	if(count($orderinfo)!= count($param['orderCode'])) return error_show(1004,"数据存在业务公司不一致");
+   	$userCommon = \app\admin\common\User::getIns();
+   	$supp = $userCommon->handle("getCodeAndName",["code"=>$param['companyNo']]);
+   	if(!isset($supp['data']) || empty($supp['data'])) return error_show(1004,'业务公司数据未获取到');
+   	$companyName = $supp['data'][$param['companyNo']]?:"";
+   	$data=[
+   		"apply_id"=>$this->uid,
+   		"apply_name"=>$this->uname,
+   		"orderCode"=>json_encode($param['orderCode']),
+   		"companyName"=>$companyName,
+   		"companyNo"=>$param['companyNo'],
+   		"manager"=>$param['manager'],
+   		"managerid"=>$param['managerid'],
+   		"remark"=>$param['remark'],
+   		"status"=>1
+   		];
+   	$ad =$this->model->save($data);
+   	return $ad? app_show(0,"创建成功"): error_show(1004,"创建失败");
+   }
+   
+   public function list(){
+  	$param = $this->request->only(['orderCode'=>'','oaCode'=>'','companyNo'=>'','apply_name'=>'','status'=>'','manager'=>'','page'=>1,'size'=>15],'post','trim');
+  	$where=[];
+  	$param['orderCode']==''?: $where[]=['orderCode','like',"%{$param['orderCode']}%"];
+  	$param['apply_name']==''?: $where[]=['apply_name','like',"%{$param['apply_name']}%"];
+  	$param['companyNo']==''?: $where[]=['companyNo','like',"%{$param['companyNo']}%"];
+  	$param['manager']==''?: $where[]=['manager','like',"%{$param['manager']}%"];
+  	$param['status']==''?: $where[]=['status','=',$param['status']];
+  	$list = $this->model->where($where)->json(['orderCode'])->order('id','desc')->paginate(['page'=>$param['page'],'list_rows'=>$param['size']]);
+  	return app_show(0,'获取成功',['list'=>$list->items(),'count'=>$list->total()]);
+  }
+  
+  public function  info(){
+     $param = $this->request->only(['id'],'post','trim');
+     $info = $this->model->json(['orderCode'])->findOrEmpty($param['id']);
+     return app_show(0,'获取成功',$info);
+  }
+  
+  public function status(){
+  	$param = $this->request->only(['id'=>'','status'=>'','remark'=>''],'post','trim');
+  	$Valid =Validate::rule(['id|申请id'=>'require','status|状态'=>'require|number|in:2,3']);
+  	if($Valid->check($param)==false) return error_show(1004,$Valid->getError());
+  	$info = $this->model->findOrEmpty($param['id']);
+  	if($info->isEmpty())return error_show(1004,'未找到申请单数据');
+  	if($info->status!=1) return error_show(1004,'申请单数据已审核');
+  	
+    $info->status=$param['status'];
+    $info->remark=$param['remark'];
+    $this->model->startTrans();
+    try{
+        $up=$info->save();
+        if($up==false)throw  new \Exception('申请单审核失败');
+        if($param['status']==2){
+        	$update=["manager"=>$info->manager,"managerid"=>$info->managerid,"updatetime"=>date("Y-m-d H:i:s")];
+        	$orderCode =json_decode($info->orderCode,true);
+            Db::name("sale")->whereIn("orderCode",$orderCode)->update($update);
+        }
+    	$this->model->commit();
+    }catch (\Exception $exception){
+        $this->model->rollback();
+        return error_show(1004,$exception->getMessage());
+    }
+    return app_show(0,'申请数据处理完成');
+  }
+}

app/admin/controller/Reorder.php

@@ -999,7 +999,7 @@ class Reorder extends Base
                                 $cgd['wsend_num'] -= $info['num'];
                                 $cgd['send_num'] += $info['num'];
                             }
-                            $cgd['status'] = $cgd['wsend_num'] == 0 ? 2 : ($cgd['send_num'] == 0 ? 0 : 1);
+                            $cgd['status'] = $cgd['wsend_num'] == 0 ? 3 : ($cgd['send_num'] == 0 ? 1 : 2);
                             $cgd['send_status'] = $cgd['wsend_num'] == 0 ? 3 : ($cgd['send_num'] == 0 ? 1 : 2);
                             $cgd['th_num'] += $info['num'];
                             if ($cgd['th_num'] == $cgd['send_num'] && $cgd['wsend_num'] == 0) {

app/admin/model/ManagerChange.php

@@ -0,0 +1,17 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\model;
+
+use think\Model;use think\model\concern\SoftDelete;
+
+/**
+ * @mixin \think\Model
+ */
+class ManagerChange extends Model
+{
+    use SoftDelete;
+    protected $createTime="addtime";
+    protected $updateTime="updatetime";
+    
+}

app/admin/route/app.php

@@ -855,5 +855,10 @@ route::rule('dachangeadd','admin/DataChange/create');
 route::rule('dachangeinfo','admin/DataChange/info');
 route::rule('dachangestatus','admin/DataChange/status');
 
+route::rule('managerlist','admin/Manager/list');
+route::rule('manageradd','admin/Manager/create');
+route::rule('managerinfo','admin/Manager/info');
+route::rule('managerstatus','admin/Manager/status');
+
 
 

app/model/AccountItem.php

@@ -11,7 +11,6 @@ use think\Model;
 class AccountItem extends Model
 {
     protected $connection='mysql_sys';
-    
     public function GetUidByDepartId($departId){
         return $this->where(["itemid"=>$departId])->column("account_id");
     }