d

app/admin/controller/After.php

@@ -561,7 +561,7 @@ class After extends \app\BaseController
                     return error_show(1005,"未找到出库单数据");
                 }
                 $ware = Db::name("warehouse_info")->alias("a")->leftJoin("warehouse_addr b","a.wsm_code=b.wsm_code and b.status=1 and b.is_del=0")
-                    ->where(["a.status"=>1,"a.is_del"=>0,"a.supplierNo"=>$out['wsm_code']])->field("a.wsm_code,a.name,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code")->find();
+                    ->where(["a.status"=>1,"wsm_type"=>1,"a.is_del"=>0,"a.supplierNo"=>$out['wsm_code']])->field("a.wsm_code,a.name,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code")->find();
                 if(empty($ware)){
                     return error_show(1005,"未找到仓库数据");
                 }

app/admin/controller/Allot.php

@@ -55,7 +55,7 @@ class Allot extends BaseController
                 return error_show(1004,"未找到出库供应商信息");
             }
             $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"supplierNo"=>$out_supplierNo])->column("wsm_code");
+                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$out_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_out',"in",$wsmcode];
         }
@@ -68,7 +68,7 @@ class Allot extends BaseController
                 return error_show(1004,"未找到入库供应商信息");
             }
             $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"supplierNo"=>$in_supplierNo])->column("wsm_code");
+                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$in_supplierNo])->column("wsm_code");
             //$condtion["c.wsm_code"] = $wsmcode;
             $where[]=['wsm_in',"in",$wsmcode];
         }
@@ -85,13 +85,15 @@ class Allot extends BaseController
         $data=[];
         foreach ($list as $value){
             $db = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name rname,b.code")->where(['a.wsm_code'=>$value['wsm_out'],'a.is_del'=>0])->find();
+                ->field("a.name,a.wsm_code,b.name rname,b.code")->where(['a.wsm_code'=>$value['wsm_out'],"a
+                .wsm_type"=>1,'a.is_del'=>0])->find();
             $value['name'] =isset($db['name']) ? $db['name']:"";
             $value['wsm_code'] =isset($db['wsm_code']) ? $db['wsm_code']:"";
             $value['rname'] =isset($db['rname']) ? $db['rname']:"";
            $value['code'] =isset($db['code']) ? $db['code']:"";
             $dc = Db::name('warehouse_info')->alias('a')->join("supplier b","b.code=a.supplierNo","left")
-                ->field("a.name,a.wsm_code,b.name tname,b.code")->where(['a.wsm_code'=>$value['wsm_in'],'a.is_del'=>0])->find();
+                ->field("a.name,a.wsm_code,b.name tname,b.code")->where(['a.wsm_code'=>$value['wsm_in'],"a
+               .wsm_type"=>1,'a.is_del'=>0])->find();
             $value['wsm_in_name'] =isset($dc['name']) ? $dc['name']:"";
             $value['wsm_in_code'] =isset($dc['wsm_code']) ? $dc['wsm_code']:"";
             $value['tname'] =isset($dc['tname']) ? $dc['tname']:"";
@@ -164,7 +166,7 @@ class Allot extends BaseController
                         ->join("good_stock c", "c.good_type_code = b.type_code", "left")
                         ->join("warehouse_info v","v.wsm_code=c.wsm_code","left")
                         ->join("supplier n","n.code=v.supplierNo","left")
-                        ->where(['c.wsm_code' => $wsm_out, 'good_type_code' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
+                        ->where(['c.wsm_code' => $wsm_out,"v.wsm_type"=>1, 'good_type_code' => $value['good_code'], 'b.is_del' => 0, 'a.is_del' => 0])->where("c.is_del=0 or c.is_del is null")
                         ->field("b.type_code,a.good_name,a.unit,c.wsm_code,c.usable_stock,c.good_type_code,c.wait_out_stock,c.wait_in_stock,n.name")->find();
                     if (empty($st)) {
                         Db::rollback();
@@ -212,7 +214,7 @@ class Allot extends BaseController
         if(empty($str)){
             return error_show(1003,"未找到调拨数据");
         }
-        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $stv = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_out'],"wsm_type"=>1,'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($stv)){
             return error_show(1002,"未找到仓库数据");
         }
@@ -220,7 +222,7 @@ class Allot extends BaseController
         if(empty($vr)){
             return error_show(1001,"未找到供应商数据");
         }
-        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
+        $st = Db::name('warehouse_info')->where(['wsm_code'=>$str['wsm_in'],"wsm_type"=>1,'is_del'=>0])->field('supplierNo,wsm_code,name')->find();
         if(empty($st)){
             return error_show(1003,"未找到仓库数据");
         }

app/admin/controller/Check.php

@@ -57,7 +57,7 @@ public function flist(){
         if(empty($supplier)){
             return error_show(1004,"未找到供应商信息");
         }
-                $wsmcode = Db::name("warehouse_info")->where([
+                $wsmcode = Db::name("warehouse_info")->where(["wsm_type"=>1,
                     "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
         //$condtion["c.wsm_code"] = $wsmcode;
         $condtion[]=['c.wsm_code',"in",$wsmcode];
@@ -433,6 +433,8 @@ public function edit()
         }
         $sv = Db::name('good_check')->update(['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
         if($sv){
+            $orde = ["order_code"=>$deln['check_code'],"status"=>$deln['status'],"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($this->post['token'],$orde,'qrd',$deln['status'],['id'=>$id,'is_del'=>1,'updatetime'=>date("Y-m-d H:i:s")]);
             $process=["order_code"=>$deln['check_code'],"order_status"=>$deln['status'],"order_type"=>'PDD'];
             ProcessOrder::workdel($process);
             return error_show(0,"删除成功");
@@ -471,8 +473,8 @@ public function edit()
             $st['updatetime']= date('Y-m-d H:i:s');
             $sv = Db::name('good_check')->save($st);
             if($sv){
-                $orde = ["order_code"=>$st['check_code'],$temp,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$orde,'zxd',$st['status'],$orde);
+                $orde = ["order_code"=>$st['check_code'],$temp,"action_remark"=>'',"action_type"=>"status"];
+                ActionLog::logAdd($this->post['token'],$orde,'PDD',$st['status'],$orde);
                 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")]);
@@ -586,6 +588,8 @@ public function edit()
             if($inst){
                 $check_up = Db::name("good_check")->where(["check_code"=>$fo['check_code'],"is_del"=>0])->save(["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
                 if($check_up){
+                    $orde = ["order_code"=>$fo['check_code'],$fo['status'],"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$orde,'PDD',2,["status"=>2,"updatetime"=>date("Y-m-d H:i:s")]);
                     $process=["order_code"=>$fo['check_code'],"order_id"=>$fo['id'],"order_status"=>2,"order_type"=>'PDD'];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();

app/admin/controller/Good.php

@@ -148,7 +148,7 @@ class Good extends \app\BaseController
         $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");
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"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")
@@ -181,7 +181,7 @@ class Good extends \app\BaseController
       $suplierNo = isset($this->post['suplierNo']) &&$this->post['suplierNo'] !=="" ? trim($this->post['suplierNo'])
           :"";
       if($suplierNo!==""){
-          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $start = isset($this->post['start']) &&$this->post['start'] !=="" ? $this->post['start']:"";
@@ -251,7 +251,7 @@ class Good extends \app\BaseController
       $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");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $build= Db::name("good_stock")->where($condition)->group("wsm_code")->field("wsm_code")->buildSql();
@@ -311,7 +311,7 @@ class Good extends \app\BaseController
                 sum(wait_out_stock) wait_out_stock,sum(usable_stock) usable_stock,sum(intra_stock) intra_stock,sum(warn_stock) warn_stock,sum(total_stock) total_stock")
                  ->find();
                 $child = Db::name("good_stock")->alias("a")->join("warehouse_info b","a.wsm_code=b.wsm_code","left")
-                    ->where(['a.good_type_code'=>$value['type_code'],"a.is_del"=>0])->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.warn_stock")->select();
+                    ->where(['a.good_type_code'=>$value['type_code'],"b.wsm_type"=>1,"a.is_del"=>0])->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.warn_stock")->select();
             }
             $temp['good_name'] = $value['good_name'];
             $temp['good_code'] = $value['good_code'];
@@ -346,7 +346,7 @@ class Good extends \app\BaseController
         }
         $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");
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
@@ -416,7 +416,7 @@ class Good extends \app\BaseController
                 return error_show(1004,"未找到供应商信息");
             }
             $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
+                "is_del"=>0,"wsm_type"=>1,"supplierNo"=>$supplierNo])->column("wsm_code");
             $where[]=['b.wsm_code',"in",$wsmcode];
         }
         $count = Db::name("good_log")->alias('a')
@@ -437,7 +437,7 @@ class Good extends \app\BaseController
             $db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
             $item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
             $wsm = Db::name("warehouse_info")->alias("a")->Join("supplier b","a.supplierNo=b.code","left")->where
-            (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
+            (['a.wsm_code'=>$value['wsm_code'],"a.wsm_type"=>1,"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
             $int = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $value['wsm_name'] =$wsm['wsm_name'];
             $value['wsm_code'] =$wsm['wsm_code'];

app/admin/controller/WareHouse.php

@@ -40,8 +40,8 @@ class WareHouse extends BaseController
         if($wsmtype==''){
             return error_show(1004,'参数wsmtype 不能为空');
         }
-        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],['supplierNo',"=",$supplier]])
-            ->find();
+        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],["wsm_type","=",1],
+            ['supplierNo',"=",$supplier]])->find();
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }
@@ -90,7 +90,7 @@ class WareHouse extends BaseController
             $add = Db::name('warehouse_info')->insert($data,true);
             if($add>0){
                 $st = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($post['token'],$st,"resign_info",1,$st);
+                ActionLog::logAdd($post['token'],$st,"warehouse",1,$data);
                 $addrinfo = [
                     "wsm_code"=>$wsm_code,
                     "wsm_type"=> $wsm_type,
@@ -106,7 +106,7 @@ class WareHouse extends BaseController
                 if($addri){
 
                     $sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($post['token'],$sf,"resign_info",1,$sf);
+                    ActionLog::logAdd($post['token'],$sf,"warehouse",1,$addrinfo);
                     Db::commit();
                     return app_show(0,'仓库创建成功');
                 }
@@ -122,7 +122,7 @@ class WareHouse extends BaseController
     public function list(){
         $post  =$this->request->post();
 
-        $condition= [['a.is_del',"=",0],["b.is_del","=",0]];
+        $condition= [['a.is_del',"=",0],['a.status',"=",1],["b.is_del","=",0]];
 
         $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         if($supplier!=""){
@@ -187,7 +187,8 @@ class WareHouse extends BaseController
           return  error_show(1004,"参数id不能为空");
         };
         $warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
-            ->where(["a.id"=>$id,"a.is_del"=>0])->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,
+            ->where(["a.id"=>$id,"a.is_del"=>0,"a.status"=>1])->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")->find();
         if(empty($warse)){
             return error_show(1004,"未找到数据");
@@ -215,7 +216,7 @@ class WareHouse extends BaseController
         if($id===""){
             return  error_show(1004,"参数id不能为空");
         };
-        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0])->find();
+        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0,"status"=>1])->find();
         if(empty($warse)){
             return error_show(1004,"未找到数据");
         }
@@ -277,8 +278,12 @@ class WareHouse extends BaseController
                     "addr_code"=>json_encode($addr_code),
                     "updatetime"=>date("Y-m-d H:i:s"),
                 ];
-             $addri = DB::name("warehouse_addr")->where(["wsm_code"=>$warse['wsm_code'],"is_del"=>0])->update($addrinfo);
+             $addri = Db::name("warehouse_addr")->where(["wsm_code"=>$warse['wsm_code'],"is_del"=>0])->update
+             ($addrinfo);
                 if($addri){
+                    $sf = ["order_code"=>$warse['wsm_code'],"status"=>$warse['status'],"action_remark"=>'',
+                        "action_type"=>"edit"];
+                    ActionLog::logAdd($post['token'],$sf,"warehouse",1,$data);
                     Db::commit();
                     return app_show(0,'仓库更新成功');
                 }
@@ -304,6 +309,10 @@ class WareHouse extends BaseController
         $warse['is_del'] = 1;
         $warse['updatetime'] = date("Y-m-d H:i:s");
         $Del= Db::name("warehouse_info")->save($warse);
+        if($Del){
+            $sf = ["order_code"=>$warse['wsm_code'],"status"=>$warse['status'],"action_remark"=>'',"action_type"=>"delete"];
+            ActionLog::logAdd($post['token'],$sf,"warehouse",1,$warse);
+        }
         return $Del? app_show(0,'仓库删除成功'): error_show(1005,'仓库删除失败');
     }
 
@@ -325,8 +334,10 @@ class WareHouse extends BaseController
         $warse['status'] = $status;
         $warse['updatetime'] = date("Y-m-d H:i:s");
         $Del= Db::name("warehouse_info")->save($warse);
-        $st = ["order_code"=>$id,"status"=>$vmp,"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($post['token'],$st,"warehouse_info",$warse['status'],$st);
+        if($Del){
+            $sf = ["order_code"=>$warse['wsm_code'],"status"=>$vmp,"action_remark"=>'',"action_type"=>"status"];
+            ActionLog::logAdd($post['token'],$sf,"warehouse",$status,$warse);
+        }
         return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
     }