ad

app/admin/controller/Payment.php

@@ -834,6 +834,10 @@ class Payment extends BaseController
         $companyNo = isset($post['companyNo']) && $post['companyNo']!='' ? trim($post['companyNo']) :"";
         if($companyNo!=""){
           $condition []=["companyNo","=",$companyNo];
+        }
+         $cxCode = isset($post['cxCode'])&&$post['cxCode']!==''?trim($post['cxCode']):'';
+        if($cxCode!==''){
+           $condition[]=["cxCode","=",$cxCode];
         }
          $relaComNo= isset($post['relaComNo'])&&$post['relaComNo']!="" ? trim($post['relaComNo']) :"";
          if($relaComNo!=""){

app/admin/controller/Sale.php

@@ -31,10 +31,14 @@ class Sale extends BaseController{
         if($total_min!==''){
            $condition[]=["a.totalPrice",">=",$total_min];
         }
-         $total_max = isset($post['total_max'])&&$post['total_max']!==''?floatval($post['total_max']):'';
+        $total_max = isset($post['total_max'])&&$post['total_max']!==''?floatval($post['total_max']):'';
         if($total_max!==''){
            $condition[]=["a.totalPrice","<=",$total_max];
         }
+        $cxCode = isset($post['cxCode'])&&$post['cxCode']!==''?trim($post['cxCode']):'';
+        if($cxCode!==''){
+           $condition[]=["a.cxCode","=",$cxCode];
+        }
         $inv_status =  isset($post['inv_status'])&&$post['inv_status']!==''?intval($post['inv_status']):'';
         if($inv_status!==''){
         	if($inv_status==0){

app/admin/middleware/checkToken.php

@@ -0,0 +1,31 @@
+<?php
+declare (strict_types = 1);
+
+namespace app\admin\middleware;
+use think\facade\Db;
+class checkToken
+{
+    /**
+     * 处理请求
+     *
+     * @param \think\Request $request
+     * @param \Closure       $next
+     * @return Response
+     */
+    public function handle($request, \Closure $next)
+    {
+        if ($request->isOptions()) {
+            return json();
+        }
+        $data=[
+        	"info"=>"",
+        	"action"=>"",
+        	"url"=>$request->server()['REQUEST_URI'],
+        	"param"=>json_encode($request->param(),JSON_UNESCAPED_UNICODE),
+        	"name"=>'',
+        	"addtime"=>date("Y-m-d H:i:s")
+        ];
+        Db::name("system_log")->insert($data);
+        return $next($request);
+    }
+}

app/command/handleCxData.php

@@ -129,7 +129,8 @@ class handleCxData extends command
                                         'sendStatus' => $data['send_status'],//发货状态,
                                         'pay_status' =>$data['total_price']==0?3:1,//收款状态,1未付，2部分，3完结
                                         'inv_status' => $data['total_price']==0?3:1,//开票状态,,1未付，2部分，3完结
-                                        'remark' => $data['oldCode']??"",//备注,
+                                        'remark' =>"",//备注,
+                                        'cxCode' => $data['oldCode']??"",//备注,
                                         'invtime' => null,
                                         'paytime' => null,
                                         'diff_weight' => $data['diff_weight'],//工差重量,
@@ -214,7 +215,8 @@ class handleCxData extends command
                                 'sendStatus' => $data['send_status'],//发货状态,
                                 'pay_status' => $data['total_price']==0?3: 1,//收款状态,1未付，2部分，3完结
                                 'inv_status' => $data['total_price']==0?3: 1,//开票状态,,1未付，2部分，3完结
-                                'remark' => $data['oldCode']??"",//备注,
+                                'remark' => "",//备注,
+                                'cxCode' => $data['oldCode']??"",//备注,
                                 'invtime' => null,
                                 'paytime' => null,
                                 'diff_weight' => $data['diff_weight'],//工差重量,
@@ -322,6 +324,7 @@ class handleCxData extends command
                                         'wareHouse' => $data['wsm_code'],//仓库名称',
                                         'wsmCode' => $data['wsm_code'],//仓库编号',
                                         'remark' => '',//备注',
+                                        'cxCode' => $data['oldCode']??"",//备注,
                                         'pay_status' => $data['total_fee']==0?3: 1,//付款情况',
                                         'inv_status' => $data['total_fee']==0?3: 1,//开票情况',
                                         'diff_weight' => $data['diff_weight'],//工差重量',
@@ -411,6 +414,7 @@ class handleCxData extends command
                                 'thNum' => $data['th_num'],//退货数量',
                                 'th_fee' => $data['th_fee'],//退货金额',
                                 'check_rate' => '',//修正后的税率',
+                                'cxCode' => $data['oldCode']??"",//备注,
                                 'is_del' => 0,
                                 'addtime' => $date,
                                 'updatetime' => $date,

app/middleware.php

@@ -7,4 +7,5 @@ return [
     // \think\middleware\LoadLangPack::class,
     // Session初始化
     // \think\middleware\SessionInit::class
+    app\admin\middleware\checkToken::class
 ];