Merge branch 'plm' of wugg/stock into master

app/admin/controller/After.php

@@ -22,8 +22,8 @@ class After extends \app\BaseController
          if($outCode==''){
              return error_show(1004,"参数outCode 不能为空");
          }
-         $order= Db::name("order_out")->where(["outCode"=>$outCode])->find();
-         if(empty($order)){
+         $orderout= Db::name("order_out")->where(["outCode"=>$outCode])->find();
+         if(empty($orderout)){
              return error_show(1005,"未找到订单数据");
          }
         $order= Db::name("sale")->where(["orderCode"=>$order['orderCode'],"is_del"=>0])->find();
@@ -71,7 +71,7 @@ class After extends \app\BaseController
                 "customer_code"=>$order['customer_code'],
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
-                'total_num'=>$order['send_num'],
+                'total_num'=>$orderout['send_num'],
                 "error_code"=>$errorCode,
                 "error_num"=>$num,
                 "error_img"=>$img,
@@ -87,9 +87,9 @@ class After extends \app\BaseController
             ];
             $create = Db::name("order_return")->insert($in,true);
             $orde = ["order_code"=>$returnCode,"status"=>$in['status'],"action_remark"=>'',"action_type"=>"create"];
-            ActionLog::logAdd($this->post['token'],$orde,'zxd',0,$orde);
+            ActionLog::logAdd($this->post['token'],$orde,$order['order_type']==1?'SHD':"ZXSHD",0,$orde);
             if($create>0){
-                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'SHD'];
+                    $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>$order['order_type']==1?'SHD':"ZXSHD"];
                     ProcessOrder::AddProcess($token,$process);
                     Db::commit();
                     return app_show(0,"售后申请单新建成功");
@@ -241,8 +241,8 @@ class After extends \app\BaseController
         $up =Db::name("order_return")->save($info);
         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_id"=>$info['id'],"order_status"=>$status,"order_type"=>'SHD'];
+            ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD", $info['status'],$this->post);
+            $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
             ProcessOrder::AddProcess($this->post['token'],$process);
             return app_show(0,"更新成功");
         }else{
@@ -351,8 +351,8 @@ class After extends \app\BaseController
                 $in=Db::name("order_returninfo")->save($returninfo);
                 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_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'SHD'];
+                    ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD",$info['status'],$order);
+                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");
@@ -425,7 +425,9 @@ class After extends \app\BaseController
             $up =Db::name("order_return")->save($info);
             if($up){
                 $order = ["order_code"=>$info['orderCode'],"status"=>$str,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$order,"zxd",$info['status'],$order);
+                ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD",$info['status'],$order);
+                $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'SHD':"ZXSHD"];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 $in=Db::name("order_returninfo")->save($return_info);
                 if($in){
                     $data=[
@@ -453,9 +455,9 @@ class After extends \app\BaseController
                     ];
                     $back =Db::name("order_back")->insert($data,true);
                     if($back>0){
-                        $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_id"=>$back,"order_status"=>$info['status'],"order_type"=>'SHD'];
+                        $order = ["order_code"=>$data['thNo'],"status"=>0,"action_remark"=>'',"action_type"=>"create"];
+                        ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'SHD':"ZXSHD", 0,$data);
+                        $process=["order_code"=>$data['thNo'],"order_id"=>$back,"order_status"=>0,"order_type"=>$info['order_type']==1?'CKTHD':"ZXCKTHD"];
                         ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,"更新成功");
@@ -544,9 +546,9 @@ class After extends \app\BaseController
                 }
                 $in=Db::name("order_returninfo")->save($returninfo);
                 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_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'SHD'];
+                    $order = ["order_code"=>$info['returnCode'],"status"=>$stat,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$order,$info['order_type']==1?'CKTHD':"ZXCKTHD",3,$order);
+                    $process=["order_code"=>$info['returnCode'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>$info['order_type']==1?'CKTHD':"ZXCKTHD"];
                     ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return app_show(0,"更新成功");

app/admin/controller/Orderback.php

@@ -174,8 +174,8 @@ 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,"CKTHD",2,$stn);
-              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>2,"order_type"=>'CKTHD'];
+              ActionLog::logAdd($this->post['token'],$stn,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",2,$info);
+              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>2,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
               ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   Db::commit();
@@ -231,8 +231,8 @@ 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,"CKTHD",$info['status'],$stn);
-              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'CKTHD'];
+              ActionLog::logAdd($this->post['token'],$stn,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",$info['status'],$stn);
+              $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
               ProcessOrder::AddProcess($this->post['token'],$process);
               if(empty($errorlist)){
                   Db::commit();
@@ -287,8 +287,8 @@ 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,"CKTHD",$info['status'],$stn);
-                $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'CKTHD'];
+                ActionLog::logAdd($this->post['token'],$stn,$info['order_type'] == 2?"ZXCKTHD":"CKTHD",$info['status'],$stn);
+                $process=["order_code"=>$info['thNo'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type'] == 2?"ZXCKTHD":"CKTHD"];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return app_show(0,'更新成功');

app/admin/controller/Purchback.php

@@ -222,6 +222,12 @@ public function info(){
     return app_show(0,"获取成功",$info);
 }
 
+    /**
+     * @return \think\response\Json|void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
     public function delete(){
         $returnCode = isset($this->post['returnCode']) && $this->post['returnCode'] !==""? trim($this->post['returnCode']) :"";
         if($returnCode==""){

app/admin/controller/Reorder.php

@@ -324,8 +324,8 @@ class Reorder extends \app\BaseController
         $del = Db::name("sale_return")->save($info);
         if($del){
             $ste = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
-            ActionLog::logAdd($this->post['token'],$ste,"QRTHD",0,$ste);
-            $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>0,"order_type"=>'QRTHD'];
+            ActionLog::logAdd($this->post['token'],$ste,$info['order_type'] == 2?"ZXTHD":"QRTHD",0,$ste);
+            $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>0,"order_type"=>$info['order_type'] == 2?"ZXTHD":"QRTHD"];
             ProcessOrder::workdel($process);
             return app_show(0,"删除成功");
         }else{
@@ -398,10 +398,10 @@ class Reorder extends \app\BaseController
             $info["updatetime"]=date("Y-m-d H:i:s");
             $up = Db::name("sale_return")->save($info);
             if($up){
-                $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'QRTHD'];
+                $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>$info['order_type'] == 2?"ZXTHD":"QRTHD"];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $ste = ["order_code"=>$code,"status"=>$temp,"action_remark"=>'',"action_type"=>"status"];
-                ActionLog::logAdd($this->post['token'],$ste,"QRTHD",$status,$info);
+                ActionLog::logAdd($this->post['token'],$ste,$info['order_type'] == 2?"ZXTHD":"QRTHD",$status,$info);
                 if($info['order_type']==2&&$status==4){
                     $returnCode=makeNo("TH");
                     $data = [
@@ -522,11 +522,11 @@ class Reorder extends \app\BaseController
             ];
             $create = Db::name("sale_return")->insert($in,true);
             if($create>0) {
-                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'QRTHD'];
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'ZXTHD'];
                 ProcessOrder::AddProcess($this->post['token'],$process);
                 $ste = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',
                     "action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$ste,"QRTHD",3,$in);
+                ActionLog::logAdd($this->post['token'],$ste,"ZXTHD",3,$in);
                 if ($order['send_type'] == 1) {
                     $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"
                     =>2])->select();

app/admin/controller/Resigninfo.php

@@ -119,7 +119,7 @@ class Resigninfo extends BaseController
         ];
         $in = Db::name('resign_info')->insert($data);
         $stn = ["order_code"=>"BH","status"=>$status,"action_remark"=>'',"action_type"=>"create"];
-        ActionLog::logAdd($this->post['token'],$stn,"resign_info",$status,$stn);
+        ActionLog::logAdd($this->post['token'],$stn,"离职交接",$status,$stn);
         return $in ? error_show(0,"添加成功") : error_show(1002,"添加失败");
     }
     public function selec(){

app/admin/controller/Sale.php

@@ -860,13 +860,12 @@ class Sale extends BaseController
             $datainfo = Db::name('order_out')->insert($data,true);
             if ($datainfo>0) {
                 $stx = ["order_code"=>$outCode,"status"=>$status,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$stx,"CKD",$status,$data);
-                $order=["order_type"=>"CKD","order_code"=>$outCode,"order_id"=>$datainfo,"order_status"=>$data['status']];
+                ActionLog::logAdd($this->post['token'],$stx,$der['order_type']==1?"CKD":'ZXCKD',$status,$data);
+                $order=["order_type"=>$der['order_type']==1?"CKD":'ZXCKD',"order_code"=>$outCode,"order_id"=>$datainfo,"order_status"=>$data['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 1) {
 
                     $var = Db::name('sale_info')->where(['orderCode' => $orderCode, 'wsm_code' => $wsm_code])->find();
-                    //var_dump(Db::name('sale_info')->getLastSql());
                     if ($var == "") {
                         return error_show(1002, "未找到数据");
                     }
@@ -884,9 +883,10 @@ class Sale extends BaseController
                         return error_show(1003, "更新失败");
                     }
                     $stx = ["order_code"=>$orderCode,"status"=>$item,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$stx,$der['order_type'] == 2?"ZXQRD":"XSQRD",$der['status'],
-                        $der);
-                    $order=["order_type"=>$der['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$outCode,"order_id"=>$data,"order_status"=>$data['status']];
+
+                    ActionLog::logAdd($this->post['token'],$stx,$der['order_type'] == 2?"ZXQRD":"XSQRD",$der['status'],$der);
+                    $order=["order_type"=>$der['order_type'] == 2?"ZXQRD":"XSQRD","order_code"=>$orderCode,"order_id"=>$der['id'],"order_status"=>$data['status']];
+
                     ProcessOrder::AddProcess($this->post['token'],$order);
                     $str = Db::name('good_stock')->where(['wsm_code' => $var['wsm_code'], 'good_type_code' => $der['good_code']])->find();
                     if ($str == false) {
@@ -907,7 +907,7 @@ class Sale extends BaseController
                     }
                     $good_data[]=  ["stock_id"=>$str['id'],"type"=>2,'stock'=>$send_num,"stock_name"=>"wait_out_stock"];
                     $good_data[]=  ["stock_id"=>$str['id'],"type"=>1,'stock'=>$send_num,"stock_name"=>"intra_stock"];
-                    GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
+                    GoodLog::LogAdd($this->post['token'],$good_data,$der['order_type'] == 2?"ZXQRD":"XSQRD");
                 }
 
                 Db::commit();
@@ -952,8 +952,9 @@ class Sale extends BaseController
             $cust = Db::name('order_out')->save($codeinfo);
             if ($cust) {
                 $stx = ["order_code"=>$outCode,"status"=>$time,"action_remark"=>'',"action_type"=>"status"];
-                ActionLog::logAdd($this->post['token'],$stx,"CKD",$codeinfo['status'],$codeinfo);
-                $order=["order_type"=>"CKD","order_code"=>$outCode,"order_id"=>$codeinfo['id'],"order_status"=>$codeinfo['status']];
+                ActionLog::logAdd($this->post['token'],$stx,$codeinfo['order_type'] == 2?"ZXCKD":"CKD",$codeinfo['status'],$codeinfo);
+                $order=["order_type"=>$codeinfo['order_type'] == 2?"ZXCKD":"CKD","order_code"=>$outCode,
+                    "order_id"=>$codeinfo['id'],"order_status"=>$codeinfo['status']];
                 ProcessOrder::AddProcess($this->post['token'],$order);
                 if ($status == 1) {
 
@@ -1020,7 +1021,7 @@ class Sale extends BaseController
                     $var['updatetime'] = date("Y-m-d H:i:s");
                     $stre = Db::name('good_stock')->save($var);
                     $good_data[]=  ["stock_id"=>$var['id'],"type"=>2,'stock'=>$codeinfo['send_num'],"stock_name"=>"intra_stock"];
-                    GoodLog::LogAdd($this->post['token'],$good_data,'CKD');
+                    GoodLog::LogAdd($this->post['token'],$good_data,$codeinfo['order_type'] == 2?"ZXCKD":"CKD");
                     if ($stre == false) {
                         Db::rollback();
                         return error_show(1002, "状态更新失败");