ad

app/admin/controller/Proorder.php

@@ -38,7 +38,7 @@ public function list(){
 public function waitlist(){
     $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']) :"1";
     $size = isset($this->post['size']) && $this->post['size'] !==""? intval($this->post['size']) :"10";
-    $where = [['is_del',"=",0]];
+    $where = [['is_del',"=",0],['a.status',"=",1]];
     $order_code= isset($this->post['order_code']) && $this->post['order_code'] !==""? intval($this->post['order_code']):"";
     if($order_code!=""){
         $where[]= ["a.order_code",'like',"%$order_code%"];

app/admin/controller/Sale.php

@@ -3288,7 +3288,7 @@ class Sale extends Base
                     Db::rollback();
                     return error_show(1002, "库存更新失败");
                 }
-                $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$temp['id'], "type" => 2,'stock'=>$outinfo['send_num'],"stock_name" => "wait_out_stock"];
+                $good_data[] = ['good_log_code' =>$outCode, "stock_id" =>$stokc['id'], "type" => 2,'stock'=>$outinfo['send_num'],"stock_name" => "wait_out_stock"];
                 GoodLog::LogAdd($this->post['token'],$good_data,"CKD");
                 Db::commit();
                 return app_show(0,"发货成功");

app/admin/model/Workflow.php

@@ -7,18 +7,13 @@ use think\facade\Config;
 //记录操作流程
 class Workflow extends \think\Model
 {
-    public static  $conf=[];
-    public static  $order_status=2;
-    public function __construct(array $data = [])
-    {
-        parent::__construct($data);
-        self::$conf=Config::get("process");
-    }
+
 
     public static function SaveFlow($data){
-        $conf =self::$conf;
+        $conf =Config::get("process");
         $action = isset($conf[$data['order_type']]) ? $conf[$data['order_type']]:[];
         $last =end($action);
+
         $order_status=2;//默认进行中
         if((is_array($last)&&in_array($data['action_process'],$last))||$last==$data['action_process']){
            $order_status=3; //流程结束
@@ -63,7 +58,7 @@ class Workflow extends \think\Model
      *
      */
     public  static function  Addwait($data){
-        $conf =self::$conf;
+        $conf =Config::get("process");
         $action = isset($conf[$data['order_type']]) ? $conf[$data['order_type']]:[];
         if(!empty($action)){
             $last =end($action);
@@ -75,11 +70,13 @@ class Workflow extends \think\Model
                         $index=$key+1;
                         $wait= is_array($action[$index])? $action[$index][0]:$action[$index];
                         break;
+                    }else{
+                        $wait=$data['action_process'];
+                        $order_status=2 ;
                     }
-                }else{
-                    $order_status=2 ;
                 }
             }
+
             $orderp =ActionProcess::where(["order_type"=>$data['order_type'],"order_process"=>$wait])->find();
             if($orderp!=false){