Sfoglia il codice sorgente

开单和二次分拣的问题

loustwo 3 anni fa
parent
commit
b04cfea5e3

+ 8 - 0
app/Http/Controllers/ReceivingTaskController.php

@@ -108,6 +108,13 @@ class ReceivingTaskController extends Controller
         $url = config('api.java.base') . config('api.java.piece.log.record');
         $owner = Owner::query()->where("id", $ownerId)->first();
         $warehouseId = $owner->warehouse_id ?? null;
+        $warehouseCode = null;
+        if(!is_null($warehouseId)){
+            $warehouse = Warehouse::query()->where('id',$warehouseId)->first();
+            if(!is_null($warehouse)){
+                $warehouseCode = $warehouse['code'];
+            }
+        }
         $request = [
             "user_type" => 0,
             "job_type" => "开单",
@@ -117,6 +124,7 @@ class ReceivingTaskController extends Controller
             "message_id" => $taskId,
             "user_id" => Auth::user()['id'],
             "warehouse_id" => $warehouseId,
+            "warehouse_code" => $warehouseCode,
             "owner_id" => $ownerId,
             "item_number" => 0,
         ];

+ 5 - 0
app/Services/WaveService.php

@@ -10,6 +10,7 @@ use App\OracleDOCOrderHeader;
 use App\OracleDOCWaveDetails;
 use App\OracleDOCWaveHeader;
 use App\Owner;
+use App\Warehouse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -235,6 +236,7 @@ class WaveService
     public function sendPiece($messageId, $userId, $ownerId, $warehouseId, $date, $number)
     {
         $url = config('api.java.base') . config('api.java.piece.log.record');
+        $warehouse = Warehouse::query()->where('id',$warehouseId)->first();
         $request = [
             "user_type" => 0,
             "job_type" => "二次分拣",
@@ -245,6 +247,7 @@ class WaveService
             "message_id" => $messageId,
             "user_id" => $userId,
             "warehouse_id" => $warehouseId,
+            "warehouse_code" => $warehouse['code'],
             "owner_id" => $ownerId,
             "item_number" => $number,
         ];
@@ -265,6 +268,7 @@ class WaveService
     {
         $url = config('api.java.base') . config('api.java.piece.ownerLog.delivery');
         $waveQuery = OracleDOCWaveDetails::query()->select("orderNo")->where("waveNo", $batch_id);
+        $warehouse = Warehouse::query()->where('id',$warehouseId)->first();
         $items = OracleDOCOrderDetail::query()->whereIn("orderNo", $waveQuery)->get();
         if (count($items) == 0) {
             app('LogService')->log("二次分拣货主计件", "batch_id details is null", $batch_id);
@@ -280,6 +284,7 @@ class WaveService
                 "messageId" => $batch_id . $orderDetail->orderno . $orderDetail->sku . $orderDetail->orderlineno,
                 "deliveryOrderCode" => $orderDetail->orderno,
                 "warehouseId" => $warehouseId,
+                "warehouse_code" => $warehouse['code'],
                 "ownerId" => $ownerId,
                 "userId" => $userId,
                 "userType" => 0,