yuang пре 4 година
родитељ
комит
4d6347d6bb

+ 18 - 1
app/Jobs/RejectedPushJob.php

@@ -8,6 +8,7 @@ use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Log;
 
 class RejectedPushJob implements ShouldQueue
 {
@@ -42,7 +43,23 @@ class RejectedPushJob implements ShouldQueue
      */
     public function handle()
     {
+        $data = [];
+        foreach ($this->pushData as $item) {
+            $data[] = [
+                'asnNo' => $item[0],
+                'logisticNumberReturn' => $item[1],
+                'type' => '推单',
+
+            ];
+        }
         $url = config('api.java.wms.rejectedPushTask.receivePush');
-        $response = Http::post($url, $this->pushData);
+        $response = Http::post($url, $data);
+        Log::info("推送信息!", ['res' => $response->body(), 'req' => $data]);
+
+//        if ($response->ok() && json_decode($response->body())[0]['code'] === 200) {
+//            Log::info("推送成功!", [$response->body()]);
+//        } else {
+//            Log::info("推送失败!", ['res' => $response->body(), 'req' => $this->pushData]);
+//        }
     }
 }

+ 3 - 1
resources/views/rejected/rejectedPushTask/index.blade.php

@@ -60,6 +60,7 @@
                     <span>@{{ i+1 }}</span>
                 </td>
                 <td class="td-warm text-muted"><span>@{{ item.id }}</span></td>
+                <td class="td-warm text-muted"><span>@{{ item.createTime }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.type }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.status }}</span></td>
                 <td class="td-warm text-muted"><span>@{{ item.asnNos }}</span></td>
@@ -168,7 +169,7 @@
         <div class="modal fade" id="staticBackdropShowCommodityDetail" tabindex="-1"
              aria-labelledby="staticBackdropLabel"
              aria-hidden="true">
-            <div class="modal-dialog " style="max-width: 70% !important;">
+            <div class="modal-dialog modal-lg">
                 <div class="modal-content ">
                     <div class="modal-header ">
                         <h5 class="modal-title" id="staticBackdropLabel">明细</h5>
@@ -274,6 +275,7 @@
                 let column = [
                     {name: 'row_num', value: '序号'},
                     {name: 'id', value: '推单任务编号'},
+                    {name: 'createTime', value: '创建时间'},
                     {name: 'type', value: '任务类型'},
                     {name: 'status', value: '状态'},
                     {name: 'asnNos', value: 'ASN单号'},