页面修复与路由修复

app/Http/Controllers/api/thirdPart/jianshang/RejectedController.php

@@ -4,6 +4,7 @@
 namespace App\Http\Controllers\api\thirdPart\jianshang;
 
 
+use App\Components\ErrorPush;
 use App\Http\Controllers\Controller;
 use App\Logistic;
 use App\QualityLabel;
@@ -17,6 +18,8 @@ use Zttp\ZttpResponse;
 
 class RejectedController extends Controller
 {
+    use ErrorPush;
+
     function sendRejected($rejected){
         $amount = $rejected['amount'] ?? '';
         $created_at = $rejected['created_at'] ?? '';
@@ -201,6 +204,12 @@ class RejectedController extends Controller
             $forSign = $str . $timestamp . $nonce . $signKey;
             return strtolower(md5($forSign));
         };
+        if (!$data){
+            app('LogService')->log(__METHOD__,'笕尚接口参数异常',json_encode(array($created_at,$fee_collected,$goodses,
+                $logistic_name_return,$logistic_number,$logistic_number_return,$order_number,
+                $sender_mobile,$sender_name)));
+            return false;
+        }
         $timestamp=intval(microtime(true)*1000);
         $nonce=md5(microtime(true));
         $sign=$sortParamsAndMd5(json_decode($data,true),$timestamp,$nonce,config('api.sign_key_rejected_send_jianshang'));

resources/views/station/monitor/visual.blade.php

@@ -69,6 +69,32 @@
                     np2:0,
                     np3:0,
                 },
+                blacklist:{
+                    "HAI01-045-%":[
+                        "HAI01-045-01",
+                        "HAI01-045-02",
+                        "HAI01-045-03",
+                        "HAI01-045-04",
+                    ],
+                    "HAI01-046-%":[
+                        "HAI01-046-01",
+                        "HAI01-046-02",
+                        "HAI01-046-03",
+                        "HAI01-046-04",
+                    ],
+                    "HAI01-047-%":[
+                        "HAI01-047-01",
+                        "HAI01-047-02",
+                        "HAI01-047-03",
+                        "HAI01-047-04",
+                    ],
+                    "HAI01-048-%":[
+                        "HAI01-048-01",
+                        "HAI01-048-02",
+                        "HAI01-048-03",
+                        "HAI01-048-04",
+                    ],
+                },
             },
             mounted() {
                 let data = [];
@@ -104,16 +130,27 @@
                     this.mapping.push(arr);
                     let max = this.columnSize * this.heightSize;
                     window.tempTip.postBasicRequest("{{url('station/monitor/visual/getData')}}",{arr:arr},res=>{
+                        let sub = {};
+                        arr.forEach((ar,i)=>{
+                            for (let key in this.blacklist){
+                                if (ar.indexOf(key)!==-1){
+                                    if (!sub['_'+i])sub['_'+i] = this.blacklist[key].length;
+                                    else sub['_'+i] += this.blacklist[key].length;
+                                }
+                            }
+                        });
                         res.forEach((ar,i)=>{
+                            let amount = max;
+                            if (sub['_'+i])amount -= sub['_'+i];
                             let sum = Number(ar[0]);
                             let quantity = Number(ar[1]);
-                            let number2 = Number(this.accSubtr(max,sum));
+                            let number2 = Number(this.accSubtr(amount,sum));
                             let number3 = Number(this.accSubtr(sum,quantity));
-                            let q1 = this.accDivCoupon(quantity,max)
-                            let q2 = this.accDivCoupon(number2,max)
-                            let q3 = this.accDivCoupon(number3,max)
+                            let q1 = this.accDivCoupon(quantity,amount)
+                            let q2 = this.accDivCoupon(number2,amount)
+                            let q3 = this.accDivCoupon(number3,amount)
                             this.$set(this.data[index-1],i,[q1,q2,q3]);
-                            this.statistic.sum += max;
+                            this.statistic.sum += amount;
                             this.statistic.number1 += quantity;
                             this.statistic.number2 += number2;
                             this.statistic.number3 += number3;
@@ -143,6 +180,7 @@
                         let suffix = i.toString().length<maxLen ? before.substr(0,maxLen-i.toString().length)+i.toString() : i.toString();
                         for (let k=arr.length-1;k>=0;k--){
                             let val = arr[k].substr(0,arr[k].length-1)+suffix;
+                            if (this.blacklist[arr[k]] && this.blacklist[arr[k]].indexOf(val)!==-1)continue;
                             res.push(val);
                             detailTemp.push({location:val,status:undefined});
                             mapping[val] = [rowIndex,columnIndex];

routes/web.php

@@ -30,7 +30,7 @@ Route::post('package/weigh/measureMonitor/data','MeasureMonitorController@data')
 //称重显示
 Route::get('package/measureMonitor','MeasureMonitorController@index');
 Route::resource('package/weigh/measureMonitor','MeasureMonitorController');
-Route::resource('package/measureMonitor','MeasureMonitorController');
+
 //入库预约终端
 Route::get('store/deliveryAppointment/exhibition','DeliveryAppointmentController@exhibition');
 //入库预约预约码输入