d

app/admin/controller/After.php

@@ -265,22 +265,35 @@ class After extends \app\BaseController
         if(empty($info)){
             return error_show(1005,"未找到售后数据");
         }
+        $contactor = isset($this->post['contactor']) && $this->post['contactor']!="" ? trim($this->post['contactor']) :"";
+
+        $mobile = isset($this->post['mobile']) && $this->post['mobile']!="" ? trim($this->post['mobile']):"";
+
+        $addr = isset($this->post['addr']) && $this->post['addr']!="" ? trim($this->post['addr']):"";
+        $addr_code = isset($this->post['addr_code']) && $this->post['addr_code']!=""&&!empty($this->post['addr_code']) ?
+            $this->post['addr_code']:"";
         $wsm_code = isset($this->post['wsm_code']) && $this->post['wsm_code']!="" ? trim($this->post['wsm_code']):"";
         if($wsm_code==""){
                 return error_show(1005,"参数 wsm_code不能为空");
         }
+       // var_dump($contactor);
         if($info['is_th']==0&&$info['order_type']==1) {
             $wsm = Db::name("warehouse_info")->where(["wsm_code" => $wsm_code])->find();
             if (empty($wsm)) {
                 return error_show(1005, "未找到仓库数据");
             }
-        }
-        $contactor = isset($this->post['contactor']) && $this->post['contactor']!="" ? trim($this->post['contactor'])
-            :"";
-        $mobile = isset($this->post['mobile']) && $this->post['mobile']!="" ? trim($this->post['mobile']):"";
-        $addr = isset($this->post['addr']) && $this->post['addr']!="" ? trim($this->post['addr']):"";
-        $addr_code = isset($this->post['addr_code']) && $this->post['addr_code']!=""&&!empty($this->post['addr_code']) ?
-            $this->post['addr_code']:"";
+            $sm = Db::name("warehouse_addr")->where(["wsm_code" => $wsm_code,"is_del"=>0])->find();
+         // var_dump(Db::name("warehouse_addr")->getLastSql());
+            $contactor==""?(isset($sm['wsm_name']) ?  $contactor=$sm['wsm_name']:""):"";
+            $sm['wsm_name'] =isset($sm['wsm_name']) ? $sm['wsm_name']:"";
+            $mobile==""?(isset($sm['wsm_mobile']) ?  $mobile=$sm['wsm_mobile']:""):"";
+            $sm['wsm_mobile'] =isset($sm['wsm_mobile']) ? $sm['wsm_mobile']:"";
+            $addr==""?(isset($sm['wsm_addr']) ?  $addr=$sm['wsm_addr']:""):"";
+            $sm['wsm_addr'] =isset($sm['wsm_addr']) ? $sm['wsm_addr']:"";
+            $addr_code==""?(isset($sm['addr_code']) ?  $addr=$sm['addr_code']:""):"";
+            $sm['addr_code'] =isset($sm['addr_code']) ? $sm['addr_code']:"";
+        }
+        //var_dump($contactor);
         $remark = isset($this->post['remark']) && $this->post['remark']!="" ? trim($this->post['remark']):"";
         if($info['is_th']==1 && $info['order_type']==1){
             if($contactor==''){
@@ -312,6 +325,7 @@ class After extends \app\BaseController
             $info['updatetime']=date("Y-m-d H:i:s");
             $up =Db::name("order_return")->save($info);
             if($up){
+              //  var_dump($contactor);
                 $returninfo = Db::name("order_returninfo")->where(["returnCode"=>$bkcode])->find();
                 if(empty($returninfo)){
                     $returninfo=[
@@ -325,13 +339,15 @@ class After extends \app\BaseController
                     ];
                 }else{
                     $returninfo['return_wsm'] = $wsm_code;
-                    if($info['is_th']==1 && $info['order_type']==1) {
-                        $returninfo['contactor'] = $contactor;
-                        $returninfo['mobile'] = $mobile;
-                        $returninfo['addr'] = $addr;
-                        $returninfo['addr_code'] = $addr_code;
-                    }
+                    //if($info['is_th']==1 && $info['order_type']==1) {
+                    $contactor !==""? $returninfo['contactor'] = $contactor:"";
+                    $mobile!==""?$returninfo['mobile'] = $mobile:"";
+                    $addr!==""?  $returninfo['addr'] = $addr:"";
+                    $addr_code!==""?$returninfo['addr_code'] = $addr_code:"";
+                   // }
                 }
+//                var_dump($contactor);
+//                var_dump($returninfo);
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
                     $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
@@ -570,8 +586,8 @@ class After extends \app\BaseController
                 $temp['contactor'] = isset($ware['wsm_name'])?$ware['wsm_name']:"";
                 $temp['mobile'] =isset($ware['wsm_mobile'])?$ware['wsm_mobile']:"";
                 $temp['addr'] =isset($ware['wsm_addr'])?$ware['wsm_addr']:"";
-                $temp['addr_cn'] =GetAddr( $ware['addr_code']);
                 $temp['addr_code'] = isset($ware['addr_code'])?$ware['addr_code']:"";
+                $temp['addr_cn'] =GetAddr( $ware['addr_code']);
                 $list[]=$temp;
             }else {
                 $returninfo = Db::name("order_returninfo")->where(["returnCode" => $bkcode])->find();

app/admin/controller/Supplier.php

@@ -180,8 +180,8 @@ public function edit(){
         "updatetime"=>date("Y-m-d H:i:s")
     ];
     $ed = Db::name('supplier')->where(['is_del'=>0,'id'=>$id])->save($vmp);
-    $st = ["order_code"=>"GYS","status"=>0,"action_remark"=>'',"action_type"=>"edit"];
-    ActionLog::logAdd($this->post['token'],$st,"role_share",0,$st);
+    $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+    ActionLog::logAdd($this->post['token'],$st,"GYS",0,$vmp);
     return $ed ? error_show(0,"编辑成功") : error_show(1002,"编辑失败");
 }
 /*查询*/
@@ -202,6 +202,8 @@ public function selec(){
     }
     $supp= Db::name('supplier')->update(['id'=>$id,'is_del'=>1,"updatetime"=>date("Y-m-d H:i:s")]);
     if($supp){
+        $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"del"];
+        ActionLog::logAdd($this->post['token'],$st,"GYS",0,$supp);
         return error_show(0,"供应商信息删除成功");
     }else{
         return error_show(1002,"供应商信息删除失败");

app/admin/controller/WareHouse.php

@@ -104,7 +104,6 @@ class WareHouse extends BaseController
                 ];
                 $addri = DB::name("warehouse_addr")->insert($addrinfo);
                 if($addri){
-
                     $sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
                     ActionLog::logAdd($post['token'],$sf,"warehouse",1,$addrinfo);
                     Db::commit();
@@ -174,6 +173,8 @@ class WareHouse extends BaseController
             }else{
                 $value['type_name']="";
             }
+            $value['addrs_cn'] =isset($value['addrs_code']) ?GetAddr($value['addrs_code']):"";
+            $value['addr_cn'] =isset($value['addr_code']) ? GetAddr($value['addr_code']):"";
             $list[$key]=$value;
 
         }
@@ -270,6 +271,8 @@ class WareHouse extends BaseController
             ];
             $add = Db::name('warehouse_info')->where($warse)->update($data);
             if($add){
+                $st = ["order_code"=>$id,"status"=>0,"action_remark"=>'',"action_type"=>"edit"];
+                ActionLog::logAdd($post['token'],$st,"warehouse_info",0,$data);
                 $addrinfo = [
                     "wsm_type"=> $wsm_type,
                     "wsm_name"=>$wsm_name,
@@ -313,6 +316,7 @@ class WareHouse extends BaseController
             $sf = ["order_code"=>$warse['wsm_code'],"status"=>$warse['status'],"action_remark"=>'',"action_type"=>"delete"];
             ActionLog::logAdd($post['token'],$sf,"warehouse",1,$warse);
         }
+
         return $Del? app_show(0,'仓库删除成功'): error_show(1005,'仓库删除失败');
     }
 

app/admin/route/app.php

@@ -264,3 +264,5 @@ Route::rule('salediffcheck','admin/Sale/diffcheck');
 Route::rule('salediffinfo','admin/Sale/diffinfo');
 Route::rule('salediffstatus','admin/Sale/diffstatus');
 
+
+