OrderTracking 显示问题 已经修改OrderTracking 填充任务

app/Http/Controllers/TestController.php

@@ -1500,37 +1500,19 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
                  * @var DataHandlerService $dataService
                  */
                 $service = new OrderTrackingService();
-                $orderHeaderService = new OracleDOCOrderHeaderService();
-                $dataService = new DataHandlerService();
-                $order_nos = array_unique(data_get($orderTrackings,'*.commodities.package.order.code'));
-                $order_headers = $orderHeaderService->getQuery()->whereIn('orderno',$order_nos)->get();
-                $update[] = ['id','order_client_code','client',];
-                $order_header_map = $dataService->dataHeader(['orderno'],$order_headers);
+                $update = [];
+                $update[]  = ['id','order_client_code_wms'];
                 foreach ($orderTrackings as $orderTracking) {
-                    $params = ['id' => $orderTracking->id];
-                    $order_package_commodity = $orderTracking->commodities;
-                    if(!$order_package_commodity)continue;
-                    if(!$order_package_commodity->package)continue;
-                    if(!$order_package_commodity->package->order)continue;
-                    $order= $order_package_commodity->package->order;
-                    $order_header = $dataService->getKeyValue(['orderno'=>$order->code],$order_header_map);
-                    $order_remark = $order_header['notes'] ?? '';        // 订单备注
-                    $params['client'] = $order_header['issuepartyname'];
-                    if(mb_stristr($order_remark,'天猫') && mb_stristr($order_remark,'赠品')){ // client and order_remark 商铺 和 订单备注
-                        $params['client'] = '天猫(赠品)';
-                        $params['order_remark'] = $order_remark;
+                    if($orderTracking->commodities->order ?? false){
+                        $update = [
+                            'id' => $orderTracking->id,
+                            'order_client_code_wms' => $orderTracking->commodities->order->client_code
+                        ];
                     }
-                    if(mb_stristr($order_header['issuepartyname'],'天猫') && $params['client'] !== '天猫(赠品)') $params['client'] = '天猫';
-                    if($params['client'] == '天猫') // order_client_code 订单号  店铺包含天猫
-                        $params['order_client_code'] = $service->get_d_edit_03($order_header,$order_package_commodity);
-                    else
-                        $params['order_client_code'] = $order->client_code;
-                    if($params['client'] != '天猫' && $params['client'] != '天猫(赠品)')continue;
-                    if($params['client']!=$orderTracking->client ||  $params['order_client_code']!=$orderTracking->order_client_code) $update[] = $params;
-            }
-            if(count($update) > 1){
-                $service->batchUpdate($update);
-            }
+                }
+                if(count($update) > 1){
+                    $service->batchUpdate($update);
+                }
         });
     }
 
@@ -1560,4 +1542,6 @@ where (commodities.owner_id,commodity_barcodes.code) in (select commodities.owne
             });
     }
 
+
+
 }

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

@@ -88,13 +88,14 @@
                             <span v-if="trackOrder.web_order_number">
                                 <input class="form-control form-control-sm" :value="trackOrder.order_client_code === trackOrder.web_order_number ? '' : trackOrder.order_client_code " @change="warehouseUpdate($event,'order_client_code',trackOrder)" >
                             </span>
-                            <span v-else>
-                            @can('订单管理-跟踪-仓库编辑')
-                                <input class="form-control form-control-sm" :value="trackOrder.order_client_code" @change="warehouseUpdate($event,'order_client_code',trackOrder)" >
-                            @else
-                                <span> @{{ trackOrder.order_client_code }}</span>
-                            @endcan
-                            </span>
+                            <span v-else>@{{ trackOrder.order_client_code }}</span>
+{{--                            <span v-else>--}}
+{{--                            @can('订单管理-跟踪-仓库编辑')--}}
+{{--                                <input class="form-control form-control-sm" :value="trackOrder.order_client_code" @change="warehouseUpdate($event,'order_client_code',trackOrder)" >--}}
+{{--                            @else--}}
+{{--                                <span> @{{ trackOrder.order_client_code }}</span>--}}
+{{--                            @endcan--}}
+{{--                            </span>--}}
                         </td>
                         <td class="td-warm">
                             @{{ trackOrder.order_client_code_wms }}
@@ -116,6 +117,7 @@
                         </td>
                         <td class="td-warm">
                         </td>
+{{--                        <td class="td-warm">--}}
 {{--                            @can('订单管理-跟踪-仓库编辑')--}}
 {{--                                <input class="form-control form-control-sm" :value="trackOrder.sale" @change="warehouseUpdate($event,'sale',trackOrder)" >--}}
 {{--                            @else--}}