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

app/admin/controller/Good.php

@@ -413,14 +413,17 @@ class Good extends \app\BaseController
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
         $list = Db::name("good_log")->alias('a')
-            ->join("good_stock b","b.id=a.id","left")
+            ->join("good_stock b","b.id=a.stock_id","left")
             ->where($where)->page($page,$size)->order("a.addtime desc")
-            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,a.addtime,a.action_uid")->select();
+            ->field("a.action_name,a.type,a.stock_name,a.stock,a.action_type,a.addtime,a.action_uid,b.wsm_code")->select();
         $data=[];
         foreach ($list as $value){
             $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();
             $value['item'] =$item;
+            $value['empty'] =$wsm;
             $data[]=$value;
         }
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);

app/admin/controller/Proorder.php

@@ -74,10 +74,16 @@ public function waitlist(){
     $data=[];//->field("status,order_name,process_name")
     foreach ($list as $value) {
         $str = Db::name("process")->where(['process_type' => $value['order_type']])->field("process_name,status")->find();
-        $var = Db::name("action_process")->where(['order_type'=>$value['order_type']])->find();
+        $var = Db::name("action_process")->where(['order_type'=>$value['order_type'],'order_process'=>$value['order_process']])->field("status_name,order_process,order_name,roleid")->find();
+    // var_dump(Db::name("action_process")->getLastSql());
+        $item = Db::name('role')->where(['id'=>$var['roleid']])->field("role_name")->find();
         $value['process_name']=$str['process_name'];
-        $value['order_name']=$var['order_name'];
-        $value['status']=$str['status'];
+      $value['order_name']=$var['order_name'];
+      //  $value['order_process']=$var['order_process'];
+        $value['status_name'] = $var['status_name'];
+   $value['roleid'] = $var['roleid'];
+      $value['status']=$str['status'];
+    $value['role_name']=$item['role_name'];
         $data[]=$value;
     }
     return app_show(0,"获取成功",["list"=>$data,'count'=>$count]);

app/admin/controller/Reorder.php

@@ -71,7 +71,7 @@ class Reorder extends \app\BaseController
                 "num"=>$total,
                 "remark"=>$remark,
                 "order_type"=>1,
-                "status"=>1,
+                "status"=>0,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
@@ -178,7 +178,7 @@ class Reorder extends \app\BaseController
         $count=Db::name("sale_return")->where($where)->count();
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;
-        $list = Db::name("sale_return")->where($where)->page($page,$size)->select();
+        $list = Db::name("sale_return")->where($where)->order("addtime desc")->page($page,$size)->select();
        // echo Db::name("sale_return")->getLastSql();
         $data=[];
         foreach ($list as $value){