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

app/admin/controller/Purchin.php

@@ -293,6 +293,8 @@ class Purchin extends BaseController
             $up =Db::name("purchease_in")->save($info);
             if($up){
                 ActionLog::logAdd($this->post['token'],$order,"rkd",2,$this->post);
+                $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'RKD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 if(!empty($error_list)){
                     $data=[];
                     foreach ($error_list as $value ){
@@ -345,7 +347,7 @@ class Purchin extends BaseController
             return error_show(1004,"入库单已完成");
         }
         $remark = isset($this->post['remark'])&&$this->post['remark']!="" ? trim($this->post['remark']) :"";
-        Db::rollback();
+        Db::startTrans();
         try{
             $order = ["order_code"=>$incode,"status"=>$info['status'],"action_remark"=>'',"action_type"=>"status"];
             $info['status'] = $status;
@@ -354,6 +356,8 @@ class Purchin extends BaseController
             $update = Db::name("purchease_in")->save($info);
             if($update){
                 ActionLog::logAdd($this->post['token'],$order,"rkd",$status,$this->post);
+                $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$status,"order_type"=>'RKD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 if($status==0){
                     $cgdinfo=Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],"is_del"=>0])->find();
                     if(empty($cgdinfo)){
@@ -369,6 +373,8 @@ class Purchin extends BaseController
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
                         ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,'取消成功');
                     }else{
@@ -391,6 +397,8 @@ class Purchin extends BaseController
                     $up=Db::name("purchease_order")->save($cgdinfo);
                     if($up){
                         ActionLog::logAdd($this->post['token'],$order,"cgd", $cgdinfo['status'],$cgdinfo);
+                        $process=["order_code"=>$info['cgdNo'],"order_id"=>$cgdinfo['id'],"order_status"=>$cgdinfo['status'],"order_type"=>'CGD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         Db::commit();
                         return app_show(0,'发货成功');
                     }else{
@@ -498,6 +506,8 @@ class Purchin extends BaseController
         $info['updatetime'] = date("Y-m-d H:i:s");
         $up= Db::name("purchease_in")->save($info);
         if($up){
+            $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>$info['status'],"order_type"=>'RKD'];
+            ProcessOrder::AddProcess($this->post['token'],$process);
             $data=[
                 "wsm_in_code"=>$incode,
                 "wsm_num"=>$wsm_num,
@@ -516,10 +526,12 @@ class Purchin extends BaseController
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
-            $res = Db::name("purchease_return")->insert($data);
+            $res = Db::name("purchease_return")->insert($data,true);
             if($res){
                 $sto = ["order_code"=>$incode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$sto,"BKD",0,$sto);
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",0,$sto);
+                $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$res,"order_status"=>0,"order_type"=>'RKTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 Db::commit();
                 return app_show(0,"验货审核完成");
             }else{
@@ -567,15 +579,19 @@ class Purchin extends BaseController
         try{
             $up =Db::name("purchease_return")->where($return)->save($data);
             if($up){
-                $sto = ["order_code"=>$post_code,"status"=>1,"action_remark"=>'',"action_type"=>"edit"];
-                ActionLog::logAdd($this->post['token'],$sto,"BKD",1,$sto);
+                $sto = ["order_code"=>$info['wsm_in_code'],"status"=>1,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($this->post['token'],$sto,"RKTHD",1,$sto);
+                $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$return['id'],"order_status"=>1,"order_type"=>'RKTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 $ark=$info['status'];
                 $info['status']=5;
                 $info['updatetime']=date("Y-m-d H:i:s");
                 $sa=Db::name("purchease_in")->save($info);
                 if($sa){
-                    $stn = ["order_code"=>$post_code,"status"=>$ark,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$stn,"BKD",5,$stn);
+                    $stn = ["order_code"=>$info['wsm_in_code'],"status"=>$ark,"action_remark"=>'',"action_type"=>"edit"];
+                    ActionLog::logAdd($this->post['token'],$stn,"RKD",5,$stn);
+                    $process=["order_code"=>$info['wsm_in_code'],"order_id"=>$info['id'],"order_status"=>5,"order_type"=>'RKD'];
+                    ProcessOrder::AddProcess($this->post['token'],$process);
                     Db::commit();
                     return  app_show(0,"退货发货成功");
                 }else{

app/admin/controller/Reorder.php

@@ -3,6 +3,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\ProcessOrder;
 use think\facade\Db;
 use think\App;
 use app\admin\model\ActionLog;
@@ -77,10 +78,12 @@ class Reorder extends \app\BaseController
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
-            $create = Db::name("sale_return")->insert($in);
-            if($create){
+            $create = Db::name("sale_return")->insert($in,true);
+            if($create>0){
                 $stn = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                ActionLog::logAdd($this->post['token'],$stn,"xsd",0,$stn);
+                ActionLog::logAdd($this->post['token'],$stn,"QRTHD",0,$stn);
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'QRTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 $addrinfo=[];
                 foreach ($addr as $value){
                     $addrorder= Db::name("order_addr")->where(['orderCode'=>$ordeCode,"id"=>$value['addrid']])
@@ -107,8 +110,6 @@ class Reorder extends \app\BaseController
                 }
                 $return = Db::name("sale_returnaddr")->insertAll($addrinfo);
                 if($return<=0){
-                    $str = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$str,"xsd",0,$str);
                     Db::rollback();
                     return error_show(1002,"订单地址退货数据更新失败");
                 }
@@ -138,8 +139,6 @@ class Reorder extends \app\BaseController
                 }
                 $return = Db::name("sale_returninfo")->insertAll($info);
                 if($return){
-                    $stm = ["order_code"=>$returnCode,"status"=>0,"action_remark"=>'',"action_type"=>"create"];
-                    ActionLog::logAdd($this->post['token'],$stm,"xsd",0,$stm);
                     Db::commit();
                     return app_show(0,"退货单新建成功");
                 }
@@ -316,6 +315,8 @@ class Reorder extends \app\BaseController
         if($del){
             $ste = ["order_code"=>$code,"status"=>0,"action_remark"=>'',"action_type"=>"delete"];
             ActionLog::logAdd($this->post['token'],$ste,"xsd",0,$ste);
+            $process=["order_code"=>$code,"order_id"=>$info['id'],"order_status"=>0,"order_type"=>'QRTHD'];
+            ProcessOrder::workdel($process);
             return app_show(0,"删除成功");
         }else{
             return error_show(1004,"删除失败");
@@ -386,6 +387,8 @@ 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'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 if($info['order_type']==2&&$status==4){
                     $returnCode=makeNo("TH");
                     $data = [
@@ -408,14 +411,18 @@ class Reorder extends \app\BaseController
                         "addtime"=>date("Y-m-d H:i:s"),
                         "updatetime"=>date("Y-m-d H:i:s")
                     ];
-                    $pd = Db::name('purchease_back')->insert($data);
-                    if($pd){
+                    $pd = Db::name('purchease_back')->insert($data,true);
+                    if($pd>0){
+                        $process=["order_code"=>$returnCode,"order_id"=>$pd,"order_status"=>1,"order_type"=>'CGTHD'];
+                        ProcessOrder::AddProcess($this->post['token'],$process);
                         $cgd['wsend_num']=0;
                         $cgd['status']=3;
                         $cgd['send_status']=3;
                         $cgd['updatetime']=date("Y-m-d H:i:s");
                         $up=Db::name('purchease_order')->save($cgd);
                         if($up){
+                            $process=["order_code"=>$cgd['cgdNo'],"order_id"=>$cgd['id'],"order_status"=>1,"order_type"=>'CGD'];
+                            ProcessOrder::AddProcess($this->post['token'],$process);
                             Db::commit();
                             return app_show(0,"更新成功");
                         }else{
@@ -494,12 +501,28 @@ class Reorder extends \app\BaseController
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s")
             ];
-            $create = Db::name("sale_return")->insert($in);
-            if($create) {
+            $create = Db::name("sale_return")->insert($in,true);
+            if($create>0) {
+                $process=["order_code"=>$returnCode,"order_id"=>$create,"order_status"=>0,"order_type"=>'QRTHD'];
+                ProcessOrder::AddProcess($this->post['token'],$process);
                 if ($order['send_type'] == 1) {
-                    $wsend = DB::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type" => 2])
-                        ->save(["status" => 0, "updatetime" => date("Y-m-d H:i:s")]);
-
+                    $wsend = Db::name("order_out")->where(['orderCode' => $ordeCode, "status" => 1, "order_type"
+                    =>2])->select();
+                       // ->save(["status" => 0, "updatetime" => date("Y-m-d H:i:s")]);
+                    if(!empty($wsend)){
+                        foreach ($wsend as $value){
+                            $value['status']=0;
+                            $value['updatetime']=date("Y-m-d H:i:s");
+                           $up =Db::name("order_out")->save($value);
+                           if($up){
+                               $process=["order_code"=> $value['outCode'],"order_id"=>$value['id'],"order_status"=>0,"order_type"=>'CKD'];
+                               ProcessOrder::AddProcess($this->post['token'],$process);
+                           }else{
+                               Db::rollback();
+                               return error_show(1005,"退货单新建失败");
+                           }
+                        }
+                    }
                 }
                 Db::commit();
                 return error_show(0,"退货单新建成功");

app/admin/controller/Sale.php

@@ -329,15 +329,13 @@ class Sale extends BaseController
                     $iten['stock_id'] = 0;
                     $iten['num'] = $ion['num'];
                     $iten['status'] = 1;
-                    $iten['sale_price'] = $ct['sale_price'];
+                    $iten['sale_price'] = $ct['original_price'];
                     isset($ion['id']) && $ion['id'] !== "" ? '' : $iten['addtime'] = date("Y-m-d H:i:s");
                     $iten['updatetime'] = date("Y-m-d H:i:s");
-                    //$inn[]=$iten;
+
                     $vp = Db::name('sale_info')->save($iten);
                     if ($vp == false)
                     {
-                        $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, "更新失败");
                     }
@@ -361,8 +359,6 @@ class Sale extends BaseController
                     $temp['arrive_time'] = date("Y-m-d H:i:s");
                     $dat = Db::name('order_addr')->save($temp);
                     if ($dat == false) {
-                        $stu = ["order_code"=>$good_code,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-                        ActionLog::logAdd($this->post['token'],$stu,"xsd",0,$stu);
                         Db::rollback();
                         return error_show(1002, "更新失败");
                     }

app/admin/model/ProcessOrder.php

@@ -16,6 +16,7 @@ class ProcessOrder extends \think\Model
         $data=[
             "order_type"=>$order['order_type'],
             "order_code"=>$order['order_code'],
+            "order_id"=>isset($order['order_id']) ?$order['order_id']:0 ,
             "order_status"=>$order['order_status'],
             "action_process"=>isset($action[$order['order_status']]) ?$action[$order['order_status']]:'',
             "action_uid"=>$uid,

app/admin/model/Workflow.php

@@ -26,6 +26,7 @@ class Workflow extends \think\Model
             $proces=[
                 "order_type"=>$data['order_type'],
                 "order_code"=>$data['order_code'],
+                "order_id"=>$data['order_id'],
                 "order_process"=>$data['order_status'],
                 "order_status"=>$last==$data['action_process']?3:($header==$data['action_process']?1:2),
                 "apply_id"=>$data['action_uid'],