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

app/admin/controller/Allot.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\GoodLog;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -465,6 +466,7 @@ class Allot extends BaseController
             if($datainfo){
                     $vnp = Db::name('allot_info')->where(['allot_code'=>$al['allot_code'],'is_del'=>0])->select();
                    // var_dump(Db::name('allot_info')->getLastSql());
+                $good_data=[];
                     foreach ($vnp as $value){
                         $stock = Db::name("good_stock")->where(["good_type_code"=>$value['good_type_code'],"wsm_code"=>$al['wsm_out'],"is_del"=>0])->find();
                        if($stock['wait_out_stock']<$value['allot_num']){
@@ -480,7 +482,10 @@ class Allot extends BaseController
                             Db::rollback();
                             return error_show(1002,"发货更新失败");
                         }
+                        $good_data[]=["stock_id"=>$stock['id'],"type"=>1,'stock'=>$value['allot_num'],"stock_name"=>"intra_stock"];
+                        $good_data[]=  ["stock_id"=>$stock['id'],"type"=>2,'stock'=>$value['allot_num'],"stock_name"=>"wait_out_stock"];
                     }
+                GoodLog::LogAdd($this->post['token'],$good_data,'allotsend');
                 Db::commit();
                 return error_show(0,"发货更新成功");
             }
@@ -515,6 +520,7 @@ class Allot extends BaseController
         ];
         $datainfo = Db::name('allot_stock')->where(['allot_code'=>$allot_code,"is_del"=>0])->save($data);
         if($datainfo>0) {
+            $good_data=[];
             foreach ($dain as $value) {
                 $st = Db::name("good_type")->alias("b")->join("good a", "a.good_code = b.good_code", "left")
                     ->join("good_stock c", "c.good_type_code = b.type_code", "left")->where(['wsm_code' => $al['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")
@@ -557,6 +563,7 @@ class Allot extends BaseController
                     Db::rollback();
                     return error_show(1002,"数据更新失败");
                 }
+                $good_data[]=["stock_id"=>$stock['id'],"type"=>2,'stock'=>$n['allot_num'],"stock_name"=>"intra_stock"];
                 $instock = Db::name("good_stock")->where(["good_type_code"=>$value['good_code'],"wsm_code"=>$al['wsm_in'],"is_del"=>0])->find();
                 if($instock==false){
                    $instock =[];
@@ -580,16 +587,18 @@ class Allot extends BaseController
                     Db::rollback();
                     return error_show(1003, "入库验货更新失败");
                 }
+                $good_data[]=["stock_id"=>isset($instock['id'])?$instock['id']: Db::name("good_stock")->getLastInsID(),"type"=>1,'stock'=>$n['allot_num'],"stock_name"=>"wait_in_stock"];
             }
+            GoodLog::LogAdd($this->post['token'],$good_data,'allotin');
             Db::commit();
             return error_show(0, "入库验货更新成功");
         }
         Db::rollback();
         return error_show(1002, "入库验货更新失败");
     }catch (\Exception $e){
-Db::rollback();
-return error_show(1005,$e->getMessage());
-}
+        Db::rollback();
+        return error_show(1005,$e->getMessage());
+    }
 }
 /*验货审核*/
 public function vesio(){
@@ -636,7 +645,7 @@ public function vesio(){
                     return error_show(1001,"数据更新失败");
                 }
                 $p = Db::name('allot_info')->where(['good_type_code'=>$value['good_code'],'allot_code'=>$al['allot_code'],"is_del"=>0])->find();
-                if($p==""){
+                if($p==false){
                     Db::rollback();
                     return error_show(1002,"未找到数据");
                 }
@@ -654,9 +663,12 @@ public function vesio(){
                     Db::rollback();
                     return error_show(1004, "验货更新失败");
                 }
-                Db::commit();
-                return error_show(0, "验货更新成功");
+                $good_data[]=["stock_id"=> $stock['id'],"type"=>2,'stock'=>$p['stock_num'],"stock_name"=>"wait_in_stock"];
+                $good_data[]=["stock_id"=> $stock['id'],"type"=>1,'stock'=>$p['stock_num'],"stock_name"=>"usable_stock"];
             }
+            GoodLog::LogAdd($this->post['token'],$good_data,'allotincheck');
+            Db::commit();
+            return error_show(0, "验货更新成功");
         }
         Db::rollback();
         return error_show(1003, "验货更新失败");

app/admin/controller/Check.php

@@ -102,9 +102,10 @@ public function flist(){
     foreach ($list as $key=>$value){
         $supplier = Db::name("supplier")->where(["code"=>$value['gys_code']])->find();
         $value['supplier_name'] =isset($supplier['name']) ?$supplier['name'] :"";
-        $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")->where(["a.wsm_code"=>$value['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"=>$value['wsm_code']])->field("a.name as wsm_name,b.name,b.code")->find();
         $value['wsm_name'] =isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name']:"";
         $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
+        $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
         $data[]=$value;
     }
     return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);

app/admin/controller/Departuser.php

@@ -4,7 +4,6 @@ namespace app\admin\controller;
 
 use app\BaseController;
 use think\App;
-use think\db\Where;
 use think\facade\Db;
 class Departuser extends BaseController
 {
@@ -69,8 +68,6 @@ class Departuser extends BaseController
         if($status==""){
             return error_show(0,"状态不能为空");
         }
-        //$stats['status_n'] = $status==1?"在职": $status==2? "离职":"在职";
-
         try{
             $data = [
                 'uid'=>$uid,'nickname'=>$nickname,'itemid'=>$itemid,

app/admin/controller/Good.php

@@ -3,6 +3,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\GoodLog;
 use think\App;
 use think\facade\Db;
 class Good extends \app\BaseController
@@ -99,7 +100,14 @@ class Good extends \app\BaseController
            $good['warn_stock'] = $warn_stock;
            $good['updatetime'] = date("Y-m-d H:i:s");
             $up= Db::name("good_stock")->save($good);
-            return $up ? app_show(0,"预警库存更新成功"): error_show(1005,"预警库存更新失败");
+            if($up){
+                $data=["stock_id"=>$good['id'],"type"=>1,'stock'=>$warn_stock,"stock_name"=>"warn_stock"];
+                GoodLog::LogAdd($this->post['token'],$data,'setwarn');
+
+                return app_show(0,"预警库存更新成功");
+            }else{
+                return error_show(1005,"预警库存更新失败");
+            }
         }
 
     public function SetStatus(){

app/admin/controller/Log.php

@@ -43,7 +43,7 @@ class Log extends BaseController
      */
     public function create()
     {
-        //
+
     }
 
     /**

app/admin/controller/Purchin.php

@@ -2,6 +2,7 @@
 namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
+use app\admin\model\GoodLog;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
@@ -320,7 +321,9 @@ class Purchin extends BaseController
                     $good['total_stock']=$good['usable_stock']+$good['wait_out_stock'];
                     $good['updatetime'] = date("Y-m-d H:i:s");
                     $upd=  Db::name("good_stock")->save($good);
+                    $good_data[]=["stock_id"=> $good['id'],"type"=>1,'stock'=>$info['wsm_num'],"stock_name"=>"usable_stock"];
                     if($upd){
+                        GoodLog::LogAdd($this->post['token'],$good_data,'rkd');
                         ActionLog::logAdd($this->post['token'],$order,"gst", 1,$good  );
                         Db::commit();
                         return app_show(0,'商品入库成功');

app/admin/model/GoodLog.php

@@ -0,0 +1,39 @@
+<?php
+
+
+namespace app\admin\model;
+use  think\Model;
+
+class GoodLog extends Model
+{
+    /**
+     * @param $token
+     * @param $data [{'stock_id':1,'stock_name':‘usable_stock’,'stock_remark':'','stock':10,'type':'cgd'}]
+     * @param $action_type
+     */
+  public static function LogAdd($token,$data,$action_type){
+        $user = GetUserInfo($token);
+        $uid = isset($user['data']['id']) ? $user['data']['id'] :0;
+        $name = isset($user['data']['nickname']) ? $user['data']['nickname'] :'';
+        if(is_array($data)){
+            $temp=[];
+            if(isset($data['stock_id'])){
+                $data['action_id']=$uid;
+                $data['action_name']=$name;
+                $data['action_type']=$action_type;
+                $temp[]=$data;
+            }else{
+                foreach ($data as $key=>$value){
+                    if(isset($value['stock_id'])){
+                        $value['action_id']=$uid;
+                        $value['action_name']=$name;
+                        $value['action_type']=$action_type;
+                        $temp[]=$value;
+                    }
+                }
+            }
+            self::insertAll($temp);
+        }
+
+    }
+}