Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Consult.php

@@ -229,8 +229,8 @@ class Consult extends Base
                     foreach ($value["specinfo"] as $v){
                         $spec =Db::name("specs")->where(["id"=>$v['specid']])->find();
                         $spec_value =Db::name("spec_value")->where(["id"=>$v['spec_value_id']])->find();
-                        $v['spec_name']=$spec['spec_name'];
-                        $v['spec_value_name']=$spec_value['spec_value'];
+                        $v['spec_name']=isset($spec['spec_name'])? $spec['spec_name']:"";
+                        $v['spec_value_name']=isset($spec_value['spec_value'])?$spec_value['spec_value']:"" ;
                         $specinfo[]=$v;
                     }
                 }
@@ -480,7 +480,7 @@ class Consult extends Base
             $zxinfo['project_name']=isset($project['project_name'])?$project['project_name']:"";
             $zxinfo['budget_total']=isset($project['budget_total'])?$project['budget_total']:"";
             $zxinfo['project_use_desc']=isset($project['use_desc'])?$project['use_desc']:"";
-            $projectinfo = Db::name("project_info")->where(["pgNo"=>$zxinfo['infoNo']])->find();
+            $projectinfo = Db::name("project_info")->where(["pgNo"=>$zxinfo['pgNo']])->find();
             $zxinfo['pgNo'] = isset($projectinfo['pgNo']) ? $projectinfo['pgNo']:"";
         }
         if($zxorder['depart']>0){
@@ -570,6 +570,7 @@ class Consult extends Base
         if($budget_price===""){
             return error_show(1003,"参数budget_price不能为空");
         }
+        $pgNo = isset($this->post['pgNo'])&& $this->post['pgNo']!="" ? trim($this->post['pgNo']):"";
         $use_desc = isset($this->post['use_desc'])&& $this->post['use_desc']!="" ? trim($this->post['use_desc']):"";
         if($use_desc==""){
             return error_show(1003,"参数use_desc不能为空");
@@ -638,6 +639,7 @@ class Consult extends Base
                 "total_weight"=>$total_weight===""? $num*$specs_weight :$total_weight,
                 "budget_price"=>$budget_price,
                 "num"=>$num,
+                "pgNo"=>$pgNo,
                 "use_desc"=>$use_desc,
                 "remark"=>$remark,
                 "status"=>1,

app/admin/controller/Exclusive.php

@@ -0,0 +1,125 @@
+<?php
+
+
+namespace app\admin\controller;
+
+
+use think\App;
+use think\facade\Db;
+
+class Exclusive extends Base
+{
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+    }
+
+    public function list(){
+        $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']) :"1";
+        $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']) :"10";
+        $where =[["is_del","=",0]];
+        $cat_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
+        if($cat_name!==""){
+            $where[]=['name',"like","%$cat_name%"];
+        }
+        $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
+        if($pid!==""){
+            $where[]=['pid',"=",$pid];
+        }
+        $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
+        if($status!==""){
+            $where[]=['status',"=",$status];
+        }
+        $count = Db::name("exclusive")->where($where)->count();
+        $total = ceil($count / $size);
+        $page = $page >= $total ? $total : $page;
+        $list = Db::name('exclusive')->where($where)->page($page, $size)->select();
+        return app_show(0, "获取成功", ['list' =>$list, 'count' => $count]);
+    }
+
+    public function add(){
+        $name = isset($this->post['name'])&&$this->post['name']!=""? trim($this->post['name']):"";
+        if($name==""){
+            return error_show(1004,"参数name不能为空");
+        }
+        $pid =isset($this->post['pid'])&&$this->post['pid']!=="" ? intval($this->post['pid']):0;
+        $level=1;
+        $search = $name;
+        if($pid!==0){
+            $parent= Db::name("exclusive")->where(["id"=>$pid,"is_del"=>0])->find();
+            if($parent==false){
+                return error_show(1003,"父级数据未找到");
+            }
+            $search=$parent['search']."/".$name;
+            $level=$parent['level']+1;
+        }
+        $token = isset($this->post['token'])&&$this->post['token']!="" ? trim($this->post['token']):"";
+        $user =GetUserInfo($token);
+        if(empty($user)||$user['code']!=0){
+            return error_show($user['code'],$user['msg']);
+        }
+        $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
+        $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
+
+        $data=[
+            "name"=>$name,
+            "pid"=>$pid,
+            "level"=>$level,
+            "search"=>$search,
+            "createrid"=>$createrid,
+            "creater"=>$creater,
+            "status"=>0,
+            "is_del"=>0,
+            "addtime"=>date("Y-m-d H:i:s"),
+            "updatetime"=>date("Y-m-d H:i:s")
+        ];
+        $in =Db::name("exclusive")->insert($data);
+        if($in){
+            return app_show(0,"新建成功");
+        }else{
+            return error_show(1003,"新建失败");
+        }
+    }
+
+    public function  status(){
+            $id=isset($this->post['id'])&&$this->post['id']!=="" ? intval($this->post['id']):"";
+            if($id===""){
+                return error_show(1004,"参数id不能为空");
+            }
+            $exclusive=Db::name("exclusive")->where(["id"=>$id,"is_del"=>0])->find();
+            if($exclusive==false){
+                return error_show(1004,"未找到数据");
+            }
+            $msg = $exclusive['status']==0? "启用":"禁用";
+            $exclusive['status'] = $exclusive['status']==0?1:0;
+            $exclusive['updatetime'] =date("Y-m-d H:i:s");
+            $in =Db::name("exclusive")->save($exclusive);
+            if($in){
+                return app_show(0,"{$msg}成功");
+            }else{
+                return error_show(1004,"{$msg}失败");
+            }
+    }
+
+    public function query(){
+        $where =[["is_del","=",0]];
+        $cat_name=isset($this->post['name']) && $this->post['name'] !==""? trim($this->post['name']) :"";
+        if($cat_name!==""){
+            $where[]=['name',"like","%$cat_name%"];
+        }
+        $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
+        if($pid!==""){
+            $where[]=['pid',"=",$pid];
+        }
+        $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
+        if($status!==""){
+            $where[]=['status',"=",$status];
+        }
+        $level=isset($this->post['level']) && $this->post['level'] !==""? intval($this->post['level']) :"";
+        if($level!==""){
+            $where[]=['level',"=",$level];
+        }
+        $list = Db::name("exclusive")->where($where)->select();
+        return app_show(0,"获取成功",$list);
+    }
+}

app/admin/controller/Goodup.php

@@ -96,9 +96,9 @@ class Goodup extends BaseController
             return error_show(1004,"商品分类不能为空");
         }
         $brandid = isset($this->post['brandid'])&&$this->post['brandid']!=""? intval($this->post['brandid']):"";
-//        if($brandid==''){
-//            return error_show(1004,"商品品牌不能为空");
-//        }
+        if($brandid==''){
+            return error_show(1004,"商品品牌不能为空");
+        }
         $unit = isset($this->post['unit'])&&$this->post['unit']!=""? trim($this->post['unit']):"";
         if($unit==''){
             return error_show(1004,"商品单位不能为空");
@@ -136,6 +136,10 @@ class Goodup extends BaseController
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
+        $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']):"";
+        if($good_size==''){
+            return error_show(1004,"参数good_size不能为空");
+        }
         $company_id = isset($this->post['company_id'])&&$this->post['company_id']!=""? trim($this->post['company_id'])
             :"";
         if($company_id==''){
@@ -280,6 +284,7 @@ class Goodup extends BaseController
                 "companyNo"=>$company_id,
                 "tax"=>$tax,
                 "supplierNo"=>$supplierNo,
+                "good_size"=>$good_size,
                 "is_auth"=>$is_auth,
                 "is_stock"=>$is_stock,
                 "auth_img"=>$auth_img,
@@ -433,6 +438,11 @@ class Goodup extends BaseController
         if($supplierNo==''){
             return error_show(1004,"参数supplierNo不能为空");
         }
+        $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size'])
+            :"";
+        if($good_size==''){
+            return error_show(1004,"参数good_size不能为空");
+        }
         $company_id = isset($this->post['company_id'])&&$this->post['company_id']!=""? trim($this->post['company_id'])
             :"";
         if($company_id==''){
@@ -536,6 +546,7 @@ class Goodup extends BaseController
                 "tax"=>$tax,
                 "supplierNo"=>$supplierNo,
                 "is_auth"=>$is_auth,
+                "good_size"=>$good_size,
                 "auth_img"=>$auth_img,
                 "after_sales"=>$after_sales,
                 "craft_desc"=>$craft_desc,

app/admin/controller/Purchin.php

@@ -112,20 +112,20 @@ class Purchin extends BaseController
            return error_show(1005,"采购单未发货");
        }
         $wsm_in_code = makeNo("IC");
-       $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-       if($wsm_code==""){
-           return error_show(1004,"参数 wsm_code 不能为空");
-       }
-       $wsminfo = Db::name("warehouse_info")->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
+//       $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
+//       if($wsm_code==""){
+//           return error_show(1004,"参数 wsm_code 不能为空");
+//       }
+       $wsminfo = Db::name("warehouse_info")->where(["wsm_code"=>$cgdinfo['wsm_code'],"is_del"=>0])->find();
        if(empty($wsminfo)){
            return error_show(1004,"未找到仓库信息");
        }
-       $recep = Db::name('warehouse_addr')->where(["wsm_code"=>$wsm_code,"is_del"=>0])->find();
+       $recep = Db::name('warehouse_addr')->where(["wsm_code"=>$cgdinfo['wsm_code'],"is_del"=>0])->find();
 
-//        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-//        if($wsm_code==""){
-//            return error_show(1004,"参数 wsm_code 不能为空");
-//        }
+        $sendtype = isset($this->post['sendtype'])&&$this->post['sendtype']!="" ? intval($this->post['sendtype']):"";
+        if($sendtype==""){
+            return error_show(1004,"参数 sendtype 不能为空");
+        }
 
         $data = GetUserInfo($this->post['token']);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
@@ -147,7 +147,7 @@ class Purchin extends BaseController
         $orin = [
             "wsm_in_code"=>$wsm_in_code,
             "cgdNo"=>$cgdNo,
-            "wsm_code"=>$wsm_code,
+            "wsm_code"=>$cgdinfo['wsm_code'],
             "wsm_reaper"=>isset($recep)&& $recep['wsm_name']!=''? $recep['wsm_name']:"",
             "send_num"=>$send_num,
             "post_company"=>$post_company,
@@ -157,6 +157,7 @@ class Purchin extends BaseController
             "apply_id"=>$userinfo['id'],
             "apply_name"=>$userinfo['nickname'],
             "wait_num"=>0,
+            "sendtype"=>$sendtype,
             "status"=>$status,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")
@@ -216,18 +217,16 @@ class Purchin extends BaseController
             return error_show(1002,"未找到商品数据");
         }
             $cat= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
-            $info['cgder']=$dom['cgder'];
-        $info['good_code']=$dom['good_code'];
+        $info['cgder']=$dom['cgder'];
+        $info['spuCode']=$dom['spuCode'];
         $info['good_name']=$dom['good_name'];
-        $info['good_type_code']=$dom['good_type_code'];
+        $info['skuCode']=$dom['skuCode'];
         $info['good_num']=$dom['good_num'];
         $info['good_price']=$dom['good_price'];
         $info['total_fee']=$dom['total_fee'];
         $info['diff_fee']=$dom['diff_fee'];
         $info['diff_weight']=$dom['diff_weight'];
         $info['gold_price']=$dom['gold_price'];
-//        $info['cant']=$cat;
-
         $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
             ->leftJoin("warehouse_addr c","a.wsm_code=c.wsm_code and c.is_del=0")
             ->where(["a.wsm_code"=>$info['wsm_code']])->field("a.name as wsm_name,b.name,b.code,c.wsm_name as wsm_contactor,c.wsm_mobile,c.wsm_addr,c.addr_code")->find();
@@ -412,11 +411,11 @@ class Purchin extends BaseController
                         Db::rollback();
                         return error_show(1002,"未找到采购单数据");
                     }
-                    $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'],"good_type_code"=>$cgdinfo['good_type_code'],"is_del"=>0])->find();
+                    $good = Db::name("good_stock")->where(["wsm_code"=>$info['wsm_code'],"good_type_code"=>$cgdinfo['skuCode'],"is_del"=>0])->find();
 
                     if(empty($good)) {
                       $good=[
-                          "good_type_code"=>$cgdinfo['good_type_code'],
+                          "good_type_code"=>$cgdinfo['skuCode'],
                           "wsm_code"=>$info['wsm_code'],
                           "usable_stock"=>0,
                           "wait_out_stock"=>0,

app/admin/controller/Resign.php

@@ -706,11 +706,11 @@ class Resign extends BaseController
     }
 
     public function createCgd(){
-        $id=isset($this->post['id'])&&$this->post['id']!=="" ? intval($this->post['id']):"";
-        if($id===""){
-            return error_show(1004,"参数id不能为空");
+        $bk_code=isset($this->post['bk_code'])&&$this->post['bk_code']!=="" ? trim($this->post['bk_code']):"";
+        if($bk_code===""){
+            return error_show(1004,"参数bk_code不能为空");
         }
-        $info = Db::name("purchease")->where(["id"=>$id,"is_del"=>0])->find();
+        $info = Db::name("purchease")->where(["bk_code"=>$bk_code,"is_del"=>0])->find();
         if($info==false){
             return error_show(1002,'未找到备库数据');
         }
@@ -727,8 +727,9 @@ class Resign extends BaseController
             return error_show(1004,"未找到供应商数据");
         }
         $cgdCode = makeNo("CG");
+
         $cg =["cgdNo"=>$cgdCode,
-            "bkcode"=>"",
+            "bkcode"=>$info['bk_code'],
             "wsm_code"=>$info['wsm_code'],
             "cgder"=>$supplier['person'],
             "cgder_id"=>$supplier['personid'],
@@ -764,5 +765,10 @@ class Resign extends BaseController
             "updatetime"=>date("Y-m-d H:i:s")
         ];
         $up =Db::name("purchease_order")->insert($cg);
+        if($up){
+            return app_show(0,"采购单新建成功");
+        }else{
+            return error_show(1004,"采购单新建失败");
+        }
     }
 }

app/admin/route/app.php

@@ -438,4 +438,10 @@ Route::rule("plandheck","admin/Project/planCheck");
 Route::rule("projectrate","admin/Project/changeRate");
 Route::rule("projectfeeddel","admin/Project/feeddel");
 
+Route::rule("exclulist","admin/Exclusive/list");
+Route::rule("excluadd","admin/Exclusive/add");
+Route::rule("exclustatus","admin/Exclusive/status");
+Route::rule("excluquery","admin/Exclusive/qurey");
+Route::rule("excludel","admin/Exclusive/delete");
+