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

app/admin/controller/Check.php

@@ -29,11 +29,11 @@ public function list()
     $where = ['a.is_del' => 0,'b.is_del'=>0];
     $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
     if ($start !="") {
-        $where['"a.addtime"']=Db::raw(">= '{$start}'");
+        $where["a.addtime"]=Db::raw(">= '{$start}'");
     }
     $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] :"";
     if($end !=""){
-        $where['"a.addtime"'] = Db::raw("<= '{$end}'");
+        $where["a.addtime"] = Db::raw("<= '{$end}'");
     }
     $check_code = isset($this->post['check_code']) && $this->post['check_code'] !== "" ? trim($this->post['check_code']) : "";
     if ($check_code !== "") {

app/admin/controller/Purch.php

@@ -43,10 +43,10 @@ class Purch extends \app\BaseController
         if($good_name!=""){
             $where['good_name'] = Db::raw(" like %{$good_name}%");
         }
-        $count=Db::name("purchease")->where($where)->count();
+        $count=Db::name("purchease_order")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name("purchease")->where($where)->page($page,$size)->select();
+        $list = Db::name("purchease_order")->where($where)->page($page,$size)->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }
 }

app/admin/controller/Resign.php

@@ -270,12 +270,18 @@ class Resign extends BaseController
             return error_show(1002,'未找到仓库数据');
         }
         $supplierNo = isset($this->post['supplierNo'])&&$this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
-        if($supplierNo!=""){
-            $supplie = Db::name("supplier")->where(['code'=>$supplierNo,"is_del"=>0])->find();
-            if(empty($supplie)){
-                return error_show(1002,'未找到供应商');
-            }
+        if($supplierNo==""){
+            return error_show(1002,'参数supplierNo 不能为空');
+        }
+        $supplie = Db::name("supplier")->where(['code'=>$supplierNo,"is_del"=>0])->find();
+        if(empty($supplie)){
+            return error_show(1002,'未找到供应商');
         }
+        $good_price = isset($this->post['good_price'])&&$this->post['good_price']!=="" ? $this->post['good_price']:"";
+        if($good_price===""){
+            return error_show(1002,'参数good_price 不能为空');
+        }
+
         $data = GetUserInfo($token);
         if((!empty($data) && $data['code']!=0) ||empty($data) ){
             return error_show($data['code'],$data['message']);