bug

app/admin/controller/Check.php

@@ -425,12 +425,13 @@ public function dell(){
         }
         Db::startTrans();
         try{
+            $temp =  $st['status'];
             $st['status']=$stauts;
             $st['remark']=$remark;
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('good_check')->save($st);
             if($sv){
-                if($stauts==0){
+                if($stauts==1&&$temp==2){
                     $up = Db::name('check_item')->where(['check_code'=>$st['check_code'],"is_del"=>0])->save(['is_del'=>1,
                         "updatetime"=>date("Y-m-d H:i:s")]);
                     if($up==false){
@@ -438,7 +439,7 @@ public function dell(){
                         return error_show(1003,"盘点结果删除失败");
                     }
                 }
-                if($stauts==1){
+                if($stauts==2){
                     $nu = Db::name('check_item')->where(['check_code'=>$st['check_code'],"is_del"=>0])->select()->toArray();
                     if(empty($nu)){
                         Db::rollback();
@@ -501,7 +502,7 @@ public function dell(){
         if(empty($fo)){
             return error_show(1003,"未找到盘点信息");
         }
-        if($fo['status']>=1){
+        if($fo['status']>=2){
             return error_show(1003,"盘点已提交审核，不可提交盘点数据");
         }
        $data = isset($this->post['data']) && $this->post['data'] !=="" ?$this->post['data'] :"";

app/admin/controller/Good.php

@@ -119,23 +119,26 @@ class Good extends \app\BaseController
     }
 
     public function GetStock(){
-        $condition=["a.is_del"=>0];
+        $condition = [["a.is_del","=",0]];
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
         if($type_code!==""){
-            $good= Db::name("good_type")->where(["type_code"=>$type_code,"is_del"=>0])->find();
-            if(empty($good)){
-                return error_show(1005,"未找到数据");
-            }
-          $condition["a.good_type_code"]=$type_code;
+          $condition[]=["a.good_type_code","=",$type_code];
         }
         $wsm_code = isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code'])
             :"";
         if($wsm_code!==""){
-            $condition["a.wsm_code"]=$wsm_code;
+            //$condition["a.wsm_code"]=$wsm_code;
+            $condition[]=["a.wsm_code","=",$type_code];
+        }
+        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
+            :"";
+        if($suplierNo!==""){
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+            $condition[]=["a.wsm_code","in",$wsmcode];
         }
-
        $list = Db::name("good_stock")->alias("a")->join("warehouse_info b","a.wsm_code=b.wsm_code","left")->join("supplier c","b.supplierNo=c.code","left")
-           ->where($condition)->field("a.id,b.name,c.code,c.name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.status,a.warn_stock")->select();
+           ->where($condition)->field("a.id,b.name as wsm_name,c.code,c.name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.status,a.warn_stock")->select();
+        //echo Db::name("good_stock")->getLastSql();
      return app_show(0,"获取成功",$list);
     }
 
@@ -164,6 +167,14 @@ class Good extends \app\BaseController
           $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
+      $start = isset($this->post['start']) &&$this->post['start'] !=="" ? $this->post['start']:"";
+      $end = isset($this->post['end']) &&$this->post['end'] !=="" ? $this->post['end']:"";
+      if($start!=""){
+          $condition[]=["addtime",">=",$start];
+      }
+      if($end!=""){
+          $condition[]=["addtime","<=",$end];
+      }
       $count = Db::name("good_stock")->where($condition)->count();
       $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
       $list = Db::name("good_stock")->where($condition)->page($page,$size)->order("addtime desc")->select();