提交计费

app/Http/Controllers/ReceivingTaskController.php

@@ -61,7 +61,7 @@ class ReceivingTaskController extends Controller
         $appointment_number = $request->input('appointment_number', null);
 
         $delivery_appointment_car = DeliveryAppointmentCar::query()->with('deliveryAppointment')
-            ->where('status','!=',2)
+            ->where('status', '!=', 2)
             ->where('appointment_number', $appointment_number)
             ->orderByDesc('id')
             ->first();
@@ -73,13 +73,13 @@ class ReceivingTaskController extends Controller
         $ans_number_string = $delivery_appointment_car->deliveryAppointment->asn_number ?? '';
         $ans_numbers = array_filter(preg_split('/[,， ]+/is', $ans_number_string));
 
-        if (count($ans_numbers) === 0 && count($request->input('asn_no',[])) == 0) {
+        if (count($ans_numbers) === 0 && count($request->input('asn_no', [])) == 0) {
             return ['success' => false, 'errors' => ['appointment_number' => ['预约号没有对应的Asn号']]];
         }
 
         $asn_nos = array_unique(array_merge($ans_numbers, $request->input('asn_nos') ?? []));
 
-        if (count($asn_nos) == 0){
+        if (count($asn_nos) == 0) {
             return ['success' => false, 'errors' => ['appointment_number' => ['预约号没有对应的Asn号']]];
         }
 
@@ -95,16 +95,18 @@ class ReceivingTaskController extends Controller
             $receiving_task = $this->service->createReceivingTask($delivery_appointment_car, $request->all());
             if (!$receiving_task->id) return ['success' => false, 'message' => '生成入库单任务失败，请重新尝试'];
             $receiving_task->loadMissing(['wareHouse', 'owner', 'deliveryAppointmentCar']);
-            $this->sendPiece($request->input('owner_id'),$receiving_task->number);
+            $this->sendPiece($request->input('owner_id'), $receiving_task->number);
+            $this->sendOwnerPiece($request->input('owner_id'),$receiving_task->number);
             return ['success' => true, 'data' => $receiving_task];
         } catch (\Exception $e) {
             return ['success' => false, 'message' => '生成入库单任务失败，请重新尝试'];
         }
     }
 
-    public function sendPiece($ownerId,$taskId){
-        $url = config('api.java.base').config('api.java.piece.log.record');
-        $owner = Owner::query()->where("id",$ownerId)->first();
+    public function sendPiece($ownerId, $taskId)
+    {
+        $url = config('api.java.base') . config('api.java.piece.log.record');
+        $owner = Owner::query()->where("id", $ownerId)->first();
         $warehouseId = $owner->warehouse_id ?? null;
         $request = [
             "user_type" => 0,
@@ -118,15 +120,44 @@ class ReceivingTaskController extends Controller
             "owner_id" => $ownerId,
             "item_number" => 0,
         ];
-        app('LogService')->log("开单",  "通知服务端", json_encode($request));
+        app('LogService')->log("开单", "通知服务端", json_encode($request));
         $http = Http::post($url, $request);
         if (!$http->successful()) {
-            app('LogService')->log("开单",  "sendPiece", '发送失败：'.$http->body());
+            app('LogService')->log("开单", "sendPiece", '发送失败：' . $http->body());
             return;
         }
         $result = $http->json();
         if ($result["code"] != 200) {
-            app('LogService')->log("开单",  "sendPiece", '服务端错误：'.$http->body());
+            app('LogService')->log("开单", "sendPiece", '服务端错误：' . $http->body());
+        }
+    }
+
+    public function sendOwnerPiece($ownerId, $taskId)
+    {
+        $url = config('api.java.base') . config('api.java.piece.ownerLog.entry');
+        $owner = Owner::query()->where("id", $ownerId)->first();
+        $warehouseId = $owner->warehouse_id ?? null;
+        $request = [
+            "user_type" => 0,
+            "job_type" => "开单",
+            "job_name" => "开单",
+            "form_number" => 1,
+            "piece_time" => date("Y-m-d H:i:s"),
+            "message_id" => "owner_entry" . $taskId,
+            "form_scale" =>1,
+            "user_id" => Auth::user()['id'],
+            "warehouse_id" => $warehouseId,
+            "owner_id" => $ownerId,
+        ];
+        app('LogService')->log("货主开单", "通知服务端", json_encode($request));
+        $http = Http::post($url, $request);
+        if (!$http->successful()) {
+            app('LogService')->log("货主开单", "sendPiece", '发送失败：' . $http->body());
+            return;
+        }
+        $result = $http->json();
+        if ($result["code"] != 200) {
+            app('LogService')->log("货主开单", "sendPiece", '服务端错误：' . $http->body());
         }
     }
 
@@ -150,17 +181,18 @@ class ReceivingTaskController extends Controller
         return ['success' => true, 'data' => $ans_numbers];
     }
 
-    public function exportExcel(Request $request, ReceivingTaskFilters $filter){
-        ini_set ('memory_limit', '1024M');
+    public function exportExcel(Request $request, ReceivingTaskFilters $filter)
+    {
+        ini_set('memory_limit', '1024M');
         $items = ReceivingTask::query()->with(['items', 'owner', 'wareHouse', 'file', 'deliveryAppointmentCar'])->filter($filter)->orderByDesc('created_at')->paginate(50);
         $json = [];
-        $row = ['收货任务号','状态','货主','ASN单号','投单时间','仓库','预约号','驾驶证号','收货类型'];
-        foreach ($items as $item){
+        $row = ['收货任务号', '状态', '货主', 'ASN单号', '投单时间', '仓库', '预约号', '驾驶证号', '收货类型'];
+        foreach ($items as $item) {
             $asnNos = [];
-            $item->items->each(function($receivingTaskItem)use(&$asnNos){
+            $item->items->each(function ($receivingTaskItem) use (&$asnNos) {
                 $asnNos[] = $receivingTaskItem->asn_no;
             });
-            $asnNos = implode(",\r\n",$asnNos);
+            $asnNos = implode(",\r\n", $asnNos);
             $json[] = [
                 $item->number,
                 $item->status,

app/Services/OrderRejectedBillRelationService.php

@@ -55,7 +55,7 @@ class OrderRejectedBillRelationService
         $request = [
             "returnNos" => $logisticNumbers
         ];
-        app('LogService')->log("二次分拣计件",  "modifyStatus", '推送：'.json_encode($request));
+        app('LogService')->log("通知问题件关联",  "modifyStatus", '推送：'.json_encode($request));
         Http::post($url,$request);
     }
 
@@ -104,6 +104,7 @@ class OrderRejectedBillRelationService
         }
         OrderIssueRejectedBill::query()->where("order_id",$order->id)->update(['order_issue_id'=>$order_issue->id ?? null]);
         $this->service->syncRejectingStatus($order);
+        $this->sendSWMSMessage($order);
     }
 
     private function getOrderPackagesLogisticNumbers(Order $order): array

config/api.php

@@ -109,6 +109,10 @@ return [
         "piece" => [
             "log" => [
                 "record" => "api/piece/user/record/create",
+            ],
+            'ownerLog' => [
+                "delivery" => "api/piece/dailyReport/owner/delivery/add",
+                "entry" => "api/piece/dailyReport/owner/entry/add",
             ]
         ],
         "reject" => [