ad

app/admin/controller/Base.php

@@ -41,7 +41,8 @@ class Base extends \app\BaseController
         $role =Db::name("role_action")->where(["role_id"=>$uid['roleid'],"status"=>1])->find();
         $action['action_conllect']=isset($role['action_conllect'])? $role['action_conllect']:'';
         $action['write'][]=$uid;
-        $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->column("id");
+        $group=[];
+       // $group = Db::name("role_group")->where("FIND_IN_SET($uid,group_user) >0")->column("id");
         $share =Db::name("role_share")->where(["is_del"=>0,"status"=>1])->whereOr(["to_user"=>$this->uid,"to_group"=>$group])->select();
         if(!empty($share)){
             foreach ($share as $value){

app/admin/controller/Good.php

@@ -27,6 +27,7 @@ class Good extends Base
         'DBD'=>'调拨单',
         'CKD'=>'出库单',
         'CGTHD'=>'采购退货单',
+        'QRTHD'=>'销售退货单',
         'XSTHD'=>'销售退货单',
         'CGGCD'=>'采购工差单',
         'ZXGCD'=>'咨询工差单',
@@ -362,7 +363,7 @@ class Good extends Base
             $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 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();
+            ->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.wait_out_stock+a.usable_stock) as total_stock,a.status,a.warn_stock")->select();
         if(empty($list)){
             return error_show(1004,"未找到数据");
         }
@@ -466,7 +467,7 @@ class Good extends Base
             $temp['wait_in_stock'] = $value['wait_in_stock'];
             $temp['wait_out_stock'] = $value['wait_out_stock'];
             $temp['intra_stock'] = $value['intra_stock'];
-            $temp['total_stock'] = $value['total_stock'];
+            $temp['total_stock'] = $value['wait_out_stock']+$value['usable_stock'];
             $temp['warn_stock'] = $value['warn_stock'];
             $temp['id'] = $value['id'];
             $temp['out_total'] =0;
@@ -519,7 +520,7 @@ class Good extends Base
             ->page($page,$size)
             ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
             ->group("gs.wsm_code")
-            ->field("gs.wsm_code,sum(wait_in_stock) wait_in_stock,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")
+            ->field("gs.wsm_code,sum(wait_in_stock) wait_in_stock,sum(wait_out_stock) wait_out_stock,sum(usable_stock) usable_stock,sum(intra_stock) intra_stock,sum(warn_stock) warn_stock,sum(usable_stock+wait_out_stock) total_stock")
             ->select()
             ->toArray();
         $data=[];
@@ -580,7 +581,7 @@ class Good extends Base
             $temp['wait_in_stock'] = $value['wait_in_stock'];
             $temp['wait_out_stock'] = $value['wait_out_stock'];
             $temp['intra_stock'] = $value['intra_stock'];
-            $temp['total_stock'] = $value['total_stock'];
+            $temp['total_stock'] = $value['usable_stock']+$value['wait_out_stock'] ;
             // $temp['warn_stock'] = $value['warn_stock'];
             $temp['child']=isset($good)&&!empty($good) ? $good:[];
             $data[]=$temp;
@@ -606,7 +607,7 @@ class Good extends Base
             ->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")
             ->where($condition)
-            ->field("b.spuCode,b.good_name,b.good_unit,b.brand_id,b.cat_id,b.craft_desc,b.addtime,sum(c.wait_in_stock) wait_in_stock,sum(c.wait_out_stock) wait_out_stock,sum(c.usable_stock) usable_stock,sum(c.intra_stock) intra_stock,sum(c.warn_stock) warn_stock,sum(c.total_stock) total_stock")
+            ->field("b.spuCode,b.good_name,b.good_unit,b.brand_id,b.cat_id,b.craft_desc,b.addtime,sum(c.wait_in_stock) wait_in_stock,sum(c.wait_out_stock) wait_out_stock,sum(c.usable_stock) usable_stock,sum(c.intra_stock) intra_stock,sum(c.warn_stock) warn_stock,sum(c.usable_stock+c.wait_out_stock) total_stock")
             ->page($page,$size)
             ->order("b.addtime desc")
             ->group("b.spuCode,b.good_name,b.good_unit,b.brand_id,b.cat_id,b.craft_desc,b.addtime")
@@ -630,7 +631,7 @@ class Good extends Base
                         ->join("business bus", "bus.companyNo=b.companyNo", "left")
                         ->join("supplier s", "s.code=b.supplierNo", "left")
                         ->where(['a.spuCode' => $value['spuCode'], "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,b.supplierNo,s.name supplierName,b.companyNo,bus.company")
+                        ->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,(a.wait_out_stock+a.usable_stock) total_stock,a.warn_stock,b.supplierNo,s.name supplierName,b.companyNo,bus.company")
                         ->select()
                         ->toArray();
                 }
@@ -648,7 +649,7 @@ class Good extends Base
                 $temp['wait_in_stock'] = isset($value['wait_in_stock']) ? $value['wait_in_stock'] : "";
                 $temp['wait_out_stock'] = isset($value['wait_out_stock']) ? $value['wait_out_stock'] : "";
                 $temp['intra_stock'] = isset($value['intra_stock']) ? $value['intra_stock'] : "";
-                $temp['total_stock'] = isset($value['total_stock']) ? $value['total_stock'] : "";
+                $temp['total_stock'] = intval($value['wait_out_stock'])+intval($value['usable_stock']);
                 // $temp['warn_stock'] = isset($value['warn_stock'])? $value['warn_stock']:"";
                 $temp['child'] = isset($child) && !empty($child) ? $child : [];
 

app/admin/controller/Menu.php

@@ -4,18 +4,14 @@ declare (strict_types = 1);
 namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
-use app\BaseController;
 use think\App;
 use think\facade\Db;
-use think\Request;
-
 //菜单
 class Menu extends Base
 {
     public $post="";
     /**
      * 显示资源列表
-     *
      * @return \think\Response
      */
     public  function __construct(App $app)
@@ -36,7 +32,6 @@ class Menu extends Base
         }
         $data= Db::name("view_menu")->where('aid',"in",explode(",",$role['action_conllect']))->where(['status'=>1,"cstatus"=>1,"is_display"=>1])
             ->order("weight desc,id asc,cweight desc,cid asc")->select();
-
         $list=[];
         $act=[];
         foreach ($data as $value){
@@ -45,7 +40,7 @@ class Menu extends Base
             $list[$value["id"]]['menu_route']=$value['menu_route'];
             $list[$value["id"]]['is_display']=$value['is_display'];
             $list[$value["id"]]['status']=$value['status'];
-            $temp = [];
+            $temp=[];
             $temp['menu_name']=$value['cname'];
             $temp['menu_img']=$value['cmenu_img'];
             $temp['menu_route']=$value['cmenu_route'];
@@ -56,7 +51,6 @@ class Menu extends Base
             $list[$value["id"]]['child'][$value['cid']]=$temp;
             $act[$value['id']][$value['cid']][]=$value['acode'];
             $list[$value["id"]]['child'][$value['cid']]['action']= $act[$value['id']][$value['cid']];
-
         }
         array_walk($list,function (&$value){
             $value['child']= array_values($value['child']);

app/admin/controller/Reorder.php

@@ -255,7 +255,7 @@ class Reorder extends \app\BaseController
                         return error_show(1005, '可售商品入库失败');
                     }
                     $good_data = ['good_log_code' => $returnCode, "stock_id" => isset($stock['id']) ? $stock['id'] : Db::name("good_stock")->getLastInsID(), "type" => 1, 'stock' => $thnum, "stock_name" => "usable_stock"];
-                    GoodLog::LogAdd($this->post['token'], $good_data, 'QRTHD');
+                    GoodLog::LogAdd($this->post['token'], $good_data, 'XSTHD');
                 }