临时提交

app/Http/Controllers/TestController.php

@@ -7,8 +7,10 @@ use App\CommodityBarcode;
 use App\Components\AsyncResponse;
 use App\Components\Database;
 use App\Components\ErrorPush;
+use App\Console\Commands\SyncWMSOrderTask;
 use App\Exceptions\Exception;
 use App\Jobs\SyncOrderRejectingStatusJob;
+use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveDetails;
 use App\Order;
 use App\OrderBin;
@@ -61,13 +63,33 @@ class TestController extends Controller
     {
         try {
             return call_user_func([$this, $method], $request);
-        }catch (\BadMethodCallException $e){
+        } catch (\BadMethodCallException $e) {
             dd("方法不存在");
         }
     }
+
     public function test(Request $request)
     {
-        $this->success(json_encode($request->input()));
+
+
+//        /** @var  OracleDOCOrderHeaderService $service */
+//        $service = app(OracleDOCOrderHeaderService::class);
+//        /** @var  OrderService $orderService */
+//        $orderService = app(OrderService::class);
+//        $orderHeaders = OracleDOCOrderHeader::query()->whereIn("ORDERNO",['SO230329004190','SO230329004196'])->get();
+//        $orderHeaders = OracleDOCOrderHeader::query()
+//            ->selectRaw(implode(',',OracleDOCOrderHeaderService::$columns))
+//            ->whereColumn('DOC_Order_Header.editTime','=','DOC_Order_Header.addTime')
+//            ->where('ORDERNO', ['SO230329004190','SO230329004196'])
+//            ->orderBy('DOC_Order_Header.addTime')->get();
+
+//        $orderHeaders = $service->loadMissing($orderHeaders);
+//        $orderService->syncOrder($orderHeaders);                                                    //  同步订单
+
+        /** @var SyncWMSOrderTask $service */
+        $service = app(SyncWMSOrderTask::class);
+        $service->handle();
+
     }
 
 }

app/Services/OrderPackageService.php

@@ -199,8 +199,8 @@ class OrderPackageService
             try {
                 $inner_array = array_chunk($inner_params, 200);
                 foreach ($inner_array as $params) {
-                    OrderPackage::query()->insert($params);
-//                    $this->insert($params);
+//                    OrderPackage::query()->insert($params);
+                    $this->insert($params);
                 }
             } catch (\Exception $e) {
             }

app/Services/WorkOrderImageService.php

@@ -36,7 +36,7 @@ class WorkOrderImageService
         $count = $detail->images()->where('type', 1)->count();
         /** @var WorkOrderImage $workOrderImage */
         $workOrderImage = $detail->images()->create(['type' => 1, 'number' => ++$count,'work_order_id'=> $detail->work_order_id]);
-        $workOrderImage->saveFile($image);
+//        $workOrderImage->saveFile($image);
     }
 
     /**

app/WorkOrderDetail.php

@@ -32,7 +32,7 @@ class WorkOrderDetail extends Model
         'tag',                      // 标记当前工单是否为历史标记
         'receive_address',          // 收方信息
         'return_address',           // 退回单 寄件人地址
-        'return_phone',             // 退回单 寄件人联系号码
+        'return_phone',              // 退回单 寄件人联系号码
         'return_name',              // 退回单 寄件人姓名
         'logistic_handle_tag',      // 承运商在处理标记
 

app/WorkOrderImage.php

@@ -126,13 +126,14 @@ class WorkOrderImage extends Model
 
     public function getStorageDirPath(): string
     {
-        $path = ['app','public','files','workOrder'];
-        $path = join(DIRECTORY_SEPARATOR,$path);
-        $dirPath = storage_path($path);
-        if (!file_exists($dirPath)) {
-            mkdir($dirPath);
-        }
-        return $dirPath.DIRECTORY_SEPARATOR;
+//        $path = ['app','public','files','workOrder'];
+//        $path = join(DIRECTORY_SEPARATOR,$path);
+//        $dirPath = storage_path($path);
+//        if (!file_exists($dirPath)) {
+//            mkdir($dirPath);
+//        }
+//        return $dirPath.DIRECTORY_SEPARATOR;
+        return "";
     }
 
     public function updateFile($image)

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

@@ -471,6 +471,7 @@
                     });
                 },
                 expressAbnormal() {
+
                     let {expressAbnormalData, remark} = this;
                     let message = '';
                     this.waitingTempTip("处理中");
@@ -487,16 +488,17 @@
                             data.append('commodities[]', JSON.stringify({logistic_number: e.logistic_number}));
                         })
                         let dealImages = this.getImages(expressAbnormal.dealImages);
-                        this.setFormDataImagePrefix(data, 'dealImages', dealImages);
-                        this.syncExpressAbnormal(data).then(res => {
-                            if (i === (expressAbnormalData.length - 1)) {
-                                this.cancelWaitingTempTip();
-                                this.cancelSubData();
-                            }
-                            this.successTempTip(`${expressAbnormal.order_no}创建完成`);
-                        }).catch(err => {
-                            message += err + '\\n';
-                        });
+                        console.log(data);
+                        // this.setFormDataImagePrefix(data, 'dealImages', dealImages);
+                        // this.syncExpressAbnormal(data).then(res => {
+                        //     if (i === (expressAbnormalData.length - 1)) {
+                        //         this.cancelWaitingTempTip();
+                        //         this.cancelSubData();
+                        //     }
+                        //     this.successTempTip(`${expressAbnormal.order_no}创建完成`);
+                        // }).catch(err => {
+                        //     message += err + '\\n';
+                        // });
                     }
                 },
                 syncExpressAbnormal(data) {

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

@@ -435,7 +435,7 @@
                                     </td>
                                 @endcan
                                 <td>
-                                    <span v-text="item.order.warehouse ? item.order.warehouse.name : ''"></span>
+{{--                                    <span v-text="item.order.warehouse ? item.order.warehouse.name : ''"></span>--}}
                                 </td>
                                 @can('订单管理-工单处理-宝时编辑')
                                     <td>