ad

app/admin/controller/After.php

@@ -3,6 +3,7 @@
 
 namespace app\admin\controller;
 use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
@@ -88,6 +89,8 @@ class After extends \app\BaseController
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($this->post['token'],$orde,'zxd',0,$orde);
             if($create){
+                    $process=["order_code"=>$returnCode,"order_status"=>0,"order_type"=>'SHD'];
+                    ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return app_show(0,"售后申请单新建成功");
             }
@@ -234,6 +237,8 @@ class After extends \app\BaseController
         if($up){
             $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
             ActionLog::logAdd($this->post['token'],$order,"zxd", $info['status'],$this->post);
+            $process=["order_code"=>$info['returnCode'],"order_status"=>$status,"order_type"=>'SHD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             return app_show(0,"更新成功");
         }else{
             return error_show(1004,"更新失败");
@@ -326,6 +331,8 @@ class After extends \app\BaseController
                 if($in){
                     $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
                     ActionLog::logAdd($this->post['token'],$order,"AFTER",$info['status'],$order);
+                    $process=["order_code"=>$info['returnCode'],"order_status"=>$info['status'],"order_type"=>'SHD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }
@@ -427,6 +434,8 @@ class After extends \app\BaseController
                     if($back){
                         $order = ["order_code"=>$info['orderCode'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
                         ActionLog::logAdd($this->post['token'],$order,"zxd", $info['status'],$order);
+                        $process=["order_code"=>$info['returnCode'],"order_status"=>$info['status'],"order_type"=>'SHD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,"更新成功");
                     }
@@ -516,6 +525,8 @@ class After extends \app\BaseController
                 if($in){
                     $order = ["order_code"=>$info['orderCode'],"status"=>$stat,"action_remark"=>'',"action_type"=>"edit"];
                     ActionLog::logAdd($this->post['token'],$order,"zxd",3,$order);
+                    $process=["order_code"=>$info['returnCode'],"order_status"=>$info['status'],"order_type"=>'SHD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }

app/admin/controller/Allot.php

@@ -4,6 +4,7 @@ namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -189,6 +190,8 @@ class Allot extends BaseController
                     }
                 $io = Db::name('allot_info')->insertAll($dm);
                 if ($io) {
+                    $process=["order_code"=>$allot_code,"order_status"=>$status,"order_type"=>'DBD'];
+                    ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return error_show(0, "调拨创建成功");
                 }
@@ -351,6 +354,8 @@ class Allot extends BaseController
                         return error_show(1003, "调拨更新失败");
                     }
                 }
+                $process=["order_code"=>$etid['allot_code'],"order_status"=>$etid['status'],"order_type"=>'DBD'];
+                ProcessOrder::AddProcess($token,$process);
                 Db::commit();
                 return error_show(0, "调拨更新成功");
             }
@@ -374,6 +379,8 @@ class Allot extends BaseController
         if($end){
             $order = ["order_code"=>$str['allot_code'],"status"=>$str['status'],"action_remark"=>'',"action_type"=>"del"];
             ActionLog::logAdd($this->post['token'],$order,"DBD",$str['status'],$this->post);
+            $process=["order_code"=>$str['allot_code'],"order_status"=>$str['status'],"order_type"=>'DBD'];
+            ProcessOrder::workdel($process);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");
@@ -426,6 +433,8 @@ class Allot extends BaseController
                         }
                     }
                 }
+                $process=["order_code"=>$st['allot_code'],"order_status"=>$st['status'],"order_type"=>'DBD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"状态更新成功");
             }
@@ -495,6 +504,8 @@ class Allot extends BaseController
                         $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');
+                $process=["order_code"=>$allot_code,"order_status"=>3,"order_type"=>'DBD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"发货更新成功");
             }
@@ -601,6 +612,8 @@ class Allot extends BaseController
                 $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');
+            $process=["order_code"=>$allot_code,"order_status"=>4,"order_type"=>'DBD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();
             return error_show(0, "入库验货更新成功");
         }
@@ -680,6 +693,8 @@ public function vesio(){
                 $good_data[]=["stock_id"=> $stock['id'],"type"=>1,'stock'=>$p['stock_num'],"stock_name"=>"usable_stock"];
             }
             GoodLog::LogAdd($this->post['token'],$good_data,'allotincheck');
+            $process=["order_code"=>$allot_code,"order_status"=>5,"order_type"=>'DBD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             Db::commit();
             return error_show(0, "验货更新成功");
         }

app/admin/controller/Check.php

@@ -2,6 +2,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -291,6 +292,8 @@ public function create(){
         if($da){
             $orde = ["order_code"=>$check_code,"status"=>$da['status'],"action_remark"=>'',"action_type"=>"create"];
             ActionLog::logAdd($this->post['token'],$orde,'qrd',$da['status'],$orde);
+            $process=["order_code"=>$check_code,"order_status"=>$da['status'],"order_type"=>'PDD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
            Db::commit();
             return error_show(0,"盘点创建成功");
         }else{
@@ -430,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){
+            $process=["order_code"=>$deln['check_code'],"order_status"=>$deln['status'],"order_type"=>'PDD'];
+            ProcessOrder::workdel($process);
             return error_show(0,"删除成功");
         }else{
             return error_show(1002,"删除失败");
@@ -483,6 +488,8 @@ public function edit()
                         return error_show(1003,"未上传盘点结果");
                     }
                 }
+                $process=["order_code"=>$st['check_code'],"order_status"=>$stauts,"order_type"=>'PDD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return error_show(0,"状态更新成功");
             }
@@ -579,6 +586,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){
+                    $process=["order_code"=>$fo['check_code'],"order_status"=>2,"order_type"=>'PDD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"盘点数据导入成功");
                 }

app/admin/controller/Good.php

@@ -18,14 +18,14 @@ class Good extends \app\BaseController
         {
             parent::__construct($app);
             $this->post = $this->request->post();
-//            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-//            if($token==""){
-//                return error_show(101,'token不能为空');
-//            }
-//            $effetc = VerifyTokens($token);
-//            if(!empty($effetc) && $effetc['code']!=0){
-//                return error_show($effetc['code'],$effetc['message']);
-//            }
+            $token = isset($this->post['token']) ? trim($this->post['token']) : "";
+            if($token==""){
+                return error_show(101,'token不能为空');
+            }
+            $effetc = VerifyTokens($token);
+            if(!empty($effetc) && $effetc['code']!=0){
+                return error_show($effetc['code'],$effetc['message']);
+            }
         }
 
     public function list(){

app/admin/controller/Orderback.php

@@ -4,6 +4,7 @@
 namespace app\Admin\controller;
 
 use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
@@ -173,7 +174,9 @@ class Orderback extends \app\BaseController
           $up=Db::name("order_back")->save($info);
           if($up){
               $stn = ["order_code"=>$info['thNo'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
-              ActionLog::logAdd($this->post['token'],$stn,"BKD",2,$stn);
+              ActionLog::logAdd($this->post['token'],$stn,"CKTHD",2,$stn);
+              $process=["order_code"=>$info['thNo'],"order_status"=>2,"order_type"=>'CKTHD'];
+              ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   Db::commit();
                   return app_show(0,'更新成功');
@@ -191,8 +194,6 @@ class Orderback extends \app\BaseController
                   $data['updatetime']=date("Y-m-d H:i:s");
                   $in = Db::name("order_backinfo")->save($data);
                   if(!$in){
-                      $stm = ["order_code"=>$info['thNo'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
-                      ActionLog::logAdd($this->post['token'],$stm,"BKD",2,$stm);
                       Db::rollback();
                       return error_show(1005,'更新失败');
                   }
@@ -230,7 +231,9 @@ class Orderback extends \app\BaseController
           $up=Db::name("order_back")->save($info);
           if($up){
               $stn = ["order_code"=>$thNo,"status"=>$temp,"action_remark"=>'',"action_type"=>"edit"];
-              ActionLog::logAdd($this->post['token'],$stn,"BKD",$info['status'],$stn);
+              ActionLog::logAdd($this->post['token'],$stn,"CKTHD",$info['status'],$stn);
+              $process=["order_code"=>$info['thNo'],"order_status"=>$status,"order_type"=>'CKTHD'];
+              ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   Db::commit();
                   return app_show(0,'更新成功');
@@ -284,7 +287,9 @@ class Orderback extends \app\BaseController
             $up=Db::name("order_back")->save($info);
             if($up){
                 $stn = ["order_code"=>$thNo,"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$stn,"BKD",$info['status'],$stn);
+                ActionLog::logAdd($this->post['token'],$stn,"CKTHD",$info['status'],$stn);
+                $process=["order_code"=>$info['thNo'],"order_status"=>$status,"order_type"=>'CKTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return app_show(0,'更新成功');
             }

app/admin/controller/Purch.php

@@ -5,6 +5,7 @@ namespace app\admin\controller;
 
 
 use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use think\App;
 use think\facade\Db;
 
@@ -337,6 +338,8 @@ class Purch extends \app\BaseController
         $data['updatetime'] =date("Y-m-d H:i:s");
         $upd=Db::name("purchease_order")->save($data);
         if($upd){
+            $process=["order_code"=>$cgdNo,"order_status"=>$status,"order_type"=>'CGD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             ActionLog::logAdd($this->post['token'],$order,'cgd',$status,$this->post);
             return app_show(0,"更新成功");
         }else{
@@ -393,7 +396,9 @@ class Purch extends \app\BaseController
             $item = Db::name("purchease_diff")->insert($data);
             if($item){
                 $stm = ["order_code"=>$cgdNo,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$stm,"BKD",1,$stm);
+                ActionLog::logAdd($this->post['token'],$stm,"CGGCD",1,$stm);
+                $process=["order_code"=>$cgdNo,"order_status"=>1,"order_type"=>'CGGCD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 if($cg['order_type']==2){
                     $order = Db::name("sale")->where(["orderCode"=>$cg['bkcode']])->find();
                     if(empty($order)){
@@ -415,7 +420,9 @@ class Purch extends \app\BaseController
                     $cgd = Db::name('sale_diff')->insert($data);
                     if($cgd){
                         $sto = ["order_code"=>$cg['bkcode'],"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-                        ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
+                        ActionLog::logAdd($this->post['token'],$sto,"ZXGCD",1,$sto);
+                        $process=["order_code"=>$cg['bkcode'],"order_status"=>1,"order_type"=>'ZXGCD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return error_show(0,"新建成功");
                     }else{
@@ -513,8 +520,10 @@ class Purch extends \app\BaseController
             $dio['updatetime']=date("Y-m-d H:i:s");
             $item = Db::name("purchease_diff")->update($dio);
          if ($item){
-             $sto = ["order_code"=>$id,"status"=>$temp,"action_remark"=>'',"action_type"=>"create"];
-             ActionLog::logAdd($this->post['token'],$sto,"cgd",$dio['status'],$sto);
+             $sto = ["order_code"=>$dio['cgdNo'],"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];
+             ActionLog::logAdd($this->post['token'],$sto,"CGGCD",$dio['status'],$sto);
+             $process=["order_code"=>$dio['cgdNo'],"order_status"=>$status,"order_type"=>'CGGCD'];
+             ProcessOrder::AddProcess($this->post['token'],$process);
                 return error_show(0,"更新成功");
             }else{
                 return error_show(1002,"更新失败");

app/admin/controller/Purchback.php

@@ -3,6 +3,7 @@
 namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -71,7 +72,9 @@ public function create(){
     $pd = Db::name('purchease_back')->insert($data);
     if($pd){
         $sto = ["order_code"=>$returnCode,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
+        ActionLog::logAdd($this->post['token'],$sto,"CGTHD",1,$sto);
+        $process=["order_code"=>$returnCode,"order_status"=>1,"order_type"=>'CGTHD'];
+        ProcessOrder::AddProcess($this->post['token'],$process);
         return error_show(0,"新建成功");
     }else{
         return error_show(1002,"新建失败");
@@ -139,8 +142,10 @@ public function status(){
     $dio['updatetime']=date("Y-m-d H:i:s");
     $str = Db::name("purchease_back")->update($dio);
     if($str){
-        $sto = ["order_code"=>$id,"status"=>$temp,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($this->post['token'],$sto,"BKD",$dio['status'],$sto);
+        $sto = ["order_code"=>$id,"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];
+        ActionLog::logAdd($this->post['token'],$sto,"CGTHD",$dio['status'],$sto);
+        $process=["order_code"=>$returnCode,"order_status"=>$status,"order_type"=>'CGTHD'];
+        ProcessOrder::AddProcess($this->post['token'],$process);
         return error_show(0,"更新成功");
     }else{
         return error_show(1002,"更新失败");
@@ -180,9 +185,17 @@ public function backfe(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $datainfo=Db::name('purchease_back')->save($data);
-    $sto = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-    ActionLog::logAdd($this->post['token'],$sto,"BKD",0,$sto);
-    return $datainfo ? error_show(0,"更新成功") : error_show(1002,"更新失败");
+    if($datainfo){
+        $sto = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+        ActionLog::logAdd($this->post['token'],$sto,"BKD",0,$sto);
+        $process=["order_code"=>$returnCode,"order_status"=>$dio['status'],"order_type"=>'CGTHD'];
+        ProcessOrder::AddProcess($this->post['token'],$process);
+        return error_show(0,"更新成功");
+    }else{
+        return error_show(1002,"更新失败");
+    }
+
+    //return $datainfo ? error_show(0,"更新成功") : error_show(1002,"更新失败");
 }
 public function info(){
     $returnCode = isset($this->post['returnCode']) && $this->post['returnCode'] !==""? trim($this->post['returnCode']) :"";

app/admin/controller/Purchin.php

@@ -3,6 +3,7 @@ namespace app\admin\controller;
 
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
+use app\admin\model\ProcessOrder;
 use app\BaseController;
 use think\facade\Db;
 use think\App;
@@ -163,8 +164,10 @@ class Purchin extends BaseController
         Db::startTrans();
         try{
             $win = Db::name("purchease_in")->insert($orin);
-            $sto = ["order_code"=>$wsm_in_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-            ActionLog::logAdd($this->post['token'],$sto,"BKD",$status,$sto);
+            $sto = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"edit"];
+            ActionLog::logAdd($this->post['token'],$sto,"RKD",$status,$sto);
+            $process=["order_code"=>$wsm_in_code,"order_status"=>$status,"order_type"=>'RKD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             if($win){
                 $order = ["order_code"=>$wsm_in_code,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
                 ActionLog::logAdd($this->post['token'],$order,"rkd",$status,$this->post);
@@ -177,7 +180,9 @@ class Purchin extends BaseController
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
-                        ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        ActionLog::logAdd($this->post['token'],$order,"CGD", $cgdinfo['status'],$cgdinfo);
+                        $process=["order_code"=>$cgdNo,"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,'新建成功',["wsm_in_code"=>$wsm_in_code]);
                     }else{

app/admin/controller/Sale.php

@@ -104,7 +104,6 @@ class Sale extends BaseController
                 ActionLog::logAdd($this->post['token'],$st,"xsd",1,$st);
                 foreach ($vi as $ion) {
                     $iten = [];
-                    $sto = $iten['status'];
                     $iten['orderCode'] = $orderCode;
                     $iten['wsm_code'] = $ion['wsm_code'];
                     $iten['stock_id'] = "";
@@ -121,7 +120,7 @@ class Sale extends BaseController
 //            }
                 $vp = Db::name('sale_info')->insertAll($inn);
                 if ($vp == "") {
-                    $stn = ["order_code"=>$orderCode,"status"=>$sto,"action_remark"=>'',"action_type"=>"create"];
+                    $stn = ["order_code"=>$orderCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
                     ActionLog::logAdd($this->post['token'],$stn,"xsd",0,$stn);
                     Db::rollback();
                     return error_show(1002, "添加失败");
@@ -308,7 +307,6 @@ class Sale extends BaseController
                 ActionLog::logAdd($this->post['token'],$stn,"xsd",$status,$stn);
                 foreach ($vi as $ion) {
                     $iten = [];
-                    $sto = $iten['status'];
                     isset($ion['id']) && $ion['id'] !== "" ? $iten['id'] = $ion['id'] : '';
                     $iten['orderCode'] = $etid['orderCode'];
                     $iten['wsm_code'] = $ion['wsm_code'];
@@ -322,7 +320,7 @@ class Sale extends BaseController
                     $vp = Db::name('sale_info')->save($iten);
                     if ($vp == false)
                     {
-                        $stc = ["order_code"=>$good_code,"status"=>$sto,"action_remark"=>'',"action_type"=>"edit"];
+                        $stc = ["order_code"=>$good_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
                         ActionLog::logAdd($this->post['token'],$stc,"xsd",1,$stc);
                         Db::rollback();
                         return error_show(1002, "更新失败");
@@ -616,8 +614,8 @@ class Sale extends BaseController
                     $cgin = Db::name("purchease_order")->insert($clll);
                     //  var_dump(Db::name("purchease_order")->getLastSql(),$clll);
                     if ($cgin == false) {
-                        $stb = ["order_code"=>$cgd,"status"=> $dio['send_type'],"action_remark"=>'',"action_type"=>"create"];
-                        ActionLog::logAdd($this->post['token'],$stb,"xsd", $dio['send_type'],$stb);
+                        $stb = ["order_code"=>$cgd,"status"=> $clll['status'],"action_remark"=>'',"action_type"=>"create"];
+                        ActionLog::logAdd($this->post['token'],$stb,"xsd", $clll['status'],$stb);
                         Db::rollback();
                         return error_show(1002, "咨询采购单创建商品失败");
                     }

app/admin/model/ProcessOrder.php

@@ -26,4 +26,7 @@ class ProcessOrder extends \think\Model
             Workflow::SaveFlow($data);
         };
     }
+    public static function workdel($order){
+        Workflow::where(["order_type"=>$order['order_type'],"order_code"=>$order['order_code']])->save(["is_del"=>1,"updatetime"=>date("y-m-d H:i:s")]);
+    }
 }

app/admin/model/Workflow.php

@@ -14,7 +14,6 @@ class Workflow extends \think\Model
         $header =reset($action);
         $proces = self::where(["order_type"=>$data['order_type'],"order_code"=>$data['order_code'],"is_del"=>0])->find();
         if($proces){
-
             $info=[
                 "order_process"=>$data['order_status'],
                 "order_status"=>$last==$data['action_process']?3:($header==$data['action_process']?1:2),