修改 退回单号提示

app/Http/Controllers/OrderIssueController.php

@@ -374,21 +374,21 @@ class OrderIssueController extends Controller
         if (!Gate::allows('订单管理-问题件-编辑')) {
             return ['success'=>false,'fail_info' => '没有对应权限'];
         }
-
         try {
-
             /** @var OrderIssue $orderIssue */
             $orderIssue = OrderIssue::query()->where('id',$request->input('id'))->first();
             $orderIssue->update(['logistic_number_return' => $request->input('logisticNumberReturn')]);
             $orderIssue->同步退单状态();
-
             $rejectedBill = RejectedBill::query()
                 ->with('items')
                 ->where('logistic_number_return',$request->input('logisticNumberReturn'))
                 ->first();
-
             LogService::log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
-            return ['success' => true, 'rejectedBill' => $rejectedBill,'rejectingStatus' =>$orderIssue->rejecting_status];
+            if(!$rejectedBill){
+                return ['success' => false, 'message' => '退回单号已修改，退回单号没有相应退件信息'];
+            }else{
+                return ['success' => true, 'rejectedBill' => $rejectedBill,'rejectingStatus' =>$orderIssue->rejecting_status];
+            }
         } catch (Exception $e) {
             LogService::log(__METHOD__, __FUNCTION__,'error'. json_encode($request->getContent()).'||'.$e->getMessage().'||'.$e->getTraceAsString());
             return ['success' => false ,'fail_info' => $e->getMessage()];

app/Http/Controllers/TestController.php

@@ -674,8 +674,7 @@ class TestController extends Controller
     }
 
     public function updateOrderTrackingGrossWeightAndBulk(){
-        $orderTrackings = OrderTracking::query()->with('commodities.package.order.owner','commodities.commodity')
-            ->where('created_at','>','2020-09-28 00:07:06')->get();
+        $orderTrackings = OrderTracking::query()->with('commodities.package.order.owner','commodities.commodity')->get();
         foreach ($orderTrackings as $orderTracking) {
             $code = $orderTracking->commodities->package->order->owner->code ?? false;
             $amount = $orderTracking->commodities->amount;

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

@@ -310,8 +310,8 @@
                                         :data-value="orderIssue.rejected_bill.sum += item.amount" align="center">
                                         <td style="min-width: 75px" >@{{ item.barcode_goods }}</td>
                                         <td style="min-width: 100px" >
-                                            <div class="text-truncate text-primary tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开" @dblclick="nowrapText($event)">@{{ item.commodity.name_goods }}</div>
-                                            <div class="text-nowrap m-0 p-0 tooltipTarget"  style="display: none;cursor:pointer" @dblclick="truncateText($event)" title="双击收起">@{{ item.commodity.name_goods }}</div>
+                                            <div class="text-truncate text-primary tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开" @dblclick="nowrapText($event)">@{{ item.name_goods }}</div>
+                                            <div class="text-nowrap m-0 p-0 tooltipTarget"  style="display: none;cursor:pointer" @dblclick="truncateText($event)" title="双击收起">@{{ item.name_goods }}</div>
 {{--                                            <p class="text-truncate text-primary m-0 p-0 tooltipTarget" style="width: 100px;cursor:pointer;text-decoration: underline" title="双击展开"  @dblclick="nowrapText($event)" >@{{ item.name_goods }}</p>--}}
 {{--                                            <p class="text-nowrap m-0 p-0 tooltipTarget" style="display: none;cursor:pointer"  title="双击收起" @dblclick="truncateText($event)" >@{{ item.name_goods }}</p>--}}
                                         </td>
@@ -1295,8 +1295,13 @@
                             tempTip.setDuration(2000)
                             tempTip.showSuccess('修改成功')
                         }else{
-                            tempTip.setDuration(3000)
-                            tempTip.show('修改失败:'+response.data.fail_info)
+                            if(response.data.message){
+                                orderIssue['logistic_number_return'] = logistic_number_return
+                                tempTip.okWindow(response.data.message,'确认')
+                            }else{
+                                tempTip.setDuration(3000)
+                                tempTip.show('修改失败:'+response.data.fail_info)
+                            }
                         }
                     }).catch(function(error){
                         tempTip.setDuration(3000)