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

app/admin/controller/Allot.php

@@ -69,8 +69,10 @@ class Allot extends BaseController
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_in',"in",$wsmcode];
         }
-
-
+        $status = isset($this->post['status']) && $this->post['status']!=="" ? intval($this->post['status']):"";
+        if($status!=""){
+            $where[]=['status',"=",$status];
+        }
         $count = Db::name('allot_stock')->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
@@ -118,7 +120,7 @@ class Allot extends BaseController
             return error_show(1002,"申请人数据不存在");
         }
         $rm= isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-        $ri= isset($apply_name["data"]['nickname']) ?  $apply_name["data"]['nickname'] : "";
+        $ri= isset($apply_id["data"]['nickname']) ?  $apply_id["data"]['nickname'] : "";
     $post_name = isset($this->post['post_name']) && $this->post['post_name'] !=="" ? trim($this->post['post_name']) :"" ;
     $post_code = isset($this->post['post_code']) && $this->post['post_code'] !== "" ? trim($this->post['post_code']) : "";
     $post_fee = isset($this->post['post_fee']) && $this->post['post_fee'] !== "" ? intval($this->post['post_fee']) : "";
@@ -231,6 +233,7 @@ class Allot extends BaseController
 //            ->join('supplier c',"c.code=b.supplierNo","left")->field("c.name,c.code,")
 //            ->where(['a.id'=>$id,'a.is_del'=>0])->find();
        // var_dump( Db::name('allot_stock')->getLastSql());
+
         $vmp = Db::name('allot_info')->where(['allot_code'=>$str['allot_code']])->select();
 
             $data=[];

app/admin/controller/Purchin.php

@@ -118,9 +118,10 @@ class Purchin extends BaseController
         if(empty($info)){
             return error_show(1004,"未找到数据");
         }
-        $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")->find();
+        $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();
         $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']:"";
         $check = Db::name("purchease_info")->where(['wsm_in_code'=>$incode,"is_del"=>0])->select();
         $info['checkinfo']= $check;
         return app_show(0,'获取成功',$info);
@@ -167,13 +168,13 @@ class Purchin extends BaseController
                     foreach ($error_list as $value ){
                         $temp=[];
                         $temp['wsm_in_code']=$info['wsm_in_code'];
-                        $temp['num']=$info['num'];
-                        $temp['error_code']=$info['error_code'];
-                        $temp['error_img']=$info['error_img'];
-                        $temp['remark']=$info['remark'];
+                        $temp['num']=$value['num'];
+                        $temp['error_code']=$value['error_code'];
+                        $temp['error_img']=$value['error_img'];
+                        $temp['remark']=$value['remark'];
                         $temp['is_del']=0;
-                        $temp['addtime']=$info['addtime'];
-                        $temp['updatetime']=$info['updatetime'];
+                        $temp['addtime']=date("Y-m-d H:i:s");
+                        $temp['updatetime']=date("Y-m-d H:i:s");
                         $data[]=$temp;
                     }
                     $derr= Db::name("purchease_info")->insertAll($data);
@@ -256,8 +257,8 @@ class Purchin extends BaseController
                 Db::commit();
                 return app_show(0,"状态修改完成");
             }
-                Db::rollback();
-                return error_show(1002,"状态修改失败");
+           Db::rollback();
+          return error_show(1002,"状态修改失败");
 
         }catch (\Exception $e){
             Db::rollback();

app/admin/route/app.php

@@ -172,7 +172,10 @@ Route::rule("cgdedit","admin/Purch/edit");
 Route::rule("cgdstatus","admin/Purch/status");
 
 Route::rule("orderinadd","admin/Purchin/add");
-Route::rule("purinfo","admin/Purchin/list");
+Route::rule("orderininfo","admin/Purchin/info");
+Route::rule("orderincheck","admin/Purchin/check");
+Route::rule("orderinstatus","admin/Purchin/status");
+Route::rule("orderinreturn","admin/Purchin/ReturnAdd");