ad

app/admin/controller/Project.php

@@ -319,11 +319,11 @@ class Project extends Base
         $info['ladder']=[];
         if(!empty($ladder)){
             foreach ($ladder as $value){
-                $value["cat_info"]=isset($value['cat_id'])? made($value['cat_id'],[]):[];
+                $value["cat_info"]=isset($value['cat_id']) &&$value['cat_id']!=""? made($value['cat_id'],[]):[];
                 $condition  = $type==0?['pgNo'=>$value['pgNo'],"is_del"=>0] : ['pgNo'=>$value['pgNo'],"is_del"=>0,"status"=>1];
                 $feedback = Db::name("project_feedback")->where($condition)->select()->toArray();
                 array_walk($feedback,function (&$v){
-                    $v["cat_info"]=isset($v['cat_id'])? made($v['cat_id'],[]):[];
+                    $v["cat_info"]=isset($v['cat_id'])&&$v['cat_id']!=""? made($v['cat_id'],[]):[];
                 });
 //                $zx = Db::name("consult_info")->where(["pgNo"=>$value["pgNo"],"is_del"=>0,"bargain_status"=>0])
 //                    ->column("infoNo");
@@ -429,7 +429,7 @@ class Project extends Base
         $feedlist = Db::name("project_feedback")->where(["id"=>$feedback,"is_del"=>0])->select();
         if(!empty($feedlist)){
             foreach ($feedlist as $value){
-                $value["cat_info"]=isset($value['cat_id'])? made($value['cat_id'],[]):[];
+                $value["cat_info"]=isset($value['cat_id'])&&$value['cat_id']!=""? made($value['cat_id'],[]):[];
                 $plan['feedback'][]=$value;
             }
         }
@@ -466,7 +466,7 @@ class Project extends Base
                     $feedlist = Db::name("project_feedback")->where(["id"=>$feedback,"is_del"=>0])->select();
                     if(!empty($feedlist)){
                         foreach ($feedlist as $value){
-                            $value["cat_info"]=isset($value['cat_id'])? made($value['cat_id'],[]):[];
+                            $value["cat_info"]=isset($value['cat_id'])&&$value['cat_id']!=""? made($value['cat_id'],[]):[];
                             $plan['feedback'][]=$value;
                         }
                     }

app/admin/controller/Purch.php

@@ -578,7 +578,9 @@ class Purch extends Base
             return error_show(1004,"参数remark不能为空");
         }
 
-
+        $data=[
+            ""
+        ];
     }
 
 }

app/admin/controller/Resign.php

@@ -109,41 +109,36 @@ class Resign extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $good_code = isset($this->post['good_code'])&&$this->post['good_code']!="" ? trim($this->post['good_code']):"";
+        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
+        if($customer==""){
+            return error_show(1004,"参数customer_code不能为空");
+        }
+        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
+        if($supplier==""){
+            return error_show(1004,"参数supplier_code不能为空");
+        }
+        $good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
         if($good_code==""){
-            return error_show(1002,'参数good_code 不能为空');
-        }
-        $good = Db::name("good")->where(['good_code'=>$good_code,'is_del'=>0])->find();
-        if(empty($good)){
-            return error_show(1002,'未找到商品数据');
-        }
-        $good_type_code = isset($this->post['good_type_code'])&&$this->post['good_type_code']!="" ? trim($this->post['good_type_code'])
-            :"";
-        if($good_type_code!==""){
-            $good_type= Db::name("good_type")->where(['good_code'=>$good_code,'is_del'=>0,'type_code'=>$good_type_code])
-                ->find();
-            if(empty($good_type)){
-                return error_show(1002,'未找到商品属性数据');
-            }
+            return error_show(1004,"参数good_code不能为空");
         }
-
-        $good_num = isset($this->post['good_num'])&&$this->post['good_num']!=="" ? intval($this->post['good_num']) :"";
-        if($good_num==''){
-            return error_show(1002,'参数good_num 不能为空或零');
-        }
-//        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-//        if($wsm_code==""){
-//            return error_show(1002,'参数wsm_code 不能为空');
-//        }
-//        $wsminfo = Db::name("warehouse_info")->where(['wsm_code'=>$wsm_code,"is_del"=>0])->find();
-//        if(empty($wsminfo)){
-//            return error_show(1002,'未找到仓库数据');
-//        }
-        $file_url = isset($this->post['file_url'])&&$this->post['file_url']!="" ? trim($this->post['file_url']):"";
-        $lastime = isset($this->post['lastime'])&&$this->post['lastime']!="" ? $this->post['lastime']:"";
-        if($lastime==""){
-            return error_show(1002,'参数lastime 不能为空');
+        $good_num = isset($this->post['good_num'])&& $this->post['good_num']!==""? intval($this->post['good_num']):"";
+        if($good_num===""){
+            return error_show(1004,"参数good_code不能为空");
+        }
+        $file_url = isset($this->post['file_url'])&& $this->post['file_url']!==""? trim($this->post['file_url']):"";
+        if($file_url===""){
+            return error_show(1004,"参数file_url不能为空");
+        }
+        $mark =isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
+        if($mark==""){
+            return error_show(1004,"参数remark不能为空");
+        }
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+            $good_code],["a.is_del","=",0]])->find();
+        if($good==false){
+            return error_show(1004,"未找到商品数据");
         }
+        $lastime = isset($this->post['lastime'])&&$this->post['lastime']!="" ? $this->post['lastime']:date("Y-m-d H:i:s");
         $data = GetUserInfo($token);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
             return error_show($data['code'],$data['message']);
@@ -151,13 +146,17 @@ class Resign extends BaseController
         $userinfo = $data['data'];
         $bk_code=makeNo("BK");
         $info = [
-            "good_code"=>$good_code,
+            "spuCode"=>$good_code,
             "good_name"=>$good['good_name'],
             "good_num"=>$good_num,
-            "good_type_code"=>$good_type_code,
+            "skuCode"=>$good['skuCode'],
             "wsm_code"=>'',
+            "companyNo"=>$customer,
+            "supplierNo"=>$supplier,
             "file_url"=>$file_url,
             "lasttime"=>$lastime,
+            "status"=>1,
+            "remark"=>$mark,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
             "apply_id"=>$userinfo['id'],
@@ -230,14 +229,15 @@ class Resign extends BaseController
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $goon = Db::name('good')->alias("a")->leftJoin("good_type b","a.good_code=b.good_code")->where
-        (['a.good_code'=>$info['good_code']])->field("cat_id,noble_metal")->find();
-        if(empty($goon)){
-            return error_show(1002,"未找到商品数据");
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+            $info['skuCode']],["a.is_del","=",0]])->find();
+        if($good==false){
+            return error_show(1004,"未找到商品数据");
         }
-        $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
-        $info['noble_metal']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? $goon['noble_metal']:'';
-        $info['noble_id']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? array_search($goon['noble_metal'],\think\facade\Config::get("noble")):'';
+        $int= isset($good['cat_id']) && $good['cat_id'] !=0 ? made($good['cat_id']):[];
+        $metal = \think\facade\Config::get("noble");
+        $info['noble_metal']= isset($good['noble_metal']) && $good['noble_metal'] !='' ?$metal[$good['noble_metal']]:'';
+        $info['noble_id']= isset($good['noble_metal']) && $good['noble_metal'] !='' ? $good['noble_metal']:"";
         $info['wsm_name']="";
         $info['file_name'] ='';
         if($info['file_url']){
@@ -251,25 +251,11 @@ class Resign extends BaseController
             $info['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
             $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
             $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
-
-        }
-        $feed = Db::name("purchease_feedback")->where(['bkcode'=>$info['bk_code'],'is_del'=>0])->find();
-        $info['feedback'] = [];
-        if(!empty($feed)){
-        $feed['wsm_name']="";
-        if($feed['warehouse']!=""){
-            $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
-                ->where(["a.wsm_code"=>$feed['warehouse']])->field("a.name as wsm_name,b.name,b.code")->find();
-            $feed['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
-            $feed['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
-            $feed['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
-        }
-        if($feed['supplier']!=""){
-            $supplie = Db::name("supplier")->where(['code'=>$feed['supplier'],"is_del"=>0])->find();
-            $feed['supplier_name'] =isset($supplie['name']) ? $supplie['name']:"";
-        }
-        $info['feedback'] = $feed;
         }
+        $supplier =Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
+        $info['supplier_name'] = isset($supplier['name'])?$supplier['name']:"";
+        $company =Db::name("bussiness")->where(["companyNo"=>$info['companyNo']])->find();
+        $info['company_name'] = isset($company['company'])?$company['company']:"";
         $info['can']=$int;
         return app_show(0,"获取成功",$info);
     }
@@ -286,55 +272,51 @@ class Resign extends BaseController
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $good_code = isset($this->post['good_code'])&&$this->post['good_code']!="" ? trim($this->post['good_code']):"";
+        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
+        if($customer==""){
+            return error_show(1004,"参数customer_code不能为空");
+        }
+        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
+        if($supplier==""){
+            return error_show(1004,"参数supplier_code不能为空");
+        }
+        $good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
         if($good_code==""){
-            return error_show(1002,'参数good_code 不能为空');
-        }
-        $good = Db::name("good")->where(['good_code'=>$good_code,'is_del'=>0])->find();
-        if(empty($good)){
-            return error_show(1002,'未找到商品数据');
-        }
-        $good_type_code = isset($this->post['good_type_code'])&&$this->post['good_type_code']!="" ? trim($this->post['good_type_code'])
-            :"";
-     if($good_type_code!=''){
-         $good_type= Db::name("good_type")->where(['good_code'=>$good_code,'is_del'=>0,'type_code'=>$good_type_code])
-             ->find();
-         if(empty($good_type)){
-             return error_show(1002,'未找到商品属性数据');
-         }
-     }
-
-        $good_num = isset($this->post['good_num'])&&$this->post['good_num']!=="" ? intval($this->post['good_num']) :"";
-        if($good_num==''){
-            return error_show(1002,'参数good_num 不能为空或零');
+            return error_show(1004,"参数good_code不能为空");
         }
-        $wsm_code = isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
-        if($wsm_code==""){
-            return error_show(1002,'参数wsm_code 不能为空');
+        $good_num = isset($this->post['good_num'])&& $this->post['good_num']!==""? intval($this->post['good_num']):"";
+        if($good_num===""){
+            return error_show(1004,"参数good_code不能为空");
         }
-        $wsminfo = Db::name("warehouse_info")->where(['wsm_code'=>$wsm_code,"is_del"=>0])->find();
-        if(empty($wsminfo)){
-            return error_show(1002,'未找到仓库数据');
+        $file_url = isset($this->post['file_url'])&& $this->post['file_url']!==""? trim($this->post['file_url']):"";
+        if($file_url===""){
+            return error_show(1004,"参数file_url不能为空");
+        }
+        $mark =isset($this->post['remark'])&&$this->post['remark']!=""?trim($this->post['remark']):"";
+        if($mark==""){
+            return error_show(1004,"参数remark不能为空");
         }
-        $lastime = isset($this->post['lastime'])&&$this->post['lastime']!="" ? $this->post['lastime']:"";
-        if($lastime==""){
-            return error_show(1002,'参数lastime 不能为空');
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+            $good_code],["a.is_del","=",0]])->find();
+        if($good==false){
+            return error_show(1004,"未找到商品数据");
         }
         $data = GetUserInfo($token);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
             return error_show($data['code'],$data['message']);
         }
         $userinfo = $data['data'];
-        $up = [
-            "good_code"=>$good_code,
+        $up =  [
+            "spuCode"=>$good_code,
             "good_name"=>$good['good_name'],
             "good_num"=>$good_num,
-            "good_type_code"=>$good_type_code,
-            "wsm_code"=>$wsm_code,
-            "lasttime"=>$lastime,
+            "skuCode"=>$good['skuCode'],
+            "wsm_code"=>'',
+            "companyNo"=>$customer,
+            "supplierNo"=>$supplier,
+            "file_url"=>$file_url,
+            "remark"=>$mark,
             "updatetime"=>date("Y-m-d H:i:s"),
-            "apply_id"=>$userinfo['id'],
-            "apply_name"=>$userinfo['nickname']
         ];
         $in = Db::name("purchease")->where($info)->save($up);
         if($in){
@@ -693,4 +675,33 @@ class Resign extends BaseController
         }
     }
 
+
+
+    public function addwsm(){
+        $id = isset($this->post['id']) ? intval($this->post['id']) : "";
+        if($id==""){
+            return error_show(1001,'id不能为空');
+        }
+        $info = Db::name("purchease")->where(["id"=>$id,"is_del"=>0])->find();
+        if($info==false){
+            return error_show(1002,'未找到备库数据');
+        }
+        $wsm= isset($this->post['wsm_code'])&&$this->post['wsm_code']!="" ? trim($this->post['wsm_code']) : "";
+        if($wsm==""){
+            return error_show(1004,"参数wsm_code不能为空");
+        }
+        $wsminfo = Db::name("warehouse_info")->where(["wsm_code"=>$wsm,"is_del"=>0])->find();
+        if($wsminfo==false){
+            return error_show(1004,"未找到仓库数据");
+        }
+        $info['wsm_code']=$wsm;
+        $info['status']=2;
+        $info['updatetime']=date("y-m-d H;i:s");
+        $up =Db::name("purchease")->save($info);
+        if($up){
+            return app_show(0,"备库单仓库选择成功");
+        }else{
+            return error_show(1004,"备库单仓库选择失败");
+        }
+    }
 }

app/admin/route/app.php

@@ -183,6 +183,8 @@ Route::rule("purchedit","admin/Resign/edit");
 Route::rule("purchdel","admin/Resign/delete");
 Route::rule("purchinfo","admin/Resign/info");
 Route::rule("purchstatus","admin/Resign/status");
+Route::rule("purchaddwsm","admin/Resign/addwsm");
+
 Route::rule("feedadd","admin/Resign/addFeed");
 Route::rule("feeddel","admin/Resign/delFeed");
 Route::rule("feedchange","admin/Resign/changeFeed");
@@ -436,3 +438,4 @@ Route::rule("plandheck","admin/Project/planCheck");
 Route::rule("projectrate","admin/Project/changeRate");
 Route::rule("projectfeeddel","admin/Project/feeddel");
 
+