Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/OrderInv.php

@@ -102,9 +102,11 @@ class OrderInv extends BaseController{
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票金额不足");
                     }
-                  $ainv=  Db::name("invoice_pool")->alias("a")
-			->leftJoin("invoice_good b","a.invNo=b.invNo and b.is_del=0")
-			->where(["a.status"=>[0,1,2,3,4],"b.orderCode"=>$value['sequenceNo']])->sum("b.goodNum");
+                   $ainv = Db::name("invoice_pool")
+                       ->alias("a")
+                       ->leftJoin("invoice_good b", "a.invNo=b.invNo and b.is_del=0")
+                       ->where(["a.status" => [0, 1, 2, 3, 4], "b.orderCode" => $value['sequenceNo']])
+                       ->sum("b.goodNum");
                     if($ainv+$value['num']>($qrd['goodNum']-$qrd['thNum'])) {
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票数量不足");
@@ -114,8 +116,11 @@ class OrderInv extends BaseController{
                      Db::rollback();
                      return error_show(1004,"确认单{$value['sequenceNo']}商品未确认开票类目");
                     }
-					$num = DB::name("assoc")->alias("a")->leftJoin("invoice_good b","a.viceCode=b.invNo")
-					->where(["a.status"=>[1,2],"a.is_del"=>0,"a.type"=>1,"a.orderCode"=>$value['sequenceNo']])->sum("b.goodNum");
+                   $num = Db::name("assoc")
+                       ->alias("a")
+                       ->leftJoin("invoice_good b", "a.viceCode=b.invNo AND b.orderCode=a.orderCode")
+                       ->where(["a.status" => [1, 2], "a.is_del" => 0, "a.type" => 1, "a.orderCode" => $value['sequenceNo']])
+                       ->sum("b.goodNum");
                     if($qrd['goodNum']-$qrd['thNum']-$num<$value['num']){
                     	Db::rollback();
                         return error_show(1004,"确认单{$value['sequenceNo']}待开票数量不足");

app/admin/controller/User.php

@@ -613,13 +613,11 @@ class User extends BaseController{
     //添加超管账号
     public function adminAccountAdd()
     {
-
         $post = $this->request->only(['nickname', 'mobile', 'email' => '', 'relaComNo' => ''], 'post', 'trim');
         $validate = Validate::rule([
             'nickname|真实姓名' => 'require|min:2|max:200',
             'mobile|手机号' => 'require|mobile',
             'email|邮箱' => 'email|max:255',
-            'companyArr|关联账户' => 'array|max:100',
         ]);
         if ($validate->check($post) == false) return error_show(1004, $validate->getError());
 
@@ -636,7 +634,7 @@ class User extends BaseController{
         $up = Db::name("user_role")->insert([
             "uid" => $rs['data']["userid"],
             "nickname" => $rs['data']["nickname"],
-            "roleid" => 1,
+            "roleid" => env('default_admin_addcount_role_id',1),
             "companyNo" => '',
             "company_type" => '',
             "status" => 1,
@@ -650,6 +648,37 @@ class User extends BaseController{
         return app_show(0, '添加超管账号成功');
     }
 
+    //添加供应商账号
+    public function supplierAccountAdd(){
+        $post = $this->request->only(['nickname', 'mobile', 'email' => '', 'relaComNo' => '','companyArr'], 'post', 'trim');
+        $validate = Validate::rule([
+            'nickname|真实姓名' => 'require|min:2|max:200',
+            'mobile|手机号' => 'require|mobile',
+            'email|邮箱' => 'email|max:255',
+            'companyArr|关联账户' => 'require|array|max:100'
+        ]);
+        if ($validate->check($post) == false) return error_show(1004, $validate->getError());
+
+        $rs = add_supplier_acount($post);
+        if (!isset($rs['code']) || $rs['code'] != 0) return app_show(1004, $rs['message'],$rs['data']);
+
+        $up = Db::name("user_role")->insert([
+            "uid" => $rs['data']["userid"],
+            "nickname" => $rs['data']["nickname"],
+            "roleid" => env('default_supplier_addcount_role_id',90),//需要专门为供应商账号指定一个默认的角色id，要同步到采销
+            "companyNo" => '',
+            "company_type" => '',
+            "status" => 1,
+            "is_main" => 1,
+            "is_del" => 0,
+            "addtime" => date("Y-m-d H:i:s"),
+            "updatetime" => date("Y-m-d H:i:s"),
+        ]);
+        if ($up == false) return error_show(1004, '供应商账号分配角色失败');
+
+        return app_show(0, '添加供应商账号成功');
+    }
+
 
 
 }

app/admin/route/app.php

@@ -31,6 +31,7 @@ Route::rule('setstatus', 'admin/User/setStatus');
 Route::rule('setcompanystatus', 'admin/User/setCompanyStatus');
 Route::rule('getcompany', 'admin/User/GetCompany');
 Route::rule('adminAccountAdd', 'admin/User/adminAccountAdd');
+Route::rule('supplierAccountAdd', 'admin/User/supplierAccountAdd');
 
 Route::rule('rolelist', 'admin/Role/roleList');
 Route::rule('roleall', 'admin/Role/roleAll');

app/common.php

@@ -261,6 +261,18 @@ if(function_exists('add_admin_account') == false){
     }
 }
 
+//添加供应商账号
+if(function_exists('add_supplier_acount') == false){
+    function add_supplier_acount(array $data=[]){
+        $host = Config::get("app");
+
+        $url = $host["api_host"]."/add_supplier_acount";
+        $response=curl_request($url,$data);
+
+        return json_decode($response,true);
+    }
+}
+
 
 if(!function_exists("headerSign")){