定义称重接口文件

app/Http/Controllers/ExcelController.php

@@ -47,9 +47,10 @@ class ExcelController extends Controller
         ini_set('max_execution_time',2500);
         ini_set('memory_limit','1526M');
 
+        $filePathName='d:/2020-01.json';
         $goodsesExcelArray=[['barcode','weight','id','key','time','url']];
-        $handler=fopen('d:/201912.json','r');
-        $json = fread($handler, filesize('d:/201912.json'));
+        $handler=fopen($filePathName,'r');
+        $json = fread($handler, filesize($filePathName));
 //        $json = '[' . $json . ']';
         $jsonArr=json_decode($json,true);
         foreach ($jsonArr as $obj){

app/Http/Controllers/RejectedController.php

@@ -89,6 +89,7 @@ class RejectedController extends Controller
             'order_number'=> $request->input('order_number'),
             'barcode_goods'=> $request->input('barcode_goods'),
             'logistic_number_return'=> $request->input('logistic_number_return'),
+            'logistic_number'=> $request->input('logistic_number'),
         ];
 
         if(Session::get('rejected.index.isFromEditPage')){
@@ -110,6 +111,7 @@ class RejectedController extends Controller
         $order_number = $params['order_number'];
         $barcode_goods = $params['barcode_goods'];
         $logistic_number_return = $params['logistic_number_return'];
+        $logistic_number = $params['logistic_number'];
         $rejectedBillsQuery=RejectedBill::with(['owner','logistic','items',]);
         if($created_at_start&&!$created_at_end){
             $created_at_end = $created_at_start;
@@ -193,6 +195,18 @@ class RejectedController extends Controller
                 $rejectedBillsQuery=$rejectedBillsQueryTem;
             }
         }
+        if($logistic_number){
+            $startDay = Carbon::now()->subDays(15);
+            $rejectedBillsQueryTem=clone $rejectedBillsQuery;
+            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('created_at','>',$startDay->format('Y-m-d'));
+            $rejectedBillsQueryTem=$rejectedBillsQueryTem->where('logistic_number','like','%'.$logistic_number.'%');
+            if($rejectedBillsQueryTem->count()==0
+                ||$rejectedBillsQueryTem->first()['logistic_number']==$logistic_number){
+                $rejectedBillsQuery=$rejectedBillsQuery->where('logistic_number','like','%'.$logistic_number.'%');
+            }else{
+                $rejectedBillsQuery=$rejectedBillsQueryTem;
+            }
+        }
         return $rejectedBillsQuery;
     }
 

app/Http/Controllers/api/thirdPart/weight/PackageController.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Controllers\Api\thirdPart\flux;
+
+use App\Batch;
+use App\Http\Controllers\Controller;
+use App\Order;
+use App\OrderBarcode;
+use App\SkuNew;
+use App\WMSReflectPackage;
+use App\WMSReflectReceive;
+use App\WMSReflectReceiveSku;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Validator;
+use Zttp\Zttp;
+
+class PackageController extends Controller
+{
+
+    public function new_(Request $request)
+    {
+    }
+
+
+}

app/Providers/RouteServiceProvider.php

@@ -80,5 +80,9 @@ class RouteServiceProvider extends ServiceProvider
             ->middleware('api')
             ->namespace('App\Http\Controllers\Api\thirdPart\flux')
             ->group(base_path('routes/api/thirdPart/flux.php'));
+        Route::prefix('api/thirdPart/weight')
+            ->middleware('api')
+            ->namespace('App\Http\Controllers\Api\thirdPart\weight')
+            ->group(base_path('routes/api/thirdPart/weight.php'));
     }
 }

resources/js/singles/rejectedIndex.js

@@ -159,6 +159,12 @@ let vueList=new Vue({
                 this.filterRun();
             }
         },
+        logistic_numberEntering:function(e){
+            if(e.key==='Enter'){
+                this.filterParams.logistic_number=e.target.value;
+                this.filterRun();
+            }
+        },
         cancelCheckConfirmAll:function(){
             $('#checkConfirmingAll').tooltip('hide');
             setTimeout(function () {

resources/views/layouts/app.blade.php

@@ -41,7 +41,7 @@
 <!-- Scripts -->
 @yield('script')
 {{-- 必须在app.js前边--}}
-<script src="{{ asset('js/app.js?202001061807') }}"></script>
+<script src="{{ asset('js/app.js?202002111414') }}"></script>
 <script>
     let isActive=function (name,atSlashLevel) {
         let uriWithNoParam=location.href.split('?')[0];

resources/views/rejected/index.blade.php

@@ -67,6 +67,12 @@
                                                :class="filterParams.logistic_number_return?'bg-warning':''"
                                                @keypress="logistic_number_returnEntering" title="15天以内的支持模糊搜索，回车提交">
                                     </td>
+                                    <td>
+                                        <label for="">原单单号：</label>
+                                        <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索原单单号" name="logistic_number"
+                                               :class="filterParams.logistic_number?'bg-warning':''"
+                                               @keypress="logistic_numberEntering" title="15天以内的支持模糊搜索，回车提交">
+                                    </td>
                                     <td>
                                         <label for="">审核：</label>
                                         <select name="is_checked" class="form-control-sm" @change="is_checkedChange"
@@ -74,8 +80,8 @@
                                             <option value=""></option>
                                             <option value="1">已审核</option>
                                             <option value="0">未审核</option>
-                                        </select></td>
-                                    <td></td>
+                                        </select>
+                                    </td>
                                     <td width="16%"></td>
                                 </tr>
                                 <tr>
@@ -274,7 +280,6 @@
 @endsection
 
 @section('lastScript')
-
     <script>
         let rejectedBills=[
                 @foreach( $rejectedBills as $rejectedBill )
@@ -313,5 +318,5 @@
         let exportExcelOnFilterParamsURL='{{url("rejected/exportExcelOnFilterParams")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/singles/rejectedIndex.js?202001061807')}}"></script>
+    <script src="{{asset('js/singles/rejectedIndex200212.js')}}"></script>
 @endsection

resources/views/test/index.blade.php

@@ -1,9 +0,0 @@
-@extends('layouts.app')
-
-@section('content')
-<div class="container-fluid" >
-    <div class="row justify-content-center">
-        abc
-    </div>
-</div>
-@endsection

routes/api/thirdPart/weight.php

@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Http\Request;
+
+
+
+/*
+文件地址前缀：/api/thirdPart/weight
+*/
+Route::post('new', "PackageController@new_");//增加新波次消息
+//accomplishToWMS() 发往WMS的完成单

routes/web.php

@@ -17,8 +17,6 @@ Route::get('/', function () {
 
 Route::get('test/{method}', 'TestController@method'); //测试
 
-Route::get('password/change', 'Auth\PasswordController@change'); //测试
-Route::post('password/update', 'Auth\PasswordController@update'); //测试
 Auth::routes();
 Route::get('/home', 'HomeController@index')->name('home');
 
@@ -96,4 +94,3 @@ Route::get('maintenance/', function () {return view('maintenance.index');});
 Route::get('weigh/', function () {return view('weigh.index');});
 
 
-Route::any('test/{method}', 'TestController@method'); //测试

webpack.mix.js

@@ -13,7 +13,7 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css');
-mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex.js');
+mix.js('resources/js/singles/rejectedIndex.js', 'public/js/singles/rejectedIndex200212.js');
 mix.copy('resources/sass/fonts/','public/fonts');
 mix.copy('resources/icon','public/icon');
 mix.copy('resources/images','public/images');