Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/Resign.php

@@ -94,6 +94,11 @@ class Resign extends BaseController
                 $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
                 $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             }
+            $value['file_name'] ='';
+            if($value['file_url']){
+                $file= basename($value['file_url']);
+                $value['file_name'] =substr($file,0,strripos($file,"_"));
+            }
             $data[]=$value;
         }
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
@@ -126,14 +131,14 @@ class Resign extends BaseController
         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,'未找到仓库数据');
-        }
+//        $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==""){
@@ -150,7 +155,8 @@ class Resign extends BaseController
             "good_name"=>$good['good_name'],
             "good_num"=>$good_num,
             "good_type_code"=>$good_type_code,
-            "wsm_code"=>$wsm_code,
+            "wsm_code"=>'',
+            "file_url"=>$file_url,
             "lasttime"=>$lastime,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s"),
@@ -233,6 +239,12 @@ class Resign extends BaseController
         $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")):'';
         $info['wsm_name']="";
+        $info['file_name'] ='';
+        if($info['file_url']){
+            $file= basename($info['file_url']);
+            $info['file_name'] =substr($file,0,strripos($file,"_"));
+        }
+
         if($info['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
                 ->where(["a.wsm_code"=>$info['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
@@ -410,11 +422,15 @@ class Resign extends BaseController
         if($expecttime==''){
             return error_show(1002,'参数expecttime 不能为空');
         }
+        $wsm_type = isset($this->post['wsm_type'])&&$this->post['wsm_type']!="" ? intval($this->post['wsm_type']):"";
+        if($wsm_type==""){
+            return error_show(1002,'参数wsm_type 不能为空');
+        }
         $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();
+        $wsminfo = Db::name("warehouse_info")->where(['wsm_code'=>$wsm_code,"wsm_type"=>$wsm_type,"is_del"=>0])->find();
         if(empty($wsminfo)){
             return error_show(1002,'未找到仓库数据');
         }
@@ -450,6 +466,7 @@ class Resign extends BaseController
         $data=[
             "bkcode"=>$info['bk_code'],
             "warehouse"=>$wsm_code,
+            "wsm_type"=>$wsm_type,
             "num"=>$num,
             'expecttime'=>$expecttime,
             'supplier'=>isset($supplie) && $supplie['code']!=''? $supplie['code']:'',
@@ -481,6 +498,7 @@ class Resign extends BaseController
                 ActionLog::logAdd($this->post['token'],$ste,"FKD",0,$data);
                 $temp=$info['status'];
                 $info['status']=2;
+                $info['wsm_code']=$wsm_code;
                 $info['addtime']=date("Y-m-d H:i:s");
                 $ood=Db::name('purchease')->save($info);
                 if($ood){

app/admin/controller/Resigninfo.php

@@ -213,7 +213,7 @@ class Resigninfo extends BaseController
         }
         $tn =$st['status'];
         $st['remark']=$remark;
-        $st['status']=$stauts==2 && strtotime($st['expire_date'])>=time() ? 3 :$stauts;
+        $st['status']=$stauts==3 && strtotime($st['expire_date'])>=time() ? 4 :$stauts;
         $st['updatetime']= date('Y-m-d H:i:s');
         $sv = Db::name('resign_info')->save($st);
         if($sv){

app/admin/controller/WareHouse.php

@@ -349,4 +349,43 @@ class WareHouse extends BaseController
         return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
     }
 
+    public function select(){
+        $post  =$this->request->post();
+
+        $condition= [['a.is_del',"=",0],['a.status',"=",1],["b.is_del","=",0]];
+
+        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
+        if($supplier!=""){
+            $condition[]=["supplierNo","=",$supplier];
+        }
+        $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? intval($post['wsm_type']) :"1";
+         $condition[]=["a.wsm_type","=",$wsm_type];
+        $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
+            ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,
+            a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->order("a.addtime desc")
+            ->select();
+        $data=[];
+        foreach ($list as $value){
+            $temp=[];
+            $temp['wsm_code'] =$value['wsm_code'];
+            $temp['wsm_type'] =$value['wsm_type'];
+            $temp['name'] =$value['name'];
+            $temp['supplierNo'] =$value['supplierNo'];
+            $temp['contactor_name'] =$value['contactor_name'];
+            $temp['contactor_id'] =$value['contactor'];
+            $temp['mobile'] =$value['mobile'];
+            $temp['wsm_name'] =$value['wsm_name'];
+            $temp['wsm_mobile'] =$value['wsm_mobile'];
+            $temp['wsm_addr'] =$value['wsm_addr'];
+            $temp['addrs_cn'] =GetAddr($value['addrs_code']);
+            $temp['addr'] =$value['addr'];
+            $temp['wsm_addr_cn'] =GetAddr($value['addr_code']);
+            $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+            $temp['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
+            $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
+            $temp['type_name'] = isset($type['name']) ? $type['name'] :"";
+            $data[]=$temp;
+        }
+        return app_show(0,'获取成功',$data);
+    }
 }

app/admin/route/app.php

@@ -156,6 +156,7 @@ Route::rule("waresave","admin/WareHouse/save");
 Route::rule("waredel","admin/WareHouse/delete");
 Route::rule("warelist","admin/WareHouse/list");
 Route::rule("warestatus","admin/WareHouse/status");
+Route::rule("warequery","admin/WareHouse/select");
 
 Route::rule("province","admin/Addr/province");
 Route::rule("city","admin/Addr/city");