运单系统样式调整和一些BUG修复

app/Http/Controllers/PackageController.php

@@ -350,7 +350,9 @@ class PackageController extends Controller
         if($max&&$centre&&$min){
             $newValues['bulk']=$max*$centre*$min;
         }
-        $packageBatch->update($newValues);
+        $weightChanged=$packageBatch['weight']!=$weight;
+        Package::where('batch_number',$batch_number)->update($newValues);
+        $packageBatch['forceUpload']=$weightChanged;
         $result=$accomplishToWMS->accomplishToWMS($packageBatch);
         if ($result['result']=='success'){
             $newValues['status']='已上传';

app/Http/Controllers/WaybillsController.php

@@ -94,7 +94,7 @@ class WaybillsController extends Controller
             $owners = Owner::get();
             return view('waybill.index', ['waybills' => $waybills, 'carriers' => $carries, 'owners' => $owners,'filterData'=>$data,'uriType'=>'']);
         } else {
-            $waybills = Waybill::with(['owner','wmsCommodities','waybillAuditLogs' => function ($query) {
+            $waybills = Waybill::with(['owner','waybillAuditLogs' => function ($query) {
                 return $query->with('user');
             }])->orderBy('id', 'DESC')->paginate(50);
             $carries = Carrier::get();

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

@@ -163,6 +163,12 @@ class PackageController extends Controller
      */
     public function accomplishToWMS(Package $package)
     {
+        if($package['status']=='已上传'&&strstr($package['batch_rule'],'组合')){
+            if(isset($package['forceUpload'])&&$package['forceUpload']!=true){
+                $this->log(__METHOD__,'跳过_'.__FUNCTION__,'未实际上传，之前有上传成功且无变动：'.json_encode($package),null);
+                return ['result'=>'success'];
+            }
+        }
         $json=["request"=>['TASKID'=>$package->WMSReflectPackage_name,
             'SOReference5'=>$package->logistic_number,
             'Weigh'=>$package->weight,

public/js/app.js

@@ -2259,7 +2259,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -61401,4 +61401,4 @@ module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sa
 
 /***/ })
 
-/******/ });
+/******/ });

resources/views/waybill/edit.blade.php

@@ -139,7 +139,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="warehouse_weight" class="col-2 col-form-label text-right ">仓库计数(抛)</label>
+                        <label for="warehouse_weight" class="col-2 col-form-label text-right ">仓库计抛</label>
                         <div class="col-2">
                             <input type="text"  class="form-control @error('warehouse_weight') is-invalid @enderror"
                                    name="warehouse_weight" autocomplete="off" value="@if(old('warehouse_weight')){{ old('warehouse_weight') }}@else{{$waybill->warehouse_weight}}@endif"  >
@@ -159,7 +159,7 @@
                         </div>
 
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;仓库计数二</label>
+                        <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;仓库重</label>
                         <div class="col-2">
                             <input type="text" class="form-control @error('warehouse_weight_other') is-invalid @enderror"
                                    name="warehouse_weight_other" autocomplete="off" value="@if(old('warehouse_weight_other')){{ old('warehouse_weight_other') }}@else{{$waybill->warehouse_weight_other}}@endif"  >
@@ -179,7 +179,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="carrier_weight" class="col-2 col-form-label text-right ">承运商计数(抛)</label>
+                        <label for="carrier_weight" class="col-2 col-form-label text-right ">承运商计抛</label>
                         <div class="col-2">
                             <input type="text" id="carrier_weight" :class="errors['carrier_weight'] ? 'is-invalid' :''"   class="form-control @error('carrier_weight') is-invalid @enderror"
                                    name="carrier_weight" autocomplete="off" value="@if(old('carrier_weight')){{ old('carrier_weight') }}@else{{$waybill->carrier_weight}}@endif"  >
@@ -199,7 +199,7 @@
                         </div>
 
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <label for="carrier_weight_other" class="col-form-label text-right ">承运商计数二</label>
+                        <label for="carrier_weight_other" class="col-form-label text-right ">承运商计重</label>
                         <div class="col-2">
                             <input type="text" id="carrier_weight_other" :class="errors['carrier_weight_other'] ? 'is-invalid' :''"  class="form-control @error('carrier_weight_other') is-invalid @enderror"
                                    name="carrier_weight_other" autocomplete="off" value="@if(old('carrier_weight_other')){{ old('carrier_weight_other') }}@else{{$waybill->carrier_weight_other}}@endif"  >

resources/views/waybill/index.blade.php

@@ -25,7 +25,7 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid" style="min-width: 3500px;">
+    <div class="container-fluid" style="min-width: 2000px;">
         <div class="d-none" id="list">
 
             <form  method="GET" action="@if($uriType=='ZF'){{url('waybill/index/ZF')}}@elseif($uriType=='ZX'){{url('waybill/index/ZX')}}@else{{url('waybill/index')}}@endif" id="optionSubmit">
@@ -36,15 +36,18 @@
                             </div>
                         </td>
                     </tr>
-                    <tr >
-                        <td>
+                    <tr>
+                        <td colspan="6">
                             <select name="paginate" v-model="filterData.paginate" @change="setPaginate" class="form-control-sm" style="vertical-align: middle">
                                 <option value="50">每页显示50行</option>
                                 <option value="100">每页显示100行</option>
                                 <option value="200">每页显示200行</option>
                                 <option value="500">每页显示500行</option>
                                 <option value="1000">每页显示1000行</option>
-                            </select></td>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr >
                         <td >
                             <select name="owner_id" v-model="filterData.owner_id" class="form-control-sm  "  @change="setOwner" style="vertical-align: middle">
                                 <option value="" selected>货主</option>
@@ -65,7 +68,7 @@
                         <td  >
                             <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
                                    class="form-control-sm  tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle"></td>
-                        <td width="50%"></td>
+                        <td width="60%"></td>
                     </tr>
                     <tr>
                         <td  >
@@ -92,10 +95,9 @@
                             <input hidden type="submit">
                         </td>
                         <td></td>
-                        <td></td>
                     </tr>
                     <tr>
-                        <td colspan="5">
+                        <td colspan="6">
                             <span class="dropdown">
                                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData>0?'btn-dark text-light':'']"
                                         data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
@@ -118,51 +120,75 @@
             </div>
             <table class="table table-striped table-sm table-bordered table-hover text-nowrap" style="background: #fff;">
                 <tr>
-                    <th class="waybill_1">
+                    <th>
                         <label for="all">
                             <input id="all" type="checkbox" @click="checkAll($event)">全选
                         </label>
                     </th>
+                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑','运输管理-删除')
+                        <th>操作</th>
+                    @endcan
+                    <th>状态</th>
                     <th class="waybill_1">ID</th>
                     <th class="waybill_1">创建时间</th>
                     <th class="waybill_1">运单类型</th>
                     <th class="waybill_1">货主</th>
                     <th class="waybill_1">运单号</th>
-                    <th class="waybill_1">当前状态</th>
                     <th class="waybill_1">始发地</th>
                     <th class="waybill_1">目的地</th>
                     <th class="waybill_2">承运商</th>
-                    <th class="waybill_2">承运商单号</th>
-                    <th class="waybill_2">车型</th>
-                    <th class="waybill_2">仓库计数(抛)</th>
-                    <th class="waybill_2">承运商计数(抛)</th>
-                    <th class="waybill_2">仓库计数二</th>
-                    <th class="waybill_2">承运商计数二</th>
-                    <th class="waybill_3">运费(元)</th>
-                    <th class="waybill_3">提货费(元)</th>
-                    <th class="waybill_3">其他费用(元)</th>
+                    <th class="waybill_2">单号/车型</th>
+                    <th class="waybill_2">仓库计抛</th>
+                    <th class="waybill_2">承运商计抛</th>
+                    <th class="waybill_2">仓库计重</th>
+                    <th class="waybill_2">承运商计重</th>
+                    <th class="waybill_3">运费</th>
+                    <th class="waybill_3">提货费</th>
+                    <th class="waybill_3">其他费用</th>
                     <th class="waybill_3">调度备注</th>
-                    <th>WMS单号</th>
-                    <th>收件人</th>
-                    <th>收件人电话</th>
-                    <th>收费(元)</th>
-                    <th>到付金额(元)</th>
-                    <th>下单备注</th>
-                    <th>运单审核人</th>
-                    <th>商品列表</th>
-                    @can('运输管理-编辑','运输管理-运单审核','运输管理-调度','运输管理-编辑','运输管理-删除')
-                        <th>操作</th>
-                    @endcan
-                    <th>始发市</th>
-                    <th>目的市</th>
-                    <th>车辆信息</th>
-                    <th>调度审核人</th>
+                    {{--                    <th>WMS单号</th>--}}
+                    {{--                    <th>收件人</th>--}}
+                    {{--                    <th>收件人电话</th>--}}
+                    {{--                    <th>收费(元)</th>--}}
+                    {{--                    <th>到付金额(元)</th>--}}
+                    {{--                    <th>下单备注</th>--}}
+                    {{--                    <th>运单审核人</th>--}}
+                    {{--                    <th>商品列表</th>--}}
+                    {{--                    <th>始发市</th>--}}
+                    {{--                    <th>目的市</th>--}}
+                    {{--                    <th>车辆信息</th>--}}
+                    {{--                    <th>调度审核人</th>--}}
                 </tr>
 
                 <tr v-for="waybill in waybills" :style="{color:waybill.status=='待重审'?'red':''||waybill.status=='已完结'?'green':''}" :id="'waybill'+waybill.id">
                     <td>
                         <input class="checkItem" type="checkbox" :value="waybill.id" v-model="checkData">
                     </td>
+                    <td>
+                        <span v-if=waybill.status==="未审核"||waybill.status==="待重审">
+                            @can('运输管理-运单审核')
+                                <button class="btn btn-outline-success btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
+                            @endcan
+                            @can('运输管理-运单编辑')
+                                <button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>
+                            @endcan
+                        </span>
+                        <span v-if=waybill.status==="已审核">
+                            @can('运输管理-调度')
+                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
+                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>
+                            @endcan
+                        </span>
+                        <span v-if=waybill.status==="待终审">
+                            @can('运输管理-调度审核')
+                                <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
+                            @endcan
+                            @can('运输管理-调度')
+                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>
+                            @endcan
+                        </span>
+                    </td>
+                    <td :style="{color:waybill.status=='已审核'?'blue':''}">@{{waybill.status}}</td>
                     <td>@{{waybill.id}}</td>
                     <td>@{{waybill.created_at}}</td>
                     <td>@{{waybill.type}}</td>
@@ -171,8 +197,9 @@
                     <td>@{{waybill.origination}}</td>
                     <td>@{{waybill.destination}}</td>
                     <td>@{{waybill.carrier}}</td>
-                    <td>@{{waybill.carrier_bill}}</td>
-                    <td><span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></td>
+                    <td><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
+                        <span v-if="waybill.type=='直发车'">
+                            <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
                     <td>@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</td>
                     <td>@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</td>
                     <td>@{{waybill.warehouse_weight_other}}  @{{waybill.warehouse_weight_unit_other}}</td>
@@ -184,73 +211,72 @@
                     @endcan
                     <td>@{{waybill.dispatch_remark}}</td>
 
-                    <td :style="{color:waybill.status=='已审核'?'blue':''}">@{{waybill.status}}</td>
-                    <td>@{{waybill.wms_bill_number}}</td>
-                    <td>@{{waybill.recipient}}</td>
-                    <td>@{{waybill.recipient_mobile}}</td>
-                    <td>@{{waybill.charge}}</td>
-                    <td>@{{waybill.collect_fee}}</td>
-                    <td>@{{waybill.ordering_remark}}</td>
-                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</span></td>
-                    <td ><u style="user-select: none;cursor:pointer" class="text-primary" v-if="!waybill.isBtn && waybill.wmsCommodities && waybill.wmsCommodities.length>0" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">
-                            该单有 @{{waybill.wmsCommodities.length}} 件商品，点击展开</u>
-                        <u style="user-select: none;cursor:pointer" class="text-secondary" v-if="waybill.isBtn" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">
-                            该单有 @{{waybill.wmsCommodities.length}} 件商品，点击收起</u>
-                    </td>
-                    <td>
-                        <div v-if=waybill.status==="未审核"||waybill.status==="待重审">
-                            @can('运输管理-运单审核')
-                                <button class="btn btn-outline-success btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
-                            @endcan
-                            @can('运输管理-运单编辑')
-                                <button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>
-                            @endcan
-                        </div>
-                        <div v-if=waybill.status==="已审核">
-                            @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>
-                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>
-                            @endcan
-                        </div>
-                        <div v-if=waybill.status==="待终审">
-                            @can('运输管理-调度审核')
-                                <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
-                            @endcan
-                            @can('运输管理-调度')
-                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>
-                            @endcan
-                        </div>
-                    </td>
-                    <td>@{{waybill.origination_city}}</td>
-                    <td>@{{waybill.destination_city}}</td>
-                    <td>@{{waybill.car_owner_info}}</td>
-                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</span></td>
-                </tr>
-                <tr v-show="wmsCommodities&&wmsCommodities.length>0" id="wmsCommodities">
-                    <td colspan="15"></td>
-                    <td colspan="15">
-                        <table>
-                            <tr style="background: #9fcdff">
-                                <th>商品名称</th>
-                                <th>商品编码</th>
-                                <th>条码</th>
-                                <th>数量</th>
-                                <th>体称</th>
-                                <th>毛重</th>
-                                <th>净重</th>
-                            </tr>
-                            <tr v-for="wmsCommodity in wmsCommodities">
-                                <td>@{{ wmsCommodity.SKU_Descr_c }}</td>
-                                <td>@{{ wmsCommodity.SKU }}</td>
-                                <td>@{{ wmsCommodity.Alternate_sku1 }}</td>
-                                <td>@{{ wmsCommodity.Qtyordered_each }}</td>
-                                <td>@{{ wmsCommodity.Cubic }}</td>
-                                <td>@{{ wmsCommodity.GrossWeight }}</td>
-                                <td>@{{ wmsCommodity.NetWeight }}</td>
-                            </tr>
-                        </table>
-                    </td>
+                    {{--                    <td>@{{waybill.wms_bill_number}}</td>--}}
+                    {{--                    <td>@{{waybill.recipient}}</td>--}}
+                    {{--                    <td>@{{waybill.recipient_mobile}}</td>--}}
+                    {{--                    <td>@{{waybill.charge}}</td>--}}
+                    {{--                    <td>@{{waybill.collect_fee}}</td>--}}
+                    {{--                    <td>@{{waybill.ordering_remark}}</td>--}}
+                    {{--                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="运单阶段">@{{waybillAuditLog.user.name}}</span></td>--}}
+                    {{--                    <td ><u style="user-select: none;cursor:pointer" class="text-primary" v-if="!waybill.isBtn && waybill.wmsCommodities && waybill.wmsCommodities.length>0" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">--}}
+                    {{--                            该单有 @{{waybill.wmsCommodities.length}} 件商品，点击展开</u>--}}
+                    {{--                        <u style="user-select: none;cursor:pointer" class="text-secondary" v-if="waybill.isBtn" @click="showWMSCommodities(waybill.id,waybill.wmsCommodities,waybill.isBtn)">--}}
+                    {{--                            该单有 @{{waybill.wmsCommodities.length}} 件商品，点击收起</u>--}}
+                    {{--                    </td>--}}
+                    {{--                    <td>--}}
+                    {{--                        <div v-if=waybill.status==="未审核"||waybill.status==="待重审">--}}
+                    {{--                            @can('运输管理-运单审核')--}}
+                    {{--                                <button class="btn btn-outline-success btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>--}}
+                    {{--                            @endcan--}}
+                    {{--                            @can('运输管理-运单编辑')--}}
+                    {{--                                <button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>--}}
+                    {{--                            @endcan--}}
+                    {{--                        </div>--}}
+                    {{--                        <div v-if=waybill.status==="已审核">--}}
+                    {{--                            @can('运输管理-调度')--}}
+                    {{--                                <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill.id,waybill.waybill_number)">取消审核</button>--}}
+                    {{--                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">调度</button>--}}
+                    {{--                            @endcan--}}
+                    {{--                        </div>--}}
+                    {{--                        <div v-if=waybill.status==="待终审">--}}
+                    {{--                            @can('运输管理-调度审核')--}}
+                    {{--                                <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>--}}
+                    {{--                            @endcan--}}
+                    {{--                            @can('运输管理-调度')--}}
+                    {{--                                <button class="btn btn-outline-secondary btn-sm" @click="job(waybill.id)">改调度</button>--}}
+                    {{--                            @endcan--}}
+                    {{--                        </div>--}}
+                    {{--                    </td>--}}
+                    {{--                    <td>@{{waybill.origination_city}}</td>--}}
+                    {{--                    <td>@{{waybill.destination_city}}</td>--}}
+                    {{--                    <td>@{{waybill.car_owner_info}}</td>--}}
+                    {{--                    <td><span v-for="waybillAuditLog in waybill.waybillAuditLogs" v-if=waybillAuditLog.audit_stage==="调度阶段">@{{waybillAuditLog.user.name}}</span></td>--}}
                 </tr>
+                {{--                <tr v-show="wmsCommodities&&wmsCommodities.length>0" id="wmsCommodities">--}}
+                {{--                    <td colspan="15"></td>--}}
+                {{--                    <td colspan="15">--}}
+                {{--                        <table>--}}
+                {{--                            <tr style="background: #9fcdff">--}}
+                {{--                                <th>商品名称</th>--}}
+                {{--                                <th>商品编码</th>--}}
+                {{--                                <th>条码</th>--}}
+                {{--                                <th>数量</th>--}}
+                {{--                                <th>体称</th>--}}
+                {{--                                <th>毛重</th>--}}
+                {{--                                <th>净重</th>--}}
+                {{--                            </tr>--}}
+                {{--                            <tr v-for="wmsCommodity in wmsCommodities">--}}
+                {{--                                <td>@{{ wmsCommodity.SKU_Descr_c }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.SKU }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.Alternate_sku1 }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.Qtyordered_each }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.Cubic }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.GrossWeight }}</td>--}}
+                {{--                                <td>@{{ wmsCommodity.NetWeight }}</td>--}}
+                {{--                            </tr>--}}
+                {{--                        </table>--}}
+                {{--                    </td>--}}
+                {{--                </tr>--}}
             </table>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
             {{$waybills->appends($filterData)->links()}}
@@ -490,12 +516,12 @@
                         }
                     }else {
                         location.href = "{{url('waybillExport/-1?waybill_number=')}}"+
-                        data.waybill_number+"&carrier_bill="+data.carrier_bill+
-                        "&carrier_id="+data.carrier_id+"&owner_id="+data.owner_id+
-                        "&wms_bill_number="+data.wms_bill_number+"&created_at_start="+
-                        data.created_at_start+"&created_at_end="+data.created_at_end+
-                        "&type="+data.type+"&status="+data.status+"&origination="+data.origination+
-                        "&destination="+data.destination;
+                            data.waybill_number+"&carrier_bill="+data.carrier_bill+
+                            "&carrier_id="+data.carrier_id+"&owner_id="+data.owner_id+
+                            "&wms_bill_number="+data.wms_bill_number+"&created_at_start="+
+                            data.created_at_start+"&created_at_end="+data.created_at_end+
+                            "&type="+data.type+"&status="+data.status+"&origination="+data.origination+
+                            "&destination="+data.destination;
                     }
                 },
                 //展开收起商品列表
@@ -503,12 +529,13 @@
                     if (!isBtn){
                         this.wmsCommodities=wmsCommodities;
                         $("#waybill"+id).after($("#wmsCommodities"));
-                        this.waybills.every(function (waybill) {
+                        this.waybills.forEach(function (waybill) {
+                            if (waybill.id!==id&&waybill.isBtn){
+                                waybill.isBtn=false;
+                            }
                             if (waybill.id===id){
                                 waybill.isBtn=true;
-                                return false;
                             }
-                            return  true;
                         });
                         return;
                     }