FIX，问题件，处理结果字段点击后变背景色，但无法取消

BUG，问题件，二次客户订单号字段，用“改”填写无效。在外部填写，不能带出相关运单和商品信息
跟踪件，修改“应送达时间”字段会同步修改到签收日期，反过来签收时间修改不会动到应送达时间。应送达时间填写后会为“是否赶上卡班”，“到货情况”两字段填写是

app/Http/Controllers/LogisticTimingController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\LogisticTiming;
+use Illuminate\Http\Request;
+
+class LogisticTimingController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\LogisticTiming  $logisticTiming
+     * @return \Illuminate\Http\Response
+     */
+    public function show(LogisticTiming $logisticTiming)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\LogisticTiming  $logisticTiming
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(LogisticTiming $logisticTiming)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\LogisticTiming  $logisticTiming
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, LogisticTiming $logisticTiming)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\LogisticTiming  $logisticTiming
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(LogisticTiming $logisticTiming)
+    {
+        //
+    }
+}

app/Http/Controllers/OrderIssueController.php

@@ -15,6 +15,7 @@ use App\RejectedBill;
 use App\Services\LogService;
 use App\Services\OrderIssueProcessLogService;
 use App\Services\OrderIssueService;
+use App\Services\OrderPackageService;
 use App\Services\OrderService;
 use App\Services\OwnerService;
 use App\Shop;
@@ -199,7 +200,7 @@ class OrderIssueController extends Controller
         }
         try {
             $data =  $request->only([
-                'order_issue_type_id','owner_id','logistic_id', 'logistic_number_return','result_explain','final_status','second_order_id',
+                'order_issue_type_id','owner_id','logistic_id', 'logistic_number_return','result_explain','final_status','second_order_id','second_client_no',
                 'logistic_indemnity_money','logistic_express_remission','baoshi_indemnity_money','baoshi_express_remission','user_workgroup_id'
             ]);
             $orderIssue = OrderIssue::query()->find($request->id);
@@ -456,9 +457,8 @@ class OrderIssueController extends Controller
         }
         $secondClientNo = $request->input('secondClientNo');
         try {
-            $order = Order::query()->with('packages.commodities.commodity')->where('client_code', $secondClientNo)->first();
-            OrderIssue::query()->where('id', $request->id)->update(['second_client_no'=> $secondClientNo]);
-            LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
+            app(OrderIssueService::class)->editOrderIssueSecondClientNo($request->id,$secondClientNo);
+            $order = Order::query()->with('packages.commodities.commodity')->where('client_code',$secondClientNo)->first();
             if (!$order) {
                 return ['success' => true, 'message' => '二次客户单号已修改，没有对应的订单信息'];
             } else {
@@ -470,4 +470,20 @@ class OrderIssueController extends Controller
         }
     }
 
+    public function secondOrderAddOrderPackageApi(Request $request)
+    {
+        if(!Gate::allows('订单管理-问题件-编辑')){
+            return ['success'=>false,'fail_info'=>'没有对应权限'];
+        }
+        try {
+            $orderPackage = app(OrderPackageService::class)->createByLogisticNumberAndOrderClientNo($request->input('logistic_number', $request->input('client_code')));
+            if(!$orderPackage)return ['success'=>false,'fail_info'=>'创建失败'];
+            return ['success'=>true,'orderPackage'=>$orderPackage];
+        } catch (Exception $e) {
+            LogService::log(__METHOD__,__FUNCTION__.'ERROR','问题件 根据二次客户单号和快递单创建OrderPakcage'.json_encode($request->getContent()).$e->getMessage());
+            return ['success'=>true, 'message' => $e->getMessage()];
+        }
+
+    }
+
 }

app/Http/Controllers/TestController.php

@@ -614,4 +614,15 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
         dd(Request::all());
         $users=User::query();
     }
+
+    public function test11(){
+        return view('test');
+    }
+    public function File(Request $request)
+    {
+        if($request->hasFile('excelFile')){
+            $file= $request->file('excelFile');
+        }else{
+        }
+    }
 }

app/LogisticTiming.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LogisticTiming extends Model
+{
+    //
+}

app/Services/OrderIssuePerformanceService.php

@@ -37,7 +37,7 @@ class OrderIssuePerformanceService
 
     public function  getSql($params){
         $sql =" select users.name as userName,owners.name as ownerName,count(case order_issue_process_logs.type WHEN  '创建' THEN 1 end ) as created, count(case order_issue_process_logs.type WHEN  '处理' THEN 1 end ) as processed, count(case order_issue_process_logs.type WHEN  '结束' THEN 1 end ) as end,count(1) as sumNumber ";
-        $sql.=" from order_issue_process_logs left join users on order_issue_process_logs.user_id = users.id left join order_issues on order_issue_process_logs.order_issue_id = order_issues.id left join orders on order_issues.order_id = orders.id left join owners on orders.owner_id = owners.id ";
+        $sql.=" from order_issue_process_logs inner join users on order_issue_process_logs.user_id = users.id inner join order_issues on order_issue_process_logs.order_issue_id = order_issues.id inner join orders on order_issues.order_id = orders.id inner join owners on orders.owner_id = owners.id ";
         $sql.=" where 1=1 ";
         if(isset($params['create_start'])){
             $sql.= " and order_issue_process_logs.created_at >= '".$params['create_start']." 00:00:00' ";

app/Services/OrderIssueService.php

@@ -263,7 +263,7 @@ class OrderIssueService
     public function orderIssueTag(array $params)
     {
         $orderNos = $params['orderNos'];
-        $meg = ['success' => false];
+        $meg = ['success' => true];
         foreach ($orderNos as $orderNo) {
             try {
                 $orderIssue = $this->createOrFindByOrderNo($orderNo);
@@ -274,9 +274,10 @@ class OrderIssueService
                 }
             } catch (\Exception $e) {
                 LogService::log(__METHOD__, __FUNCTION__, '标记订单问题件error' . json_encode($orderNo).$e->getMessage(),$e->getTraceAsString());
+                $meg['success'] = false;
+                $meg['fail_info'][]=  $orderNo.$e->getMessage();
             }
         }
-        $meg['success'] = true;
         unset($params,$orderIssues,$orderNos);
         return $meg;
     }
@@ -469,4 +470,12 @@ class OrderIssueService
         return OrderIssue::query()->whereIn('id',$ids)->where('final_status','已解决')->count() > 0;
     }
 
+    public function editOrderIssueSecondClientNo($id,$secondClientNo,&$order = null)
+    {
+        $order = Order::query()->where('client_code',$secondClientNo)->first();
+        if(!$order){
+            $order  = app(OrderService::class)->findOrCreateByClientCode($secondClientNo);
+        }
+        return OrderIssue::query()->where('id',$id)->update(['second_client_no'=>$secondClientNo]) > 0;
+    }
 }

app/Services/OrderPackageService.php

@@ -372,4 +372,15 @@ class OrderPackageService
         return  $map;
     }
 
+    public function createByLogisticNumberAndOrderClientNo($orderClientNo,$logisticNumber)
+    {
+        $order = Order::query()->where('client_no',$orderClientNo)->first();
+        if(!$order){
+            $order = Order::query()->create(['client_code',$orderClientNo]);
+        }
+        $orderPackage = OrderPackage::query()->where('logistic_number',$logisticNumber)->first();
+        if($orderPackage){return $orderPackage;}
+        $orderPackage = OrderPackage::query()->create(['order_id'=>$order->id,'logistic_number'=>$logisticNumber]);
+        return $orderPackage;
+    }
 }

app/Services/OrderTrackingService.php

@@ -183,17 +183,28 @@ class OrderTrackingService
     }
 
     public function updateOrderTracingAndSyc($id,$param,$value){
-        $order_tracking = OrderTracking::query()
-            ->with('commodities.package.order')
-            ->where('id', $id)
-            ->first();
+        $order_tracking = OrderTracking::query()->with('commodities.package.order')->where('id', $id)->first();
         $order_id = $order_tracking->commodities->package->order->id ?? false;
-        if(!$order_id){return ['success'=> false];}
-        $bool= OrderTracking::query()
-            ->whereHas('commodities.package.order', function ($query) use ($order_id) {
-                $query->where('id', $order_id);
-            })->update([$param=>$value]);
-        return ['success'=> $bool > 0];
+        if(!isset($order_id)){ return ['success'=> false];}
+        return $this->updateOrderTracingsByOrderIds($order_id,$param,$value);
+    }
+
+    public function updateOrderTracingsByOrderIds($orderId,$param,$value)
+    {
+        $bool = null;
+        try {
+            $update = [$param => $value];
+            if($param == 'planning_sent_at'){
+                $update= [$param => $value, 'signed_at' => $value,'is_arrival'=>'是','is_on_duty_shift'=>'是'];
+            }
+            $bool = OrderTracking::query()->whereHas('commodities.package.order', function ($query) use ($orderId) {
+                $query->where('id', $orderId);
+            })->update($update);
+            return['success'=> $bool > 0];
+        } catch (\Exception $e) {
+            LogService::log(__METHOD__,__FUNCTION__,'修改追踪件'.json_encode($orderId,$param,$value).$e->getMessage().$e->getTraceAsString());
+            return['success'=> false,'fail_info'=>$e->getMessage()];
+        }
     }
 
     public function createByWmsOrderHeader($orderHeaders)

database/factories/LogisticTimingFactory.php

@@ -0,0 +1,12 @@
+<?php
+
+/** @var \Illuminate\Database\Eloquent\Factory $factory */
+
+use App\LogisticTiming;
+use Faker\Generator as Faker;
+
+$factory->define(LogisticTiming::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/seeds/LogisticTimingSeeder.php

@@ -0,0 +1,16 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class LogisticTimingSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        //
+    }
+}

public/css/app.css

@@ -228,28 +228,38 @@ table.table-striped tbody tr:hover.td-yellow {
   background: #fdf3db;
 }
 
-table tr.focusing td,
-table.table-striped tbody tr.focusing td {
+table .table-striped > tr.focusing,
+table tr.focusing > td,
+table.table-striped tbody .table-striped > tr.focusing,
+table.table-striped tbody tr.focusing > td {
   background: #d5aba1;
 }
 
-table tr.focusing td.td-warm,
-table.table-striped tbody tr.focusing td.td-warm {
+table .table-striped > tr.focusing.td-warm,
+table tr.focusing > td.td-warm,
+table.table-striped tbody .table-striped > tr.focusing.td-warm,
+table.table-striped tbody tr.focusing > td.td-warm {
   background: #e7ae80;
 }
 
-table tr.focusing td.td-cool,
-table.table-striped tbody tr.focusing td.td-cool {
+table .table-striped > tr.focusing.td-cool,
+table tr.focusing > td.td-cool,
+table.table-striped tbody .table-striped > tr.focusing.td-cool,
+table.table-striped tbody tr.focusing > td.td-cool {
   background: #5f8fcd;
 }
 
-table tr.focusing td.td-helpful,
-table.table-striped tbody tr.focusing td.td-helpful {
+table .table-striped > tr.focusing.td-helpful,
+table tr.focusing > td.td-helpful,
+table.table-striped tbody .table-striped > tr.focusing.td-helpful,
+table.table-striped tbody tr.focusing > td.td-helpful {
   background: #69cb9c;
 }
 
-table tr.focusing td.td-yellow,
-table.table-striped tbody tr.focusing td.td-yellow {
+table .table-striped > tr.focusing.td-yellow,
+table tr.focusing > td.td-yellow,
+table.table-striped tbody .table-striped > tr.focusing.td-yellow,
+table.table-striped tbody tr.focusing > td.td-yellow {
   background: #d9c290;
 }
 

resources/views/order/index/delivering.blade.php

@@ -627,6 +627,7 @@
                         $("#result_explain #result_explain").removeClass('is-invalid');
                         $("#exampleModal").modal('hide');
                     }
+                    let _this = this;
                     tempTip.setDuration(99999);
                     tempTip.waitingTip('处理中,请稍候');
                     let data = {orderNos:this.checkData,typeId: this.typeId,result_explain:this.result_explain};
@@ -634,8 +635,12 @@
                         tempTip.setDuration(5000)
                         tempTip.cancelWaitingTip();
                         if(res.data.success){
-                            tempTip.setDuration(3000);
-                            tempTip.showSuccess('已标记为问题件');
+                            tempTip.setDuration(3000)
+                            tempTip.showSuccess('已标记为问题件')
+                            _this.checkData.forEach(function(orderNo){
+                                _this.orderIssueNos.push(orderNo)
+                            })
+                            _this.checkData = []
                         }else{
                             tempTip.setDuration(4000);
                             tempTip.show(res.data.fail_info);

resources/views/order/issue/edit.blade.php

@@ -158,7 +158,7 @@
             data: {
                 orderIssues: {!! $orderIssue!!},
                 order: @if($order){!! $order !!}@else {id:null,owner_id:null}@endif,
-                secondOrder: @if($secondOrder){!! $secondOrder !!}@else {client_code:''}@endif,
+                secondOrder: @if($secondOrder){!! $secondOrder !!}@else null @endif,
                 rejectedBill: @if($rejectedBill){!! $rejectedBill !!}@else {logistic_number_return:''}@endif,
                 create_RejectedBill:'',
                 owners:{!! $owners  !!},

resources/views/order/issue/index.blade.php

@@ -46,7 +46,7 @@
                     </span>
                 </div>
                 <table class="table table-sm table-striped table-bordered table-hover card-body p-0 m-0" style="background: #fff;@cannot('订单管理-问题件-客户不可见')min-width: 3000px;@else min-width: 1990px; @endcannot">
-                    <tr class="tr-yellow" align="center">
+                    <tr class="tr-yellow" align="center" >
                         <th class=" font-weight-bolder header-1" ></th>
                         <th class="td-yellow  font-weight-bolder original-class table-head-warning  header-2">
                             <span>原始运单号</span>
@@ -258,7 +258,7 @@
                                 <table  class="table table-sm m-0" v-if="orderIssue.order.packages"
                                         :class="orderIssue.order.commodityPackages > 1? 'collapse' : ''" :id="'order'+orderIssue.id">
                                     <template v-for="packages in orderIssue.order.packages">
-                                        <tr v-for="item in packages.commodities" class="text-center" :data-value="orderIssue.orderCount += 1" align="center" v-if="item.commodity">
+                                        <tr v-for="item in packages.commodities" class="text-center" :data-value="orderIssue.orderCount += 1" align="center" v-if="item.commodity" @click="removeFocusing($event)">
                                             <td >@{{ item.commodity.sku }}</td>
                                             <td>
                                                 <p class="text-truncate text-primary m-0 p-0 tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开"  @dblclick="nowrapText($event)">@{{ item.commodity.name }}</p>
@@ -290,7 +290,7 @@
                             <div v-if="orderIssue.rejected_bill" class="m-0 p-0">
                                 <table v-if="orderIssue.rejected_bill.items" class="table table-sm  m-0" :class="orderIssue.rejected_bill.items.length > 1 ? 'collapse' : '' " :id="'rejectedBill'+orderIssue.id"
                                        :data-value="orderIssue.rejectedCount = 0">
-                                    <tr v-for="item in orderIssue.rejected_bill.items"
+                                    <tr v-for="item in orderIssue.rejected_bill.items" @click="removeFocusing($event)"
                                         :data-value="orderIssue.rejected_bill.sum += item.amount" align="center">
                                         <td style="min-width: 75px" >@{{ item.barcode_goods }}</td>
                                         <td style="min-width: 100px" >
@@ -343,6 +343,7 @@
                                 <table class="table table-sm p-0 m-0 " :id="'logs'+orderIssue.id" :data-value="orderIssue.logShow = true">
                                     <tr style="position:static" align="center" v-for="(log,index) in orderIssue.logs"
                                         :class="(index > 1 && orderIssue.logShow) ? 'd-none':''"
+                                        @click="removeFocusing($event)"
                                         v-on:mouseover="showDelBtn($event)" v-on:mouseleave="hideDelBtn($event)" >
                                         <td style="min-width: 200px">@{{ log.content }}</td>
                                         <td class="text-muted" style="min-width: 120px">@{{ log.user.name }}</td>
@@ -380,7 +381,8 @@
                                     </span>
                                 </span>
                             </td>
-                            <td class="p-0 child-layer-3-hide" valign="middle" align="center" v-if="isShowSecondOrderInfo">
+                            <td class="log-td p-0 child-layer-3-hide " valign="middle" align="center" v-if="isShowSecondOrderInfo">
+
                                 <template v-if="orderIssue.second_order">
                                     <div class=" m-0" :id="'secondOrderNumbers'+orderIssue.id"
                                          :class="orderIssue.seconderCount > 1 ? 'collapse':''"
@@ -406,7 +408,7 @@
                                                :data-count="orderIssue.secondeOrderCount = 0"
                                                :data-value="orderIssue.secondeOrderItems = 0">
                                             <template v-for="packages in orderIssue.second_order.packages">
-                                                <tr v-for="item in packages.commodities" :data-value="orderIssue.secondeOrderCount += 1" v-if="item.commodity">
+                                                <tr v-for="item in packages.commodities" :data-value="orderIssue.secondeOrderCount += 1" v-if="item.commodity" >
                                                     <td >@{{ item.commodity.sku }}</td>
                                                     <td >
                                                         <div class="text-truncate text-primary tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开" @dblclick="nowrapText($event)">@{{ item.commodity.name }}</div>
@@ -668,6 +670,7 @@
                 edit:{
                     batchStoreLogs:'',
                     isShow:[],
+                    addSendOrderIssueID:'',
                 },
             },
             mounted: function () {
@@ -681,6 +684,9 @@
 
                 $('#list').removeClass("d-none");
 
+
+
+
                 let _this = this;
                 let log_content_range = [{name:'15',value:'15天内'},{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},];
                 let final_status = [
@@ -956,26 +962,7 @@
                     }
                     let _this = this;
                     let ids = _this.checkData;
-                    // let data = {ids: ids};
                     this.endOrderIssues(ids)
-                    {{--axios.post('{{url('apiLocal/order/issue/endOrderIssue')}}', data).then(function (res) {--}}
-                    {{--    if (res.data.success) {--}}
-                    {{--        tempTip.setDuration(2000);--}}
-                    {{--        tempTip.showSuccess('勾选订单已变为已完结');--}}
-                    {{--        _this.orderIssues.forEach(function (item,index) {--}}
-                    {{--            if (ids.includes(item.id)) {--}}
-                    {{--                item.final_status = '已解决'--}}
-                    {{--            }--}}
-                    {{--        });--}}
-                    {{--        _this.checkData = [];--}}
-                    {{--    } else {--}}
-                    {{--        tempTip.setDuration(3000)--}}
-                    {{--        tempTip.show(res.data.fail_info)--}}
-                    {{--    }--}}
-                    {{--}).catch(function (err) {--}}
-                    {{--    tempTip.setDuration(4000);--}}
-                    {{--    tempTip.show('网络异常:' + err);--}}
-                    {{--})--}}
                 },
                 disposeOrderIssue(e,orderIssue) {
                     let _this = this;
@@ -1259,7 +1246,6 @@
                     let data = {orderIssueIds:this.checkData,content:this.edit.batchStoreLogs};
                     axios.post('{{url("apiLocal/order/issue/log/batchStore")}}',data).then(function(response){
                         if(response.data.success){
-
                             _this.edit.batchStoreLogs = ''
                             let logs = response.data.logs
                             _this.orderIssues.forEach(function(item){
@@ -1347,13 +1333,15 @@
                     truncateSpan.siblings('.text-nowrap').show();
                 },
                 addShow(id){
-                    console.log(id)
                     this.edit.isShow.push(id)
                 },
                 removeShow(id){
                     let index = this.edit.isShow.indexOf(id)
                     if(index!==-1) this.edit.isShow.splice(index,1)
                 },
+                removeFocusing(e){
+                    $(e.target).parent('tr').removeClass('focusing')
+                }
             }
         })
         // modal 隐藏时修改 input 为空

resources/views/order/tracking/index.blade.php

@@ -425,11 +425,15 @@
                         tempTip.setDuration(4000)
                         tempTip.show('更新失败:'+error)
                     })
-
                 },
                 modifyOrderTracking(param,value, trackingOrder){
                     this.trackOrders.forEach(function(item){
                         if(item['orderClientNumber'] === trackingOrder['orderClientNumber']){
+                            if(param === 'planning_sent_at'){
+                                item['signed_at'] = value
+                                item['is_arrival'] = '是'
+                                item['is_on_duty_shift'] = '是'
+                            }
                             item[param] = value
                         }
                     })

routes/apiLocal.php

@@ -49,6 +49,7 @@ Route::group(['prefix' => 'order'], function () {
         Route::post('updateLogisticNumberReturn','OrderIssueController@updateLogisticNumberReturnApi');
         Route::post('editSecondClientNo','OrderIssueController@editSecondClientNoApi');
         Route::post('endOrderIssues','OrderIssueController@endOrderIssuesApi');
+        Route::post('secondOrderAddOrderPackage','OrderIssueController@secondOrderAddOrderPackageApi');
 
          Route::group(['prefix'=>'onTop'],function(){
             Route::post('/store', 'OrderIssueOnTopController@apiStore');